Merge from upstream (#3)

* resource viewer

* changed milestone 3

* quadratic-funding (w3f#227)

* quadratic-funding

* add license, unit test and a standalone minimalistic frontend to spec

* add SEOR code-less smart contract platform application (w3f#205)

* add SEOR code-less smart contract platform application

* update deliverable & add future plans

* add multi-chain support in Milestone 2 & 3's deliverable

* formart the subtitles of 'Project Details' segment

* Polkastarter Grant Application (w3f#204)

* Make Polkastarter Grant Application

* Added screenshots

* Added testing guides

Co-authored-by: Tiago Martins <[email protected]>

* Added curve market maker (w3f#225)

* Added Zondax maintenance+recovery extensions+support (w3f#234)

* Create polkakeeper.md (w3f#200)

* Create polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

Added UI User stories, and more detail on the milestones

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

* Update polkakeeper.md

Co-authored-by: Caspar Oostendorp <[email protected]>

* Readmefixing (w3f#241)

* upgrade readme

* fix icons

* smaller icons

* correct icons

* Update README.md

Updated Evaluators

* Update welcome.yml (w3f#242)

* Update welcome.yml

Update Welcome message

* Update welcome.yml

updated

* Create proposal of stone index on substrate

* Updated the BTC payment address

* draft of pallet design

* Added more details of public functions

* Added back the mandatory deliverables

* Added desc for public exposed methods

* Adjusted the budget

* Revised the deliverables

1. Merge the token module into indexed basket management module
2. Made it more clear for DEX integration
3. Update the sequence of deliverables

* Create AlgoCash.md

* Update AlgoCash.md

* Update AlgoCash.md

* Update AlgoCash.md

* Update AlgoCash.md

* Update AlgoCash.md

Update the approach of further 500,000 share token distribution

* Update AlgoCash.md

Add contract specification

* Update AlgoCash.md

* Update README.md (w3f#250)

As discussed on Element, David, I've added Edgeware Grants and Bounties under the other grant programs header.

* Update welcome.yml

fix html </b>

* Create php-scale-lib.md

* Payment change

* Upgradeability

* Add missing milestone title

* Reduce scope by removing milestone 2

Milestone 2 was deemed too uncertain to be part of the initial grant.
Depending on the results of the first milestone, we will consider
submitting another proposal with more concrete steps.

* Update pull_request_template.md

* Denominating in usd (w3f#253)

* Update application-template.md

denominating in USD

* Update README.md

* Create starry_network.md

* Rename starry_network.md to Starry_Network.md

* Update Starry_Network.md

* update Ecosystem Fit

* update overview

* update architecture

* remove ecosystem fit and add additional Information

* update overview

* Update Starry_Network.md

* add nft dao architecture image and reduce price

* Added user story about NFT DAO, update demo link

* reduce from 12000 DAI to 10000 DAI

* Update pull_request_template.md (w3f#261)

* Update kylin_network.md (w3f#259)

Update the original contract based on grant evaluation comments. [Here](w3f/Grant-Milestone-Delivery#98)

Co-authored-by: wannam2049 <[email protected]>

* Unified TOC and language with general grants (w3f#264)

* Update sensio_network.md

Second milestone of senseo will no longer be delivered

* Remove forum link (w3f#269)

* NewOmega Application (w3f#243)

* Add newomega application

newomega: Fix alignment

newomega: More details

newomega: Improve formatting

* newomega: Include github link to solidity contracts in deliverables

* newomega: Update deliverables to reflect file rename

* newomega: Update deliverableremove third milestone, tweak price

* newomega: more precision in milestone 2 definition

* dotmog application

* Create bright_treasury.md

* Update currency to DAI, add DoD

* Update README.md

Updated Committee

* Update .gitignore (w3f#279)

Co-authored-by: Aleixo Sánchez <[email protected]>

* Delete .DS_Store

* StandardProtocol application (w3f#244)

* Add Standard Protocol Application

* Update Standard_Protocol.md

* Update Standard_Protocol.md

* Update Standard_Protocol.md

* Update Standard_Protocol.md

* Update Standard_Protocol.md

* Update Standard_Protocol.md

* Update Standard_Protocol.md

* Update Standard_Protocol.md

* Update Standard_Protocol.md

* Create application-template.md (w3f#276)

* Create application-template.md

- Some clarifications and highlighting based on past issues,
- mention licensing,
- more emojis ✊,
- ask for 
  - short and long term plans,
  - community & contributors,
  - status of project before grant,
  - previous grant applications,
  - work done.

* Apply suggestions from code review

Co-authored-by: Aleixo Sánchez <[email protected]>

* Update applications/application-template.md

Co-authored-by: Aleixo Sánchez <[email protected]>

Co-authored-by: David Hawig <[email protected]>
Co-authored-by: Aleixo Sánchez <[email protected]>

* Ask for follow-up grant info (w3f#280)

* Update README.md

* fix headings (w3f#285)

* SkyePass application (w3f#212)

* add application for skyepass

* update porposal

* update: identity solution spec

* updates on milestone desc

* update milestone descp

* update milestones

* update total cost

* update milestone spec

* delete status col

* Polkadot UI Web Identicon + Angular Identicon (w3f#252)

* Submission of the project grant template

* Adding repositories for Angular and Web Identicon projects

* Deliverable + future plans update

* Grant Amount Update

* Create ZeroPool.md (w3f#208)

* add ZeroPool.md

* remove the last milestone

* fix typo

* Update ZeroPool.md

* Quadratic Funding Module and Dapp Application (w3f#268)

* Quadratic Funding Module and Dapp Application (#2)

* Added quardratic funding proposal

* Finalized quadratic funding open grant proposal

* Added web app wireframe link and description to project details

* 1. Added finalize function to M1 delivery
2. Adjusted BTC amount to make sure the total funding is within limit

* 1. Move user study out of M2 to future plans due to tightness
2. Fix the paragraph spacing of last commit

* 1. Added UI examples to team's experience section
2. Update the cost denomination to DAI instead of BTC

* 1. Changed BTC address to ERC20 DAI address
2. Added Sybil resistance to future plans

* Added identity module interaction requirement to M1 delivery

* Added project and proposal concepts to UML chart

* Webb Mixer (w3f#216)

* Create MIXER.md

* Update MIXER.md

* Update MIXER.md

* Update MIXER.md

* Update MIXER.md

* Update MIXER.md

* Update README.md (w3f#288)

* Update README.md

* Update application-template.md (w3f#289)

- target audience
- limitations
- `the project` -> `your project`

* Action to automatically label by approvals remaining (w3f#291)

* Github action to label based on approvals (missing)

* Revert "Github action to label based on approvals (missing)"

This reverts commit f6a6b70.

* Github action to label based on approvals

* Create Gluon_decentralized_hardware_crypto_wallet_services.md (w3f#182)

* Create Gluon_decentralized_hardware_crypto_wallet_services.md

* Merge branch 'master' of https://github.com/tearust/Open-Grants-Program

* update btc to dot

* add light node to communicate with DOT. adjust cost based on BTC price change

* update based on discussion. using schnorr and social recovery pellet

* update milestones

* add prerequisites to Schnorr threshold sign

* update using Schnorrkel algorithm

* update to USD

* Update google_sheet_update.yml

* EverlastingCash Web3 Grant Application (w3f#277)

* Create EverlastingCash.md

ELC - An algorithmic stablecoin with reserves

* Update EverlastingCash.md

* Update EverlastingCash.md

* Update EverlastingCash.md

* Update EverlastingCash.md

* Update Linkedin

Co-authored-by: steven <[email protected]>

* approval labeler rewrite (w3f#292)

* Github action to label based on approvals (missing)

* Revert "Github action to label based on approvals (missing)"

This reverts commit f6a6b70.

* Github action to label based on approvals

* approval labeler rewrite

* substrate identity directory (w3f#255)

* substrate identity directory

* substrate identity directory

* added 0a to 0d deliveries to milestone 1

* price changed

Co-authored-by: dark64 <[email protected]>

* A comma (w3f#298)

* Update README as in General Grants repo (w3f#303)

* Update README as in General Grants repo

* Update README.md

Co-authored-by: Aleixo Sánchez <[email protected]>

Co-authored-by: David Hawig <[email protected]>

* Update README.md

Fixing links

* Update README.md

fix rfp link

* Update README.md

fix milestone-deliverables-guidelines link

* Update README.md

Update tech stack/accepted links

* Fix broken links (w3f#307)

* Update MAP-Bridge.md

Termination, see [comment](w3f/Grant-Milestone-Delivery#89 (comment))

* Update MAP-Bridge.md

Added payment address again, just in case

* Update clover_network.md (w3f#310)

* Update shadows-network.md (w3f#309)

* Update README.md

* Update README.md

* Update README.md

* Open Grants Program application for project Delmonicos (w3f#283)

* Update delmonicos.md
+ Application update after questions from Noc2

* Update to address demand from gautamdhameja

* Changed repo url

Repo moved to the newly created Delmonicos organisation

* Update polkadex.md

* Add Treasureland Grant (w3f#218)

* Create Treasureland.md

* Update Treasureland.md

* Update Treasureland.md

* Update Treasureland.md

* Update Treasureland.md

* Update Treasureland.md

* Update Treasureland.md

* Update Treasureland.md

* Update Treasureland.md

* ChainJS Grant application (w3f#228)

* Create chainjs.md

Adding template for grant proposal

* Update chainjs.md

Adding ChainJS for Polkadot draft proposal

* Update chainjs.md

Corrected title

* Update chainjs.md

formatting

* Update chainjs.md

added ecosystem fit section

* Update chainjs.md

* Update chainjs.md

Removed instructions

* Update chainjs.md

removed instructions

* Update chainjs.md

Added more narrative to future plans

* Update chainjs.md

* Update chainjs.md

Added Kusama support into the grant application, and added more description of the difference between ChainJS and Polkadot.js

* Update chainjs.md

Updated pricing

* Update chainjs.md

Lowering price

* PolkaJ Android Support proposal (w3f#301)

* PolkaJ Android Support proposal

* Update BTC to DAI

* Adjust price based on feedback

* Remove undelivered milestone (w3f#318)

* xtoken - XCM Implementation for Fungible Assets (w3f#316)

* xtoken

* update description

* update

* update payment denomination, and milestone 1 deliverables

* file name change, milestone cost updated

Co-authored-by: Bryan Chen <[email protected]>

* stable-asset.md (w3f#286)

* stable-asset.md

* Update stable-asset.md

* Update stable-asset.md

* Update stable-asset.md

Co-authored-by: Shengda Ding <[email protected]>

* move the application file into its proper folder (w3f#320)

* discount based on hackathon participation (w3f#325)

* Update EVANESCO Legal Structure (w3f#326)

* pallet-maci (Minimal Anti Collusion Infrastructure) (w3f#232)

* Create pallet_maci.md

* Update pallet_maci.md

* Update pallet_maci.md

* Update pallet_maci.md

* discount Apron Network for ParityAsia hackathon award (w3f#323)

* changed the bitcoin address (w3f#330)

* discount deeper network due to hackathon participation (w3f#324)

* Create XPredictMarket.md (w3f#313)

* update the gsheet workflow

* re-estimate the price of milestone (w3f#331)

* Update Apron_Network.md

Remove SDK from milestone and reduce the price

* Update Apron_Network.md

Reduce the price

* Bit.Country Milestone 2 (w3f#305)

* Create bit_country_m2.md

initial draft for m2.

* Update bit_country_m2.md

Finalised the tasks in the milestone.

* Update bit_country_m2.md

minor milestone text update

* Update bit_country_m2.md

update team member

* Update bit_country_m2.md

update image.

* Update bit_country_m2.md

Change the amount to be USD as required.

* Update bit_country_m2.md

Add bootstrap tasks for launching testnet.

* Update grant application. (#1)

Restructure and update wording to improve clarity of deliverables.
Add summary and considerations sections.

* Tech stack and changing NFT native to support NFT

Tech stack and changing NFT native to support NFT

* update Duration

update Duration

* fix typo

Co-authored-by: Shannon Christie <[email protected]>

* removed "Adopt storage", reduced costs (w3f#339)

* Create vera_defi.md (w3f#281)

* Create vera_defi.md

Initial grant application

* Update grant application

* Replace https with http to fix images link.

* Add more details to the milestone

* Update vera_defi.md

Update bio

* Update vera_defi.md

* Clarification on NFT Lending

* Update vera_defi.md

NFT Token development clarification

* Update vera_defi.md

Fix style

* Update vera_defi.md

Fix style

* Update vera_defi.md

Update scope to focus on AssetManager. Use existing NFT implementation instead of building our own.

* Update vera_defi.md

Update cost

Co-authored-by: arbach <[email protected]>
Co-authored-by: Denis <[email protected]>

* Create Parallel.md (w3f#329)

* Auto-merge action (w3f#349)

* NFT Collectibles Wallet (w3f#341)

* NFT Collectibles Wallet

* updating project scope and adjusting cost

* updating estimated duration

* reordering milestone numbers

Co-authored-by: Michael Huntington <[email protected]>

* Clean & fix actions (w3f#359)

* Delete label_approval_count.yml

* Update auto_merge.yml (w3f#360)

* remove m2 (w3f#355)

* Update README.md

* cosmetic fixes

* Subspace (w3f#357)

* first draft

* second draft

* minor edits

* finial revisions

* Rename subspace.md to spartan_poc_consensus_module.md

* adjust license and cost

* adjust license and cost

* no parallel funding from multiple sources

* Update dorahacks-quadratic-funding.md

* Update README + other minor changes (w3f#367)

* Add more info to README

* Track team provenance + minor updates to template

* Update PR template

* Update dorahacks-quadratic-funding.md (w3f#370)

We completed frontend integration with HackerLink. However due to tight schedules we didn't create a demo page based on the substrate-frontend-template (task #2 of Milestone-2). Another reason why we didn't create the simple page is that HackerLink has a complete infrastructure for user registration, project upload / display, etc. The HackerLink code base is not open source. We would like to provide a complete demo of how quadratic funding grant is functioning on a parachain or potentially on Polkadot / Kusama relaychains in the future. Therefore we would like to still submit a milestone. Given that our frontend is not open source and we are only providing a demonstration site that uses our milestone-1 code to provide a service for quadratic funding grant, we are reducing the price to 0 accordingly.

* Delete application-template-cn.md (w3f#372)

Co-authored-by: borispovod <[email protected]>
Co-authored-by: Jiannan Zhang <[email protected]>
Co-authored-by: AKACoder <[email protected]>
Co-authored-by: Polkastarter <[email protected]>
Co-authored-by: Tiago Martins <[email protected]>
Co-authored-by: mikolajsobolewski <[email protected]>
Co-authored-by: Juan Leni <[email protected]>
Co-authored-by: RAMPDEFITEAM <[email protected]>
Co-authored-by: Caspar Oostendorp <[email protected]>
Co-authored-by: semuelle <[email protected]>
Co-authored-by: David Hawig <[email protected]>
Co-authored-by: calvinzhou-rockx <[email protected]>
Co-authored-by: Dohkooo <[email protected]>
Co-authored-by: Junte <[email protected]>
Co-authored-by: gmajor <[email protected]>
Co-authored-by: Hugo Peixoto <[email protected]>
Co-authored-by: Fuling <[email protected]>
Co-authored-by: Aleixo Sánchez <[email protected]>
Co-authored-by: kylin <[email protected]>
Co-authored-by: wannam2049 <[email protected]>
Co-authored-by: celrisen <[email protected]>
Co-authored-by: darkfriend77 <[email protected]>
Co-authored-by: Agnieszka Olszewska <[email protected]>
Co-authored-by: Kasia Łukasiewicz <[email protected]>
Co-authored-by: Aleixo Sánchez <[email protected]>
Co-authored-by: Hyungsuk Kang <[email protected]>
Co-authored-by: Song Zhou <[email protected]>
Co-authored-by: Mor GUEYE <[email protected]>
Co-authored-by: Igor Gulamov <[email protected]>
Co-authored-by: Drew Stone <[email protected]>
Co-authored-by: Kevin Zhang <[email protected]>
Co-authored-by: steve <[email protected]>
Co-authored-by: steven <[email protected]>
Co-authored-by: Ana Milić-Štrkalj <[email protected]>
Co-authored-by: dark64 <[email protected]>
Co-authored-by: Lumena <[email protected]>
Co-authored-by: dego-team <[email protected]>
Co-authored-by: Marc Blinder <[email protected]>
Co-authored-by: Nathan Schwermann <[email protected]>
Co-authored-by: Bette <[email protected]>
Co-authored-by: Bryan Chen <[email protected]>
Co-authored-by: Frank Yin <[email protected]>
Co-authored-by: Shengda Ding <[email protected]>
Co-authored-by: Marcin <[email protected]>
Co-authored-by: eva-networks <[email protected]>
Co-authored-by: Filip Pajic <[email protected]>
Co-authored-by: Sota Watanabe <[email protected]>
Co-authored-by: XPredictMarket <[email protected]>
Co-authored-by: Toney <[email protected]>
Co-authored-by: Ray Lu <[email protected]>
Co-authored-by: Shannon Christie <[email protected]>
Co-authored-by: arbach <[email protected]>
Co-authored-by: arbach <[email protected]>
Co-authored-by: Denis <[email protected]>
Co-authored-by: yubo-ruan <[email protected]>
Co-authored-by: Michael (GP) <[email protected]>
Co-authored-by: Michael Huntington <[email protected]>
Co-authored-by: J Wagstaff <[email protected]>

.github/pull_request_template.md

@@ -1,8 +1,9 @@
 # Grant Application Checklist
 
-- [ ] The [application-template.md](https://github.com/w3f/Open-Grants-Program/blob/master/applications/application-template.md) has been copied, renamed ( "project_name.md") and updated.
-- [ ] A BTC or Ethereum address for the payment of the milestones is provided inside the application.  
-- [ ] The software of the project will be released under the Apache license version 2.0 as specified in the [terms and conditions](https://gist.github.com/Noc2/75bc58e8ce9b5d419ff883b0cf2b8c19).
-- [ ] The total funding amount of the project is below USD $30k for initial grant applications and $100k for follow-up grants at the time of submission.
+- [ ] The [application template](https://github.com/w3f/Open-Grants-Program/blob/master/applications/application-template.md) has been copied, renamed ( `project_name.md`) and updated.
+- [ ] A BTC or Ethereum (DAI) address for the payment of the milestones is provided inside the application.  
+- [ ] I have read and acknowledged the [Terms and Conditions](https://github.com/w3f/Open-Grants-Program/blob/master/src/T&Cs.md).
+- [ ] The software delivered for this grant will be released under an open-source license specified in the application.
+- [ ] The total funding amount of the project is below USD $30k for initial grant applications and $100k for follow-up grants.
 - [ ] The initial PR contains only one commit (squash if needed before submitting your PR).
-- [ ] The grant will only be announced once we successfully [delivered](https://github.com/w3f/Grant-Milestone-Delivery) the first milestone.
+- [ ] The grant will only be announced once the first milestone [has been accepted](https://github.com/w3f/Grant-Milestone-Delivery).

.github/workflows/auto_merge.yml

@@ -0,0 +1,18 @@
+name: PRs auto merge
+
+on:
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  pr-automerge:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: davideviolante/[email protected]
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_REPOSITORY: 'w3f/Open-Grants-Program'
+      with:
+        merge-method: 'squash'
+        min-approvals: 3
+        base-ref: 'master'

.github/workflows/google_sheet_update.yml

@@ -65,7 +65,7 @@ jobs:
         uses: mmagician/[email protected]
         with:
           spreadsheetId: ${{ secrets.SPREADSHEET_ID }}
-          startRow: 235
+          startRow: 260
           worksheetTitle: "Legal"
         env:
           GSHEET_CLIENT_EMAIL: ${{ secrets.GSHEET_CLIENT_EMAIL }}
@@ -102,7 +102,7 @@ jobs:
                     "${{ steps.grant_parser.outputs.total_cost_dai }}",
                     "",
                     "",
-                    "Executed",
+                    "Signed",
                     "https://github.com/w3f/Open-Grants-Program/pull/${{ github.event.pull_request.number }}",
                     "${{ steps.date.outputs.date }}"
                   ]], 

.github/workflows/welcome.yml

@@ -26,10 +26,10 @@ jobs:
         uses: thollander/actions-comment-pull-request@master
         with:
           message: > 
-            Congratulations! As part of the Open Grants Program, we want to help winning teams acknowledge their grants publicly while observing the 
-            [foundation’s guidelines](https://github.com/w3f/General-Grants-Program/blob/master/grants/announcement-guidelines.md). To that end, we’ve created 
-            a [badge for grant-winning teams](https://github.com/w3f/General-Grants-Program/blob/master/grants/grant-badge-guidelines.md). <br/><br/> 
-            Once you complete your first grant milestone, would you be interested in collaborating on an announcement about the work you’re doing? 
-            If so, then please get in touch with us at [email protected] prior to making the announcement (at least two weeks notice is preferred).<br/><br/> 
-            Please don’t announce the grant publicly before you finished at least the first milestone of the project. 
+            Congratulations! As part of the Open Grants Program, we want to help winning teams acknowledge their grants publicly. To that end, we’ve created a [badge for projects](https://github.com/w3f/General-Grants-Program/blob/master/grants/grant-badge-guidelines.md)
+            that successfully delivered their first milestone. Please observe the 
+            [foundation’s guidelines](https://github.com/w3f/General-Grants-Program/blob/master/grants/announcement-guidelines.md) when making any announcements; in particular, <b>don’t announce the grant publicly before you've completed at least the first
+            milestone of the project.</b> <br/><br/> 
+            At that point, we will be happy to collaborate on an announcement about the work you’re doing. 
+            Please get in touch with us at [email protected] in case you're interested (at least two weeks notice is preferred).
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1 +1,60 @@
+
+# Created by https://www.toptal.com/developers/gitignore/api/macos,windows
+# Edit at https://www.toptal.com/developers/gitignore?templates=macos,windows
+
+### macOS ###
+# General
 .DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# End of https://www.toptal.com/developers/gitignore/api/macos,windows