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

Jump to bottom

chore: Upgrade candid and agent-rs #167

Merged
merged 5 commits into from
Nov 29, 2023
Merged

chore: Upgrade candid and agent-rs #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f86fe96
chore: Upgrade candid and agent-rs
Nov 28, 2023
ca778ac
Bazel repin
Nov 28, 2023
941d9ec
Fix replica import
Nov 28, 2023
2a04549
Fix typo in suffix
Nov 28, 2023
d7cef7c
Update IC commit
Nov 28, 2023
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,572 changes: 791 additions & 781 deletions Cargo.Bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

300 changes: 149 additions & 151 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ members = [
[workspace.dependencies]
anyhow = "1.0"
async-trait = "0.1.71"
candid = "0.9.3"
candid = "0.10.0"
hex = "0.4.3"
ic-agent = "0.25.0"
ic-agent = "0.31.0"
reqwest = "0.11"
ic-test-state-machine-client = "3.0.0"
rand = "0.8.5"
Expand Down
22 changes: 11 additions & 11 deletions bazel/replica_tools.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@ package(default_visibility = ["//visibility:public"])
exports_files(["replica", "ic-starter", "canister_sandbox", "sandbox_launcher","ic-test-state-machine"])
"""

IC_COMMIT_HASH = "02138563741c87cefed2b223e31f25b59623307a"
IC_COMMIT_HASH = "09c3000df0a54c470994ceb5bc33bd8457b02fe7"

BINARY_HASHES = {
"ic-starter.gz": {
"linux": "b491c82cae8ebed2e1dc39dbc884c82ce2b4b5a3b67514e37c4edcaca65f296a",
"mac os x": "7f690883abeca846c29a84fd77340ce1812abeb2e23a48f30dcc961603cffd49",
"linux": "8d8c51033cb2cd20049ca4e048144b895684d7a4fdbd07719476797b53ebafb5",
"mac os x": "1f33354049b6c83c8be06344d913a8bcfdb61ba9234706a8bf3cdb3d620723ab",
},
"replica.gz": {
"linux": "12d1e52f240ec5c6c4a1b78c01e0dddcd05de93bcbec18c6d9b3fdbc5b5a713c",
"mac os x": "757def96a7efdbe05fb4291a8f8a9fda194965cfc5cec2edabb82fa825119b22",
"linux": "2cd30cca1818b86785b3d9b808612b7c286252363806c70d196c2fcfa48d1188",
"mac os x": "f320fec5733182e1ceb0dd03d19dc5bec01a1bf7763eb282e3fe14b1e1a6e18b",
},
"canister_sandbox.gz": {
"linux": "f4f3d4f1661adc6ba038af0723e7fc794fc38f445a7947a500305c5771442139",
"mac os x": "b60d3ea3534bb68acaa639d348a5354021d9a3a91271c3c6b0c964e2ee98de2b",
"linux": "11849a543a162f0f25b3dc10f17c177ea054e4fdb8a8c86509c7f87988ce2913",
"mac os x": "4acdd46cf9b1e5be987f6ce72d0118bf9039162e3ff80cd32056da136f753011",
},
"sandbox_launcher.gz": {
"linux": "eaacaab81203b6a8a34a5c96c413d4e2491c30e02a881597cb5cf62fe85146b8",
"mac os x": "8aaff3721cb239454e50f51a0fd0e8e7f834b379354f5a0f8d874ff1d805c0b0",
"linux": "96c416bf98724aa3bf72053d06d559f007f8655261b48f435f9104b605c8f77f",
"mac os x": "ed0bc2eeaf282012c8475ddf1ca3369488dc80d385e5b194d2823ae84514ff8a",
},
"ic-test-state-machine.gz": {
"linux": "0e29029a7774ea19a37dd670ce105cb54b7e492f246f95adc506b95a32ade8ab",
"mac os x": "3d9bbee8f92b4aaf48e1e390689ea96797fe9cb379fcd803bdfef36393d1233a",
"linux": "2fb622770cfdf815f74f0e2fbaa51795c74ecba334883a4762507aef90352c15",
"mac os x": "c8c7a6daa921b243cb6f1825dd7f80a7a7543234476d50f7becda072b1725c5c",
},
}

Expand Down
8 changes: 4 additions & 4 deletions test/ref/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ async fn test_replica() {
owner: p1.sender().unwrap(),
subaccount: None
},
amount: Nat::from(100_000_000)
amount: Nat::from(100_000_000u32)
}],
minting_account: Account {
owner: agent.get_principal().unwrap(),
Expand All @@ -167,7 +167,7 @@ async fn test_replica() {
token_name: "Test token".to_string(),
token_symbol: "XTK".to_string(),
decimals: 8,
transfer_fee: Nat::from(10_000),
transfer_fee: Nat::from(10_000u16),
})
.unwrap();

Expand Down Expand Up @@ -197,7 +197,7 @@ async fn test_state_machine() {
owner: p1.sender().unwrap(),
subaccount: None
},
amount: Nat::from(100_000_000)
amount: Nat::from(100_000_000u32)
}],
minting_account: Account {
owner: minter.sender().unwrap(),
Expand All @@ -206,7 +206,7 @@ async fn test_state_machine() {
token_name: "Test token".to_string(),
token_symbol: "XTK".to_string(),
decimals: 8,
transfer_fee: Nat::from(10_000),
transfer_fee: Nat::from(10_000u16),
})
.unwrap();

Expand Down
2 changes: 1 addition & 1 deletion test/replica/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use ic_agent::agent::http_transport::ReqwestHttpReplicaV2Transport;
use ic_agent::agent::http_transport::reqwest_transport::ReqwestHttpReplicaV2Transport;
use ic_agent::identity::BasicIdentity;
use ic_agent::Agent;
use std::path::Path;
Expand Down
2 changes: 1 addition & 1 deletion test/runner/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use candid::Principal;
use ic_agent::agent::http_transport::ReqwestHttpReplicaV2Transport;
use ic_agent::agent::http_transport::reqwest_transport::ReqwestHttpReplicaV2Transport;
use ic_agent::identity::BasicIdentity;
use ic_agent::Agent;
use icrc1_test_env_replica::ReplicaLedger;
Expand Down
Loading
Loading