Skip to content
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

Release 0.10.0 #101

Merged
merged 11 commits into from
Feb 10, 2024
Merged

Release 0.10.0 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9fc1831
update dependencies
SkymanOne Feb 9, 2024
97aa779
Merge branch 'main' into gn/prepare-rc
SkymanOne Feb 9, 2024
ee4d364
bump version
SkymanOne Feb 9, 2024
b22c924
finish merge
SkymanOne Feb 9, 2024
27b72d5
update example
SkymanOne Feb 9, 2024
5f1efe9
use v1 call builder
SkymanOne Feb 9, 2024
53aaf74
increase gas limit
SkymanOne Feb 9, 2024
4f359a9
remove gas limit
SkymanOne Feb 9, 2024
5682499
remove another gas limit
SkymanOne Feb 9, 2024
d0a4315
use callv1
SkymanOne Feb 10, 2024
82bacef
bump ink version
SkymanOne Feb 10, 2024
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,231 changes: 666 additions & 565 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ homepage = "https://github.com/Cardinal-Cryptography/drink"
license = "Apache-2.0"
readme = "README.md"
repository = "https://github.com/Cardinal-Cryptography/drink"
version = "0.9.0"
version = "0.10.0"

[workspace.dependencies]
anyhow = { version = "1.0.71" }
cargo_metadata = { version = "0.18.1" }
clap = { version = "4.3.4" }
contract-build = { version = "4.0.0-rc.1" }
contract-metadata = { version = "4.0.0-rc.1" }
contract-transcode = { version = "4.0.0-rc.1" }
contract-build = { version = "4.0.0-rc.2" }
contract-metadata = { version = "4.0.0-rc.2" }
contract-transcode = { version = "4.0.0-rc.2" }
convert_case = { version = "0.6.0" }
crossterm = { version = "0.26.0" }
darling = { version = "0.20.3" }
Expand Down Expand Up @@ -57,5 +57,5 @@ sp-runtime-interface = { version = "24.0.0" }

# Local dependencies

drink = { version = "0.9.0", path = "drink" }
drink-test-macro = { version = "0.9.0", path = "drink/test-macro" }
drink = { version = "0.10.0", path = "drink" }
drink-test-macro = { version = "0.10.0", path = "drink/test-macro" }
6 changes: 3 additions & 3 deletions drink/test-macro/src/contract_building.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::{
use cargo_metadata::{Metadata, MetadataCommand, Package};
use contract_build::{
BuildArtifacts, BuildMode, ExecuteArgs, Features, ImageVariant, ManifestPath, Network,
OptimizationPasses, OutputType, Target, UnstableFlags, Verbosity,
OptimizationPasses, OutputType, Target, UnstableFlags, Verbosity, DEFAULT_MAX_MEMORY_PAGES,
};

use crate::bundle_provision::BundleProviderGenerator;
Expand Down Expand Up @@ -101,12 +101,12 @@ fn build_contract_crate(pkg: &Package) -> (String, PathBuf) {
unstable_flags: UnstableFlags::default(),
optimization_passes: Some(OptimizationPasses::default()),
keep_debug_symbols: false,
dylint: false,
extra_lints: false,
output_type: OutputType::HumanReadable,
skip_wasm_validation: false,
target: Target::Wasm,
max_memory_pages: DEFAULT_MAX_MEMORY_PAGES,
image: ImageVariant::Default,
max_memory_pages: contract_build::DEFAULT_MAX_MEMORY_PAGES,
};

let result = contract_build::execute(args).expect("Error building contract");
Expand Down
2 changes: 1 addition & 1 deletion examples/chain-extension/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version = "0.1.0"
path = "src/lib.rs"

[dependencies]
ink = { version = "=5.0.0-rc", default-features = false }
ink = { version = "=5.0.0-rc.1", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true }
Expand Down
2 changes: 1 addition & 1 deletion examples/contract-events/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version = "0.1.0"
path = "lib.rs"

[dependencies]
ink = { version = "=5.0.0-rc", default-features = false }
ink = { version = "=5.0.0-rc.1", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true }
Expand Down
2 changes: 1 addition & 1 deletion examples/cross-contract-call-tracing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repository = "https://github.com/Cardinal-Cryptography/drink"
version = "0.1.0"

[dependencies]
ink = { version = "=5.0.0-rc", default-features = false }
ink = { version = "=5.0.0-rc.1", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true }
Expand Down
6 changes: 2 additions & 4 deletions examples/cross-contract-call-tracing/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ mod contract {
arg: u32,
) -> u32 {
build_call::<DefaultEnvironment>()
.call(next_callee)
.gas_limit(0)
.call_v1(next_callee)
.transferred_value(0)
.exec_input(
ExecutionInput::new(Selector::new(ink::selector_bytes!("middle_call")))
Expand All @@ -40,8 +39,7 @@ mod contract {
#[ink(message)]
pub fn middle_call(&self, next_callee: AccountId, arg: u32) -> u32 {
build_call::<DefaultEnvironment>()
.call(next_callee)
.gas_limit(0)
.call_v1(next_callee)
.transferred_value(0)
.exec_input(
ExecutionInput::new(Selector::new(ink::selector_bytes!("inner_call")))
Expand Down
2 changes: 1 addition & 1 deletion examples/flipper/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repository = "https://github.com/Cardinal-Cryptography/drink"
version = "0.1.0"

[dependencies]
ink = { version = "=5.0.0-rc", default-features = false, features = ["ink-debug"] }
ink = { version = "=5.0.0-rc.1", default-features = false, features = ["ink-debug"] }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true }
Expand Down
2 changes: 1 addition & 1 deletion examples/mocking/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repository = "https://github.com/Cardinal-Cryptography/drink"
version = "0.1.0"

[dependencies]
ink = { version = "=5.0.0-rc", default-features = false }
ink = { version = "=5.0.0-rc.1", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true }
Expand Down
3 changes: 1 addition & 2 deletions examples/mocking/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ mod proxy {
#[ink(message)]
pub fn forward_call(&self, callee: AccountId) -> (u8, u8) {
build_call::<DefaultEnvironment>()
.call(callee)
.gas_limit(0)
.call_v1(callee)
.transferred_value(0)
.exec_input(ExecutionInput::new(CALLEE_SELECTOR.into()))
.returns::<(u8, u8)>()
Expand Down
2 changes: 1 addition & 1 deletion examples/quick-start-with-drink/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ path = "lib.rs"
# We use standard dependencies for an ink! smart-contract.

# For debugging from contract, we enable the `ink-debug` feature of `ink` crate.
ink = { version = "=5.0.0-rc", default-features = false, features = ["ink-debug"] }
ink = { version = "=5.0.0-rc.1", default-features = false, features = ["ink-debug"] }
scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true }

Expand Down
Loading