Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
950 changes: 290 additions & 660 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ members = ["crates/*"]
rust-version = "1.88"

[workspace.dependencies]
ink_metadata = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4", version = "6.0.0-alpha.4", default-features = false, features = ["std", "derive"] }
ink_env = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4", version = "6.0.0-alpha.4", features = ["unstable-hostfn"] }
ink_metadata = { version = "6.0.0-beta", default-features = false, features = ["std", "derive"] }
ink_env = { version = "6.0.0-beta", features = ["unstable-hostfn"] }
2 changes: 1 addition & 1 deletion crates/build/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ fn h256_hash(code: &[u8]) -> [u8; 32] {
Keccak256,
};
let hash = Keccak256::digest(code);
let sl = hash.as_slice();
let sl: &[u8] = hash.as_ref();
assert!(sl.len() == 32, "expected length of 32");
let mut arr = [0u8; 32];
arr.copy_from_slice(sl);
Expand Down
4 changes: 2 additions & 2 deletions crates/build/templates/new/_Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ authors = ["[your_name] <[your_email]>"]
edition = "2024"

[dependencies]
ink = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4", version = "6.0.0-alpha.4", default-features = false, features = ["unstable-hostfn"] }
ink = { version = "6.0.0-beta", default-features = false, features = ["unstable-hostfn"] }

[dev-dependencies]
ink_e2e = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4", version = "6.0.0-alpha.4" }
ink_e2e = { git = "https://github.com/use-ink/ink", branch = "master" }
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be updated in a separate PR once the ink_e2e 6.0.0-beta version is published


[lib]
path = "lib.rs"
Expand Down
10 changes: 5 additions & 5 deletions crates/cargo-contract/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ tokio = { version = "1", features = ["macros", "rt-multi-thread", "net"] }
subxt = { version = "0.44.0" }
hex = "0.4.3"

sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
sp-weights = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
sp-core = { version = "38.0.0", default-features = false }
sp-weights = { version = "33.0.0", default-features = false }

[build-dependencies]
anyhow = "1.0.100"
substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
anyhow = "1.0.95"
substrate-build-script-utils = { version = "11.0.0", default-features = false }
current_platform = "0.2.0"
which = "8.0.0"

Expand All @@ -63,7 +63,7 @@ assert_cmd = "2.0.17"
regex = "1.11.1"
predicates = "3.1.3"
tempfile = "3.23.0"
sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
sp-keyring = { version = "43.0.0", default-features = false }

[features]
# This `std` feature is required for testing using an inline contract's metadata, because `ink!` annotates the metadata
Expand Down
10 changes: 5 additions & 5 deletions crates/extrinsics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ subxt = "0.44.0"
hex = "0.4.3"
derivative = "2.2.0"

sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0" }
sp-weights = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
pallet-revive-uapi = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false, features = ["unstable-hostfn", "scale"] }
sp-core = { version = "38.0.0", default-features = false }
sp-runtime = { version = "43.0.0" }
sp-weights = { version = "33.0.0", default-features = false }
pallet-revive-uapi = { version = "0.8.0", default-features = false, features = ["unstable-hostfn", "scale"] }

ink_metadata = { workspace = true }
ink_env = { workspace = true }

[dev-dependencies]
ink = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4", features = ["unstable-hostfn"], version = "6.0.0-alpha.4" }
ink = { version = "6.0.0-beta", features = ["unstable-hostfn"] }
assert_cmd = "2.0.17"
regex = "1.11.1"
predicates = "3.1.3"
Expand Down
6 changes: 3 additions & 3 deletions crates/transcode/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ tokio = { version = "1.44.2", features = ["net", "macros", "rt-multi-thread"] }

[dev-dependencies]
assert_matches = "1.5.0"
ink = { git = "https://github.com/use-ink/ink", tag = "v6.0.0-alpha.4", features = ["unstable-hostfn"] }
sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
ink = { version = "6.0.0-beta", features = ["unstable-hostfn"] }
sp-core = { version = "38.0.0", default-features = false }
sp-keyring = { version = "43.0.0", default-features = false }

[features]
# This `std` feature is required for testing using an inline contract's metadata, because `ink!` annotates the metadata
Expand Down
4 changes: 2 additions & 2 deletions crates/transcode/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ mod tests {
(
32u32,
self.env().address(),
self.env().own_code_hash().unwrap(),
self.env().own_code_hash(),
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

//self.env().transferred_value()
ink::U256::one(),
AccountId::from([0x17; 32]),
Expand All @@ -579,7 +579,7 @@ mod tests {
/*
pub fn get_complex(&self) -> (ink::H160, ink::H256, ink::U256) {
(self.env().address(),
self.env().own_code_hash().unwrap(), self.env().transferred_value())
self.env().own_code_hash(), self.env().transferred_value())
}
*/

Expand Down
Loading