Skip to content
Snippets Groups Projects
Unverified Commit 815fb0d1 authored by bgallois's avatar bgallois
Browse files

use only polkadot-sdk from duniter

parent 0662dd9e
No related branches found
No related tags found
No related merge requests found
Pipeline #36667 passed
This diff is collapsed.
...@@ -8,10 +8,8 @@ ParityTech frequently releases upgrades of the polkadot-sdk. For each upgrade, D ...@@ -8,10 +8,8 @@ ParityTech frequently releases upgrades of the polkadot-sdk. For each upgrade, D
* Set the upstream repository: `git remote add upstream git@github.com:paritytech/polkadot-sdk.git` * Set the upstream repository: `git remote add upstream git@github.com:paritytech/polkadot-sdk.git`
* Fetch the latest released version: `git fetch --tag polkadot-v1.9.0` * Fetch the latest released version: `git fetch --tag polkadot-v1.9.0`
* Create a new branch: `git checkout -b duniter-polkadot-v1.9.0` * Create a new branch: `git checkout -b duniter-polkadot-v1.9.0`
* Rebase the branch, keeping only specific commits: "fix treasury benchmarks when no SpendOrigin", "allow manual seal to produce non-empty blocks with BABE", "add custom pallet-balance GenesisConfig", and "remove pallet-balances upgrade_account extrinsic". * Rebase the branch, keeping only specific commits: "fix treasury benchmarks when no SpendOrigin", "allow manual seal to produce non-empty blocks with BABE", "add custom pallet-balance GenesisConfig", and "remove pallet-balances upgrade_account extrinsic", "remove all paritytech sdk dependencies".
* Push the new branch: `git push` * Push the new branch: `git push`
* Create the lightweight branch that drops the non-Substrate parts of the repository using the command `git subtree split --prefix substrate/ --branch duniter-substrate-light-v1.9.0`.
* Checkout and push the new branch.
## 2. Upgrade duniter subxt ## 2. Upgrade duniter subxt
...@@ -21,7 +19,11 @@ ParityTech frequently releases upgrades of the polkadot-sdk. For each upgrade, D ...@@ -21,7 +19,11 @@ ParityTech frequently releases upgrades of the polkadot-sdk. For each upgrade, D
* In the `Cargo.toml` file of duniter subxt, change the GitHub path pointing to the paritytech polkadot-sdk, or old duniter-polkadot-sdk to the new duniter-polkadot-sdk. * In the `Cargo.toml` file of duniter subxt, change the GitHub path pointing to the paritytech polkadot-sdk, or old duniter-polkadot-sdk to the new duniter-polkadot-sdk.
* Run `cargo upgrade` and push the branch. * Run `cargo upgrade` and push the branch.
## 3. Upgrade repository ## 3. Upgrade Dependencies
Ensure that the dependencies for [Arkwork](https://github.com/duniter/arkworks-substrate) and [ring-vrf bandersnatch-vrfs](https://github.com/bgallois/ring-vrf/blob/master/bandersnatch_vrfs/) are exclusively only depend on the duniter-polkadot-sdk. When upgrading these repositories, make sure to cherry-pick the "use duniter polkadot-sdk" commit.
## 4. Upgrade repository
* In the `Cargo.toml` file of Duniter, change the version number from 1.8.0 to 1.9.0 for all polkadot-sdk dependencies. Also, change the version for Subxt. `find . -type f -name "Cargo.toml" -exec sed -i'' -e 's/polkadot-v1.8.0\/polkadot-v1.9.0/g' {} +`. * In the `Cargo.toml` file of Duniter, change the version number from 1.8.0 to 1.9.0 for all polkadot-sdk dependencies. Also, change the version for Subxt. `find . -type f -name "Cargo.toml" -exec sed -i'' -e 's/polkadot-v1.8.0\/polkadot-v1.9.0/g' {} +`.
* Upgrade the version number of all crateio dependencies to ensure compatibility with those used in the polkadot-sdk, see the node template at: [Node Template](https://github.com/paritytech/polkadot-sdk/blob/master/templates/solochain/node/Cargo.toml) (choose the correct branch/tag). * Upgrade the version number of all crateio dependencies to ensure compatibility with those used in the polkadot-sdk, see the node template at: [Node Template](https://github.com/paritytech/polkadot-sdk/blob/master/templates/solochain/node/Cargo.toml) (choose the correct branch/tag).
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment