Skip to content

chore: update crates dependencies #2658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AlexD10S wants to merge 15 commits into from
Closed

chore: update crates dependencies #2658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d226c41
feat: ink_revive crate
AlexD10S Sep 24, 2025
b9eeff6
refactor: remove revive references from e2e crate
AlexD10S Sep 24, 2025
361f991
chore: format
AlexD10S Sep 24, 2025
4797cc4
chore: format in tests
AlexD10S Sep 24, 2025
daf7837
docs: licenses in ink_revive files
AlexD10S Sep 25, 2025
842163e
refactor: move pallet_revive deps into ink_sandbox
AlexD10S Sep 25, 2025
bfbbdaa
refactor: rename ink_revive to ink_revive_types
AlexD10S Sep 25, 2025
a0d173b
docs: description and version in ink_revive_types
AlexD10S Sep 26, 2025
dec49d1
refactor: remove some unnecesary dependencies
AlexD10S Sep 26, 2025
1ded365
chore: upgrade some dependencies
AlexD10S Sep 25, 2025
22b6032
chore: upgrade all dependencies except pallet_revive
AlexD10S Sep 25, 2025
ff5cdfe
fix: weights update
AlexD10S Sep 26, 2025
62a3681
refactor: dependencies
AlexD10S Sep 26, 2025
3af797d
chore: merge main changes
AlexD10S Sep 26, 2025
4645c41
fix: dependencies in tests
AlexD10S Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,451 changes: 1,073 additions & 378 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,16 @@ pallet-revive = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a7
pallet-revive-uapi = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["unstable-hostfn"] }

sp-externalities = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
sp-io = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
sp-runtime-interface = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["disable_target_static_assertions"] }
sp-core = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
sp-keyring = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
sp-io = {git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
sp-runtime-interface = { version = "31.0.0", default-features = false, features = ["disable_target_static_assertions"] }
sp-core = { version = "38.0.0", default-features = false }
sp-keyring = {version = "43.0.0", default-features = false }
sp-runtime = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1" }
sp-weights = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
xcm = { package = "staging-xcm", git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false }
sp-weights = { version = "33.0.0", default-features = false }
xcm = { package = "staging-xcm", version = "18.0.0", default-features = false }

# PolkaVM dependencies
polkavm-derive = { version = "0.26.0", default-features = false }
polkavm-derive = { version = "0.29.0", default-features = false }

# Solidity dependencies
alloy-core = { version = "1.1.0", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions crates/e2e/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ sp-weights = { workspace = true }
regex = "1.11.2"
itertools = "0.14.0"

sp-io = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
sp-runtime-interface = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["disable_target_static_assertions"] }
sp-io = { workspace = true, default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
sp-runtime-interface = { workspace = true, default-features = false, features = ["disable_target_static_assertions"] }

[dev-dependencies]
# Required for the doctest of `MessageBuilder::call`
Expand Down
32 changes: 25 additions & 7 deletions crates/e2e/src/sandbox_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ use ink_primitives::{
DepositLimit,
H160,
U256,
Weight,
abi::AbiEncodeWith,
};
use ink_revive_types::{
Expand All @@ -72,7 +73,6 @@ use ink_sandbox::{
AccountIdFor,
RuntimeCall,
Sandbox,
Weight,
api::prelude::*,
frame_system,
frame_system::pallet_prelude::OriginFor,
Expand Down Expand Up @@ -351,7 +351,10 @@ where
data,
salt(),
caller_to_origin::<S>(caller),
gas_limit,
sp_runtime::Weight::from_parts(
gas_limit.ref_time(),
gas_limit.proof_size(),
),
storage_deposit_limit,
)
});
Expand Down Expand Up @@ -447,8 +450,14 @@ where
};

let result = ContractResult::<InstantiateReturnValue, E::Balance> {
gas_consumed: dry_run_result.gas_consumed,
gas_required: dry_run_result.gas_required,
gas_consumed: sp_runtime::Weight::from_parts(
dry_run_result.gas_consumed.ref_time(),
dry_run_result.gas_consumed.proof_size(),
),
gas_required: sp_runtime::Weight::from_parts(
dry_run_result.gas_required.ref_time(),
dry_run_result.gas_required.proof_size(),
),
storage_deposit: to_revive_storage_deposit(dry_run_result.storage_deposit),
result: dry_run_result.result.map(|res| {
InstantiateReturnValue {
Expand Down Expand Up @@ -557,7 +566,10 @@ where
value,
input_data,
caller_to_origin::<S>(signer),
gas_limit,
sp_runtime::Weight::from_parts(
gas_limit.ref_time(),
gas_limit.proof_size(),
),
storage_deposit_limit,
)
.result
Expand Down Expand Up @@ -636,8 +648,14 @@ where
// todo error when `AccountUnmapped`
Ok(CallDryRunResult {
exec_result: ContractExecResultFor::<E> {
gas_consumed: result.gas_consumed,
gas_required: result.gas_required,
gas_consumed: sp_runtime::Weight::from_parts(
result.gas_consumed.ref_time(),
result.gas_consumed.proof_size(),
),
gas_required: sp_runtime::Weight::from_parts(
result.gas_required.ref_time(),
result.gas_required.proof_size(),
),
storage_deposit: to_revive_storage_deposit(result.storage_deposit),
result: result.result.map(|res| {
ExecReturnValue {
Expand Down
4 changes: 2 additions & 2 deletions crates/env/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ xcm = { workspace = true, optional = true }
hex-literal = "1"
const-crypto = "0.3.0"

sp-io = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
sp-runtime-interface = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["disable_target_static_assertions"] }
sp-io = { workspace = true, default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
sp-runtime-interface = { workspace = true, default-features = false, features = ["disable_target_static_assertions"] }

[target.'cfg(target_arch = "riscv64")'.dependencies]
polkavm-derive = { workspace = true, default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions crates/ink/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ linkme = { workspace = true, optional = true }
polkavm-derive = { workspace = true }
xcm = { workspace = true, optional = true }

sp-io = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
sp-runtime-interface = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["disable_target_static_assertions"] }
sp-io = { workspace = true, default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
sp-runtime-interface = { workspace = true, default-features = false, features = ["disable_target_static_assertions"] }

[dev-dependencies]
ink_ir = { workspace = true, default-features = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ cfg-if = { workspace = true }
num-traits = { workspace = true, features = ["i128"] }
sp-core = { workspace = true }

sp-io = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
sp-runtime-interface = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["disable_target_static_assertions"] }
sp-io = { workspace = true, default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
sp-runtime-interface = { workspace = true, default-features = false, features = ["disable_target_static_assertions"] }
sp-weights = { workspace = true }
impl-trait-for-tuples = { workspace = true }
itertools = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/storage/traits/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ ink_prelude = { workspace = true }
scale = { workspace = true }
scale-info = { workspace = true, features = ["derive"], optional = true }

sp-io = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
sp-runtime-interface = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "a71ec19a94702ea71767ba5ac97603ea6c6305c1", default-features = false, features = ["disable_target_static_assertions"] }
sp-io = { workspace = true, default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
sp-runtime-interface = { workspace = true, default-features = false, features = ["disable_target_static_assertions"] }

[dev-dependencies]
paste = { workspace = true }
Expand Down
Loading