From db3b49c37a3987e2a1c8a9be13283c0b588fc9fc Mon Sep 17 00:00:00 2001 From: Keegan | W3F <35080151+keeganquigley@users.noreply.github.com> Date: Wed, 23 Aug 2023 02:22:24 -0400 Subject: [PATCH 1/3] Update RFPs (#1924) * update rfp * Rename social-recovery-wallet.md to social-recovery-wallet.md * update rfp * Rename ISO_8583.md to ISO_8583.md * update rfp * update * update * update * Rename validator-setup-maintenance.md to validator-setup-maintenance.md * Update IDE_for_ink_Smart_Contracts.md --- .../{Under Development => Closed}/social-recovery-wallet.md | 2 +- .../validator-setup-maintenance.md | 3 ++- docs/RFPs/Open/xcm-tool.md | 2 +- docs/RFPs/Under Development/IDE_for_ink_Smart_Contracts.md | 2 +- docs/RFPs/{Open => Under Development}/ISO_8583.md | 2 +- .../Under Development/ink_smart_contract_block_explorer.md | 2 +- docs/RFPs/Under Development/validator-selection-algorithm.md | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) rename docs/RFPs/{Under Development => Closed}/social-recovery-wallet.md (89%) rename docs/RFPs/{Under Development => Closed}/validator-setup-maintenance.md (92%) rename docs/RFPs/{Open => Under Development}/ISO_8583.md (88%) diff --git a/docs/RFPs/Under Development/social-recovery-wallet.md b/docs/RFPs/Closed/social-recovery-wallet.md similarity index 89% rename from docs/RFPs/Under Development/social-recovery-wallet.md rename to docs/RFPs/Closed/social-recovery-wallet.md index 579b05d5bd0..22cddad44cd 100644 --- a/docs/RFPs/Under Development/social-recovery-wallet.md +++ b/docs/RFPs/Closed/social-recovery-wallet.md @@ -1,6 +1,6 @@ # Social Recovery Wallet -* **Status:** [Under Development 1](https://github.com/w3f/Grants-Program/blob/master/applications/Plus-social-recovery-wallet.md), [Implemented](https://github.com/hypha-dao/hashed-wallet), [Under Development 3](https://github.com/w3f/Grants-Program/blob/master/applications/keysafe_network.md) +* **Status:** [Implemented 1](https://github.com/w3f/Grants-Program/blob/master/applications/Plus-social-recovery-wallet.md), [Implemented 2](https://github.com/hypha-dao/hashed-wallet), [Under Development 1](https://github.com/w3f/Grants-Program/blob/master/applications/dauth_network.md) * **Proposer:** [Noc2](https://github.com/Noc2) ## Project Description :page_facing_up: diff --git a/docs/RFPs/Under Development/validator-setup-maintenance.md b/docs/RFPs/Closed/validator-setup-maintenance.md similarity index 92% rename from docs/RFPs/Under Development/validator-setup-maintenance.md rename to docs/RFPs/Closed/validator-setup-maintenance.md index 933cd2b180f..7dabd5bfd1f 100644 --- a/docs/RFPs/Under Development/validator-setup-maintenance.md +++ b/docs/RFPs/Closed/validator-setup-maintenance.md @@ -1,6 +1,6 @@ # polkadot-validator-setup maintenance -* **Status:** [See Polkadot Validation Node Ansible Setup](https://github.com/polkachu/polkadot-validator) +* **Status:** [Closed](https://github.com/polkachu/polkadot-validator) * **Teams/People that could deliver the RFP:** @melozo, @pmensik, @tylerztl, @bLd75 ## Project Description :page_facing_up: @@ -8,6 +8,7 @@ One of the more accessible ways of spinning up validator nodes is by using the [`polkadot-validator-setup`](https://github.com/w3f/polkadot-validator-setup) repository, which uses a mix of terraform and ansible tools to create a server, adjust its configuration and install the necessary packages needed for running a substrate node. This RFP aims at providing maintenance to that repository and add some small features. +**UPDATE:** This repo has been archived. ## Deliverables :nut_and_bolt: diff --git a/docs/RFPs/Open/xcm-tool.md b/docs/RFPs/Open/xcm-tool.md index 8198519b580..85a7525194c 100644 --- a/docs/RFPs/Open/xcm-tool.md +++ b/docs/RFPs/Open/xcm-tool.md @@ -1,6 +1,6 @@ # XCM library & tools -* **Status:** Open +* **Status:** [Implemented](https://github.com/keeganquigley/Grants-Program/blob/master/applications/ParaSpell_follow-up2.md), [Under Development 1](https://github.com/keeganquigley/Grants-Program/blob/master/applications/xcm-tools.md), [Under Development 2](https://github.com/keeganquigley/Grants-Program/blob/master/applications/xcm-domain-service.md) * **Proposer:** [Bryan Chen](https://github.com/xlc) * **Projects you think this work could be useful for** : Every parachain. diff --git a/docs/RFPs/Under Development/IDE_for_ink_Smart_Contracts.md b/docs/RFPs/Under Development/IDE_for_ink_Smart_Contracts.md index 97e828261a2..d00e9afc75e 100644 --- a/docs/RFPs/Under Development/IDE_for_ink_Smart_Contracts.md +++ b/docs/RFPs/Under Development/IDE_for_ink_Smart_Contracts.md @@ -1,6 +1,6 @@ # Browser based IDE for ink! Smart Contracts -* **Status:** [Under Development](https://github.com/w3f/Grants-Program/blob/master/applications/ink-playground-ide-improvements.md) +* **Status:** [Under Development 1](https://github.com/w3f/Grants-Program/blob/master/applications/ink-playground-ide-improvements.md), [Under Development 2](https://github.com/w3f/Grants-Program/blob/master/applications/sandox.md) * **Proposer:** [David Hawig](https://github.com/Noc2) ## Project Description :page_facing_up: diff --git a/docs/RFPs/Open/ISO_8583.md b/docs/RFPs/Under Development/ISO_8583.md similarity index 88% rename from docs/RFPs/Open/ISO_8583.md rename to docs/RFPs/Under Development/ISO_8583.md index a910d2a595c..1312749da23 100644 --- a/docs/RFPs/Open/ISO_8583.md +++ b/docs/RFPs/Under Development/ISO_8583.md @@ -1,6 +1,6 @@ # RFP: ISO 8583 -* **Status:** Open +* **Status:** [Implemented](https://github.com/w3f/Grants-Program/blob/master/applications/Integrating-ISO8583.md), [Under Development](https://github.com/w3f/Grants-Program/blob/master/applications/ISO-8583-implementation.md) * **Proposer:** [Noc2](https://github.com/Noc2) ## Project Description :page_facing_up: diff --git a/docs/RFPs/Under Development/ink_smart_contract_block_explorer.md b/docs/RFPs/Under Development/ink_smart_contract_block_explorer.md index 5d1b73c750e..fae0d22e091 100644 --- a/docs/RFPs/Under Development/ink_smart_contract_block_explorer.md +++ b/docs/RFPs/Under Development/ink_smart_contract_block_explorer.md @@ -1,6 +1,6 @@ # RFP: ink! block explorer -* **Status:** [Under Development](https://github.com/w3f/Grants-Program/blob/master/applications/epirus_substrate_explorer.md) +* **Status:** [Implemented 1](https://github.com/w3f/Grants-Program/blob/master/applications/epirus_substrate_explorer.md), [Implemented 2](https://github.com/w3f/Grants-Program/blob/master/applications/ink-explorer.md) * **Proposer:** [Noc2](https://github.com/Noc2) ## Project Description :page_facing_up: diff --git a/docs/RFPs/Under Development/validator-selection-algorithm.md b/docs/RFPs/Under Development/validator-selection-algorithm.md index 24766965e0b..5956cce6d10 100644 --- a/docs/RFPs/Under Development/validator-selection-algorithm.md +++ b/docs/RFPs/Under Development/validator-selection-algorithm.md @@ -1,6 +1,6 @@ # RFP: Validator Selection Algorithm -* **Status:** [Under Development](https://github.com/w3f/Grants-Program/blob/master/applications/validators_selection.md) +* **Status:** [Implemented](https://github.com/w3f/Grants-Program/blob/master/applications/validators_selection.md) * **Proposer:** [jonasW3F](https://github.com/jonasW3F) ## Project Description From 673e6da58909438061a57beb0f1d3332f5de945d Mon Sep 17 00:00:00 2001 From: Noc2 Date: Wed, 23 Aug 2023 09:10:45 +0200 Subject: [PATCH 2/3] update resolutions --- package.json | 4 +++- yarn.lock | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 716100c6219..8c878feac96 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,9 @@ "url-loader": "^4.1.1" }, "resolutions": { - "semver": "^7.5.4" + "semver": "^7.5.4", + "trim":"^0.0.3", + "got@":"11.8.5" }, "browserslist": { "production": [ diff --git a/yarn.lock b/yarn.lock index 3c76bd6bc6c..81bb326c07f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8018,10 +8018,10 @@ trim-trailing-lines@^1.0.0: resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0" integrity sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ== -trim@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" - integrity sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ== +trim@0.0.1, trim@^0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.3.tgz#05243a47a3a4113e6b49367880a9cca59697a20b" + integrity sha512-h82ywcYhHK7veeelXrCScdH7HkWfbIT1D/CgYO+nmDarz3SGNssVBMws6jU16Ga60AJCRAvPV6w6RLuNerQqjg== trough@^1.0.0: version "1.0.5" From 80ea9c149cd19c311704883f5746eb64f1c279fe Mon Sep 17 00:00:00 2001 From: Noc2 Date: Wed, 23 Aug 2023 09:18:01 +0200 Subject: [PATCH 3/3] fix resolutions --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c878feac96..789c4095c82 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "resolutions": { "semver": "^7.5.4", "trim":"^0.0.3", - "got@":"11.8.5" + "got":"13.0.0" }, "browserslist": { "production": [