Merge branch 'w3f:master' into master

.github/labeler.yml

@@ -0,0 +1,13 @@
+"admin-review":
+- changed-files:
+  - any-glob-to-any-file: applications/**
+
+"update docs":
+- all:
+  - changed-files:
+    - any-glob-to-any-file: 'docs/**'
+    - all-globs-to-all-files: '!docs/RFPs/**'
+
+"rfp":
+- changed-files:
+  - any-glob-to-any-file: docs/RFPs/**

.github/pull_request_template.md

@@ -14,7 +14,7 @@
 
 - [x] The [application template](https://github.com/w3f/Grants-Program/blob/master/applications/application-template.md) has been copied and aptly renamed (`project_name.md`).
 - [ ] I have read the [application guidelines](https://github.com/w3f/Grants-Program/blob/master/docs/Support%20Docs/grant_guidelines_per_category.md).
-- [ ] Payment details have been provided (bank details via email _or_ Polkadot (USDC & USDT) address in the application).
+- [ ] Payment details have been provided (Polkadot AssetHub (DOT, USDC & USDT) address in the application and bank details via email, if applicable).
 - [ ] I am aware that, in order to receive a grant, I (and the entity I represent) have to successfully complete a KYC/KYB check.
 - [ ] The software delivered for this grant will be released under an open-source license specified in the application.
 - [ ] The initial PR contains only one commit (squash and force-push if needed).

.github/workflows/check_application_document.yml

@@ -20,19 +20,6 @@ jobs:
           filter: 'applications/*.md'
           format: 'csv'
 
-  add_label:
-    needs: get_filename
-    if: needs.get_filename.outputs.filename
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - name: add admin-review label
-        uses: actions-ecosystem/action-add-labels@v1
-        with:
-          labels: admin-review
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-
   parse_document:
     needs: get_filename
     if: needs.get_filename.outputs.filename

.github/workflows/labeler.yml

@@ -0,0 +1,14 @@
+name: "Pull Request Labeler"
+on:
+- pull_request_target
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v5
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@v2
         with:
-          node-version: "16.16.0"
+          node-version: "18.19.0"
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0

.gitignore

@@ -65,4 +65,4 @@ node_modules
 
 # docusaurus
 build/
-.docusaurus/
+.docusaurus/

README.md

@@ -24,8 +24,7 @@
   - [Office Hours](#office-hours)
   - [Additional Information](#additional-information)
 - [:rocket: Alternative Funding Sources](#rocket-alternative-funding-sources)
-  - [Substrate Builders Program vs Treasury vs Web3 Grants](#substrate-builders-program-vs-treasury-vs-web3-grants)
-  - [Substrate Builders Program](#substrate-builders-program)
+  - [Treasury vs Web3 Grants](#treasury-vs-web3-grants)
   - [Treasury](#treasury)
   - [Hackathons](#hackathons)
   - [Other Grant or Bounty Programs](#other-grant-or-bounty-programs)
@@ -74,7 +73,7 @@ If you have a **good concept of the technical challenges** that your idea entail
 
 ### Support
 
-The scope of our Grants Programs consists of funding and feedback on delivered milestones. This means that we do not provide hands-on support as part of a grant, but if you face specific issues during development, we will do our best and try to direct you to the correct resources. If this sounds like something you would like however, you may also want to apply to Parity's [Substrate Builders Program](https://www.substrate.io/builders-program/), which provides hands-on technical, ecosystem, and strategical long-term support and access to extensive resources. You can find general documentation and more information on Substrate on the [Substrate Developer Hub](https://substrate.dev/), and we encourage you to join the [community](https://substrate.dev/en/community) in order to get help with specific issues or to stay up to date with the most recent developments.
+The scope of our Grants Programs consists of funding and feedback on delivered milestones. This means that we do not provide hands-on support as part of a grant, but if you face specific issues during development, we will do our best and try to direct you to the correct resources. You can find general documentation and more information on Substrate on the [Substrate Developer Hub](https://substrate.dev/), and we encourage you to join the [community](https://substrate.dev/en/community) in order to get help with specific issues or to stay up to date with the most recent developments.
 
 For questions about the grants program itself, see our [FAQ](docs/faq.md#frequently-asked-questions).
 
@@ -116,7 +115,7 @@ The Operations Team takes care of legal documents, invoicing, and remittances.
 
 ## :level_slider: Levels
 
-The W3F Grants Program offers different grant levels to help you best, depending on your current stage.
+The W3F Grants Program offers different grant levels to help you best, depending on your current stage. 30% of any grant is paid out in vested DOT.
 
 ### :hatching_chick: Level 1 (= InstaGrants)<!-- omit in toc -->
 
@@ -130,7 +129,7 @@ The W3F Grants Program offers different grant levels to help you best, depending
 - **Target:** Small teams/start-ups
 - **Amount:** Up to $30,000
 - **Requirements:** 3 approvals
-- **Benefits:** All of the above + [co-promotion](https://github.com/w3f/Grants-Program/blob/master/docs/Support%20Docs/announcement-guidelines.md), [Grants Program badge](https://github.com/w3f/Grants-Program/blob/master/docs/Support%20Docs/grant-badge-guidelines.md), fast track to [Substrate Builders Program](https://www.substrate.io/builders-program/)
+- **Benefits:** All of the above + [co-promotion](https://github.com/w3f/Grants-Program/blob/master/docs/Support%20Docs/announcement-guidelines.md), [Grants Program badge](https://github.com/w3f/Grants-Program/blob/master/docs/Support%20Docs/grant-badge-guidelines.md)
 
 ### :rooster: Level 3<!-- omit in toc -->
 
@@ -141,7 +140,7 @@ The W3F Grants Program offers different grant levels to help you best, depending
 
 ## :pencil: Process
 
-> **:loudspeaker:** Payments can be made in USDT and USDC on the Polkadot [AssetHub](https://wiki.polkadot.network/docs/learn-assets) and fiat (USD, EUR, CHF). Please indicate your preference in the application [as outlined in our application template](https://github.com/w3f/Grants-Program/blob/master/applications/application-template.md?plain=1#L7). If you want to apply in **private**, you can do so [:arrow_right: here](https://docs.google.com/forms/d/e/1FAIpQLSfMfjiRmDQDRk-4OhNASM6BAKii7rz_B1jWtbCPkUh6N7M2ww/viewform). Note that this is generally a slower process and imposes stricter requirements on applicants.
+> **:loudspeaker:** 30% of each milestone payment is made in DOT (linearly vesting over 2 years). The remaining 70% is paid in_either_ USDT or USDC on the Polkadot [AssetHub](https://wiki.polkadot.network/docs/learn-assets) _or_ fiat (USD, EUR, CHF). Please indicate your preference in the application [as outlined in our application template](https://github.com/w3f/Grants-Program/blob/master/applications/application-template.md?plain=1#L7). If you want to apply in **private**, you can do so [:arrow_right: here](https://docs.google.com/forms/d/e/1FAIpQLSfMfjiRmDQDRk-4OhNASM6BAKii7rz_B1jWtbCPkUh6N7M2ww/viewform). Note that this is generally a slower process and imposes stricter requirements on applicants.
 
 ### 1. Application
 
@@ -263,9 +262,9 @@ It is **not** a chance to pitch your project, especially since only a small subs
 
 We encourage you to explore the alternative funding options listed below. Please note, however, that you should not seek to fund the **same scope of work** from multiple sources and that any team found doing so will have its Web3 Foundation support terminated.
 
-### Substrate Builders Program vs Treasury vs Web3 Grants
+### Treasury vs Web3 Grants
 
-The following flowchart gives a rough, oversimplified view of how the W3F Grants Program, the Polkadot and Kusama treasuries and Parity's Substrate Builders Program relate, and where your project might fit best. Note that this diagram does not include any of the [parachain-specific grants/builders programs](#other-grant-programs) other organisations are offering.  
+The following flowchart gives a rough, oversimplified view of how the W3F Grants Program, the Polkadot and Kusama treasuries relate, and where your project might fit best. Note that this diagram does not include any of the [parachain-specific grants/builders programs](#other-grant-programs) other organisations are offering.  
 
 ```mermaid
 flowchart LR
@@ -276,7 +275,6 @@ flowchart LR
     B -->|Existing POC| E[Goal of the Application]
     B -->|No POC| F[Grants Program]
     E -->|Funding| G[Treasury or Grants Program]
-    E -->|Support| H[Substrate Builders Program]
     style C stroke:#e83e8c,stroke-width:2px,stroke-dasharray: 5 5
     style D stroke:#e83e8c,stroke-width:2px,stroke-dasharray: 5 5
     style F stroke:#e83e8c,stroke-width:2px,stroke-dasharray: 5 5
@@ -285,13 +283,8 @@ flowchart LR
     click C "https://github.com/w3f/Grants-Program#pencil-process" "You are already in the right place :)"
     click D "https://polkadot.network/treasury" "https://polkadot.network/treasury/" _blank
     click F "https://github.com/w3f/Grants-Program#pencil-process" "You are already in the right place :)"
-    click H "https://www.substrate.io/builders-program/" "https://www.substrate.io/builders-program/" _blank
 ```
 
-### Substrate Builders Program
-
-The [Substrate Builders Program](https://substrate.io/ecosystem/substrate-builders-program/) directly supports you by connecting you with Parity’s extensive resources.
-
 ### Treasury
 
 The treasury is a pot of on-chain funds collected through transaction fees, slashing, staking inefficiencies, etc. The funds held in the treasury can be spent on spending proposals. Both [Polkadot](https://polkadot.network/) and [Kusama](https://kusama.network/) offer everyone the opportunity to apply for funding via the treasury. See:

applications/AdMeta.md

@@ -72,7 +72,7 @@ Dr. John Wu - Core Dev of Litentry Parachain Team. The University of Tokyo
 
 - **Contact Name:** Han Zhao
 - **Contact Email:** [email protected]
-- **Website:** <https://admeta.network/>
+- **Website:** https://admeta.network/
 
 ### Legal Structure
 
@@ -93,28 +93,28 @@ Note: Both [Litentry](https://www.litentry.com/) and [Web3Go](https://github.com
 
 ### Team Code Repos
 
-- <https://github.com/litentry/litentry-parachain>
-- <https://github.com/litentry/litentry-pallets>
-- <https://github.com/web3go-xyz/web3go>
+- https://github.com/litentry/litentry-parachain
+- https://github.com/litentry/litentry-pallets
+- https://github.com/web3go-xyz/web3go
 
 Please also provide the GitHub accounts of all team members. If they contain no activity, references to projects hosted elsewhere or live are also fine.
 
-- <https://github.com/h4n0> Han Zhao
-- <https://github.com/Shihao66> Shihao Zhao
-- <https://github.com/Moehringen> Hao Ding
+- https://github.com/h4n0 Han Zhao
+- https://github.com/Shihao66 Shihao Zhao
+- https://github.com/Moehringen Hao Ding
 
 ### Team LinkedIn Profiles (if available)
 
-- <https://www.linkedin.com/in/zhaohan6>
-- <https://www.linkedin.com/in/shihao-zhao-55752685/>
-- <https://www.linkedin.com/in/hao-ding-msc-pmp-64411193/>
+- https://www.linkedin.com/in/zhaohan6
+- https://www.linkedin.com/in/shihao-zhao-55752685/
+- https://www.linkedin.com/in/hao-ding-msc-pmp-64411193/
 
 ## Development Status :open_book:
 
-- <https://github.com/AdMetaNetwork/admeta> This is the AdMeta Substrate chain implementation. We already started to build the pallets mentioned in Milestone 1 below.
-- <https://github.com/AdMetaNetwork/admeta-webapp> This is our web app repo according to Milestone 1. We already had a single page app with polkadot js API integrated now.
-- <https://github.com/AdMetaNetwork/admeta-decentraland> This is a simple asset built with Decentraland SDK, and currently it's just for a demo purpose.
-- <https://admeta.network/> We also have the first version of our website.
+- https://github.com/AdMetaNetwork/admeta This is the AdMeta Substrate chain implementation. We already started to build the pallets mentioned in Milestone 1 below.
+- https://github.com/AdMetaNetwork/admeta-webapp This is our web app repo according to Milestone 1. We already had a single page app with polkadot js API integrated now.
+- https://github.com/AdMetaNetwork/admeta-decentraland This is a simple asset built with Decentraland SDK, and currently it's just for a demo purpose.
+- https://admeta.network/ We also have the first version of our website.
 
 ## Development Roadmap :nut_and_bolt:
 

applications/Afloat.md

@@ -135,7 +135,7 @@ Louise Reed is scheduled to speak at the following Certified Public Accountant S
 
 - **Contact Name:** Louise Reed
 - **Contact Email:** [email protected]
-- **Website:** <https://stayafloat.io/#/>
+- **Website:** https://stayafloat.io/#/
 
 ### Legal Structure
 
@@ -154,12 +154,12 @@ Afloat is partnering with Hashed Systems DAO LLC, a substrate development team w
 
 ### Relevant profile links
 
-- Louise Reed CPA website: <https://louisereedcpa.com/>
-- Louise Reed LinkedIn: <https://www.linkedin.com/in/louisewreed/>
-- Abel on Github: <https://github.com/amatsonkali>
-- Jose Maria on Github: <https://github.com/jmgayosso> and Gitlab: <https://gitlab.com/jmgayosso>
-- Hashed website: <https://hashed.io/>
-- Erick on GitHub: <https://github.com/tlacloc>
+- Louise Reed CPA website: https://louisereedcpa.com/
+- Louise Reed LinkedIn: https://www.linkedin.com/in/louisewreed/
+- Abel on Github: https://github.com/amatsonkali
+- Jose Maria on Github: https://github.com/jmgayosso and Gitlab: https://gitlab.com/jmgayosso
+- Hashed website: https://hashed.io/
+- Erick on GitHub: https://github.com/tlacloc
 
 ## Development Roadmap :nut_and_bolt:
 
@@ -309,4 +309,4 @@ Blockchain Friendly State Breakdown
 
 ![Image](https://user-images.githubusercontent.com/7217054/160020643-84313880-4e0b-4942-8b1a-7278eb7aa219.png)
 
-<https://www.investopedia.com/news/majority-us-states-are-still-acknowledge-cryptocurrencies/>
+https://www.investopedia.com/news/majority-us-states-are-still-acknowledge-cryptocurrencies/

applications/AlgoCash.md

@@ -174,7 +174,7 @@ Gang is now working as a freelancer. He is a full stack developer proficient in
 
 ### Team Code Repos
 
-* <https://github.com/ReserveLabs/AlgoCash>
+* https://github.com/ReserveLabs/AlgoCash
 
 ### Team LinkedIn Profiles
 

applications/Apron_Network.md

@@ -93,7 +93,7 @@ The Apron Network provides exactly the same API services as infura.io but in a d
 
 ### Contact
 
-- <https://apron.network>
+- https://apron.network
 
 ### Legal Structure
 
@@ -118,7 +118,7 @@ Junjun
 
 ### Team Code Repos
 
-* Apron Labs: <https://github.com/apron-network>
+* Apron Labs: https://github.com/apron-network
 
 ### Team LinkedIn Profiles
 
@@ -184,4 +184,4 @@ Development Plan
 
 Currently we just start the first design of the Apron Network.
 
-The project repo: <https://github.com/apron-network>
+The project repo: https://github.com/apron-network

applications/Awesome-Polka.md

@@ -223,7 +223,7 @@ This project is planned as 1 milestone, it will be completed in one months.
 | **0c.** | Testing and Testing Guide | Core functions will be fully covered by comprehensive unit tests to ensure functionality and robustness. In the guide, we will describe how to run these tests. |
 | **0d.** | Docker | I will provide a Dockerfile(s) that can be used to test all the functionality delivered with this milestone. |
 | **0e.** | Article | I will publish an **article**/workshop that explains what was done/achieved as part of the grant. |
