diff --git a/README.md b/README.md index 349a51d7..53dfeb5c 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ You can find extensive documentation for the EVM RPC canister in the [ICP develo ## Canister -The EVM RPC canister runs on the 31-node fiduciary subnet with the following principal: [`7hfb6-caaaa-aaaar-qadga-cai`](https://dashboard.internetcomputer.org/canister/7hfb6-caaaa-aaaar-qadga-cai). +The EVM RPC canister runs on the [fiduciary subnet](https://internetcomputer.org/docs/current/concepts/subnet-types#fiduciary-subnets) with the following principal: [`7hfb6-caaaa-aaaar-qadga-cai`](https://dashboard.internetcomputer.org/canister/7hfb6-caaaa-aaaar-qadga-cai). Refer to the [Reproducible Builds](#reproducible-builds) section for information on how to verify the hash of the deployed WebAssembly module. diff --git a/e2e/motoko/main.mo b/e2e/motoko/main.mo index d71a571b..ade3d097 100644 --- a/e2e/motoko/main.mo +++ b/e2e/motoko/main.mo @@ -14,8 +14,7 @@ shared ({ caller = installer }) actor class Main() { // (`subnet name`, `nodes in subnet`, `expected cycles for JSON-RPC call`) type SubnetTarget = (Text, Nat32, Nat); - let collateralCycles = 10_000_000; - let fiduciarySubnet : SubnetTarget = ("fiduciary", 31, 270344800); + let fiduciarySubnet : SubnetTarget = ("fiduciary", 34, 642_627_200); let testTargets = [ // (`canister module`, `canister type`, `subnet`) @@ -79,9 +78,8 @@ shared ({ caller = installer }) actor class Main() { }; }; - let expectedCyclesWithCollateral = expectedCycles + collateralCycles * Nat32.toNat(nodesInSubnet); - if (cycles != expectedCyclesWithCollateral) { - addError("Unexpected number of cycles: " # debug_show cycles # " (expected " # debug_show expectedCyclesWithCollateral # ")"); + if (cycles != expectedCycles) { + addError("Unexpected number of cycles: " # debug_show cycles # " (expected " # debug_show expectedCycles # ")"); }; // `request()` without cycles diff --git a/src/accounting.rs b/src/accounting.rs index ceba563e..c6ca1909 100644 --- a/src/accounting.rs +++ b/src/accounting.rs @@ -50,7 +50,7 @@ mod test { get_http_request_cost(123, 4567890), get_http_request_cost(890, 4567890), ], - [240932000, 253133600, 113533755200, 113590820000] + [270368000, 283750400, 124527012800, 124589600000] ); } } diff --git a/src/constants.rs b/src/constants.rs index e2cfda5c..a6b84c42 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -30,7 +30,7 @@ pub const WASM_PAGE_SIZE: u64 = 65536; pub const ETH_GET_LOGS_MAX_BLOCKS: u32 = 500; -pub const NODES_IN_SUBNET: u32 = 31; +pub const NODES_IN_SUBNET: u32 = 34; pub const API_KEY_REPLACE_STRING: &str = "{API_KEY}"; pub const VALID_API_KEY_CHARS: &str =