Skip to content

Commit

Permalink
Revert to scale 3.6.12
Browse files Browse the repository at this point in the history
  • Loading branch information
@cmichi
cmichi committed Jan 30, 2025
1 parent d4b460d commit 3a17f6f
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 40 deletions.
21 changes: 11 additions & 10 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 1 addition & 9 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down Expand Up @@ -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" }
11 changes: 0 additions & 11 deletions crates/ink/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion integration-tests/public/complex-storage-structures/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-invocation/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-invocation/contract1/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-invocation/contract2/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-invocation/virtual_contract/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-invocation/virtual_contract_ver1/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-invocation/virtual_contract_ver2/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/runtime-call-contract/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion linting/extra/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion linting/mandatory/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3a17f6f

Please sign in to comment.