Merge branch 'w3f:master' into master

docs/RFPs/Under Development/social-recovery-wallet.md → 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: 

docs/RFPs/Under Development/validator-setup-maintenance.md → docs/RFPs/Closed/validator-setup-maintenance.md

@@ -1,13 +1,14 @@
 # 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: 
 
 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:
 

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.
 

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:  

docs/RFPs/Open/ISO_8583.md → 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: 

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: 

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 

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":"13.0.0"
   },
   "browserslist": {
     "production": [

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==
 
-[email protected]:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
-  integrity sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==
+[email protected], 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"