Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge from upstream #3

Merged
merged 125 commits into from
Apr 19, 2021
Merged

Merge from upstream #3

merged 125 commits into from
Apr 19, 2021

Conversation

chrisli30
Copy link
Member

Grant Application Checklist

  • The 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.
  • 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 initial PR contains only one commit (squash if needed before submitting your PR).
  • The grant will only be announced once we successfully delivered the first milestone.

borispovod and others added 30 commits January 29, 2021 08:49
@borispovod
resource viewer
6869c53
@borispovod
changed milestone 3
d3e629e
@zhangjiannan
quadratic-funding (#227)
e00e6e7 
* quadratic-funding

* add license, unit test and a standalone minimalistic frontend to spec
@AKACoder
add SEOR code-less smart contract platform application (#205)
954fa1d 
* 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
@tiagom87
Polkastarter Grant Application (#204)
4fe4226 
* Make Polkastarter Grant Application

* Added screenshots

* Added testing guides

Co-authored-by: Tiago Martins <[email protected]>
@mikolajsobolewski
Added curve market maker (#225)
dde3853
@jleni
Added Zondax maintenance+recovery extensions+support (#234)
5c5772d
@RAMPDEFITEAM
Create polkakeeper.md (#200)
f594376 
* 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]>
@semuelle
Readmefixing (#241)
daefcc9 
* upgrade readme

* fix icons

* smaller icons

* correct icons
@Noc2
Update README.md
71d399f 
Updated Evaluators
@Noc2
Update welcome.yml (#242)
931d68a 
* Update welcome.yml

Update Welcome message

* Update welcome.yml

updated
@calvinzhou-rockx
Create proposal of stone index on substrate
cf3c7e0
@calvinzhou-rockx
Updated the BTC payment address
0bc64bd
@calvinzhou-rockx
draft of pallet design
f3dc338
@calvinzhou-rockx
Added more details of public functions
ee100bc
@calvinzhou-rockx
Added back the mandatory deliverables
d286485
@calvinzhou-rockx
Added desc for public exposed methods
825f6c3
@calvinzhou-rockx
Adjusted the budget
5a40e61
@calvinzhou-rockx
Revised the deliverables
8fe3192 
1. Merge the token module into indexed basket management module
2. Made it more clear for DEX integration
3. Update the sequence of deliverables
@Dohkooo
Create AlgoCash.md
4a8dbf3
@Dohkooo
Update AlgoCash.md
4956f86
@Dohkooo
Update AlgoCash.md
b8040aa
@Dohkooo
Update AlgoCash.md
0c1da2f
@Dohkooo
Update AlgoCash.md
9f5e49a
@Dohkooo
Update AlgoCash.md
c1419e0 
Update the approach of further 500,000 share token distribution
@Dohkooo
Update AlgoCash.md
c0718c5 
Add contract specification
@Dohkooo
Update AlgoCash.md
dbc9b51
Update README.md (#250)
a3c3bd6 
As discussed on Element, David, I've added Edgeware Grants and Bounties under the other grant programs header.
@Noc2
Update welcome.yml
0789fa8 
fix html </b>
@gmajor-encrypt
Create php-scale-lib.md
555b57d
alxs and others added 29 commits March 16, 2021 20:52
@alxs
Remove undelivered milestone (#318)
a51805a
@bette7 @xlc
xtoken - XCM Implementation for Fungible Assets (#316)
2dff44b 
* xtoken

* update description

* update

* update payment denomination, and milestone 1 deliverables

* file name change, milestone cost updated

Co-authored-by: Bryan Chen <[email protected]>
@ukby1234 @shengda
stable-asset.md (#286)
f44a1a1 
* 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 (#320)
d75a529
discount based on hackathon participation (#325)
46f90ed
@eva-networks
Update EVANESCO Legal Structure (#326)
ca5e3af
@pajicf
pallet-maci (Minimal Anti Collusion Infrastructure) (#232)
44e4b52 
* Create pallet_maci.md

* Update pallet_maci.md

* Update pallet_maci.md

* Update pallet_maci.md
discount Apron Network for ParityAsia hackathon award (#323)
467ee13
@SotaWatanabe
changed the bitcoin address (#330)
68d9a91
discount deeper network due to hackathon participation (#324)
20f59a9
@XPredictMarket
Create XPredictMarket.md (#313)
352cff1
update the gsheet workflow
344b3da
@Toney2000
re-estimate the price of milestone (#331)
b1b9232 
* Update Apron_Network.md

Remove SDK from milestone and reduce the price

* Update Apron_Network.md

Reduce the price
@codemeit @shannon-christie
Bit.Country Milestone 2 (#305)
27b4a5a 
* 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]>
@borispovod
removed "Adopt storage", reduced costs (#339)
9ca55a5
@arbach @denislam
Create vera_defi.md (#281)
ce5e2d4 
* 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]>
@yubo-ruan
Create Parallel.md (#329)
13ed2f2
@semuelle
Auto-merge action (#349)
b7bd969
@GamePowerDev @MikeHuntington
NFT Collectibles Wallet (#341)
51ffd87 
* NFT Collectibles Wallet

* updating project scope and adjusting cost

* updating estimated duration

* reordering milestone numbers

Co-authored-by: Michael Huntington <[email protected]>
@semuelle
Clean & fix actions (#359)
d9439ad 
* Delete label_approval_count.yml

* Update auto_merge.yml (#360)
remove m2 (#355)
0908bbb
@Noc2
Update README.md
af0f0bb
cosmetic fixes
1ccd4a7
@rg3l3dr
Subspace (#357)
610b35b 
* 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
080ea0e
@zhangjiannan
Update dorahacks-quadratic-funding.md
c24fa06
@alxs
Update README + other minor changes (#367)
9ff879a 
* Add more info to README

* Track team provenance + minor updates to template

* Update PR template
@zhangjiannan
Update dorahacks-quadratic-funding.md (#370)
e739271 
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.
@alxs
Delete application-template-cn.md (#372)
e2ec798
@chrisli30 chrisli30 merged commit f95075f into AvaProtocol:master Apr 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.