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

switch to subxt official

parent b8ffd62c
No related branches found
No related tags found
No related merge requests found
Pipeline #40349 passed
Stage: labels
Stage: quality
Stage: build
Stage: tests
Stage: deploy
Show whitespace changes
Inline Side-by-side
Cargo.lock
+ 16
− 16
View file @ 07d35ee8
...@@ -5856,9 +5856,9 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" ...@@ -5856,9 +5856,9 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
[[package]] [[package]]
name = "linux-raw-sys" name = "linux-raw-sys"
version = "0.9.3" version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413" checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
[[package]] [[package]]
name = "lioness" name = "lioness"
...@@ -9029,7 +9029,7 @@ dependencies = [ ...@@ -9029,7 +9029,7 @@ dependencies = [
"bitflags 2.9.0", "bitflags 2.9.0",
"errno", "errno",
"libc", "libc",
"linux-raw-sys 0.9.3", "linux-raw-sys 0.9.4",
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
...@@ -12420,7 +12420,7 @@ dependencies = [ ...@@ -12420,7 +12420,7 @@ dependencies = [
[[package]] [[package]]
name = "subxt" name = "subxt"
version = "0.41.0" version = "0.41.0"
source = "git+https://github.com/duniter/subxt?branch=subxt-v0.41.0-duniter-substrate-v1.18.0#f80e1a1e9368aeb0c575e50036bec6d528d0b852" source = "git+https://github.com/paritytech/subxt#a8ae55a61b13902b83c0aaa4a42e7d5b0a3f13a7"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"derive-where", "derive-where",
...@@ -12438,7 +12438,7 @@ dependencies = [ ...@@ -12438,7 +12438,7 @@ dependencies = [
"scale-value 0.18.0", "scale-value 0.18.0",
"serde", "serde",
"serde_json", "serde_json",
"sp-crypto-hashing 0.1.0 (git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-substrate-v1.18.0)", "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"subxt-core 0.41.0", "subxt-core 0.41.0",
"subxt-lightclient 0.41.0", "subxt-lightclient 0.41.0",
"subxt-macro 0.41.0", "subxt-macro 0.41.0",
...@@ -12473,7 +12473,7 @@ dependencies = [ ...@@ -12473,7 +12473,7 @@ dependencies = [
[[package]] [[package]]
name = "subxt-codegen" name = "subxt-codegen"
version = "0.41.0" version = "0.41.0"
source = "git+https://github.com/duniter/subxt?branch=subxt-v0.41.0-duniter-substrate-v1.18.0#f80e1a1e9368aeb0c575e50036bec6d528d0b852" source = "git+https://github.com/paritytech/subxt#a8ae55a61b13902b83c0aaa4a42e7d5b0a3f13a7"
dependencies = [ dependencies = [
"heck 0.5.0", "heck 0.5.0",
"parity-scale-codec", "parity-scale-codec",
...@@ -12518,7 +12518,7 @@ dependencies = [ ...@@ -12518,7 +12518,7 @@ dependencies = [
[[package]] [[package]]
name = "subxt-core" name = "subxt-core"
version = "0.41.0" version = "0.41.0"
source = "git+https://github.com/duniter/subxt?branch=subxt-v0.41.0-duniter-substrate-v1.18.0#f80e1a1e9368aeb0c575e50036bec6d528d0b852" source = "git+https://github.com/paritytech/subxt#a8ae55a61b13902b83c0aaa4a42e7d5b0a3f13a7"
dependencies = [ dependencies = [
"base58", "base58",
"blake2 0.10.6", "blake2 0.10.6",
...@@ -12538,7 +12538,7 @@ dependencies = [ ...@@ -12538,7 +12538,7 @@ dependencies = [
"scale-value 0.18.0", "scale-value 0.18.0",
"serde", "serde",
"serde_json", "serde_json",
"sp-crypto-hashing 0.1.0 (git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-substrate-v1.18.0)", "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"subxt-metadata 0.41.0", "subxt-metadata 0.41.0",
"thiserror 2.0.12", "thiserror 2.0.12",
"tracing", "tracing",
...@@ -12564,7 +12564,7 @@ dependencies = [ ...@@ -12564,7 +12564,7 @@ dependencies = [
[[package]] [[package]]
name = "subxt-lightclient" name = "subxt-lightclient"
version = "0.41.0" version = "0.41.0"
source = "git+https://github.com/duniter/subxt?branch=subxt-v0.41.0-duniter-substrate-v1.18.0#f80e1a1e9368aeb0c575e50036bec6d528d0b852" source = "git+https://github.com/paritytech/subxt#a8ae55a61b13902b83c0aaa4a42e7d5b0a3f13a7"
dependencies = [ dependencies = [
"futures 0.3.31", "futures 0.3.31",
"futures-util", "futures-util",
...@@ -12596,7 +12596,7 @@ dependencies = [ ...@@ -12596,7 +12596,7 @@ dependencies = [
[[package]] [[package]]
name = "subxt-macro" name = "subxt-macro"
version = "0.41.0" version = "0.41.0"
source = "git+https://github.com/duniter/subxt?branch=subxt-v0.41.0-duniter-substrate-v1.18.0#f80e1a1e9368aeb0c575e50036bec6d528d0b852" source = "git+https://github.com/paritytech/subxt#a8ae55a61b13902b83c0aaa4a42e7d5b0a3f13a7"
dependencies = [ dependencies = [
"darling", "darling",
"parity-scale-codec", "parity-scale-codec",
...@@ -12625,21 +12625,21 @@ dependencies = [ ...@@ -12625,21 +12625,21 @@ dependencies = [
[[package]] [[package]]
name = "subxt-metadata" name = "subxt-metadata"
version = "0.41.0" version = "0.41.0"
source = "git+https://github.com/duniter/subxt?branch=subxt-v0.41.0-duniter-substrate-v1.18.0#f80e1a1e9368aeb0c575e50036bec6d528d0b852" source = "git+https://github.com/paritytech/subxt#a8ae55a61b13902b83c0aaa4a42e7d5b0a3f13a7"
dependencies = [ dependencies = [
"frame-decode 0.7.0", "frame-decode 0.7.0",
"frame-metadata 20.0.0", "frame-metadata 20.0.0",
"hashbrown 0.14.5", "hashbrown 0.14.5",
"parity-scale-codec", "parity-scale-codec",
"scale-info", "scale-info",
"sp-crypto-hashing 0.1.0 (git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-substrate-v1.18.0)", "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"thiserror 2.0.12", "thiserror 2.0.12",
] ]
[[package]] [[package]]
name = "subxt-rpcs" name = "subxt-rpcs"
version = "0.41.0" version = "0.41.0"
source = "git+https://github.com/duniter/subxt?branch=subxt-v0.41.0-duniter-substrate-v1.18.0#f80e1a1e9368aeb0c575e50036bec6d528d0b852" source = "git+https://github.com/paritytech/subxt#a8ae55a61b13902b83c0aaa4a42e7d5b0a3f13a7"
dependencies = [ dependencies = [
"derive-where", "derive-where",
"frame-metadata 20.0.0", "frame-metadata 20.0.0",
...@@ -12702,7 +12702,7 @@ dependencies = [ ...@@ -12702,7 +12702,7 @@ dependencies = [
[[package]] [[package]]
name = "subxt-utils-fetchmetadata" name = "subxt-utils-fetchmetadata"
version = "0.41.0" version = "0.41.0"
source = "git+https://github.com/duniter/subxt?branch=subxt-v0.41.0-duniter-substrate-v1.18.0#f80e1a1e9368aeb0c575e50036bec6d528d0b852" source = "git+https://github.com/paritytech/subxt#a8ae55a61b13902b83c0aaa4a42e7d5b0a3f13a7"
dependencies = [ dependencies = [
"hex", "hex",
"parity-scale-codec", "parity-scale-codec",
...@@ -14760,9 +14760,9 @@ dependencies = [ ...@@ -14760,9 +14760,9 @@ dependencies = [
[[package]] [[package]]
name = "xml-rs" name = "xml-rs"
version = "0.8.25" version = "0.8.26"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5b940ebc25896e71dd073bad2dbaa2abfe97b0a391415e22ad1326d9c54e3c4" checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda"
[[package]] [[package]]
name = "xmltree" name = "xmltree"
......
Cargo.toml
+ 1
− 1
View file @ 07d35ee8
...@@ -108,7 +108,7 @@ array-bytes = { version = "6.2.2", default-features = false } ...@@ -108,7 +108,7 @@ array-bytes = { version = "6.2.2", default-features = false }
parking_lot = { version = "0.12.1" } parking_lot = { version = "0.12.1" }
# Subxt # Subxt
subxt = { git = 'https://github.com/duniter/subxt', branch = 'subxt-v0.41.0-duniter-substrate-v1.18.0', default-features = false } subxt = { git = 'https://github.com/paritytech/subxt', tags = '0.41.0', default-features = false }
# local dependencies # local dependencies
weight-analyzer = { path = "resources/weight_analyzer", default-features = false } weight-analyzer = { path = "resources/weight_analyzer", default-features = false }
......
docs/dev/upgrade-substrate.md
+ 1
− 13
View file @ 07d35ee8
...@@ -11,19 +11,7 @@ ParityTech frequently releases upgrades of the polkadot-sdk. For each upgrade, D ...@@ -11,19 +11,7 @@ ParityTech frequently releases upgrades of the polkadot-sdk. For each upgrade, D
* 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". * 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`
## 2. Upgrade duniter subxt ## 2. Upgrade repository
* Clone the repository: `git clone git@github.com:duniter/subxt.git`
* Set the upstream repository: `git remote add upstream git@github.com:paritytech/subxt.git`
* If a new version compatible with the polkadot-sdk version used in duniter is available, upgrade Subxt using the same method as 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.
## 3. Upgrade Dependencies
Ensure that the dependencies for [Arkwork](https://github.com/duniter/arkworks-substrate) and [ring-vrf bandersnatch-vrfs](https://github.com/duniter/ring-vrf/) 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% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment