Merge branch 'w3f:master' into master

w3f · Feb 8, 2024 · f44f89c · f44f89c
2 parents c8bac5f + 78a15bf
commit f44f89c
Show file tree

Hide file tree

Showing 256 changed files with 46,239 additions and 50 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,10 +1,9 @@
 # Milestone Delivery Checklist
 
 - [x] The [milestone-delivery-template.md](https://github.com/w3f/Grant-Milestone-Delivery/blob/master/deliveries/milestone-delivery-template.md) has been copied and updated.
-- [ ] The [invoice form :pencil:](https://forms.gle/LSRr7PCjBpEbKGh89) has been filled out for this milestone.
 - [ ] This pull request is being made by the same account as the accepted application.
 - [ ] I have disclosed any and all sources of reused code in the submitted repositories and have done my due diligence to meet its license requirements.
-- [ ] In case of acceptance, the payment will be transferred to the BTC/ETH/fiat account provided in the application.
+- [ ] In case of acceptance, an invoice must be submitted and the payment will be transferred to the Polkadot/fiat account provided in the application.
 - [ ] The delivery is according to the [Guidelines for Milestone Deliverables](https://grants.web3.foundation/docs/Support%20Docs/milestone-deliverables-guidelines).
 
 Link to the application pull request: https://github.com/w3f/Grants-Program/pull/XXX < please fill this in with the PR number of your application.
diff --git a/.github/workflows/badge_or_last_milestone.yml b/.github/workflows/badge_or_last_milestone.yml
@@ -18,15 +18,15 @@ jobs:
           filter: |
             deliveries/*.md
             maintenance_deliveries/*.md
-          
+
   check-needs-badge:
     runs-on: ubuntu-latest
     needs: get-delivery-files
     if: github.event.pull_request.merged == true && needs.get-delivery-files.outputs.filenames != '[]'
     outputs:
-      needs_badge: ${{ steps.badge-check.outputs.check }} 
-      needs_last_milestone_comment: ${{ steps.last-milestone.outputs.check }}
-
+      needs_badge: ${{ steps.badge-check.outputs.check && github.event.pull_request.merged == true }} 
+      needs_last_milestone_comment: ${{ steps.last-milestone.outputs.check && github.event.pull_request.merged == true }}
+      request_invoice: ${{ github.event.pull_request.merged == true && needs.get-delivery-files.outputs.filenames != '[]' && github.event.pull_request.merged == true }}
     strategy:
       max-parallel: 1
       fail-fast: false
@@ -76,12 +76,12 @@ jobs:
           message: >
             Congratulations on completing the first milestone of this grant!
             As part of the Grants Program, we want to help grant recipients acknowledge their grants publicly.
-            To that end, we’ve created a [badge for projects](https://github.com/w3f/Grants-Program/blob/master/docs/Support%20Docs/grant-badge-guidelines.md)
+            To that end, we've created a [badge for projects](https://github.com/w3f/Grants-Program/blob/master/docs/Support%20Docs/grant-badge-guidelines.md)
             that successfully deliver their first milestone.
             Please use the badge only in reference to the work that has been completed as part of this grant,
             so please do not display it on your team or project's homepage unless accompanied by a short description of the grant.
             Furthermore, you're now welcome to announce the grant publicly. Please remember to observe the
-            [foundation’s guidelines](https://github.com/w3f/Grants-Program/blob/master/docs/Support%20Docs/announcement-guidelines.md) in doing so.
+            [foundation's guidelines](https://github.com/w3f/Grants-Program/blob/master/docs/Support%20Docs/announcement-guidelines.md) in doing so.
             If you haven't already, reach out to [email protected] for feedback on your announcement and cross-promotion.<br/><br/>
             Thank you for your contribution, and good luck!
             If you have any remaining milestone, let us know if you encounter any delays by leaving a comment on the application PR
@@ -97,17 +97,29 @@ jobs:
     if: always()
     steps:
       - name: Last milestone comment
-        if: needs.check-needs-badge.outputs.needs_last_milestone_comment
+        if: needs.check-needs-badge.outputs.needs_last_milestone_comment 
         uses: thollander/[email protected]
         with:
           message: > 
             We noticed that this is the last milestone of your project. Congratulations on completing your grant! 🎊<br/>
 
             So, where to from here? First of all, you should join our [Grants Community chat](https://matrix.to/#/!XpynPDLusWUWfDpaqr:matrix.org?via=web3.foundation&via=matrix.org), if you haven't already, so we can stay in touch.
 
-            If you are looking for continuative support for your project, there are quite a few options. The main goal of the W3F grants program is to support research as well as early-stage technical projects. If your project still falls under one of those categories, you might want to apply for a follow-up grant. However, depending on your goals and project status, there are other support programs in our ecosystem that might be better suited as the next step. For example, projects with a Business Case/Token should look into the [Substrate Builders Program](https://substrate.io/ecosystem/substrate-builders-program/) or [VC Funding](https://parachains.info/investors). Common Good projects have a good chance of receiving [Treasury Funding](https://github.com/w3f/Grants-Program#treasury).<br/> 
+            If you are looking for continuative support for your project, there are quite a few options. The main goal of the W3F grants program is to support research as well as early-stage technical projects. If your project still falls under one of those categories, you might want to apply for a follow-up grant. However, depending on your goals and project status, there are other support programs in our ecosystem that might be better suited as the next step. For example, projects with a Business Case/Token should look into the [Substrate Builders Program](https://substrate.io/ecosystem/substrate-builders-program/) or [VC Funding](https://parachains.info/investors) and Common Good projects have a good chance of receiving [Treasury Funding](https://github.com/w3f/Grants-Program#treasury). If you are looking for guidance, the team at https://substrate.io/ecosystem/square-one/ has compiled a list of ecosystem support sources and are happy to help you navigate it.<br/> 
 
             For a more comprehensive list, see our [Alternative Funding page](https://w3f.github.io/Grants-Program/funding). Let us know if you have any questions regarding the above. We are more than happy to point you to additional resources and help you determine the best course of action. 
 
             Lastly, we hope your W3F grant was a success and we want to thank you for being part of the journey!
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  request-invoice:
+    runs-on: ubuntu-latest
+    needs: check-needs-badge
+    if: always()
+    steps:
+      - name: Request invoice
+        uses: thollander/[email protected]
+        with:
+          message: >
+            :coin: Please fill out the [invoice form](https://docs.google.com/forms/d/e/1FAIpQLSfmNYaoCgrxyhzgoKQ0ynQvnNRoTmgApz9NrMp-hd8mhIiO0A/viewform?usp=pp_url&entry.1070766548=${{github.event.pull_request.html_url}}) in order to initiate the payment process. Thank you! 
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 ---
 
 - [:mailbox: Milestone Delivery Process](#mailbox-milestone-delivery-process)
-- [:ballot_box_with_check: External Evaluations](#ballot_box_with_check-external-evaluations)
+- [:ballot\_box\_with\_check: External Evaluations](#ballot_box_with_check-external-evaluations)
   - [Requirements](#requirements)
   - [Process](#process)
 - [:bulb: Help](#bulb-help)
@@ -23,28 +23,29 @@ The milestone delivery process is part of the [W3F Grants Program](https://githu
    2. In the newly created fork, create a copy of the milestone delivery template ([`deliveries/milestone-delivery-template.md`](deliveries/milestone-delivery-template.md)). If you're using the GitHub web interface, you will need to create a new file and copy the [contents](https://raw.githubusercontent.com/w3f/Grant-Milestone-Delivery/master/deliveries/milestone-delivery-template.md) of the template inside the new one. Make sure you **do not modify the template file directly**. In the case of a maintenance application, use the ([`maintenance template`](maintenance_deliveries/maintenance-delivery-template.md)) instead.
    5. Fill out the template with the details of your milestone, including all deliverables as listed in your application.
    4. Name the file `project_name-milestone_number.md` or in the case of maintenance agreement `project_name-delivery_number.md`
-   5. Fill out the [invoice form](https://forms.gle/LSRr7PCjBpEbKGh89).
    6. Create a pull request and fill out the comment template.
 2. **Milestone Review:**
    1. [Evaluators](https://grants.web3.foundation/docs/Introduction/team#w3f-grants-committee) can (and usually do) issue comments and request changes on the pull request. Their feedback needs to be resolved before your milestone is accepted.
    2. Grants Evaluators will merge your pull request to accept the delivery.
 3. **Milestone Payment:**
-   1. The [operations team](https://grants.web3.foundation/docs/Introduction/team#w3f-operations-team) receives a notification once the delivery is accepted. Payments are usually processed within 14 days.
-   2. Payment is made to the bank account or Bitcoin, Polkadot, Kusama or Ethereum address specified in the initial application. The exchange rate for BTC depends on the time of payment.
+   1. After the milestone is approved and the pull request merged, fill out the [invoice form](https://forms.gle/LSRr7PCjBpEbKGh89).
+   1. The [operations team](https://grants.web3.foundation/docs/Introduction/team#w3f-operations-team) receives a notification once the invoice is submitted. Payments are usually processed within 14 days.
+   2. Payment is made to the bank account or Polkadot address specified in the initial application.
 
 Grant applications can be [amended](https://grants.web3.foundation/docs/Process/changes) at any time. However, this _necessitates a reevaluation by the committee_. If your application has been accepted and, during development, you find that your project significantly deviates from the original specification, please open a new pull request that modifies the existing application.
 
 ## :ballot_box_with_check: External Evaluations
 
-As part of the grant program, we allow everyone to participate in the evaluation process of submitted milestones. Successfully merged external evaluations will receive **up to 15 KSM**, depending on the quality and depth of the evaluation. The payout will be sent to their Kusama identity address. *You can evaluate as many deliveries as you like, but only one at a time.*
-
+As part of the grant program, we allow everyone to participate in the evaluation process of submitted milestones. Successfully merged external evaluations will receive **up to 15 KSM**, depending on the quality and depth of the evaluation. The payout will be sent to their Kusama identity address.
 
 ### Requirements
 
 - [On-Chain identity](https://guide.kusama.network/docs/learn-identity/) on Kusama
 - GitHub account
 - Share your identity and postal address with us via [email protected] due to regulatory reasons
 - The evaluation must be submitted within ten days after the milestone was delivered
+- Should your cumulative payouts exceed 1,000 CHF, we may request and perform Know Your Customer (KYC) verification procedures before processing the payout
+- You are permitted to evaluate a limited number of cases, with a calendar yearly cap equivalent to 2,000 CHF in KSM, in adherence to regulatory guidelines
 
 ### Process
 

diff --git a/deliveries/.delivery_testing.md b/deliveries/.delivery_testing.md
@@ -1,5 +1,5 @@
 # Milestone Delivery :mailbox
 
-- **Application Document:** https://github.com/w3f/Open-Grants-Program/blob/master/applications/example-project.md
+- **Application Document:** https://github.com/w3f/Grants-Program/blob/master/applications/example-project.md
 - **Milestone Number:** 2
 - **Project Name:** Substrate package manager
diff --git a/deliveries/Aisland-DocSig_Milestone1.md b/deliveries/Aisland-DocSig_Milestone1.md
@@ -0,0 +1,34 @@
+# Milestone Delivery :mailbox:
+
+**The [invoice form :pencil:](https://docs.google.com/forms/d/e/1FAIpQLSfmNYaoCgrxyhzgoKQ0ynQvnNRoTmgApz9NrMp-hd8mhIiO0A/viewform) has been filled out correctly for this milestone and the delivery is according to the official [milestone delivery guidelines](https://github.com/w3f/Grants-Program/blob/master/docs/Support%20Docs/milestone-deliverables-guidelines.md).**  
+
+* **Application Document:**  [Aisland-Docsig](https://github.com/w3f/Grants-Program/blob/master/applications/Aisland-DocSig.md)  
+
+* **Milestone Number:** 1
+
+**Context** (optional)
+Aisland docsig is a platform to exchange signed documents throught the blockchain.  
+In this first milestone we added some features to Docsig:  
+1.new functions in Docsig Pallet to store the documents completely on chain (not only the hash);  
+2. UI managament of a standard signature (generated from fonts or scanned and uploaded);  
+3. Plugin for blocks editor to insert the standard signature;  
+4. Encryption/Decryption of the the documents stored on the blockchain.  
+
+**Deliverables**
+> Please provide a list of all deliverables of the milestone extracted from the initial application and a link to the deliverable itself. Ideally all links inside the below table should include a commit hash, which will be used for testing. If you don't provide a commit hash, we will work off the default branch of your repository. Thus, if you plan on continuing work after delivery, we suggest you create a separate branch for either the delivery or your continuing work. 
+> 
+> If there is anything particular about any of the deliverables we or a future reader should know, use the respective `Notes` column.
+
+| Number | Deliverable | Link | Notes |
+| ------------- | ------------- | ------------- |------------- |
+| 0a. | License |[https://github.com/aisland-dao/docsig/blob/main/LICENSE](https://github.com/aisland-dao/docsig/blob/main/LICENSE)| Apache 2.0| 
+| 0b.| Documentation |[Dapp Documentation](https://github.com/aisland-dao/docsig/blob/main/README.md),  [Pallet Documentation](https://github.com/aisland-dao/aisland-node/blob/main/pallets/docsig/README.md), [Dapp Repository](https://github.com/aisland-dao/docsig), [Pallet Repository](https://github.com/aisland-dao/aisland-node/blob/main/pallets/docsig)| in-line documentation is present in every source code file| 
+| 0c.  |Testing and Testing Guide|[Dapp unit tests](https://github.com/aisland-dao/docsig/blob/main/README.md#unit-tests), [Pallet unit tests](https://github.com/aisland-dao/aisland-node/blob/main/pallets/docsig/README.md#unit-tests)| | 
+| 0d.  | Docker |[Docker Documentation](https://github.com/aisland-dao/docsig/blob/main/README.md#docker), [Docker file](https://github.com/aisland-dao/docsig/blob/main/docker-compose.yml)| | 
+| 0e.  | Article |[Article of Introduction](https://news.aisland.io/aisland-docsig-decentralised-exchange-of-signed-documents/),[Workshop Video](https://dropbox.aisland.io/index.php/s/fvIn7U4b75v6jSo)|| 
+| 1.  | Substrate module: pallet-docsig |[Pallet Docsig](https://github.com/aisland-dao/aisland-node/tree/main/pallets/docsig), new functions: [newBlob()](https://github.com/aisland-dao/aisland-node/blob/66433f01b1ec232ca013a7d2cb8d8ca1eaebe007/pallets/docsig/src/lib.rs#L234), [destroyBlob()](https://github.com/aisland-dao/aisland-node/blob/66433f01b1ec232ca013a7d2cb8d8ca1eaebe007/pallets/docsig/src/lib.rs#L264), [storePublickey()](https://github.com/aisland-dao/aisland-node/blob/66433f01b1ec232ca013a7d2cb8d8ca1eaebe007/pallets/docsig/src/lib.rs#L210)| | 
+| 2.  | Dapp Feature: Standard Signature Image |The main entry point is the function [render_settings()](https://github.com/aisland-dao/docsig/blob/84e57c3fa448fc71e412f126394355864c40c3ed/client-src/index.js#L1676)|From the dapp, click on "Settings" icon| 
+| 3.  | Dapp Feature: Signature Marker |[Plugin Source Code](https://github.com/aisland-dao/docsig/tree/main/editorjs-signature-plugin), [UI Implementation](https://github.com/aisland-dao/docsig/blob/84e57c3fa448fc71e412f126394355864c40c3ed/client-src/index.js#L1412)|The new option is shown in the blocks editor when you create a blank document, for example.| 
+| 4.  | Dapp Feature: Encryption |[Encryption/Decryption Module](https://github.com/aisland-dao/docsig/blob/main/modules/cryptostream.js), [UI to manage encryption keys](https://github.com/aisland-dao/docsig/blob/84e57c3fa448fc71e412f126394355864c40c3ed/client-src/index.js#L1881), [Implementation on UI multiple points](https://github.com/aisland-dao/docsig/blob/main/client-src/index.js)| | 
+
+**Additional Information**