-| **1.** | UI & UX Development | **Home Page:** Visually appealing and user-friendly homepage which includes latest articles, popular categories and many more <br /> **Projects Page:** Showcase page with detailed filtering and search infrastructure <br/>**Project Detail Page:** Project details page to display detailed information about project with several modules like explained in the solution <br />**Articles Page:** Articles page to showcase informative articles related to the subject <br />**Article Detail Page:** Detail page for individual articles to display their full content <br />**Ranking Page:** Ranking page based on votes and token stats which is supported by CoinGecko api to showcase popular projects and articles <br/> **Learn Page:** Useful resources to learn about polkadot ecosystem </br/> **UX Improvements & Testing:** I will work to improve the user experience by ensuring that the user interface is fully compatible with mobile and tablet devices. |
+| **1.** | UI & UX Development | **Home Page:** Visually appealing and user-friendly homepage which includes latest articles, popular categories and many more <br /> **Projects Page:** Showcase page with detailed filtering and search infrastructure <br />**Project Detail Page:** Project details page to display detailed information about project with several modules like explained in the solution <br />**Articles Page:** Articles page to showcase informative articles related to the subject <br />**Article Detail Page:** Detail page for individual articles to display their full content <br />**Ranking Page:** Ranking page based on votes and token stats which is supported by CoinGecko api to showcase popular projects and articles <br /> **Learn Page:** Useful resources to learn about polkadot ecosystem <br /> **UX Improvements & Testing:** I will work to improve the user experience by ensuring that the user interface is fully compatible with mobile and tablet devices. |
 | *2.* | Project Owner Dashboard  | As part of this milestone, I will be implementing both the frontend and backend components of the Project Owner Dashboard. This involves designing and developing the user interface (UI) for the dashboard, as well as building the necessary backend infrastructure to support its functionality. To ensure the quality of my work, I will conduct thorough testing to ensure that the dashboard is user-friendly and performs as expected. My ultimate goal is to provide project owners with a seamless and efficient experience when updating their pages and publishing articles on our platform.
 
 ## Future Plans

applications/CESS.md

@@ -78,7 +78,7 @@ Compared to the similar projects in the Polkadot ecosystem including Ocean, Data
 
 - **Contact Name:** Jessie Dai
 - **Contact Email:** [email protected]
-- **Website:** <http://cess.cloud>
+- **Website:** http://cess.cloud
 
 ### Legal Structure
 
@@ -105,8 +105,8 @@ Jinghong Zeng served more than 20 years with a global telecommunications coopera
 
 ### Team Code Repos
 
-- <https://github.com/Cumulus2021/CumulusSystem>
-- <https://github.com/Cumulus2021/Whitepaper>
+- https://github.com/Cumulus2021/CumulusSystem
+- https://github.com/Cumulus2021/Whitepaper
 
 ## Development Roadmap :nut_and_bolt: