From 3a17f6f8971a728ac19d89b047a26411c3511dfd Mon Sep 17 00:00:00 2001 From: Michael Mueller Date: Thu, 30 Jan 2025 09:48:37 +0100 Subject: [PATCH] Revert to `scale` 3.6.12 --- Cargo.lock | 21 ++++++++++--------- Cargo.toml | 10 +-------- crates/ink/Cargo.toml | 11 ---------- .../complex-storage-structures/Cargo.toml | 2 +- .../public/contract-invocation/Cargo.toml | 2 +- .../contract-invocation/contract1/Cargo.toml | 2 +- .../contract-invocation/contract2/Cargo.toml | 2 +- .../virtual_contract/Cargo.toml | 2 +- .../virtual_contract_ver1/Cargo.toml | 2 +- .../virtual_contract_ver2/Cargo.toml | 2 +- .../public/runtime-call-contract/Cargo.toml | 2 +- linting/extra/Cargo.toml | 2 +- linting/mandatory/Cargo.toml | 2 +- 13 files changed, 22 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dcb6fd6827..be4aa7ba2e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4456,7 +4456,8 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" version = "3.6.12" -source = "git+https://github.com/paritytech/parity-scale-codec?tag=v3.6.12#57925fc782ed76d42730c83255a0d1cafef9e086" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6365,7 +6366,7 @@ dependencies = [ [[package]] name = "sp-crypto-ec-utils" version = "0.10.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ada12be652a4fa8f60fc54e8cfe9ca81e09ad28b" +source = "git+https://github.com/paritytech/polkadot-sdk#80e30ec3cdccae8e9099bd67840ff8737b043496" dependencies = [ "ark-bls12-377", "ark-bls12-377-ext", @@ -6432,7 +6433,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ada12be652a4fa8f60fc54e8cfe9ca81e09ad28b" +source = "git+https://github.com/paritytech/polkadot-sdk#80e30ec3cdccae8e9099bd67840ff8737b043496" dependencies = [ "proc-macro2", "quote", @@ -6452,7 +6453,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.25.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ada12be652a4fa8f60fc54e8cfe9ca81e09ad28b" +source = "git+https://github.com/paritytech/polkadot-sdk#80e30ec3cdccae8e9099bd67840ff8737b043496" dependencies = [ "environmental", "parity-scale-codec", @@ -6631,7 +6632,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ada12be652a4fa8f60fc54e8cfe9ca81e09ad28b" +source = "git+https://github.com/paritytech/polkadot-sdk#80e30ec3cdccae8e9099bd67840ff8737b043496" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -6663,7 +6664,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ada12be652a4fa8f60fc54e8cfe9ca81e09ad28b" +source = "git+https://github.com/paritytech/polkadot-sdk#80e30ec3cdccae8e9099bd67840ff8737b043496" dependencies = [ "Inflector", "expander", @@ -6728,7 +6729,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?rev=645878a27115db52e5d [[package]] name = "sp-std" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ada12be652a4fa8f60fc54e8cfe9ca81e09ad28b" +source = "git+https://github.com/paritytech/polkadot-sdk#80e30ec3cdccae8e9099bd67840ff8737b043496" [[package]] name = "sp-storage" @@ -6745,7 +6746,7 @@ dependencies = [ [[package]] name = "sp-storage" version = "19.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ada12be652a4fa8f60fc54e8cfe9ca81e09ad28b" +source = "git+https://github.com/paritytech/polkadot-sdk#80e30ec3cdccae8e9099bd67840ff8737b043496" dependencies = [ "impl-serde", "parity-scale-codec", @@ -6780,7 +6781,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "16.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ada12be652a4fa8f60fc54e8cfe9ca81e09ad28b" +source = "git+https://github.com/paritytech/polkadot-sdk#80e30ec3cdccae8e9099bd67840ff8737b043496" dependencies = [ "parity-scale-codec", "tracing", @@ -6853,7 +6854,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "20.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ada12be652a4fa8f60fc54e8cfe9ca81e09ad28b" +source = "git+https://github.com/paritytech/polkadot-sdk#80e30ec3cdccae8e9099bd67840ff8737b043496" dependencies = [ "anyhow", "impl-trait-for-tuples", diff --git a/Cargo.toml b/Cargo.toml index 0d2dc010fd..ccdf0f87de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,7 +56,7 @@ quickcheck = { version = "1" } quickcheck_macros = { version = "1" } quote = { version = "1" } alloy-rlp = { version = "0.3.9", default-features = false } -scale = { package = "parity-scale-codec", version = "=3.6.12", default-features = false, features = ["derive"] } +scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive"] } scale-decode = { version = "0.16.0", default-features = false } scale-encode = { version = "0.10.0", default-features = false } scale-info = { version = "2.11", default-features = false } @@ -120,11 +120,3 @@ ink_storage_traits = { version = "=6.0.0-alpha", path = "crates/storage/traits", [profile.release] panic = "abort" lto = true - -# todo -# we temporarily replace the version of this dep in child deps. this is because of version -# issues with the `parity-scale-codec` used in `ink` and `polkadot-sdk`. there was some -# yanking of `parity-scale-codec` dep versions recently and this replacement here should -# not be necessary for long. -[patch.crates-io] -parity-scale-codec-derive = { git = "https://github.com/paritytech/parity-scale-codec", tag = "v3.6.12" } diff --git a/crates/ink/Cargo.toml b/crates/ink/Cargo.toml index 7f8621186c..63f2addbe0 100644 --- a/crates/ink/Cargo.toml +++ b/crates/ink/Cargo.toml @@ -72,14 +72,3 @@ level = "warn" check-cfg = [ 'cfg(feature, values(any()))', ] - -# todo -# we temporarily replace the version of this dep in child deps. this is because of version -# issues with the `parity-scale-codec` used in `ink` and `polkadot-sdk`. there was some -# yanking of `parity-scale-codec` dep versions recently and this replacement here should -# not be necessary for long. -#[patch.crates-io] -#parity-scale-codec-derive = { git = "https://github.com/paritytech/parity-scale-codec", tag = "v3.6.12" } - -#[replace] -#"parity-scale-codec-derive:3.7.2" = { git = "https://github.com/paritytech/parity-scale-codec", tag = "3.6.12" } diff --git a/integration-tests/public/complex-storage-structures/Cargo.toml b/integration-tests/public/complex-storage-structures/Cargo.toml index 20c5b546ff..934a1ec064 100644 --- a/integration-tests/public/complex-storage-structures/Cargo.toml +++ b/integration-tests/public/complex-storage-structures/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] ink = { path = "../../../crates/ink", default-features = false } -scale = { package = "parity-scale-codec", version = "=3.6.12", default-features = false, features = ["derive"] } +scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive"] } scale-info = { version = "2.11", default-features = false } [dev-dependencies] diff --git a/integration-tests/public/contract-invocation/Cargo.toml b/integration-tests/public/contract-invocation/Cargo.toml index 613b25457b..0474cd97db 100644 --- a/integration-tests/public/contract-invocation/Cargo.toml +++ b/integration-tests/public/contract-invocation/Cargo.toml @@ -24,7 +24,7 @@ e2e-tests = [] [dependencies] ink = { path = "../../../crates/ink", default-features = false } -scale = { package = "parity-scale-codec", version = "=3.6.12", default-features = false, features = [ +scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [ "derive", ] } scale-info = { version = "2.11.1", default-features = false, features = [ diff --git a/integration-tests/public/contract-invocation/contract1/Cargo.toml b/integration-tests/public/contract-invocation/contract1/Cargo.toml index c4b7866eb9..b4a2ba2504 100644 --- a/integration-tests/public/contract-invocation/contract1/Cargo.toml +++ b/integration-tests/public/contract-invocation/contract1/Cargo.toml @@ -15,7 +15,7 @@ e2e-tests = [] [dependencies] ink = { path = "../../../../crates/ink", default-features = false } -scale = { package = "parity-scale-codec", version = "=3.6.12", default-features = false, features = [ +scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [ "derive", ] } scale-info = { version = "2.11.1", default-features = false, features = [ diff --git a/integration-tests/public/contract-invocation/contract2/Cargo.toml b/integration-tests/public/contract-invocation/contract2/Cargo.toml index 68f613e487..d83014aa22 100644 --- a/integration-tests/public/contract-invocation/contract2/Cargo.toml +++ b/integration-tests/public/contract-invocation/contract2/Cargo.toml @@ -15,7 +15,7 @@ e2e-tests = [] [dependencies] ink = { path = "../../../../crates/ink", default-features = false } -scale = { package = "parity-scale-codec", version = "=3.6.12", default-features = false, features = [ +scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [ "derive", ] } scale-info = { version = "2.11.1", default-features = false, features = [ diff --git a/integration-tests/public/contract-invocation/virtual_contract/Cargo.toml b/integration-tests/public/contract-invocation/virtual_contract/Cargo.toml index b3834658a1..699dee19e8 100644 --- a/integration-tests/public/contract-invocation/virtual_contract/Cargo.toml +++ b/integration-tests/public/contract-invocation/virtual_contract/Cargo.toml @@ -15,7 +15,7 @@ e2e-tests = [] [dependencies] ink = { path = "../../../../crates/ink", default-features = false } -scale = { package = "parity-scale-codec", version = "=3.6.12", default-features = false, features = [ +scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [ "derive", ] } scale-info = { version = "2.11.1", default-features = false, features = [ diff --git a/integration-tests/public/contract-invocation/virtual_contract_ver1/Cargo.toml b/integration-tests/public/contract-invocation/virtual_contract_ver1/Cargo.toml index 08fa2aeb4b..85c7d755be 100644 --- a/integration-tests/public/contract-invocation/virtual_contract_ver1/Cargo.toml +++ b/integration-tests/public/contract-invocation/virtual_contract_ver1/Cargo.toml @@ -15,7 +15,7 @@ e2e-tests = [] [dependencies] ink = { path = "../../../../crates/ink", default-features = false } -scale = { package = "parity-scale-codec", version = "=3.6.12", default-features = false, features = [ +scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [ "derive", ] } scale-info = { version = "2.11.1", default-features = false, features = [ diff --git a/integration-tests/public/contract-invocation/virtual_contract_ver2/Cargo.toml b/integration-tests/public/contract-invocation/virtual_contract_ver2/Cargo.toml index 7fbba98152..8433a13b01 100644 --- a/integration-tests/public/contract-invocation/virtual_contract_ver2/Cargo.toml +++ b/integration-tests/public/contract-invocation/virtual_contract_ver2/Cargo.toml @@ -15,7 +15,7 @@ e2e-tests = [] [dependencies] ink = { path = "../../../../crates/ink", default-features = false } -scale = { package = "parity-scale-codec", version = "=3.6.12", default-features = false, features = [ +scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [ "derive", ] } scale-info = { version = "2.11.1", default-features = false, features = [ diff --git a/integration-tests/public/runtime-call-contract/Cargo.toml b/integration-tests/public/runtime-call-contract/Cargo.toml index 53df9735de..04714647d4 100644 --- a/integration-tests/public/runtime-call-contract/Cargo.toml +++ b/integration-tests/public/runtime-call-contract/Cargo.toml @@ -16,7 +16,7 @@ frame-system = { git = "https://github.com/paritytech/polkadot-sdk", rev = "6458 pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", rev = "645878a27115db52e5d63115699b4bbb89034067", default-features = false } pallet-revive = { git = "https://github.com/paritytech/polkadot-sdk", rev = "645878a27115db52e5d63115699b4bbb89034067", default-features = false } sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", rev = "645878a27115db52e5d63115699b4bbb89034067", default-features = false } -codec = { package = "parity-scale-codec", version = "=3.6.12", default-features = false } +codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false } scale-info = { version = "2.11.1", default-features = false } [package] diff --git a/linting/extra/Cargo.toml b/linting/extra/Cargo.toml index 24537d953f..358a9c200a 100644 --- a/linting/extra/Cargo.toml +++ b/linting/extra/Cargo.toml @@ -38,7 +38,7 @@ ink = { version = "=6.0.0-alpha", path = "../../crates/ink", default-features = ink_metadata = { version = "=6.0.0-alpha", path = "../../crates/metadata", default-features = false } ink_primitives = { version = "=6.0.0-alpha", path = "../../crates/primitives", default-features = false } ink_storage = { version = "=6.0.0-alpha", path = "../../crates/storage", default-features = false } -scale = { package = "parity-scale-codec", version = "=3.6.12", default-features = false, features = ["derive"] } +scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive"] } scale-info = { version = "2.11", default-features = false, features = ["derive"] } # For the moment we have to include the tests as examples and diff --git a/linting/mandatory/Cargo.toml b/linting/mandatory/Cargo.toml index f3068d29f8..dd340cdf87 100644 --- a/linting/mandatory/Cargo.toml +++ b/linting/mandatory/Cargo.toml @@ -36,7 +36,7 @@ ink_env = { version = "=6.0.0-alpha", path = "../../crates/env", default-feature ink_metadata = { version = "=6.0.0-alpha", path = "../../crates/metadata", default-features = false } ink_primitives = { version = "=6.0.0-alpha", path = "../../crates/primitives", default-features = false } ink_storage = { version = "=6.0.0-alpha", path = "../../crates/storage", default-features = false } -scale = { package = "parity-scale-codec", version = "=3.6.12", default-features = false, features = ["derive"] } +scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive"] } scale-info = { version = "2.11", default-features = false, features = ["derive"] } # For the moment we have to include the tests as examples and