From 614a9f0c13d1f9a3b3db1f65add6cfecfc35fd43 Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari Date: Sun, 21 Jan 2024 23:45:17 +0530 Subject: [PATCH 1/5] milestone1 --- deliveries/pocs-milestone_1.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 deliveries/pocs-milestone_1.md diff --git a/deliveries/pocs-milestone_1.md b/deliveries/pocs-milestone_1.md new file mode 100644 index 000000000..ad9453c65 --- /dev/null +++ b/deliveries/pocs-milestone_1.md @@ -0,0 +1,27 @@ +# Milestone Delivery :mailbox: + +**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 & Milestone Details + +- **Application Document:** [Proof of Contract Stake](https://github.com/w3f/Grants-Program/tree/master/applications/PoCS.md). +- **Milestone** : [1. Pallet Contract Update](https://github.com/w3f/Grants-Program/blob/master/applications/PoCS.md#milestone-1---pallet-contract-update) + +## Purpose + +Short Paragraph describing milestone purpose + +## Deliverables + +|Number|Deliverable|Link|Notes| +|-------------|-------------|------------- |------------- | +|0a.|License| [Apache 2.0](https://github.com/auguth/pocs/blob/master/LICENSE) |-| +|0b.|Documentation| [Inline Documentation](https://auguth.github.io/pocs/target/doc/pallet_contracts/) |Crate Documentation for pallet_contracts (PoCS version)| +|0c.|Testing Guide| [Testing guide](https://github.com/auguth/pocs/blob/master/README.md#testing) |`cargo test pocs`| +|0d.|Docker | [Dockerfile](https://github.com/auguth/pocs/blob/master/Dockerfile) | DockerFile is added (The image is very large to upload with requirement of all core folders required. Any suggestions Let us know)| +|0e.|Article (Repo Readme) / External Documentation| [PoCS article](https://github.com/auguth/pocs/blob/master/README.md) |Sections for Milestone 1 Completed. Remaining sections upon Milestone 2 & 3 completion| +|1.|Delivery| [PoCS Node](https://github.com/auguth/pocs/tree/master) |PoCS Node Repository| + +## Additional Information +To check out the changes one can also run the contract node https://github.com/paritytech/substrate-contracts-node. Upload any sample contract, instantiate and deploy. +Check ContractStakeInfo and AccountStakeInfo events emitted. \ No newline at end of file From cb34db01e90d91d5154bd418065c5117ff2781c9 Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari Date: Sun, 21 Jan 2024 23:51:00 +0530 Subject: [PATCH 2/5] purpose --- deliveries/pocs-milestone_1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deliveries/pocs-milestone_1.md b/deliveries/pocs-milestone_1.md index ad9453c65..a1a648117 100644 --- a/deliveries/pocs-milestone_1.md +++ b/deliveries/pocs-milestone_1.md @@ -9,7 +9,7 @@ ## Purpose -Short Paragraph describing milestone purpose +Code base set-up for developing contract staking consensus. Accomplished adding new storage variables for the same, tight coupled required pallets and tested end-to-end working of them. ## Deliverables From c17c46697c30762514decdea1160c525047c6df5 Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari Date: Mon, 29 Jan 2024 07:28:21 -0500 Subject: [PATCH 3/5] added more information --- deliveries/pocs-milestone_1.md | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/deliveries/pocs-milestone_1.md b/deliveries/pocs-milestone_1.md index a1a648117..d64e98248 100644 --- a/deliveries/pocs-milestone_1.md +++ b/deliveries/pocs-milestone_1.md @@ -17,11 +17,29 @@ Code base set-up for developing contract staking consensus. Accomplished adding |-------------|-------------|------------- |------------- | |0a.|License| [Apache 2.0](https://github.com/auguth/pocs/blob/master/LICENSE) |-| |0b.|Documentation| [Inline Documentation](https://auguth.github.io/pocs/target/doc/pallet_contracts/) |Crate Documentation for pallet_contracts (PoCS version)| -|0c.|Testing Guide| [Testing guide](https://github.com/auguth/pocs/blob/master/README.md#testing) |`cargo test pocs`| -|0d.|Docker | [Dockerfile](https://github.com/auguth/pocs/blob/master/Dockerfile) | DockerFile is added (The image is very large to upload with requirement of all core folders required. Any suggestions Let us know)| +|0c.|Testing Guide| [Testing guide](https://github.com/auguth/pocs/blob/master/README.md#testing) , [Node Setup & Run](https://github.com/auguth/pocs/blob/master/README.md#run-pocs-node) | `nightly-2023-12-21` required and overriden| +|0d.|Docker | [DockerImage 2.46GB compressed](https://hub.docker.com/r/jobyreuben/pocs-w3f-m1/tags) , [Dockerfile](https://github.com/auguth/pocs/blob/master/Dockerfile)| Linux Hosts are recommended to interact with [Polkadot JS](https://polkadot.js.org/apps/) and [Contracts UI](https://contracts-ui.substrate.io/) . Mac & Windows Host Docker Engines cannot publish ports to localhost and only runs Node | |0e.|Article (Repo Readme) / External Documentation| [PoCS article](https://github.com/auguth/pocs/blob/master/README.md) |Sections for Milestone 1 Completed. Remaining sections upon Milestone 2 & 3 completion| |1.|Delivery| [PoCS Node](https://github.com/auguth/pocs/tree/master) |PoCS Node Repository| ## Additional Information -To check out the changes one can also run the contract node https://github.com/paritytech/substrate-contracts-node. Upload any sample contract, instantiate and deploy. -Check ContractStakeInfo and AccountStakeInfo events emitted. \ No newline at end of file + +1. Nightly specific version should be overidden `rustup override set nightly-2023-12-21` and wasm targets added `rustup target add wasm32-unknown-unknown --toolchain nightly-2023-12-21` + + Recommended `rustup toolchain list` + + ``` + stable-x86_64-unknown-linux-gnu (default) + nightly-2023-12-21-x86_64-unknown-linux-gnu (override) + ``` +3. PoCS Tests : `cargo test pocs` +4. To check out the changes one can run [Contracts UI](https://contracts-ui.substrate.io/). Upload any sample contract (or [use pocs-test-ink-contracts](https://github.com/auguth/ink-contracts-for-testing)), instantiate and deploy. +5. Check `ContractStakeInfo` and `AccountStakeInfo` events emitted. +6. Next Milestone Includes modifying pallet-staking and delivering a pocs-npos-babe-grandpa node. + +**Sections to refer in External Documentation** +- [Setting Up Node](https://github.com/auguth/pocs/blob/master/README.md#run-pocs-node) +- [Docker Pull/Build/Run](https://github.com/auguth/pocs/blob/master/README.md#pullbuild-docker--run) +- [Running Tests](https://github.com/auguth/pocs/blob/master/README.md#run-tests) +- [Pallet Contracts Modification Details](https://github.com/auguth/pocs/blob/master/README.md#contract-staking-pallet_contracts) +- [Testing Details](https://github.com/auguth/pocs/blob/master/README.md#testing) \ No newline at end of file From 7b775b47ecfeb398647570cffe21ada51b3a3c14 Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari Date: Tue, 30 Jan 2024 11:08:29 -0500 Subject: [PATCH 4/5] updates --- deliveries/pocs-milestone_1.md | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/deliveries/pocs-milestone_1.md b/deliveries/pocs-milestone_1.md index d64e98248..54d3914b3 100644 --- a/deliveries/pocs-milestone_1.md +++ b/deliveries/pocs-milestone_1.md @@ -17,29 +17,32 @@ Code base set-up for developing contract staking consensus. Accomplished adding |-------------|-------------|------------- |------------- | |0a.|License| [Apache 2.0](https://github.com/auguth/pocs/blob/master/LICENSE) |-| |0b.|Documentation| [Inline Documentation](https://auguth.github.io/pocs/target/doc/pallet_contracts/) |Crate Documentation for pallet_contracts (PoCS version)| -|0c.|Testing Guide| [Testing guide](https://github.com/auguth/pocs/blob/master/README.md#testing) , [Node Setup & Run](https://github.com/auguth/pocs/blob/master/README.md#run-pocs-node) | `nightly-2023-12-21` required and overriden| -|0d.|Docker | [DockerImage 2.46GB compressed](https://hub.docker.com/r/jobyreuben/pocs-w3f-m1/tags) , [Dockerfile](https://github.com/auguth/pocs/blob/master/Dockerfile)| Linux Hosts are recommended to interact with [Polkadot JS](https://polkadot.js.org/apps/) and [Contracts UI](https://contracts-ui.substrate.io/) . Mac & Windows Host Docker Engines cannot publish ports to localhost and only runs Node | -|0e.|Article (Repo Readme) / External Documentation| [PoCS article](https://github.com/auguth/pocs/blob/master/README.md) |Sections for Milestone 1 Completed. Remaining sections upon Milestone 2 & 3 completion| -|1.|Delivery| [PoCS Node](https://github.com/auguth/pocs/tree/master) |PoCS Node Repository| +|0c.|Testing Guide| [Testing guide](https://github.com/auguth/pocs/blob/master/README.md#testing) , [Node Setup & Run](https://github.com/auguth/pocs/blob/master/README.md#pocs-node-set-up) | `nightly-2023-12-21` required and overriden| +|0d.|Docker | [Dockerfile](https://github.com/auguth/pocs/blob/master/Dockerfile) , [Docker Compose](https://github.com/auguth/pocs/blob/master/docker-compose.yml) , [DockerImage 2.45GB compressed](https://hub.docker.com/layers/jobyreuben/pocs-node/w3f_m1/images/sha256-0cc7dcf68b7cc2e3db14f8fd85102b1651967871aade6d10f0416955e0de845d?context=repo)| `docker compose up --build -d` | +|0e.|Article (Repo Readme)/External Documentation|[PoCS article](https://github.com/auguth/pocs/blob/master/README.md)|Sections for Milestone 1 Completed. Remaining sections upon Milestone 2 & 3 completion| +|1.|Delivery|[PoCS Node](https://github.com/auguth/pocs/tree/master)|PoCS Node Repository| ## Additional Information 1. Nightly specific version should be overidden `rustup override set nightly-2023-12-21` and wasm targets added `rustup target add wasm32-unknown-unknown --toolchain nightly-2023-12-21` - + Recommended `rustup toolchain list` ``` stable-x86_64-unknown-linux-gnu (default) nightly-2023-12-21-x86_64-unknown-linux-gnu (override) ``` + 3. PoCS Tests : `cargo test pocs` 4. To check out the changes one can run [Contracts UI](https://contracts-ui.substrate.io/). Upload any sample contract (or [use pocs-test-ink-contracts](https://github.com/auguth/ink-contracts-for-testing)), instantiate and deploy. 5. Check `ContractStakeInfo` and `AccountStakeInfo` events emitted. -6. Next Milestone Includes modifying pallet-staking and delivering a pocs-npos-babe-grandpa node. +6. The [modified functions in pallet-contracts](https://github.com/auguth/pocs/blob/master/README.md#contract-staking-pallet_contracts) will undergo further adjustments. Therefore, it is preferable to conduct benchmarking weights (for pallet-contracts & pallet-staking) after the pallet-staking modifications in Milestone 2. For E.g., the function `update_delegate()` in pallet-contracts currently sets `stake_score` locally, but in Milestone 2, `stake_score` will be retrieved from pallet-staking which requires new benchmarks. +7. Next Milestone 2 will include modifying pallet-staking and delivering a pocs-npos-babe-grandpa node. **Sections to refer in External Documentation** -- [Setting Up Node](https://github.com/auguth/pocs/blob/master/README.md#run-pocs-node) -- [Docker Pull/Build/Run](https://github.com/auguth/pocs/blob/master/README.md#pullbuild-docker--run) -- [Running Tests](https://github.com/auguth/pocs/blob/master/README.md#run-tests) +- [Setting Up Node](https://github.com/auguth/pocs/blob/master/README.md#pocs-node-set-up) +- [Docker Compose](https://github.com/auguth/pocs/blob/master/README.md#docker-compose) +- [Docker Pull](https://github.com/auguth/pocs/blob/master/README.md#docker-pull) +- [Running Tests](https://github.com/auguth/pocs/blob/master/README.md#tests) - [Pallet Contracts Modification Details](https://github.com/auguth/pocs/blob/master/README.md#contract-staking-pallet_contracts) - [Testing Details](https://github.com/auguth/pocs/blob/master/README.md#testing) \ No newline at end of file From 91652d045b7c3a6f2152d29e01dbd112110ec30d Mon Sep 17 00:00:00 2001 From: Keegan | W3F <35080151+keeganquigley@users.noreply.github.com> Date: Tue, 30 Jan 2024 16:00:26 -0500 Subject: [PATCH 5/5] Update pocs-milestone_1.md --- deliveries/pocs-milestone_1.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deliveries/pocs-milestone_1.md b/deliveries/pocs-milestone_1.md index 54d3914b3..1bff8a9b8 100644 --- a/deliveries/pocs-milestone_1.md +++ b/deliveries/pocs-milestone_1.md @@ -5,7 +5,7 @@ ## Application & Milestone Details - **Application Document:** [Proof of Contract Stake](https://github.com/w3f/Grants-Program/tree/master/applications/PoCS.md). -- **Milestone** : [1. Pallet Contract Update](https://github.com/w3f/Grants-Program/blob/master/applications/PoCS.md#milestone-1---pallet-contract-update) +- **Milestone** : 1 ## Purpose @@ -45,4 +45,4 @@ Code base set-up for developing contract staking consensus. Accomplished adding - [Docker Pull](https://github.com/auguth/pocs/blob/master/README.md#docker-pull) - [Running Tests](https://github.com/auguth/pocs/blob/master/README.md#tests) - [Pallet Contracts Modification Details](https://github.com/auguth/pocs/blob/master/README.md#contract-staking-pallet_contracts) -- [Testing Details](https://github.com/auguth/pocs/blob/master/README.md#testing) \ No newline at end of file +- [Testing Details](https://github.com/auguth/pocs/blob/master/README.md#testing)