diff --git a/.github/workflows/application_accepted.yml b/.github/workflows/application_accepted.yml
index 1dce2961214..757cea0e1c5 100644
--- a/.github/workflows/application_accepted.yml
+++ b/.github/workflows/application_accepted.yml
@@ -119,6 +119,8 @@ jobs:
In particular, please don't announce the grant publicly before at least the first milestone of your
project has been approved. At that point or shortly before, you can get in touch with us at
grantsPR@web3.foundation and we'll be happy to collaborate on an announcement about the work you’re doing.
+ Also, if you haven't yet, consider signing up for the [Polkadot Alpha Program](https://polkadot.network/development/alpha/).
+ The program offers plenty of resources for people building on Polkadot.
Lastly, please remember to let us know in case you run into any delays or deviate from the deliverables
in your application. You can either leave a comment here or directly request to amend your application
via PR. We wish you luck with your project! :rocket:
diff --git a/README.md b/README.md
index 05290139251..acdfb22edc6 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,7 @@
- [:moneybag: Referral Program](#moneybag-referral-program)
- [:bulb: Help](#bulb-help)
- [Real-time Conversation](#real-time-conversation)
- - [Office Hours](#office-hours)
- - [Additional Information](#additional-information)
+ - [Ecosystem Funding Office Hours](#ecosystem-funding-office-hours)
- [:rocket: Alternative Funding Sources](#rocket-alternative-funding-sources)
- [Treasury vs Web3 Grants](#treasury-vs-web3-grants)
- [Treasury](#treasury)
@@ -233,31 +232,21 @@ We also have Matrix/Element channels for real-time discussions on Web3 and Polka
- [Polkadot Space](https://matrix.to/#/#polkadot:web3.foundation)
- [Kusama Space](https://matrix.to/#/#kusama:web3.foundation)
-### Office Hours
+### Ecosystem Funding Office Hours
-Web3 Foundation Grants Office Hours are a chance to ask the grants team questions regarding a specific (potential) grant application. It offers
+Ecosystem Funding Office Hours are a chance to ask the W3F Ecosystem Funding team questions regarding a specific project or (potential) grant application. It offers
-- general guidance regarding the grants program,
+- general guidance regarding the various grants programs and prizes,
- some quick initial feedback and
- help how to navigate the ecosystem.
Apply for Office Hours if you
-- need feedback before submitting an application,
-- want to find out what kind of support there might be available or
-- need help finding the resources you need.
+- want to find out what kind of support there might be available for your needs,
+- need feedback before submitting an application or
+- look for help finding other resources you might need.
-It is **not** a chance to pitch your project, especially since only a small subset of the committee will participate in the call. To apply, please fill out the [Office Hours :alarm_clock: form](https://forms.gle/54xkiqU37WwdN9UR6). Be as specific as possible, so we can help you more quickly. We will get back to you with follow-up questions or a link for booking a timeslot.
-
-### Additional Information
-
-
+It is **not** a chance to _pitch_ your project, especially since only the various programs and prizes have different evaluation criteria and decision makers and only a small subset of the Grants team will participate in the call. To apply, please fill out the [Office Hours :alarm_clock: form](https://forms.gle/54xkiqU37WwdN9UR6). Be as specific as possible, so we can help you more quickly. We will get back to you with follow-up questions or a link for booking a timeslot.
## :rocket: Alternative Funding Sources
@@ -308,21 +297,14 @@ Below is a list of other grant and bounty programs in the Polkadot/Substrate eco
- [Acala Grants Program](https://acala.network/ecosystem-program)
- [Aleph Zero Funding Program](https://alephzero.org/ecosystem-funding-program)
-- [Astar / Shiden Network Builders Program](https://github.com/PlasmNetwork/Builders-Program)
- [Avail Uncharted Grants](https://github.com/availproject/avail-uncharted/blob/main/grants/grants.md)
-- [Crust Grants Program](https://github.com/crustio/Crust-Grants-Program)
- [Darwinia Grants Program](https://github.com/darwinia-network/collaboration/blob/master/grant/README.md#grant-program)
- [Decentralized Futures Program](https://futures.web3.foundation/)
-- [Edgeware Grants and Bounties](https://gov.edgewa.re/discussion/1132-edgeware-proposal-process-and-template)
- [HydraDX Grants and Bounties](https://docs.hydradx.io/spending_fw/)
- [ink!ubator](https://use.ink/ubator/)
-- [Interlay Labs Grants Program](https://github.com/interlay/Grants-Program)
-- [KodaDot Ecosystem Grants](https://github.com/kodadot/grants)
- [Moonbeam Grants Program](https://moonbeam.foundation/grants/)
- [OAK’s Developer Grants](https://oak.tech/community/grants/)
- [peaq Ecosystem Grant Program](https://www.peaq.network/grant-program)
-- [Phala Builders Program](https://wiki.phala.network/en-us/build/general/builders-program/)
-- [Picasso / Composable Grants Program](https://docs.composable.finance/ecosystem/composable-grants/)
- [Polkadot Pioneers Prize](https://pioneersprize.polkadot.network/)
- [SubQuery Grants Programme](https://subquery.network/grants)
- [Pendulum / Amplitude Grant Programs](https://pendulumchain.org/ecosystem-grant)
diff --git a/applications/Tokenguard.md b/applications/Tokenguard.md
index f0e303995ae..763a9fa32db 100644
--- a/applications/Tokenguard.md
+++ b/applications/Tokenguard.md
@@ -4,7 +4,7 @@
* **Team Name:** [Tokenguard.io](http://tokenguard.io/) (Block Solutions Sp z o.o.)
-* **Payment Address:** 0x5509f23d6cbd4ebad25b7632c0f1f3ce289834fe (Ethereum ERC20 USDT)
+* **Payment Address:** PL83249010570000990157469781 (USD IBAN; Alior Bank; SWIFT / BIC: ALBPPLPW)
* **[Level](https://github.com/w3f/Grants-Program/tree/master#level_slider-levels):** 2
diff --git a/applications/TuxedoDapp.md b/applications/TuxedoDapp.md
index 51aab0af508..ddac7546ee3 100644
--- a/applications/TuxedoDapp.md
+++ b/applications/TuxedoDapp.md
@@ -6,99 +6,88 @@
## Project Overview :page_facing_up:
-Develop a Tuxedo Web Wallet and DApp
+Develop a Tuxedo DApp, extend the CLI-Wallet and integrate Talisman
### Overview
-Unlike traditional account-based systems, UTXO-based systems treat each transaction output as a distinct entity, introducing advantages in parallel processing and state transition simplicity.
+Unlike traditional account-based systems, UTXO-based systems treat each transaction output as a distinct entity, introducing advantages in parallel processing and state transition simplicity.
+
The Tuxedo project endeavours to demonstrate the flexibility and interoperability of Polkadot by implementing UTXO as one of its paradigms. MLabs, with expertise in the Cardano ecosystem utilizing UTXO as its core model, sees an opportunity to contribute to Tuxedo's success, address identified issues, and engage in future collaborative activities.
Our goal is to showcase the potential of Polkadot using the UTXO paradigm for the end user, leveraging Tuxedo. The project will consist of two key stages:
-- Stage 1: Developing a simple Web Wallet
-- Stage 2: Developing a basic DApp
+- Stage 1: Extend the CLI-wallet and integrate Talisman
+- Stage 2: Developing a basic CryptoKitties DApp
### Project Details
-- Stage 1: Developing a simple Web Wallet
+- Stage 1: Extend the CLI-wallet and integrate Talisman
-Develop a user-friendly web wallet that allows users to manage their UTXOs on the Tuxedo-based Polkadot network which is similar to polkadot.js which will get the chain info(genesisHash, runtime metadata, chain runtime version, API version), block info
-Focus on simplicity, security, and ease of use to provide a seamless experience for users interacting with UTXOs.
+We start by extending the CLI-wallet to allow all the functionalities required by the DApp.
-**Technical Requirements**
-
-**Security:** : Private key storage:
-The web-based wallet will provide a secure method for private key storage on the client side, such as a browser's secure storage or hardware wallets.
+We had the idea to build a basic web wallet ad hoc for Tuxedo-based app, however, a better approach for helping Tuxedo to expand was to make an integration with Talisman, a well-known Polkadot web wallet. Talisman doesn't support UTXO, overcoming this limitation is the biggest challenge.
-**Functionality**:
-1. Feature Parity Between Web-Based and CLI Wallets
-The web-based wallet will be designed to mirror the core functionality of the CLI wallet, offering seamless UTXO synchronization and token handling, ensuring that users have an equivalent experience across both interfaces
-Note: _Feature Parity_ means Means web-based and command-line interface (CLI) wallets, have the same set of features and functionalities, both versions provide an equivalent or identical user experience by offering the same core capabilities and options.
+We want to ensure users can perform the same actions on the CLI and the Web wallet.
-2. Issues Fix in web-based wallet (https://github.com/Off-Narrative-Labs/Tuxedo/issues/62)
-The current implementation of a CLI-based wallet allows sending inputs from multiple owners in a single transaction, but it only supports a single recipient for all specified outputs.
+**Functionality**:
-3. Browser compatibility:
-Web-based wallet will ensure compatibility with Chrome, Firefox and Edge.
+1. Feature parity between Web-Based and CLI wallets
-**Blockchain Integration**:
-Web-based wallet will connect to the blockchain node to fetch relevant data.
-We will check if there is any lib such as the one used by "https://polkadot.js.org/" to interact with the Tuxedo-based blockchain for easy integration.
+The web-based wallet allows core functionality of the CLI wallet, offering seamless UTXO synchronization and token handling, ensuring that users have an equivalent experience across both interfaces.
-**Transactions**:
-web-based wallet will implement transaction creation and signing on the client side.
-We will consider using libraries that support the specific blockchain's transaction format for Tuxedo with UTXO instead of accounts.
+2. Talisman integration:
-**Local Database**:
-web-based wallet will consider using databases for storing non-sensitive user data.
-Local database (e.g., IndexedDB, WebSQL, or a lightweight client-side database) to store relevant wallet data locally on the user's device.
+The Web-based wallet Talisman to allow transactions of the DApp.
-**Tech Stack**:
-- polkadot\{.js} trying to re-use it if possible
-- React Framework(React + Redux + React Router) OR Vue Framework (Vue.js with Vuex and the Vue Router)
-- TypeScript
-- webpack
-- Babel for backward compatibility in older Browsers
-- IndexedDB for Local database
-- Jest as JavaScript testing framework
+3. Issues Fix to support transactions to multiple recipients (https://github.com/Off-Narrative-Labs/Tuxedo/issues/62)
+
+The current implementation of a CLI-based wallet allows sending inputs from multiple owners in a single transaction, but it only supports a single recipient for all specified outputs.
-Wallet Wireframes: [![Wallet wireframes](https://lh3.googleusercontent.com/d/1nzE2_uqK5V4IwUJJPb92Q_WJk3RDR9UL=-h1932-iv2)](https://drive.google.com/file/d/1nzE2_uqK5V4IwUJJPb92Q_WJk3RDR9UL/view?usp=sharing)
+**Blockchain Integration**:
+
+Web-based and CLI wallet to connect with the blockchain node and fetch data.
-- Stage 2: DApp Development
+- Stage 2: Developing a basic CryptoKitties DApp
Create a simple decentralized application to demonstrate the viability and maturity of the Tuxedo framework, as required by this opened ticket "Full Tuxedo App Implementation" https://github.com/Off-Narrative-Labs/Tuxedo/issues/76
Showcase the unique features of UTXO-based transactions on Polkadot, emphasizing scalability and robustness.
Address identified gaps and limitations in the current Tuxedo product to enhance overall functionality.
We think that a successful showcase of a DApp is Cryptokitties which is provided in Tuxedo via pieces in "https://github.com/Off-Narrative-Labs/Tuxedo/tree/main/wardrobe/kitties".
We want to use this concept and extend the wardrobe codebase by implementing a basic web interface and allowing breeding, trading, searching, and updating the kitty features such as name, price and tradable status of kitties.
-This DApp is intended for educational purposes only, and not for production use. The web wallet previously developed will be used for this DApp.
+This DApp is intended for educational purposes only, and not for production use. The integrated Talisman will be used for this DApp.
**Technical Requirements**
**Functionality**:
+
Kitties Creation with NFTs:
Represent each kitty as a unique NFT on the Tuxedo blockchain.
Use Tuxedo runtime pieces i.e. kitties to handle NFT-based kitties creation transactions.
**Breeding and NFT Ownership**:
+
DApp ensures NFT ownership is transferred correctly during breeding transactions.
Leverage NFT attributes to determine genetics and other breeding-related factors.
**Trading of kitties between users**:
+
DApp ensures Kitties can be traded between the users.
Ensure ownership is transferred successfully once trading is completed.
**Updating the kitty details**:
+
DApp ensures Kittie's details such as name, tradable status(Yes or No) and Price can be updated.
**Search kitties owned by other users**:
+
DApp helps search the kitties other users own based on the user's public key.
This displays the list of kitties owned by other users with all details required for trading such as Gender, Tradable status, Price, Parents, etc.
**Blockchain Integration**:
-Tuxedo Runtime pieces.(wardrobe/kitties ):
-We need Leverage Tuxedo runtime pieces for implementing specific DApp functionalities in the UTXO model, with a focus on NFTs, if some modification is required or if some new functionality is required we may need to customize runtime logic to suit the requirements of the UTXO-based DApp.
-For this scope, we plan to modify the kitties' pieces code to support below features:
+
+Tuxedo Runtime pieces (wardrobe/kitties):
+We need to leverage Tuxedo runtime pieces for implementing specific DApp functionalities in the UTXO model, with a focus on NFTs, if some modification is required or if some new functionality is required we may need to customize runtime logic to suit the requirements of the UTXO-based DApp.
+For this scope, we plan to modify the kitties' pieces code to support the below features:
1. Generating the kitty without the parent when the user inserts the new key in the wallet (basically, 1 kitty is provided for free as an onboarding process)
2. Implementing the Trading of kitties between users
@@ -106,60 +95,69 @@ For this scope, we plan to modify the kitties' pieces code to support below feat
4. Adding/Updating more details of kitties such as Gender, Tradable status, Price, and Name.
**Transaction Handling**:
+
DApp implements transaction handling logic in the web application to initiate UTXO-based transactions, including NFT-related transactions, on the Tuxedo blockchain.
Provide feedback to users on transaction status and confirmations.
-**Transaction Confirmation**:
-DApp implements a transaction confirmation mechanism to ensure that users are informed about the progress and finalization of UTXO and NFT-based transactions such as Trade and Breed.
-
**Personal Dashboard**:
+
We will develop a personal dashboard for users to view and manage their NFT-based Kitties collections.
Display detailed information about each NFT, including ownership history and transaction history.
Manage NFT means, it includes below :
1. Viewing NFTs:
+
Users should be able to see a comprehensive list or visual representation of all the NFTs (kitties) they own.
- Display detailed information about each NFT, including attributes such as below :
- Name
- parents(mom and dad)
- free_breedings(numbers)
- dna(H256 Hash value)
- num_breedings(number)
- Tradable(yes or No)
- Price
- Status (Ready for Raring, Tired (only for Dad), Had birth recently(only for Mom)).
-2. Trade :
- Users should be able to buy the kitty from other users via the search kitty screen or directly from the Trade Kitty screen by inputting the kitty & owner details.
-3. Breed :
- Users should be able to initiate breeding directly from the dashboard.
-4. Update :
- Users should be able to update features such as Tradable status, price, and name from the dashboard by clicking on any cell which will navigate to update the kitty screen.
+ Display detailed information about each NFT, including attributes such as below:
+ - Name
+ - parents (mom and dad)
+ - free_breedings (numbers)
+ - DNA (H256 Hash value)
+ - num_breedings (number)
+ - Tradable (yes or No)
+ - Price
+ - Status (Ready for Raring, Tired (only for Dad), Had birth recently (only for Mom))
+
+2. Trade:
+
+ Users should be able to buy the kitty from other users via the search kitty screen or directly from the Trade Kitty screen by inputting the kitty & owner details
+
+3. Breed:
+
+ Users should be able to initiate breeding directly from the dashboard
+
+4. Update:
+
+ Users should be able to update features such as Tradable status, price, and name from the dashboard by clicking on any cell which will navigate to update the kitty screen
+
5. Interactivity:
- Make the dashboard interactive, allowing users to click on individual NFTs to access more detailed information or initiate specific actions.
+
+ Make the dashboard interactive, allowing users to click on individual NFTs to access more detailed information or initiate specific actions
**Tech Stack:**
-- Polkadot-JS APIs for getting block data
-- React Framework(React + Redux + React Router) OR Vue Framework (Vue.js with Vuex and the Vue Router)
-- TypeScript
-- Babel for backward compatibility in older Browsers
-- IndexedDB for Local database
-- IPFS for storing metadata related to the kitty such as Name, Trade status, Price, etc.
-- Jest as JavaScript testing framework
-DApp Wireframes: [![Wallet wireframes](https://lh3.googleusercontent.com/d/1dCr5Wwi0L-fGPdwAQGFPDhmTeBQYPDy1=w3692-h1932-iv1)](https://drive.google.com/file/d/1dCr5Wwi0L-fGPdwAQGFPDhmTeBQYPDy1/view?usp=sharing)
+- React Framework (React + Redux + React Router)
+- TypeScript
+- Babel (for backward compatibility in older browsers)
+- Jest (JavaScript Testing Framework)
+- Rust
+- Axum (Rust Web Application Framework)
+- Sled (embedded database)
+
+DApp Wireframes: [![DApp Wireframes](https://lh3.googleusercontent.com/d/1dCr5Wwi0L-fGPdwAQGFPDhmTeBQYPDy1=w3692-h1932-iv1)](https://drive.google.com/file/d/1dCr5Wwi0L-fGPdwAQGFPDhmTeBQYPDy1/view?usp=sharing)
### Ecosystem Fit
-**Where and how does your project fit into the ecosystem?**
+**Where and how does your project fit into the ecosystem?**
-- TuxedoDApp seeks to propel the Tuxedo project forward by addressing its current limitations and showcasing the capabilities of Polkadot with the UTXO paradigm. By developing a user-friendly web wallet and a simple DApp, we aim to provide a valuable use case for users of this ecosystem with limited experience in UTXO.
+- TuxedoDApp seeks to propel the Tuxedo project forward by addressing its current limitations and showcasing the capabilities of Polkadot with the UTXO paradigm. By developing a simple DApp and integrating the Talisman wallet, we aim to provide a valuable use case for users of this ecosystem with limited experience in UTXO.
**Who is your target audience?**
- **Developers and Enthusiasts from other blockchains:** Developers interested in experimenting with another paradigm but also developers from other ecosystems more "bitcoin-based" that want to try Polkadot.
-- **New Learners in Blockchain Development:** Individuals who are new to blockchain development and want to learn by engaging with the Tuxedo framework. The Tuxedo Web Wallet and DApp can serve as educational tools, providing a practical environment for learners to understand and experiment with UTXO-based blockchain concepts.
+- **New Learners in Blockchain Development:** Individuals who are new to blockchain development and want to learn by engaging with the Tuxedo framework. The Tuxedo DApp and the Talisman integration can serve as educational tools, providing a practical environment for learners to understand and experiment with UTXO-based blockchain concepts.
**Are there any other projects similar to yours in the Substrate/Polkadot/Kusama ecosystem?**
@@ -218,7 +216,7 @@ We have had conversations with the W3F team to validate the idea and find a star
- **Full-Time Equivalent (FTE):** 2 FTE
- **Total Costs:** $24000 (USD)
-### Milestone 1 — Stage 1: Developing a simple Web Wallet
+### Milestone 1 — Extend the CLI-wallet and integrate Talisman
- **Estimated duration:** 1 month
- **FTE:** *1*
@@ -227,13 +225,14 @@ We have had conversations with the W3F team to validate the idea and find a star
| Number | Deliverable | Specification |
| -----: | ----------- | ------------- |
| **0a.** | License | Apache 2.0 |
-| **0b.** | Documentation | We will provide both **inline documentation** of the code and a basic **tutorial** that explains how a user can use the web wallet app for Tuxedo (Private key configuration, local URI to be used to connect to blockchain) and send test transactions, tuxedo balance, which will show how the new functionality works. |
-| **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.** | Article | We will publish an **article**/workshop that explains how to use the web-based wallet which can be used to configure the user's private key and also get the information from the tuxedo based blockchain, how to do the transactions based on UTXO instead of account-based blockchain. |
-| **0e.** | Docker image containing any changes/issue fix in Tuxedo core | Will provide the docker image containing any changes or issue fix in Tuxedo core for wallet implementation |
-| **0f.** | Web-based wallet | We will create a web-based wallet that will have functionalities like Storing the private key of the user,(send and receive) Transaction support, all the functionalities provided by the CLI-based wallet (VerifyCoin, SpendCoins, InsertKey, GenerateKey, ShowKeys, RemoveKey, ShowBalance, ShowAllOutputs) |
+| **0b.** | Documentation | We will provide a basic **video** that shows how a user can use Talisman to send test tuxedo transactions, together with other videos showing how to do the same with the CLI-wallet interface. We will publish information in a wiki format about: how to build and run the project, the APIs, libs, etc. |
+| **0c.** | Testing and Testing Guide | The extension of the CLI-wallet will be fully covered by unit tests. Documentation about how to test will be provided|
+| **0d.** | Article | We will publish information about the DApp specification, the talisman integration and the extended CLI-wallet functionalities |
+| **0e.** | Docker image containing any changes/issue fix in Tuxedo core | If the tuxedo core need changes due the Talimans integration and/or the CLI wallet, we will provide the docker image containing the changes |
+| **0f.** | CLI-wallet extended and Talisman wallet integration | The CLI-wallet will be extended to support the new functionalities of the DApp. We will integrate Talisman web-based wallet to support all the transactions of the DApp. |
+
-### Milestone 2 — Stage 2: Developing a basic DApp
+### Milestone 2 — Stage 2: Developing a basic CryptoKitties DApp
- **Estimated Duration:** 2 months
- **FTE:** 2
@@ -242,16 +241,15 @@ We have had conversations with the W3F team to validate the idea and find a star
| Number | Deliverable | Specification |
| -----: | ----------- | ------------- |
| **0a.** | License | Apache 2.0 |
-| **0b.** | Documentation | We will provide both **inline documentation** of the code and a basic **tutorial** that explains how a user can use the DApp app to breed kitties, view the kitties using the dashboard |
+| **0b.** | Documentation | We will provide a basic **video** that shows how a user can use the DApp to breed and trades kitties |
| **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.** | Article | We will publish an **article**/workshop that explains how to use the DApp which can be used to "create the kitty as NFT", Breeding of kitties, and also how to use the Dashboard |
-| **0e.** | Kitties Pieces: Docker image |Docker image containing the kitties which support new features such as "Mint kitty without mom and dad, Trade kitty, change ownership of kitty and search kitties" |
-| **0f.** | DApp | We will create a web-based Daap to support functionality such as "create the kitty as NFT", managing the ownership of NFT/Kitties, Breeding, Trading kitties, and showing info (meaning of "Management of NFT" is mentioned above in Dashboard section ) |
-| **0g.** | Personalized Dashboard | We will create a personal dashboard for users to view and manage their NFT-based kitty collections. Display detailed information about each NFT, including ownership and other details such as parents, dna, Tradable status, Price, etc |
+| **0d.** | Article | We will publish information in a wiki format about: the APIs built, the DApp specification, the frontend libs used, the game design, the wireframes of the DApp|
+| **0e.** | DApp | We will create a web-based DApp to support functionality such as "create the kitty as NFT", managing the ownership of NFT/Kitties, Breeding, Trading kitties, and showing info (meaning of "Management of NFT" is mentioned above in Dashboard section ) |
+| **0f.** | Personalized Dashboard | We will create a personal dashboard for users to view and manage their NFT-based kitty collections. Display detailed information about each NFT, including ownership and other details such as parents, dna, Tradable status, Price, etc |
## Future Plans
-**Dynamic Wallet**: Making the wallet dynamic by using a standard metadata format such in FRAME, between the wallet and the blockchain, so that any newly created pieces can be tested without extra modification. For this priority activity, we expect not less than 3 months of work with a budget estimation under $30k
+**Indexer and caching**: Implement an indexer that listens to the Tuxedo blockchain and captures relevant events and data related to kitties, enabling fast data retrieval. Introduce a caching layer to further optimize data retrieval and reduce database lookup lag.
## Referral Program (optional) :moneybag:
diff --git a/applications/application-template.md b/applications/application-template.md
index 4926db15980..b102b4cec52 100644
--- a/applications/application-template.md
+++ b/applications/application-template.md
@@ -135,9 +135,9 @@ Below we provide an **example roadmap**. In the descriptions, it should be clear
| Number | Deliverable | Specification |
| -----: | ----------- | ------------- |
-| **0a.** | License | Apache 2.0 / GPLv3 / MIT / Unlicense |
-| **0b.** | Documentation | We will provide both **inline documentation** of the code and a basic **tutorial** that explains how a user can (for example) spin up one of our Substrate nodes and send test transactions, which will show how the new functionality works. |
-| **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. |
+| **0a.** | License | Apache 2.0 / GPLv3 / MIT / Unlicense. See the [delivery guidelines](https://grants.web3.foundation/docs/Support%20Docs/milestone-deliverables-guidelines#license) for details. |
+| **0b.** | Documentation | We will provide both **inline documentation** of the code and a basic **tutorial** that explains how a user can (for example) spin up one of our Substrate nodes and send test transactions, which will show how the new functionality works. See the [delivery guidelines](https://grants.web3.foundation/docs/Support%20Docs/milestone-deliverables-guidelines#documentation) for details. |
+| **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. See the [delivery guidelines](https://grants.web3.foundation/docs/Support%20Docs/milestone-deliverables-guidelines#testing-guide) for details. |
| **0d.** | Docker | We will provide a Dockerfile(s) that can be used to test all the functionality delivered with this milestone. |
| 0e. | Article | We will publish an **article**/workshop that explains [...] (what was done/achieved as part of the grant). (Content, language, and medium should reflect your target audience described above.) |
| 1. | Substrate module: X | We will create a Substrate module that will... (Please list the functionality that will be implemented for the first milestone. You can refer to details provided in previous sections.) |
diff --git a/applications/dotnix.md b/applications/dotnix.md
index 6903620c6d0..476b211825f 100644
--- a/applications/dotnix.md
+++ b/applications/dotnix.md
@@ -170,7 +170,7 @@ We have started designing the architecture and the interfaces between the differ
| **0e.** | Article | We will publish an article explaining why we believe this project is a step in the right direction and what benefits we hope to bring to the polkadot and general staking services. |
| 1. | Package Polkadot binary | We will create a polkadot `nix flake` that packages the Polkadot validator. We will likely use [`polkadot.nix`](https://github.com/andresilva/polkadot.nix) since the work has already been done there and the License is MIT. We plan to contribute back to `polkadot.nix`. any changes we might need. |
| 2. | NixOS Validator Module | We will create a NixOS module (similar to ansible playbook(s)`) that allows compatible CPU architecture (`linux-x86_64`, `linux-aarch64) NixOS system virtual machine to run the packaged `polkadot` binary as `systemd unit(s)`. |
-| 3. | Secret Management | The previous `systemd unit` will be granted access to the validator secrets with the combined usage of [`systemd-vault`](https://github.com/numtide/systemd-vaultd) and Hashicorp's [`vault`](https://www.vaultproject.io/). `systemd units` have the the option to use the `LoadCredential=` to provide access to secrets from `vault` to the `systemd unit`. Additonal Details: - configure vault using [integrated storage](https://developer.hashicorp.com/vault/docs/internals/integrated-storage) - configure `vault-agent` to integrate with `systemd-vault` i.e. by writing secrets to `/run/systemd-vaultd/secrets/$service_name.service.json` - configure `systemd-vaultd` - configure the validator to load credentials from systemd-vault - restart the validator whenever secrets change |
+| 3. | Secret Management | Secrets are managed using a command-line utility that allows the user to set and unset the validator's node key. The validator will run depending on the presence of the key. This means that a freshly installed validator won't start until the user sets the key. When the key is set, the validator will start automatically and keep running until the key is unset. If the key gets reset to a different value, the validator will be restarted. |
| 4. | Tests for secret maangement | Services using the secret management will not start unless all required secrets have been provided (services will wait for the secrets). Removing required secrets will stop affected services (put them into a waiting state). Re-adding secrets will start waiting services. Modifying secrets will restart affected services |
| 5. | Basic Security Hardening | Implement dynamic unprivileged user, restrict filesystem access, and other suggestions that `systemd-analyze security` command suggests. |
| | | |
diff --git a/applications/index.md b/applications/index.md
index 5866da73376..2b140aeff9f 100644
--- a/applications/index.md
+++ b/applications/index.md
@@ -16,6 +16,7 @@ Besides, **there is a clear difference between an application being accepted and
- [2024](#2024)
+ - [🏄 Wave 23 - Q3 2024](#-wave-23---q3-2024)
- [🏄 Wave 22 - Q2 2024](#-wave-22---q2-2024)
- [🏄 Wave 21 - Q1 2024](#-wave-21---q1-2024)
- [2023](#2023)
@@ -47,6 +48,13 @@ Besides, **there is a clear difference between an application being accepted and
## 2024
+### 🏄 Wave 23 - Q3 2024
+
+| Team | Project | Link | Terminated | First Delivery | Completed |
+| :------------------------------------------------------------------| :------------------------------------------------------------------------------------------------------| :------------------------------------------| :---------: | :------------: | :--------: |
+
+[🔝](#top)
+
### 🏄 Wave 22 - Q2 2024
| Team | Project | Link | Terminated | First Delivery | Completed |
@@ -54,27 +62,31 @@ Besides, **there is a clear difference between an application being accepted and
| [Tuguldur Baigalmaa](https://github.com/philoniare/) | [subxt-python](./subxt-python.md) | [GitHub](https://github.com/philoniare/) | ☐ | ☐ | ☐ |
| [Cyborg Network](https://cyborgnetwork.io/) | [Cyborg Network - Empowering Decentralized Edge Networks](./Cyborg.md) | [GitHub](https://github.com/Cyborg-Network) | ☐ | ☐ | ☐ |
| [Massa Labs](https://massa.net/) | [Sub-consensus mechanism](./sub_consensus_mechanism.md) | [GitHub](https://github.com/massalabs/) | ☐ | ☐ | ☐ |
-| [Sporyon Technologies](https://sporyon.io) | [Dotnix](./dotnix.md) | [GitHub](https://github.com/sporyon/dotnix) | ☐ | ☐ | ☐ |
+| [Sporyon Technologies](https://sporyon.io) | [Dotnix](./dotnix.md) | [GitHub](https://github.com/sporyon/dotnix) | ☐ | ☒ | ☒ |
| [Dastanbek Samatov](https://dastansam.github.io/) | [Substrate EVM Adapter](./substrate-evm-adapter.md) | [GitHub](https://github.com/dastanbeksamatov) | ☐ | ☐ | ☐ |
| [KodaDot](https://kodadot.xyz/) | [AssetHub NFT Indexer (M2)](./kodadot_assethub_nft_m2.md) | [GitHub](https://github.com/kodadot) | ☐ | ☐ | ☐ |
+| C Forge | [Improve & Update Typechain Polkadot](./typechain_revived.md) | | ☐ | ☐ | ☐ |
+
+[🔝](#top)
### 🏄 Wave 21 - Q1 2024
| Team | Project | Link | Terminated | First Delivery | Completed |
| :------------------------------------------------------------------| :------------------------------------------------------------------------------------------------------| :------------------------------------------| :---------: | :------------: | :--------: |
| [MLabs](https://mlabs.city/) | [TuxedoDapp](./TuxedoDapp.md) | [GitHub](https://github.com/mlabs-haskell) | ☐ | ☐ | ☐ |
-| [Lastic](https://www.lastic.xyz/) | [Coretime Indexer + Visualizations](./lastic-grant3.md) | [GitHub](https://github.com/LasticXYZ) | ☐ | ☐ | ☐ |
-| [IgorStojanov](https://igorstojanov.com/) | [Material Design Makeover for Substrate Front-End Template](./lsi-front-end-template.md) | [GitHub](https://github.com/stojanov-igor) | ☐ | ☐ | ☐ |
+| [Lastic](https://www.lastic.xyz/) | [Coretime Indexer + Visualizations](./lastic-grant3.md) | [GitHub](https://github.com/LasticXYZ) | ☐ | ☒ | ☒ |
+| [IgorStojanov](https://igorstojanov.com/) | [Material Design Makeover for Substrate Front-End Template](./lsi-front-end-template.md) | [GitHub](https://github.com/stojanov-igor) | ☐ | ☒ | ☒ |
| DOT Login | [DOT Login](./dot-login.md) | [GitHub](https://github.com/singkeo) | ☐ | ☐ | ☐ |
| [gmajor-encrypt](https://github.com/gmajor-encrypt) | [XCM Tools follow-up](./xcm-tools-follow-up.md) | [GitHub](https://github.com/gmajor-encrypt/xcm-tools) | ☐ | ☒ | ☒ |
-| [inkscope.xyz](https://inkscope.xyz/) | [Inkscope Fuzzer](./inkscope-fuzzer.md) | [GitHub](https://github.com/inkscopexyz) | ☐ | ☐ | ☐ |
+| [inkscope.xyz](https://inkscope.xyz/) | [Inkscope Fuzzer](./inkscope-fuzzer.md) | [GitHub](https://github.com/inkscopexyz) | ☐ | ☒ | ☒ |
| [Relai Network](https://relai.network/) | [Futur & Fusion Protocols](./FuturFusion.md) | [GitHub](https://github.com/RELAI-Network) | ☐ | ☒ | ☒ |
| [Zondax AG](https://zondax.ch/) | [User Account Access Security Analysis](./research_wallets.md) | [GitHub](https://github.com/zondax) | ☐ | ☐ | ☐ |
| [Philoniare Team](https://github.com/philoniare/) | [create-substrate-app](./create-substrate-app.md) | [GitHub](https://github.com/philoniare/) | ☐ | ☒ | ☒ |
| [David Semakula](https://davidsemakula.com) | [pallet-verifier](./pallet-verifier.md) | [GitHub](https://github.com/davidsemakula) | ☐ | ☐ | ☐ |
-| [Algorealm](https://github.com/algorealminc) | [pallet-verifier](./swarm-nl.md) | [GitHub](https://github.com/algorealminc) | ☐ | ☐ | ☐ |
+| [Algorealm](https://github.com/algorealminc) | [SwarmNL](./swarm-nl.md) | [GitHub](https://github.com/algorealminc) | ☐ | ☒ | ☒ |
| [Rui Morais](https://github.com/fiono11) | [Threshold Signature Implementation](./ThresholdSignature.md) | [GitHub](https://github.com/fiono11) | ☐ | ☐ | ☐ |
+[🔝](#top)
## 2023
@@ -83,9 +95,9 @@ Besides, **there is a clear difference between an application being accepted and
| Team | Project | Link | Terminated | First Delivery | Completed |
| :------------------------------------------------------------------| :------------------------------------------------------------------------------------------------------| :------------------------------------------| :---------: | :------------: | :--------: |
| [Farcloud-labs](https://github.com/YanOctavian) | [SubSMT](./subsmt.md) | [GitHub](https://github.com/YanOctavian) | ☐ | ☐ | ☐ |
-| [Livetree Community Ltd](https://github.com/livetreetech/) | [DecentralML](./decentral_ml.md) | [GitHub](https://github.com/livetreetech/) | ☐ | ☐ | ☐ |
+| [Livetree Community Ltd](https://github.com/livetreetech/) | [DecentralML](./decentral_ml.md) | [GitHub](https://github.com/livetreetech/) | ☐ | ☒ | ☒ |
| [LimeChain](https://github.com/LimeChain) | [Polkadot Protocol Conformance Tests Research](./Polkadot-Protocol-Conformance-Tests.md) | [GitHub](https://github.com/LimeChain) | ☐ | ☒ | ☒ |
-| [KodaDot](https://kodadot.xyz/) | [AssetsHub NFT indexer](./kodadot_assethub_nft_indexer_statemine_statemint.md) | [GitHub](https://github.com/kodadot) | ☐ | ☐ | ☐ |
+| [KodaDot](https://kodadot.xyz/) | [AssetsHub NFT indexer](./kodadot_assethub_nft_indexer_statemine_statemint.md) | [GitHub](https://github.com/kodadot) | ☐ | ☒ | ☐ |
| [Apollos Collective](https://rhys.tech) | [Infimum](./infimum.md) | [GitHub](https://github.com/rhysbalevicius) | ☐ | ☒ | ☐ |
| [CoinFabrik](https://www.coinfabrik.com/) | [CoinFabrik On Ink Integration Tests 2](CoinFabrik_On_Ink_Integration_Tests_2.md) | [GitHub](https://github.com/CoinFabrik) | ☐ | ☒ | ☒ |
| [Plutonication](https://github.com/cisar2218/Plutonication) | [Plutonication](Plutonication.md) | [GitHub](https://github.com/cisar2218/Plutonication) | ☐ | ☒ | ☐ |
@@ -97,7 +109,7 @@ Besides, **there is a clear difference between an application being accepted and
| [Mansa Capital](https://mansacapital.us/) | [Ssal](ssal-commods-dex.md) | [GitHub](https://github.com/MatteoPerona/Riso) | ☐ | ☒ | ☒ |
| [Deitos Network](https://github.com/Deitos-Network) | [Deitos Network](Deitos_Network.md) | [GitHub](https://github.com/Deitos-Network) | ☐ | ☒ | ☒ |
| [Lastic](https://www.lastic.xyz/) | [Coretime Sale Price Calculator](lastic-price-simulation-2.md) | [GitHub](https://github.com/LasticXYZ/price-simulation) | ☐ | ☒ | ☒ |
-| [Tokenguard.io](http://tokenguard.io/) | [Tokenguard](Tokenguard.md) | [GitHub](https://github.com/tokenguardio) | ☐ | ☐ | ☐ |
+| [Tokenguard.io](http://tokenguard.io/) | [Tokenguard](Tokenguard.md) | [GitHub](https://github.com/tokenguardio) | ☐ | ☒ | ☒ |
| [element36 AG](https://element36.io) | [Hyperfridge](hyperfridge.md) | [GitHub](https://github.com/element36-io) | ☐ | ☒ | ☐ |
| [RegionX](https://regionx.tech) | [RegionX](RegionX.md) | [GitHub](https://github.com/RegionX-Labs) | ☐ | ☒ | ☒ |
| [WeTEE DAO](https://www.wetee.app) | [WeTEE Network](WeTEE_Network.md) | [GitHub](https://github.com/wetee-dao) | ☐ | ☒ | ☒ |
@@ -130,8 +142,8 @@ Besides, **there is a clear difference between an application being accepted and
| [MOBR Systems](https://www.mobr.ai) | [Polkadot Analytics Platform](polkadot_analytics_platform.md) | [GitHub](https://github.com/mobr-ai) | ☐ | ☒ | ☐ |
| [Infra3](https://network.infra-3.xyz) | [Hyperdot - Powerful data analysis and creations platform](Hyperdot.md) | [GitHub](https://github.com/Infra3-Network/hyperdot) | ☐ | ☒ | ☒ |
| [David Semakula](https://github.com/davidsemakula) | [ink! analyzer (phase 2)](ink-analyzer-phase-2.md) | [GitHub](https://github.com/ink-analyzer) | ☐ | ☒ | ☒ |
-| [Myriad Systems LTD.](https://myriad.social/) | [Myriad Social](myriad_social.md) | [GitHub](https://github.com/myriadsocial/myriad-node) | ☐ | ☒ | ☐ |
-| [Liisa](www.liisa.io) | [Polkadot NFT Portfolio Tracker](LiisaPortfolioTracker.md) | [GitHub](https://github.com/LiisaNFT) | ☐ | ☐ | ☐ |
+| [Myriad Systems LTD.](https://myriad.social/) | [Myriad Social](myriad_social.md) | [GitHub](https://github.com/myriadsocial/myriad-node) | ☐ | ☒ | ☒ |
+| [Liisa](www.liisa.io) | [Polkadot NFT Portfolio Tracker](LiisaPortfolioTracker.md) | [GitHub](https://github.com/LiisaNFT) | ☐ | ☒ | ☒ |
| [NeoPower Digital](https://neopower.digital/) | [Roloi - XCM Payment Automation](./roloi-xcm-payment-automation.md) | [GitHub](https://github.com/NeoPower-Digital) | ☐ | ☒ | ☒ |
| [Eiger](https://www.eiger.co/) | [MoveVM Substrate Pallet, part 2](./Substrate_Move_System_Pallet_2.md) | [GitHub](https://github.com/eigerco) | ☐ | ☒ | ☒ |
| [Rust Syndicate x Decentration](https://www.decentration.org/) | [XCMSend](./xcmsend.md) | [GitHub](https://github.com/decentration) | ☐ | ☒ | ☒ |
@@ -141,9 +153,9 @@ Besides, **there is a clear difference between an application being accepted and
| [DAOsign](https://daosign.org/) | [DAOsign](./DAOsign.md) | [GitHub](https://github.com/DAOsign) | ☐ | ☒ | ☐ |
| [Zondax AG](https://zondax.ch/) | [PoC Polkadot Conformance Tests](./polkadot_tests.md) | [GitHub](https://github.com/zondax) | ☐ | ☒ | ☒ |
| [SO/DA zone](https://github.com/sodazone) | [Ocelloids XCM Transfer Monitoring Service](ocelloids_xcm_monitoring_service.md) | [GitHub](https://github.com/sodazone) | ☐ | ☒ | ☒ |
-| [Moonsong Labs](https://moonsonglabs.com/) | [StorageHub](./StorageHub.md) | [GitHub](https://github.com/Moonsong-Labs) | ☐ | ☒ | ☐ |
+| [Moonsong Labs](https://moonsonglabs.com/) | [StorageHub](./StorageHub.md) | [GitHub](https://github.com/Moonsong-Labs) | ☐ | ☒ | ☒ |
| [Jonathan Brown](https://acuity.social/) | [Hybrid Explorer Phase 2](hybrid2.md) | [GitHub](https://github.com/hybrid-explorer) | ☐ | ☒ | ☒ |
-| [Coong Crafts](https://coongcrafts.io/) | [DelightfulDOT](delightfuldot.md) | [GitHub](https://github.com/CoongCrafts) | ☐ | ☒ | ☐ |
+| [Coong Crafts](https://coongcrafts.io/) | [DelightfulDOT](delightfuldot.md) | [GitHub](https://github.com/CoongCrafts) | ☐ | ☒ | ☒ |
| [Lastic](https://www.lastic.xyz/) | [Lastic](Lastic.md) | [GitHub](https://github.com/LasticXYZ) | ☐ | ☒ | ☒ |
[🔝](#top)
@@ -158,9 +170,9 @@ Besides, **there is a clear difference between an application being accepted and
| [Galaxy.Do](https://galaxy.do) | [Galaxy: Three-dimensional Web for Polkadot Users](./galaxy.md) | [GitHub](https://github.com/7flash) | ☐ | ☒ | ☒ |
| [Web3 Labs Ltd](https://www.web3labs.com/) | [Sirato (Epirus) Substrate Explorer - Phase III](./sirato_substrate_phase3.md) | [GitHub](https://github.com/web3labs) | ☐ | ☒ | ☒ |
| [Collective Intelligence Labs](https://collectiveintelligence.dev/)| [Omnichain Infrastructure](./CILA-omnichain-infrastructure.md) | [GitHub](https://github.com/Collective-Intelligence-Labs) | ☐ | ☒ | ☐ |
-| [TradeLink](https://tradelink.pro/) | [Sandox](./sandox.md) | [GitHub](https://github.com/BEARlogin) | ☐ | ☒ | ☐ |
+| [TradeLink](https://tradelink.pro/) | [Sandox](./sandox.md) | [GitHub](https://github.com/BEARlogin) | ☐ | ☒ | ☒ |
| [Wunderbar Network](https://wunderbar.network/) | [Vue.js + TypeScript Substrate Front-End Template](./vue-typescript-substrate-frontend-template.md) | [GitHub](https://github.com/WunderbarNetwork) | ☐ | ☐ | ☐ |
-| [Profond.ai](https://www.profond.ai/) | [Profond](./Profond.md) | [GitHub](https://github.com/emarai) | ☐ | ☒ | ☐ |
+| [Profond.ai](https://www.profond.ai/) | [Profond](./Profond.md) | [GitHub](https://github.com/emarai) | ☐ | ☒ | ☒ |
| [727.ventures](https://727.ventures) | [Patron](./patron.md) | [GitHub](https://github.com/727-Ventures) | ☐ | ☒ | ☒ |
| [Supercomputing Systems AG](https://www.scs.ch) | [SARP - A Static Analysis Tool for Runtime Pallets](./sarp-basic-functionality.md) | [GitHub](https://github.com/scs) | ☐ | ☒ | ☒ |
| [Ed Anderson](https://github.com/eca20) | [Blockchainia](./blockchainia.md) | [GitHub](https://github.com/eca20) | ☐ | ☐ | ☐ |
@@ -168,16 +180,16 @@ Besides, **there is a clear difference between an application being accepted and
| [Polytope Labs](https://research.polytope.technology/) | [Interoperable State Machine Protocol](ismp.md) | [GitHub](https://github.com/polytope-labs) | ☐ | ☒ | ☒ |
| [Talentica Software](https://www.talentica.com/) | [Implementation Benchmarking Milestone 3](ink-pallet-benchmarking-phase-2.md) | [GitHub](https://github.com/Nikhil-Desai-Talentica) | ☐ | ☒ | ☒ |
| [Deep Ink Ventures GmbH](https://github.com/deep-ink-ventures) | [Stylograph](Stylograph.md) | [GitHub](https://github.com/deep-ink-ventures) | ☐ | ☒ | ☒ |
-| [Zeeve](https://www.zeeve.io) | [Ink Playground IDE Improvements](ink-playground-ide-improvements.md) | [GitHub](https://github.com/Zeeve-App) | ☐ | ☐ | ☐ |
+| [Zeeve](https://www.zeeve.io) | [Ink Playground IDE Improvements](ink-playground-ide-improvements.md) | [GitHub](https://github.com/Zeeve-App) | ☐ | ☒ | ☒ |
| [Scio Labs](https://scio.xyz/) | [XCM Domain Name Service](xcm-domain-service.md) | [GitHub](https://github.com/scio-labs) | ☐ | ☒ | ☒ |
-| [Gloslab](https://github.com/smiasojed) | [Contracts performance measurement tool proposal](contracts-tool.md) | [GitHub](https://github.com/smiasojed) | ☐ | ☒ | ☐ |
+| [Gloslab](https://github.com/smiasojed) | [Contracts performance measurement tool proposal](contracts-tool.md) | [GitHub](https://github.com/smiasojed) | ☐ | ☒ | ☒ |
| [Nikita Orlov PR](https://github.com/stringnick) | [Faucet chat based bot](faucet-bot.md) | [GitHub](https://github.com/stringnick) | ☐ | ☒ | ☒ |
| [Societal Labs Ltd.](https://www.sctl.xyz/) | [Societal Saas Pricing](societal_saas_pricing.md) | [GitHub](https://github.com/sctllabs) | ☐ | ☒ | ☒ |
| [MASTER UNION LLC.](https://github.com/TheDotflow) | [Dotflow](Dotflow.md) | [GitHub](https://github.com/TheDotflow) | ☐ | ☒ | ☒ |
| [Antier Solutions](https://www.antiersolutions.com/) | [RFP/securityMarketPlace](Security_Marketplace.md) | [GitHub](https://github.com/ParthChaudhary31) | ☐ | ☒ | ☒ |
| [SO/DA zone](https://github.com/mfornos) | [Ocelloids Monitoring SDK grant application](ocelloids_monitoring_sdk.md) | [GitHub](https://github.com/mfornos) | ☐ | ☒ | ☒ |
| [Antier Solutions Pvt. Ltd.](https://github.com/kulwindersingh-ant)| [Grants webapp](Grant_management_webapp.md) | [GitHub](https://github.com/kulwindersingh-ant) | ☐ | ☒ | ☒ |
-| [Zaniyar Jahany](https://github.com/Zaniyar/) | [Grantmaster](grantmaster.md) | [GitHub](https://github.com/Zaniyar/plant2earn/) | ☐ | ☐ | ☐ |
+| [Zaniyar Jahany](https://github.com/Zaniyar/) | [Grantmaster](grantmaster.md) | [GitHub](https://github.com/Zaniyar/plant2earn/) | ☐ | ☒ | ☒ |
| [FiDi Tech](https://fidi.tech/) | [FiDi DotSight: Analytics Data Platform for DotSama](fidi-dotsight-analytics.md)| [GitHub](https://github.com/fidi-tech) | ☐ | ☒ | ☐ |
| [Ideal Labs](https://www.idealabs.network/) | [Cryptex](cryptex.md)| [GitHub](https://github.com/ideal-lab5) | ☐ | ☒ | ☒ |
| [Xcavate](https://xcavate.io/) | [Real estate centric lending and asset minting protocol](Xcavate.md)| [GitHub](https://github.com/xcavateblockchain) | ☐ | ☒ | ☒ |
@@ -324,7 +336,7 @@ Besides, **there is a clear difference between an application being accepted and
| [Popular Coding](https://www.popularcoding.com/) | [Ventur](./ventur.md) | [GitHub](https://github.com/popular_coding) | ☐ | ☒ | ☒ |
| [Asylum](https://asylum.space/) | [Asylum follow-up 1](./asylum_follow_up_1.md) | [GitHub](https://gitlab.com/asylum-space/) | ☒ | ☒ | ☐ |
| [Cyril Carlier](https://github.com/CrommVardek) | [Maki](./Maki.md) | [GitHub](https://github.com/CrommVardek) | ☐ | ☐ | ☐ |
-| [TopMonks](https://www.topmonks.com/) | [Calamar](./Calamar.md) | [GitHub](https://github.com/topmonks/calamar) | ☐ | ☒ | ☐ |
+| [TopMonks](https://www.topmonks.com/) | [Calamar](./Calamar.md) | [GitHub](https://github.com/topmonks/calamar) | ☐ | ☒ | ☒ |
| [Bela Supernova](https://bsn.si/) | [Rubeus Keeper](./RubeusKeeper.md) | [GitHub](https://github.com/bsn-si) | ☐ | ☒ | ☒ |
| [Web3 Labs Ltd](https://www.web3labs.com/epirus-explorer) | [Epirus Substrate Explorer - Phase 2](./epirus_substrate_phase_2.md) | [GitHub](https://github.com/web3labs) | ☐ | ☒ | ☒ |
| [Uke](https://github.com/Uke-Messaging) | [Uke Protocol PoC & App (revised)](./uke-protocol.md) | [GitHub](https://github.com/Uke-Messaging) | ☐ | ☒ | ☒ |
diff --git a/applications/infimum.md b/applications/infimum.md
index cb443fbd206..a051dd25665 100644
--- a/applications/infimum.md
+++ b/applications/infimum.md
@@ -166,8 +166,8 @@ Development status will be found over at [https://github.com/rhysbalevicius/infi
### Milestone 2 — On-chain verification logic and circuits
-- **Estimated Duration:** 2 months
-- **FTE:** 0,5
+- **Estimated Duration:** 6 months
+- **FTE:** 0,1
- **Costs:** 9,000 USD
| Number | Deliverable | Specification |
@@ -181,8 +181,8 @@ Development status will be found over at [https://github.com/rhysbalevicius/infi
### Milestone 3 — CLI tool and docsite
-- **Estimated Duration:** 2 months
-- **FTE:** 0,5
+- **Estimated Duration:** 3 months
+- **FTE:** 0,25
- **Costs:** 9,000 USD
| Number | Deliverable | Specification |
diff --git a/applications/lastic-grant3.md b/applications/lastic-grant3.md
index 13f0cc9bc33..cf0e0222831 100644
--- a/applications/lastic-grant3.md
+++ b/applications/lastic-grant3.md
@@ -1,7 +1,7 @@
# Lastic - Grant 3 - Indexing Coretime Chain with Subsquid and Graph Implementation
- **Team Name:** Lastic
-- **Payment Address:** 16Jbt5zru6XdUx1jYRV8AZtGk76ujtUNdd1UVWVVkVvGZ31L (USDT)
+- **Payment Address:** Fiat (EUR)
- **[Level](https://github.com/w3f/Grants-Program/tree/master#level_slider-levels):** 2
> :exclamation: *The combination of your GitHub account submitting the application and the payment address above will be your unique identifier during the program. Please keep them safe.*
@@ -46,18 +46,17 @@ For this grant, we will concentrate on the following key areas:
- Phil Lucsok (aka Asynchronous Phil)
- Aurora Makovac (aka Aurora Poppyseed)
-- Pierina Ponce
### Contact
-- **Contact Name:** Phil Lucsok, Aurora Poppyseed, Pierina Ponce
-- **Contact Email:** plucsok@gmail.coml, aurora.makovac@gmail.com, pierinaponce1993@gmail.com
+- **Contact Name:** Phil Lucsok, Aurora Poppyseed
+- **Contact Email:** plucsok@gmail.coml, aurora.makovac@gmail.com
- **Website:** [lastic.xyz](https://www.lastic.xyz/)
### Legal Structure
- **Registered Address:** Private
-- **Registered Legal Entity:** In progress
+- **Registered Legal Entity:** Private
### Team's experience
diff --git a/applications/quantum-guard.md b/applications/quantum-guard.md
index 9bc1b4e88f3..c669847b07f 100644
--- a/applications/quantum-guard.md
+++ b/applications/quantum-guard.md
@@ -80,7 +80,7 @@ The development will start with the approval of the Grant application.
* **Description** Development of QuantumGuard - MVP - Phase 0.5
-* **Total Estimated Duration:** 32 Person Weeks
+* **Total Estimated Duration:** 44 Person Weeks
* **Full-time equivalent (FTE):** 1
* **Total Costs:** 9,800 USDC
@@ -88,7 +88,7 @@ The development will start with the approval of the Grant application.
### Milestone 1 — Quantum-safe cryptographic algorithms for keypairs
-- **Estimated duration:** 24 weeks
+- **Estimated duration:** 36 weeks
- **FTE:** 1
- **Costs:** 5,000 USDC
diff --git a/applications/subsmt.md b/applications/subsmt.md
index 553b6a5bf0e..643829dc9e8 100644
--- a/applications/subsmt.md
+++ b/applications/subsmt.md
@@ -104,7 +104,7 @@ And many zero-knowledge proofs use languages similar to rust or use rust directl
### Milestone 1 - SMT pallet, SMT ink smart contract, and backend base on rocksdb.
-- **Estimated duration:** 1 month
+- **Estimated duration:** 1 month (From July 1st to August 1st)
- **FTE:** 2
- **Costs:** 7,000 USD
@@ -124,7 +124,7 @@ And many zero-knowledge proofs use languages similar to rust or use rust directl
> It also includes some changes to the hash algorithm and the selection of data serialization and deserialization algorithms, as well as the testing of these parts, which do not need to be included in the milestone work because some of them have been completed before.
### Milestone 2 - backend base on parity-db and common backend.
-- **Estimated Duration:** 1 month
+- **Estimated Duration:** 1 month (From August 15th to September 15th)
- **FTE:** 1
- **Costs:** 3,000 USD
diff --git a/applications/tokenomics-survey-2022.md b/applications/tokenomics-survey-2022.md
index 48e5a16fd96..93828b38083 100644
--- a/applications/tokenomics-survey-2022.md
+++ b/applications/tokenomics-survey-2022.md
@@ -1,7 +1,7 @@
# Tokenomics Scoping Review: Annotated Bibliography
- **Team Name:** Mark Van de Vyver [PhD(Dist)](https://www.student.uwa.edu.au/course/award-verification-service?family=van+de+vyver&family_partial=on&given=mark&search=Search)
-- **Payment Address:** 15WoVugRLfBAogS1FBmhzxVv8WZqZK1z4KKHALijTZfdVcCm (USDC)
+- **Payment Address:** Fiat Wed, 05 Jun 2024 18:57:53 +1000
- **[Level](https://github.com/w3f/Grants-Program/tree/master#level_slider-levels):** 1
## Project Overview :page_facing_up:
diff --git a/applications/tux0.md b/applications/tux0.md
index f131657ea7a..ff99360faa5 100644
--- a/applications/tux0.md
+++ b/applications/tux0.md
@@ -3,6 +3,7 @@
- **Team Name:** Libeccio Labs
- **Payment Address:** 12poSUQPtcF1HUPQGY3zZu2P8emuW9YnsPduA4XG3oCEfJVp (USDT on Asset Hub)
- **[Level](https://github.com/w3f/Grants-Program/tree/master#level_slider-levels):** 2 🐤
+- **Status:** [Terminated](https://github.com/w3f/Grants-Program/pull/2071#issuecomment-2212310184)
## Project Overview :page_facing_up:
diff --git a/applications/xcm-tools-follow-up-2.md b/applications/xcm-tools-follow-up-2.md
new file mode 100644
index 00000000000..de7d4fa4819
--- /dev/null
+++ b/applications/xcm-tools-follow-up-2.md
@@ -0,0 +1,104 @@
+# XCM Tools follow-up-2
+
+- **Team Name:** [gmajor](https://github.com/gmajor-encrypt)
+- **Payment Details:**
+ - **DOT:** 12ENNVUJwkoGvdq45jLaMgNv8e3oBd5asaUFL4GjdYHnAVm3
+ - **Payment:** 12ENNVUJwkoGvdq45jLaMgNv8e3oBd5asaUFL4GjdYHnAVm3 (AssetHub USDT)
+- **[Level](https://github.com/w3f/Grants-Program/tree/master#level_slider-levels):** 1
+
+## Project Overview :page_facing_up:
+
+RFPs [https://github.com/w3f/Grants-Program/blob/master/docs/RFPs/xcm-tool.md](https://github.com/w3f/Grants-Program/blob/master/docs/RFPs/xcm-tool.md)
+
+### Overview
+
+XCM (Cross-Consensus Message) is a messaging format and language used to communicate between consensus systems.
+
+In the past two proposals, support for ordinary DMP, UMP, HRMP, XCM V3/V4, and snowBridge (Ethereum bridge) has been completed. This proposal is a continuation of the previous proposals.
+
+1. Add feature for the Polkadot <=> Kusama bridge(https://wiki.polkadot.network/docs/learn-guides-dot-ksm-bridge), including message sending and message tracking.
+2. Message tracking needs to be adjusted after the recent messageQueue pallet upgrade, and this proposal will also adjust message tracking.
+3. Update the mainnet configuration of the Ethereum Bridge.
+
+### Project Details
+
+1. Add feature for the Polkadot <=> Kusama bridge(https://wiki.polkadot.network/docs/learn-guides-dot-ksm-bridge), including cross-chain transfers of native tokens and foreign tokens, as well as message tracking. Message tracking includes tracking messages from the initiating chain and the receiving chain.
+2. Due to the removal of the **dmpQueue** and **xcmpQueue** pallets, message tracking needs to be adjusted. This proposal will adjust message tracking accordingly.
+3. The Ethereum Bridge has opened the Polkadot <=> Ethereum bridge in runtime [1002004](https://bridgehub-polkadot.subscan.io/runtime?version=1002004). This proposal will update the configuration of this bridge.
+
+### Ecosystem Fit
+
+Help us locate your project in the Polkadot/Substrate/Kusama landscape and what problems it tries to solve by answering each of these questions:
+
+- Where and how does your project fit into the ecosystem?
+ XCM developers or users who want to use the XCM Feature. A solution is provided here. You can send and track your XCM transaction.
+
+- Who is your target audience (parachain/dapp/wallet/UI developers, designers, your own user base, some dapp's user base, yourself)?
+ Wallet & explorer & parachain developer.
+
+- What need(s) does your project meet?
+ Provide a solution for parachain and parachain interaction, between Polkadot and Ethereum, transactions between parachain and relay chain, XCM message parsing, and XCM transaction tracking. It can be easily integrated into applications using Golang or directly used as a tool.
+
+- Are there any other projects similar to yours in the Substrate / Polkadot / Kusama ecosystem?
+ No.
+
+## Team :busts_in_silhouette:
+
+### Team members
+
+- gmajor
+
+### Contact
+
+* **Contact Name:** gmajor
+* **Contact Email:** gmajorencrypt@gmail.com
+* **Website:** https://github.com/gmajor-encrypt
+
+### Legal Structure
+
+Individual
+
+### Team's experience
+
+I have many years of PHP development experience and nearly five years of blockchain development experience, familiar with PHP, GOLANG, PYTHON, Nodejs, Rust.
+
+### Team Code Repos
+
+- https://github.com/gmajor-encrypt/php-scale-codec
+- https://github.com/gmajor-encrypt/php-substrate-api
+- https://github.com/gmajor-encrypt/scale-codec-comparator
+- https://github.com/gmajor-encrypt/sr25519-bindings
+- https://github.com/gmajor-encrypt/xcm-tools
+
+## Development Status :open_book:
+
+I have researched the Polkadot <> Kusama bridge.
+
+## Development Roadmap :nut_and_bolt:
+
+### Overview
+
+- **Total Estimated Duration:** 3 Weeks
+- **Full-Time Equivalent (FTE):** 1
+- **Total Costs:** 5,000 USDt
+
+### Milestone 1
+
+* **Estimated duration:** 3 weeks
+* **FTE:** 1
+* **Costs:** 5,000 USDt
+
+| Number | Deliverable | Specification |
+|-------:|----------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 0a. | License | Apache 2.0 |
+| 0b. | Documentation | Simple documentation on how to use and how to test |
+| 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 | We will provide a Dockerfile(s) that can be used to test all the functionality delivered with this milestone. |
+| 1. | Polkadot <=> Kusama message send | Support Polkadot <=> Kusama cross-chain message sending |
+| 2. | Message tracking | Adjust message tracking after the recent messageQueue pallet upgrade |
+| 3. | Ethereum Bridge update | Update the mainnet configuration of the Ethereum Bridge |
+| 4. | CLI support | Add a command-line tool to send messages from Polkadot => Kusama |
+
+## Future Plans
+
+There are currently many configuration items. I will add a configuration file in future updates to make it easier for users to use. The CLI will also be adjusted to an interactive command-line tool.
diff --git a/applications/zkverse.md b/applications/zkverse.md
index 5c3ffcdcf95..0ff3c12e1fc 100644
--- a/applications/zkverse.md
+++ b/applications/zkverse.md
@@ -3,6 +3,7 @@
- **Team Name:** Zkverse
- **Payment Address:** 0x8554fff69177C2cf470fA276b0C65dB58b5EfEE5(DAI)
- **[Level](https://github.com/w3f/Grants-Program/tree/master#level_slider-levels):** 2
+- **Status:** [Terminated](https://github.com/w3f/Grants-Program/pull/1563#issuecomment-2118322126)
## Project Overview :page_facing_up:
diff --git a/docs/funding.md b/docs/funding.md
index a25019ac8c9..7f1727a297d 100644
--- a/docs/funding.md
+++ b/docs/funding.md
@@ -31,18 +31,11 @@ Below is a list of other grant and bounty programs in the Polkadot/Substrate eco
- [Acala Grants Program](https://acala.network/ecosystem-program)
- [Aleph Zero Funding Program](https://alephzero.org/ecosystem-funding-program)
- [Avail Uncharted Grants](https://github.com/availproject/avail-uncharted/blob/main/grants/grants.md)
-- [Darwinia Grants Program](https://github.com/darwinia-network/collaboration/blob/master/grant/README.md#grant-program)
- [Decentralized Futures Program](https://futures.web3.foundation/)
- [Decentralized JAM](https://jam.web3.foundation/)
-- [Edgeware Grants and Bounties](https://gov.edgewa.re/discussion/1132-edgeware-proposal-process-and-template)
-- [HydraDX Grants and Bounties](https://docs.hydradx.io/spending_fw/)
- [ink!ubator](https://use.ink/ubator/)
-- [KodaDot RFPs](https://github.com/kodadot/grants/discussions/2)
-- [Moonbeam Grants Program](https://moonbeam.foundation/grants/)
- [OAK’s Developer Grants](https://oak.tech/community/grants/)
- [peaq Ecosystem Grant Program](https://www.peaq.network/grant-program)
- [Pendulum / Amplitude Grant Programs](https://pendulumchain.org/ecosystem-grant)
-- [Phala Builders Program](https://wiki.phala.network/en-us/build/general/builders-program/)
- [Polkadot Assurance Legion](https://polkadotassurance.com/)
- [Polkadot Pioneers Prize](https://pioneersprize.polkadot.network/)
-- [SubQuery Grants Programme](https://subquery.network/grants)
diff --git a/docs/help.md b/docs/help.md
index 012e258b4d2..1e0eab22004 100644
--- a/docs/help.md
+++ b/docs/help.md
@@ -10,28 +10,18 @@ We have a Matrix channel for grant-related questions and activities. Head over t
- [W3F Grants Community](https://matrix.to/#/!XpynPDLusWUWfDpaqr:matrix.org?via=web3.foundation&via=matrix.org)
+There are also program-specific Matrix channels for the Decentralized Futures Program and the JAM Prize:
+
+- [JAM Prize](https://matrix.to/#/#jam:polkadot.io)
+- [Decentralized Futures](https://matrix.to/#/#df:web3.foundation)
+
+
We also have Matrix/Element channels for real-time discussions on Web3 and Polkadot. Join the conversation!
- [Web3 Foundation Chat](https://matrix.to/#/#w3f:matrix.org)
- [Polkadot Space](https://matrix.to/#/#polkadot:web3.foundation)
- [Kusama Space](https://matrix.to/#/#kusama:web3.foundation)
-### Office Hours
-
-Web3 Foundation Grants Office Hours are a chance to ask the grants team questions regarding a specific (potential) grant application. It offers
-
-- general guidance regarding the grants program,
-- some quick initial feedback and
-- help how to navigate the ecosystem.
-
-Apply for Office Hours if you
-
-- need feedback before submitting an application,
-- want to find out what kind of support there might be available or
-- need help finding the resources you need.
-
-It is **not** a chance to pitch your project, especially since only a small subset of the committee will participate in the call. To apply, please fill out the [Office Hours :alarm_clock: form](https://forms.gle/54xkiqU37WwdN9UR6). Be as specific as possible, so we can help you more quickly. We will get back to you with follow-up questions or a link for booking a timeslot.
-
### Additional Information
diff --git a/docs/office-hours.md b/docs/office-hours.md
new file mode 100644
index 00000000000..ffb4447558f
--- /dev/null
+++ b/docs/office-hours.md
@@ -0,0 +1,23 @@
+---
+sidebar_position: 7
+title: 💼 Office Hours
+---
+
+**Ecosystem Funding Office Hours** are a chance to ask the W3F Ecosystem Funding team questions regarding a specific project, a (potential) grant application or about funding opportunities in general. It offers
+
+- **general guidance** regarding the various grants programs and prizes,
+- some quick **initial feedback** about project ideas, RFPs, roadmaps, etc. and
+- help how to navigate the ecosystem and to find the right resources.
+
+[Apply for Office Hours](https://forms.gle/54xkiqU37WwdN9UR6) if you
+
+- want to find out what kind of **support** there might be available for your needs,
+- need **feedback** before submitting an application or
+- look for help finding other **resources** you might need.
+
+Applying is as simple as giving us a brief outline of the project or questions you would like to discuss and your availabilities. To do so, please fill out the [Office Hours form](https://forms.gle/54xkiqU37WwdN9UR6). We will then follow up with an invitation to book a 30-minute call with one of our Ecosystem Development team members. Be as specific as possible, so we can help you as efficiently as possible.
+
+:::tip
+Please note: Office Hours is **not** a chance to _pitch_ your project, especially since the various programs and prizes have different evaluation criteria and decision makers and only a small subset of the Ecosystem Development team will participate in the call.
+
+:::
diff --git a/docs/rfps.md b/docs/rfps.md
index 229c18fd6eb..630b2f4539f 100644
--- a/docs/rfps.md
+++ b/docs/rfps.md
@@ -26,6 +26,7 @@ If you find an open RFP here that you think you can address, feel free to [submi
| RFP | Last Updated |
| :-- | :----------: |
+| [action_research_opengov.md](RFPs/action_research_opengov.md) | 31.05.2024 |
| [anti-collusion_infrastructure.md](RFPs/anti-collusion_infrastructure.md) | 21.09.2023 |
| [formal_guarantees_for_grandpa.md](RFPs/formal_guarantees_for_grandpa.md) | 12.10.2023 |
| [ISO_20022.md](RFPs/ISO_20022.md) | 12.10.2023 |
diff --git a/docusaurus.config.js b/docusaurus.config.js
index 6509a152f1f..1ff13cdc77d 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -35,7 +35,7 @@ module.exports = {
announcementBar: {
id: 'announcement',
content:
- 'We now have a dedicated page for projects supported through the Decentralized Futures Program. Have a look!',
+ 'Do you want to help build JAM? Checkout the JAM Prize!',
backgroundColor: '#000',
textColor: '#ffffff',
isCloseable: true,
@@ -51,7 +51,7 @@ module.exports = {
type: 'doc',
docId: 'docs/introduction',
position: 'right',
- label: 'Introduction',
+ label: 'Docs',
},
{
type: 'doc',
diff --git a/sidebars.js b/sidebars.js
index 3abb05bbfb2..96492819890 100644
--- a/sidebars.js
+++ b/sidebars.js
@@ -49,6 +49,10 @@ const sidebars = {
type: 'doc',
id:'docs/help'
},
+ {
+ type: 'doc',
+ id:'docs/office-hours'
+ },
{
type: 'doc',
id:'docs/faq'
diff --git a/src/pages/index.js b/src/pages/index.js
index 9298b6fa208..8049f78cbaa 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -15,20 +15,47 @@ function HomepageHeader() {