From 7ed25cc23b88da212e64c6eb13eb4e78d4f65fda Mon Sep 17 00:00:00 2001 From: sa-github-api <138766536+sa-github-api@users.noreply.github.com> Date: Mon, 21 Oct 2024 09:57:06 +0200 Subject: [PATCH] Update Candid Files (#737) # Motivation The canisters APIs have been updated. # Changes * Updated the candid interface files for the canisters used in this library. * Updated the javascript bindings for the latest candid interfaces. # Tests - [ ] Please check the API updates for any breaking changes that affect our code. Co-authored-by: gix-bot --- packages/ckbtc/candid/minter.certified.idl.js | 6 ++ packages/ckbtc/candid/minter.d.ts | 3 + packages/ckbtc/candid/minter.did | 11 ++- packages/ckbtc/candid/minter.idl.js | 6 ++ packages/cketh/candid/minter.certified.idl.js | 6 ++ packages/cketh/candid/minter.d.ts | 3 + packages/cketh/candid/minter.did | 9 ++- packages/cketh/candid/minter.idl.js | 6 ++ .../candid/orchestrator.certified.idl.js | 6 ++ packages/cketh/candid/orchestrator.d.ts | 3 + packages/cketh/candid/orchestrator.did | 9 ++- packages/cketh/candid/orchestrator.idl.js | 6 ++ packages/cmc/candid/cmc.did | 2 +- packages/ledger-icp/candid/index.did | 2 +- packages/ledger-icp/candid/ledger.did | 2 +- packages/ledger-icrc/candid/icrc_index-ng.did | 2 +- packages/ledger-icrc/candid/icrc_index.did | 2 +- packages/ledger-icrc/candid/icrc_ledger.did | 2 +- packages/nns/candid/genesis_token.did | 2 +- .../nns/candid/governance.certified.idl.js | 26 +++---- packages/nns/candid/governance.d.ts | 19 ++--- packages/nns/candid/governance.did | 22 +++--- packages/nns/candid/governance.idl.js | 26 +++---- .../candid/governance_test.certified.idl.js | 26 +++---- packages/nns/candid/governance_test.d.ts | 19 ++--- packages/nns/candid/governance_test.did | 22 +++--- packages/nns/candid/governance_test.idl.js | 26 +++---- packages/nns/candid/sns_wasm.did | 2 +- .../candid/sns_governance.certified.idl.js | 61 +++++++++++----- packages/sns/candid/sns_governance.d.ts | 21 +++++- packages/sns/candid/sns_governance.did | 22 +++++- packages/sns/candid/sns_governance.idl.js | 61 +++++++++++----- .../sns_governance_test.certified.idl.js | 70 ++++++++++++++----- packages/sns/candid/sns_governance_test.d.ts | 29 +++++++- packages/sns/candid/sns_governance_test.did | 26 ++++++- .../sns/candid/sns_governance_test.idl.js | 70 ++++++++++++++----- packages/sns/candid/sns_root.did | 2 +- packages/sns/candid/sns_swap.certified.idl.js | 7 ++ packages/sns/candid/sns_swap.d.ts | 7 ++ packages/sns/candid/sns_swap.did | 10 ++- packages/sns/candid/sns_swap.idl.js | 7 ++ 41 files changed, 495 insertions(+), 174 deletions(-) diff --git a/packages/ckbtc/candid/minter.certified.idl.js b/packages/ckbtc/candid/minter.certified.idl.js index 62fe7b905..37c0da505 100644 --- a/packages/ckbtc/candid/minter.certified.idl.js +++ b/packages/ckbtc/candid/minter.certified.idl.js @@ -39,10 +39,16 @@ export const idlFactory = ({ IDL }) => { 'stopping' : IDL.Null, 'running' : IDL.Null, }); + const LogVisibility = IDL.Variant({ + 'controllers' : IDL.Null, + 'public' : IDL.Null, + }); const DefiniteCanisterSettings = IDL.Record({ 'freezing_threshold' : IDL.Nat, 'controllers' : IDL.Vec(IDL.Principal), 'reserved_cycles_limit' : IDL.Nat, + 'log_visibility' : LogVisibility, + 'wasm_memory_limit' : IDL.Nat, 'memory_allocation' : IDL.Nat, 'compute_allocation' : IDL.Nat, }); diff --git a/packages/ckbtc/candid/minter.d.ts b/packages/ckbtc/candid/minter.d.ts index c29c7b125..9a998018e 100644 --- a/packages/ckbtc/candid/minter.d.ts +++ b/packages/ckbtc/candid/minter.d.ts @@ -34,6 +34,8 @@ export interface DefiniteCanisterSettings { freezing_threshold: bigint; controllers: Array; reserved_cycles_limit: bigint; + log_visibility: LogVisibility; + wasm_memory_limit: bigint; memory_allocation: bigint; compute_allocation: bigint; } @@ -129,6 +131,7 @@ export interface InitArgs { min_confirmations: [] | [number]; kyt_fee: [] | [bigint]; } +export type LogVisibility = { controllers: null } | { public: null }; export type MinterArg = { Upgrade: [] | [UpgradeArgs] } | { Init: InitArgs }; export interface MinterInfo { retrieve_btc_min_amount: bigint; diff --git a/packages/ckbtc/candid/minter.did b/packages/ckbtc/candid/minter.did index 573981c82..0726a6266 100644 --- a/packages/ckbtc/candid/minter.did +++ b/packages/ckbtc/candid/minter.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/bitcoin/ckbtc/minter/ckbtc_minter.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/bitcoin/ckbtc/minter/ckbtc_minter.did' by import-candid // Represents an account on the ckBTC ledger. type Account = record { owner : principal; subaccount : opt blob }; @@ -28,6 +28,13 @@ type DefiniteCanisterSettings = record { memory_allocation : nat; compute_allocation : nat; reserved_cycles_limit : nat; + log_visibility: LogVisibility; + wasm_memory_limit : nat; +}; + +type LogVisibility = variant { + controllers; + public; }; type RetrieveBtcArgs = record { @@ -454,7 +461,7 @@ service : (minter_arg : MinterArg) -> { /// Returns the status of a withdrawal request request using the RetrieveBtcStatusV2 type. retrieve_btc_status_v2 : (record { block_index : nat64 }) -> (RetrieveBtcStatusV2) query; - + // Returns the withdrawal statues by account. // // # Note diff --git a/packages/ckbtc/candid/minter.idl.js b/packages/ckbtc/candid/minter.idl.js index fdafe1bdf..749f6b623 100644 --- a/packages/ckbtc/candid/minter.idl.js +++ b/packages/ckbtc/candid/minter.idl.js @@ -39,10 +39,16 @@ export const idlFactory = ({ IDL }) => { 'stopping' : IDL.Null, 'running' : IDL.Null, }); + const LogVisibility = IDL.Variant({ + 'controllers' : IDL.Null, + 'public' : IDL.Null, + }); const DefiniteCanisterSettings = IDL.Record({ 'freezing_threshold' : IDL.Nat, 'controllers' : IDL.Vec(IDL.Principal), 'reserved_cycles_limit' : IDL.Nat, + 'log_visibility' : LogVisibility, + 'wasm_memory_limit' : IDL.Nat, 'memory_allocation' : IDL.Nat, 'compute_allocation' : IDL.Nat, }); diff --git a/packages/cketh/candid/minter.certified.idl.js b/packages/cketh/candid/minter.certified.idl.js index f32cdaf41..15134ac25 100644 --- a/packages/cketh/candid/minter.certified.idl.js +++ b/packages/cketh/candid/minter.certified.idl.js @@ -54,10 +54,16 @@ export const idlFactory = ({ IDL }) => { 'stopping' : IDL.Null, 'running' : IDL.Null, }); + const LogVisibility = IDL.Variant({ + 'controllers' : IDL.Null, + 'public' : IDL.Null, + }); const DefiniteCanisterSettings = IDL.Record({ 'freezing_threshold' : IDL.Nat, 'controllers' : IDL.Vec(IDL.Principal), 'reserved_cycles_limit' : IDL.Nat, + 'log_visibility' : LogVisibility, + 'wasm_memory_limit' : IDL.Nat, 'memory_allocation' : IDL.Nat, 'compute_allocation' : IDL.Nat, }); diff --git a/packages/cketh/candid/minter.d.ts b/packages/cketh/candid/minter.d.ts index c0272f1bf..d22602570 100644 --- a/packages/cketh/candid/minter.d.ts +++ b/packages/cketh/candid/minter.d.ts @@ -36,6 +36,8 @@ export interface DefiniteCanisterSettings { freezing_threshold: bigint; controllers: Array; reserved_cycles_limit: bigint; + log_visibility: LogVisibility; + wasm_memory_limit: bigint; memory_allocation: bigint; compute_allocation: bigint; } @@ -232,6 +234,7 @@ export type LedgerError = failed_burn_amount: bigint; }; }; +export type LogVisibility = { controllers: null } | { public: null }; export type MinterArg = { UpgradeArg: UpgradeArg } | { InitArg: InitArg }; export interface MinterInfo { eth_balance: [] | [bigint]; diff --git a/packages/cketh/candid/minter.did b/packages/cketh/candid/minter.did index 02b62a606..20083f57a 100644 --- a/packages/cketh/candid/minter.did +++ b/packages/cketh/candid/minter.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/ethereum/cketh/minter/cketh_minter.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/ethereum/cketh/minter/cketh_minter.did' by import-candid type EthereumNetwork = variant { // The public Ethereum mainnet. Mainnet; @@ -25,6 +25,13 @@ type DefiniteCanisterSettings = record { memory_allocation : nat; compute_allocation : nat; reserved_cycles_limit : nat; + log_visibility: LogVisibility; + wasm_memory_limit : nat; +}; + +type LogVisibility = variant { + controllers; + public; }; type QueryStats = record { diff --git a/packages/cketh/candid/minter.idl.js b/packages/cketh/candid/minter.idl.js index 6891dedc9..0922b0759 100644 --- a/packages/cketh/candid/minter.idl.js +++ b/packages/cketh/candid/minter.idl.js @@ -54,10 +54,16 @@ export const idlFactory = ({ IDL }) => { 'stopping' : IDL.Null, 'running' : IDL.Null, }); + const LogVisibility = IDL.Variant({ + 'controllers' : IDL.Null, + 'public' : IDL.Null, + }); const DefiniteCanisterSettings = IDL.Record({ 'freezing_threshold' : IDL.Nat, 'controllers' : IDL.Vec(IDL.Principal), 'reserved_cycles_limit' : IDL.Nat, + 'log_visibility' : LogVisibility, + 'wasm_memory_limit' : IDL.Nat, 'memory_allocation' : IDL.Nat, 'compute_allocation' : IDL.Nat, }); diff --git a/packages/cketh/candid/orchestrator.certified.idl.js b/packages/cketh/candid/orchestrator.certified.idl.js index 2cfbfc691..79c92a781 100644 --- a/packages/cketh/candid/orchestrator.certified.idl.js +++ b/packages/cketh/candid/orchestrator.certified.idl.js @@ -65,10 +65,16 @@ export const idlFactory = ({ IDL }) => { 'stopping' : IDL.Null, 'running' : IDL.Null, }); + const LogVisibility = IDL.Variant({ + 'controllers' : IDL.Null, + 'public' : IDL.Null, + }); const DefiniteCanisterSettings = IDL.Record({ 'freezing_threshold' : IDL.Nat, 'controllers' : IDL.Vec(IDL.Principal), 'reserved_cycles_limit' : IDL.Nat, + 'log_visibility' : LogVisibility, + 'wasm_memory_limit' : IDL.Nat, 'memory_allocation' : IDL.Nat, 'compute_allocation' : IDL.Nat, }); diff --git a/packages/cketh/candid/orchestrator.d.ts b/packages/cketh/candid/orchestrator.d.ts index a4d0e2597..76ae62b5b 100644 --- a/packages/cketh/candid/orchestrator.d.ts +++ b/packages/cketh/candid/orchestrator.d.ts @@ -30,6 +30,8 @@ export interface DefiniteCanisterSettings { freezing_threshold: bigint; controllers: Array; reserved_cycles_limit: bigint; + log_visibility: LogVisibility; + wasm_memory_limit: bigint; memory_allocation: bigint; compute_allocation: bigint; } @@ -64,6 +66,7 @@ export interface LedgerSuiteVersion { ledger_compressed_wasm_hash: string; index_compressed_wasm_hash: string; } +export type LogVisibility = { controllers: null } | { public: null }; export interface ManagedCanisterIds { ledger: [] | [Principal]; index: [] | [Principal]; diff --git a/packages/cketh/candid/orchestrator.did b/packages/cketh/candid/orchestrator.did index ba0cb6b80..90fe9a2c9 100644 --- a/packages/cketh/candid/orchestrator.did +++ b/packages/cketh/candid/orchestrator.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/ethereum/ledger-suite-orchestrator/ledger_suite_orchestrator.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/ethereum/ledger-suite-orchestrator/ledger_suite_orchestrator.did' by import-candid type OrchestratorArg = variant { UpgradeArg : UpgradeArg; InitArg : InitArg; @@ -226,6 +226,13 @@ type DefiniteCanisterSettings = record { memory_allocation : nat; compute_allocation : nat; reserved_cycles_limit : nat; + log_visibility: LogVisibility; + wasm_memory_limit : nat; +}; + +type LogVisibility = variant { + controllers; + public; }; type QueryStats = record { diff --git a/packages/cketh/candid/orchestrator.idl.js b/packages/cketh/candid/orchestrator.idl.js index b5e7e19dc..3802eb526 100644 --- a/packages/cketh/candid/orchestrator.idl.js +++ b/packages/cketh/candid/orchestrator.idl.js @@ -65,10 +65,16 @@ export const idlFactory = ({ IDL }) => { 'stopping' : IDL.Null, 'running' : IDL.Null, }); + const LogVisibility = IDL.Variant({ + 'controllers' : IDL.Null, + 'public' : IDL.Null, + }); const DefiniteCanisterSettings = IDL.Record({ 'freezing_threshold' : IDL.Nat, 'controllers' : IDL.Vec(IDL.Principal), 'reserved_cycles_limit' : IDL.Nat, + 'log_visibility' : LogVisibility, + 'wasm_memory_limit' : IDL.Nat, 'memory_allocation' : IDL.Nat, 'compute_allocation' : IDL.Nat, }); diff --git a/packages/cmc/candid/cmc.did b/packages/cmc/candid/cmc.did index 18b78bd63..9269d7b3f 100644 --- a/packages/cmc/candid/cmc.did +++ b/packages/cmc/candid/cmc.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/nns/cmc/cmc.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/nns/cmc/cmc.did' by import-candid type Cycles = nat; type BlockIndex = nat64; type log_visibility = variant { diff --git a/packages/ledger-icp/candid/index.did b/packages/ledger-icp/candid/index.did index 368c7374e..a32d73e49 100644 --- a/packages/ledger-icp/candid/index.did +++ b/packages/ledger-icp/candid/index.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/rosetta-api/icp_ledger/index/index.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/ledger_suite/icp/index/index.did' by import-candid type Account = record { owner : principal; subaccount : opt vec nat8 }; type GetAccountIdentifierTransactionsArgs = record { max_results : nat64; diff --git a/packages/ledger-icp/candid/ledger.did b/packages/ledger-icp/candid/ledger.did index f24f8a9c3..1c0f095db 100644 --- a/packages/ledger-icp/candid/ledger.did +++ b/packages/ledger-icp/candid/ledger.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/rosetta-api/icp_ledger/ledger.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/ledger_suite/icp/ledger.did' by import-candid // This is the official Ledger interface that is guaranteed to be backward compatible. // Amount of tokens, measured in 10^-8 of a token. diff --git a/packages/ledger-icrc/candid/icrc_index-ng.did b/packages/ledger-icrc/candid/icrc_index-ng.did index 36637e052..dbf29f928 100644 --- a/packages/ledger-icrc/candid/icrc_index-ng.did +++ b/packages/ledger-icrc/candid/icrc_index-ng.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/rosetta-api/icrc1/index-ng/index-ng.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/ledger_suite/icrc1/index-ng/index-ng.did' by import-candid type Tokens = nat; type InitArg = record { diff --git a/packages/ledger-icrc/candid/icrc_index.did b/packages/ledger-icrc/candid/icrc_index.did index a76bc846b..ffd5ee45a 100644 --- a/packages/ledger-icrc/candid/icrc_index.did +++ b/packages/ledger-icrc/candid/icrc_index.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/rosetta-api/icrc1/index/index.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/ledger_suite/icrc1/index/index.did' by import-candid type TxId = nat; type Account = record { owner : principal; subaccount : opt blob }; diff --git a/packages/ledger-icrc/candid/icrc_ledger.did b/packages/ledger-icrc/candid/icrc_ledger.did index 8121fe39e..ddd596fc6 100644 --- a/packages/ledger-icrc/candid/icrc_ledger.did +++ b/packages/ledger-icrc/candid/icrc_ledger.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/rosetta-api/icrc1/ledger/ledger.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/ledger_suite/icrc1/ledger/ledger.did' by import-candid type BlockIndex = nat; type Subaccount = blob; // Number of nanoseconds since the UNIX epoch in UTC timezone. diff --git a/packages/nns/candid/genesis_token.did b/packages/nns/candid/genesis_token.did index a619d35fd..2e9cf85cb 100644 --- a/packages/nns/candid/genesis_token.did +++ b/packages/nns/candid/genesis_token.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/nns/gtc/canister/gtc.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/nns/gtc/canister/gtc.did' by import-candid type AccountState = record { authenticated_principal_id : opt principal; successfully_transferred_neurons : vec TransferredNeuron; diff --git a/packages/nns/candid/governance.certified.idl.js b/packages/nns/candid/governance.certified.idl.js index f5a60b1f3..cb7e64806 100644 --- a/packages/nns/candid/governance.certified.idl.js +++ b/packages/nns/candid/governance.certified.idl.js @@ -59,9 +59,10 @@ export const idlFactory = ({ IDL }) => { 'SetDissolveTimestamp' : SetDissolveTimestamp, }); const Configure = IDL.Record({ 'operation' : IDL.Opt(Operation) }); + const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RegisterVote = IDL.Record({ 'vote' : IDL.Int32, - 'proposal' : IDL.Opt(NeuronId), + 'proposal' : IDL.Opt(ProposalId), }); const Merge = IDL.Record({ 'source_neuron_id' : IDL.Opt(NeuronId) }); const DisburseToNeuron = IDL.Record({ @@ -447,7 +448,7 @@ export const idlFactory = ({ IDL }) => { 'total_available_e8s_equivalent' : IDL.Nat64, 'latest_round_available_e8s_equivalent' : IDL.Opt(IDL.Nat64), 'distributed_e8s_equivalent' : IDL.Nat64, - 'settled_proposals' : IDL.Vec(NeuronId), + 'settled_proposals' : IDL.Vec(ProposalId), }); const NeuronStakeTransfer = IDL.Record({ 'to_subaccount' : IDL.Vec(IDL.Nat8), @@ -550,7 +551,7 @@ export const idlFactory = ({ IDL }) => { 'current_deadline_timestamp_seconds' : IDL.Nat64, }); const ProposalData = IDL.Record({ - 'id' : IDL.Opt(NeuronId), + 'id' : IDL.Opt(ProposalId), 'failure_reason' : IDL.Opt(GovernanceError), 'ballots' : IDL.Vec(IDL.Tuple(IDL.Nat64, Ballot)), 'proposal_timestamp_seconds' : IDL.Nat64, @@ -587,7 +588,7 @@ export const idlFactory = ({ IDL }) => { }); const BallotInfo = IDL.Record({ 'vote' : IDL.Int32, - 'proposal_id' : IDL.Opt(NeuronId), + 'proposal_id' : IDL.Opt(ProposalId), }); const DissolveState = IDL.Variant({ 'DissolveDelaySeconds' : IDL.Nat64, @@ -678,7 +679,7 @@ export const idlFactory = ({ IDL }) => { }); const Result_5 = IDL.Variant({ 'Ok' : NeuronInfo, 'Err' : GovernanceError }); const GetNeuronsFundAuditInfoRequest = IDL.Record({ - 'nns_proposal_id' : IDL.Opt(NeuronId), + 'nns_proposal_id' : IDL.Opt(ProposalId), }); const NeuronsFundAuditInfo = IDL.Record({ 'final_neurons_fund_participation' : IDL.Opt(NeuronsFundParticipation), @@ -697,7 +698,7 @@ export const idlFactory = ({ IDL }) => { 'Err' : GovernanceError, }); const ProposalInfo = IDL.Record({ - 'id' : IDL.Opt(NeuronId), + 'id' : IDL.Opt(ProposalId), 'status' : IDL.Int32, 'topic' : IDL.Int32, 'failure_reason' : IDL.Opt(GovernanceError), @@ -744,7 +745,7 @@ export const idlFactory = ({ IDL }) => { const ListProposalInfo = IDL.Record({ 'include_reward_status' : IDL.Vec(IDL.Int32), 'omit_large_fields' : IDL.Opt(IDL.Bool), - 'before_proposal' : IDL.Opt(NeuronId), + 'before_proposal' : IDL.Opt(ProposalId), 'limit' : IDL.Nat32, 'exclude_topic' : IDL.Vec(IDL.Int32), 'include_all_manage_neuron_proposals' : IDL.Opt(IDL.Bool), @@ -814,7 +815,7 @@ export const idlFactory = ({ IDL }) => { }); const MakeProposalResponse = IDL.Record({ 'message' : IDL.Opt(IDL.Text), - 'proposal_id' : IDL.Opt(NeuronId), + 'proposal_id' : IDL.Opt(ProposalId), }); const StakeMaturityResponse = IDL.Record({ 'maturity_e8s' : IDL.Nat64, @@ -1023,9 +1024,10 @@ export const init = ({ IDL }) => { 'SetDissolveTimestamp' : SetDissolveTimestamp, }); const Configure = IDL.Record({ 'operation' : IDL.Opt(Operation) }); + const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RegisterVote = IDL.Record({ 'vote' : IDL.Int32, - 'proposal' : IDL.Opt(NeuronId), + 'proposal' : IDL.Opt(ProposalId), }); const Merge = IDL.Record({ 'source_neuron_id' : IDL.Opt(NeuronId) }); const DisburseToNeuron = IDL.Record({ @@ -1411,7 +1413,7 @@ export const init = ({ IDL }) => { 'total_available_e8s_equivalent' : IDL.Nat64, 'latest_round_available_e8s_equivalent' : IDL.Opt(IDL.Nat64), 'distributed_e8s_equivalent' : IDL.Nat64, - 'settled_proposals' : IDL.Vec(NeuronId), + 'settled_proposals' : IDL.Vec(ProposalId), }); const NeuronStakeTransfer = IDL.Record({ 'to_subaccount' : IDL.Vec(IDL.Nat8), @@ -1514,7 +1516,7 @@ export const init = ({ IDL }) => { 'current_deadline_timestamp_seconds' : IDL.Nat64, }); const ProposalData = IDL.Record({ - 'id' : IDL.Opt(NeuronId), + 'id' : IDL.Opt(ProposalId), 'failure_reason' : IDL.Opt(GovernanceError), 'ballots' : IDL.Vec(IDL.Tuple(IDL.Nat64, Ballot)), 'proposal_timestamp_seconds' : IDL.Nat64, @@ -1551,7 +1553,7 @@ export const init = ({ IDL }) => { }); const BallotInfo = IDL.Record({ 'vote' : IDL.Int32, - 'proposal_id' : IDL.Opt(NeuronId), + 'proposal_id' : IDL.Opt(ProposalId), }); const DissolveState = IDL.Variant({ 'DissolveDelaySeconds' : IDL.Nat64, diff --git a/packages/nns/candid/governance.d.ts b/packages/nns/candid/governance.d.ts index 396f3147e..a750f1a09 100644 --- a/packages/nns/candid/governance.d.ts +++ b/packages/nns/candid/governance.d.ts @@ -40,7 +40,7 @@ export interface Ballot { } export interface BallotInfo { vote: number; - proposal_id: [] | [NeuronId]; + proposal_id: [] | [ProposalId]; } export type By = | { NeuronIdOrSubaccount: {} } @@ -206,7 +206,7 @@ export interface FollowersMap { followers_map: Array<[bigint, Followers]>; } export interface GetNeuronsFundAuditInfoRequest { - nns_proposal_id: [] | [NeuronId]; + nns_proposal_id: [] | [ProposalId]; } export interface GetNeuronsFundAuditInfoResponse { result: [] | [Result_6]; @@ -368,7 +368,7 @@ export interface ListNodeProvidersResponse { export interface ListProposalInfo { include_reward_status: Int32Array | number[]; omit_large_fields: [] | [boolean]; - before_proposal: [] | [NeuronId]; + before_proposal: [] | [ProposalId]; limit: number; exclude_topic: Int32Array | number[]; include_all_manage_neuron_proposals: [] | [boolean]; @@ -385,7 +385,7 @@ export interface MakeProposalRequest { } export interface MakeProposalResponse { message: [] | [string]; - proposal_id: [] | [NeuronId]; + proposal_id: [] | [ProposalId]; } export interface MakingSnsProposal { proposal: [] | [Proposal]; @@ -672,7 +672,7 @@ export type ProposalActionRequest = | { AddOrRemoveNodeProvider: AddOrRemoveNodeProvider } | { Motion: Motion }; export interface ProposalData { - id: [] | [NeuronId]; + id: [] | [ProposalId]; failure_reason: [] | [GovernanceError]; ballots: Array<[bigint, Ballot]>; proposal_timestamp_seconds: bigint; @@ -690,8 +690,11 @@ export interface ProposalData { executed_timestamp_seconds: bigint; original_total_community_fund_maturity_e8s_equivalent: [] | [bigint]; } +export interface ProposalId { + id: bigint; +} export interface ProposalInfo { - id: [] | [NeuronId]; + id: [] | [ProposalId]; status: number; topic: number; failure_reason: [] | [GovernanceError]; @@ -711,7 +714,7 @@ export interface ProposalInfo { } export interface RegisterVote { vote: number; - proposal: [] | [NeuronId]; + proposal: [] | [ProposalId]; } export interface RemoveHotKey { hot_key_to_remove: [] | [Principal]; @@ -748,7 +751,7 @@ export interface RewardEvent { total_available_e8s_equivalent: bigint; latest_round_available_e8s_equivalent: [] | [bigint]; distributed_e8s_equivalent: bigint; - settled_proposals: Array; + settled_proposals: Array; } export type RewardMode = | { RewardToNeuron: RewardToNeuron } diff --git a/packages/nns/candid/governance.did b/packages/nns/candid/governance.did index 770f0e6cd..73bcf257e 100644 --- a/packages/nns/candid/governance.did +++ b/packages/nns/candid/governance.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/nns/governance/canister/governance.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/nns/governance/canister/governance.did' by import-candid type AccountIdentifier = record { hash : blob; }; @@ -45,7 +45,7 @@ type Ballot = record { type BallotInfo = record { vote : int32; - proposal_id : opt NeuronId; + proposal_id : opt ProposalId; }; type By = variant { @@ -254,7 +254,7 @@ type FollowersMap = record { }; type GetNeuronsFundAuditInfoRequest = record { - nns_proposal_id : opt NeuronId; + nns_proposal_id : opt ProposalId; }; type GetNeuronsFundAuditInfoResponse = record { @@ -438,7 +438,7 @@ type ListNodeProvidersResponse = record { type ListProposalInfo = record { include_reward_status : vec int32; omit_large_fields : opt bool; - before_proposal : opt NeuronId; + before_proposal : opt ProposalId; limit : nat32; exclude_topic : vec int32; include_all_manage_neuron_proposals : opt bool; @@ -458,7 +458,7 @@ type MakeProposalRequest = record { type MakeProposalResponse = record { message : opt text; - proposal_id : opt NeuronId; + proposal_id : opt ProposalId; }; type MakingSnsProposal = record { @@ -602,6 +602,10 @@ type NeuronId = record { id : nat64; }; +type ProposalId = record { + id : nat64; +}; + type NeuronIdOrSubaccount = variant { Subaccount : blob; NeuronId : NeuronId; @@ -789,7 +793,7 @@ type ProposalActionRequest = variant { }; type ProposalData = record { - id : opt NeuronId; + id : opt ProposalId; failure_reason : opt GovernanceError; ballots : vec record { nat64; Ballot }; proposal_timestamp_seconds : nat64; @@ -809,7 +813,7 @@ type ProposalData = record { }; type ProposalInfo = record { - id : opt NeuronId; + id : opt ProposalId; status : int32; topic : int32; failure_reason : opt GovernanceError; @@ -830,7 +834,7 @@ type ProposalInfo = record { type RegisterVote = record { vote : int32; - proposal : opt NeuronId; + proposal : opt ProposalId; }; type RemoveHotKey = record { @@ -909,7 +913,7 @@ type RewardEvent = record { total_available_e8s_equivalent : nat64; latest_round_available_e8s_equivalent : opt nat64; distributed_e8s_equivalent : nat64; - settled_proposals : vec NeuronId; + settled_proposals : vec ProposalId; }; type RewardMode = variant { diff --git a/packages/nns/candid/governance.idl.js b/packages/nns/candid/governance.idl.js index 133a8fc53..812381e7e 100644 --- a/packages/nns/candid/governance.idl.js +++ b/packages/nns/candid/governance.idl.js @@ -59,9 +59,10 @@ export const idlFactory = ({ IDL }) => { 'SetDissolveTimestamp' : SetDissolveTimestamp, }); const Configure = IDL.Record({ 'operation' : IDL.Opt(Operation) }); + const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RegisterVote = IDL.Record({ 'vote' : IDL.Int32, - 'proposal' : IDL.Opt(NeuronId), + 'proposal' : IDL.Opt(ProposalId), }); const Merge = IDL.Record({ 'source_neuron_id' : IDL.Opt(NeuronId) }); const DisburseToNeuron = IDL.Record({ @@ -447,7 +448,7 @@ export const idlFactory = ({ IDL }) => { 'total_available_e8s_equivalent' : IDL.Nat64, 'latest_round_available_e8s_equivalent' : IDL.Opt(IDL.Nat64), 'distributed_e8s_equivalent' : IDL.Nat64, - 'settled_proposals' : IDL.Vec(NeuronId), + 'settled_proposals' : IDL.Vec(ProposalId), }); const NeuronStakeTransfer = IDL.Record({ 'to_subaccount' : IDL.Vec(IDL.Nat8), @@ -550,7 +551,7 @@ export const idlFactory = ({ IDL }) => { 'current_deadline_timestamp_seconds' : IDL.Nat64, }); const ProposalData = IDL.Record({ - 'id' : IDL.Opt(NeuronId), + 'id' : IDL.Opt(ProposalId), 'failure_reason' : IDL.Opt(GovernanceError), 'ballots' : IDL.Vec(IDL.Tuple(IDL.Nat64, Ballot)), 'proposal_timestamp_seconds' : IDL.Nat64, @@ -587,7 +588,7 @@ export const idlFactory = ({ IDL }) => { }); const BallotInfo = IDL.Record({ 'vote' : IDL.Int32, - 'proposal_id' : IDL.Opt(NeuronId), + 'proposal_id' : IDL.Opt(ProposalId), }); const DissolveState = IDL.Variant({ 'DissolveDelaySeconds' : IDL.Nat64, @@ -678,7 +679,7 @@ export const idlFactory = ({ IDL }) => { }); const Result_5 = IDL.Variant({ 'Ok' : NeuronInfo, 'Err' : GovernanceError }); const GetNeuronsFundAuditInfoRequest = IDL.Record({ - 'nns_proposal_id' : IDL.Opt(NeuronId), + 'nns_proposal_id' : IDL.Opt(ProposalId), }); const NeuronsFundAuditInfo = IDL.Record({ 'final_neurons_fund_participation' : IDL.Opt(NeuronsFundParticipation), @@ -697,7 +698,7 @@ export const idlFactory = ({ IDL }) => { 'Err' : GovernanceError, }); const ProposalInfo = IDL.Record({ - 'id' : IDL.Opt(NeuronId), + 'id' : IDL.Opt(ProposalId), 'status' : IDL.Int32, 'topic' : IDL.Int32, 'failure_reason' : IDL.Opt(GovernanceError), @@ -744,7 +745,7 @@ export const idlFactory = ({ IDL }) => { const ListProposalInfo = IDL.Record({ 'include_reward_status' : IDL.Vec(IDL.Int32), 'omit_large_fields' : IDL.Opt(IDL.Bool), - 'before_proposal' : IDL.Opt(NeuronId), + 'before_proposal' : IDL.Opt(ProposalId), 'limit' : IDL.Nat32, 'exclude_topic' : IDL.Vec(IDL.Int32), 'include_all_manage_neuron_proposals' : IDL.Opt(IDL.Bool), @@ -814,7 +815,7 @@ export const idlFactory = ({ IDL }) => { }); const MakeProposalResponse = IDL.Record({ 'message' : IDL.Opt(IDL.Text), - 'proposal_id' : IDL.Opt(NeuronId), + 'proposal_id' : IDL.Opt(ProposalId), }); const StakeMaturityResponse = IDL.Record({ 'maturity_e8s' : IDL.Nat64, @@ -1039,9 +1040,10 @@ export const init = ({ IDL }) => { 'SetDissolveTimestamp' : SetDissolveTimestamp, }); const Configure = IDL.Record({ 'operation' : IDL.Opt(Operation) }); + const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RegisterVote = IDL.Record({ 'vote' : IDL.Int32, - 'proposal' : IDL.Opt(NeuronId), + 'proposal' : IDL.Opt(ProposalId), }); const Merge = IDL.Record({ 'source_neuron_id' : IDL.Opt(NeuronId) }); const DisburseToNeuron = IDL.Record({ @@ -1427,7 +1429,7 @@ export const init = ({ IDL }) => { 'total_available_e8s_equivalent' : IDL.Nat64, 'latest_round_available_e8s_equivalent' : IDL.Opt(IDL.Nat64), 'distributed_e8s_equivalent' : IDL.Nat64, - 'settled_proposals' : IDL.Vec(NeuronId), + 'settled_proposals' : IDL.Vec(ProposalId), }); const NeuronStakeTransfer = IDL.Record({ 'to_subaccount' : IDL.Vec(IDL.Nat8), @@ -1530,7 +1532,7 @@ export const init = ({ IDL }) => { 'current_deadline_timestamp_seconds' : IDL.Nat64, }); const ProposalData = IDL.Record({ - 'id' : IDL.Opt(NeuronId), + 'id' : IDL.Opt(ProposalId), 'failure_reason' : IDL.Opt(GovernanceError), 'ballots' : IDL.Vec(IDL.Tuple(IDL.Nat64, Ballot)), 'proposal_timestamp_seconds' : IDL.Nat64, @@ -1567,7 +1569,7 @@ export const init = ({ IDL }) => { }); const BallotInfo = IDL.Record({ 'vote' : IDL.Int32, - 'proposal_id' : IDL.Opt(NeuronId), + 'proposal_id' : IDL.Opt(ProposalId), }); const DissolveState = IDL.Variant({ 'DissolveDelaySeconds' : IDL.Nat64, diff --git a/packages/nns/candid/governance_test.certified.idl.js b/packages/nns/candid/governance_test.certified.idl.js index 4b68aba80..1b3f2d1c8 100644 --- a/packages/nns/candid/governance_test.certified.idl.js +++ b/packages/nns/candid/governance_test.certified.idl.js @@ -59,9 +59,10 @@ export const idlFactory = ({ IDL }) => { 'SetDissolveTimestamp' : SetDissolveTimestamp, }); const Configure = IDL.Record({ 'operation' : IDL.Opt(Operation) }); + const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RegisterVote = IDL.Record({ 'vote' : IDL.Int32, - 'proposal' : IDL.Opt(NeuronId), + 'proposal' : IDL.Opt(ProposalId), }); const Merge = IDL.Record({ 'source_neuron_id' : IDL.Opt(NeuronId) }); const DisburseToNeuron = IDL.Record({ @@ -447,7 +448,7 @@ export const idlFactory = ({ IDL }) => { 'total_available_e8s_equivalent' : IDL.Nat64, 'latest_round_available_e8s_equivalent' : IDL.Opt(IDL.Nat64), 'distributed_e8s_equivalent' : IDL.Nat64, - 'settled_proposals' : IDL.Vec(NeuronId), + 'settled_proposals' : IDL.Vec(ProposalId), }); const NeuronStakeTransfer = IDL.Record({ 'to_subaccount' : IDL.Vec(IDL.Nat8), @@ -550,7 +551,7 @@ export const idlFactory = ({ IDL }) => { 'current_deadline_timestamp_seconds' : IDL.Nat64, }); const ProposalData = IDL.Record({ - 'id' : IDL.Opt(NeuronId), + 'id' : IDL.Opt(ProposalId), 'failure_reason' : IDL.Opt(GovernanceError), 'ballots' : IDL.Vec(IDL.Tuple(IDL.Nat64, Ballot)), 'proposal_timestamp_seconds' : IDL.Nat64, @@ -587,7 +588,7 @@ export const idlFactory = ({ IDL }) => { }); const BallotInfo = IDL.Record({ 'vote' : IDL.Int32, - 'proposal_id' : IDL.Opt(NeuronId), + 'proposal_id' : IDL.Opt(ProposalId), }); const DissolveState = IDL.Variant({ 'DissolveDelaySeconds' : IDL.Nat64, @@ -678,7 +679,7 @@ export const idlFactory = ({ IDL }) => { }); const Result_5 = IDL.Variant({ 'Ok' : NeuronInfo, 'Err' : GovernanceError }); const GetNeuronsFundAuditInfoRequest = IDL.Record({ - 'nns_proposal_id' : IDL.Opt(NeuronId), + 'nns_proposal_id' : IDL.Opt(ProposalId), }); const NeuronsFundAuditInfo = IDL.Record({ 'final_neurons_fund_participation' : IDL.Opt(NeuronsFundParticipation), @@ -697,7 +698,7 @@ export const idlFactory = ({ IDL }) => { 'Err' : GovernanceError, }); const ProposalInfo = IDL.Record({ - 'id' : IDL.Opt(NeuronId), + 'id' : IDL.Opt(ProposalId), 'status' : IDL.Int32, 'topic' : IDL.Int32, 'failure_reason' : IDL.Opt(GovernanceError), @@ -744,7 +745,7 @@ export const idlFactory = ({ IDL }) => { const ListProposalInfo = IDL.Record({ 'include_reward_status' : IDL.Vec(IDL.Int32), 'omit_large_fields' : IDL.Opt(IDL.Bool), - 'before_proposal' : IDL.Opt(NeuronId), + 'before_proposal' : IDL.Opt(ProposalId), 'limit' : IDL.Nat32, 'exclude_topic' : IDL.Vec(IDL.Int32), 'include_all_manage_neuron_proposals' : IDL.Opt(IDL.Bool), @@ -814,7 +815,7 @@ export const idlFactory = ({ IDL }) => { }); const MakeProposalResponse = IDL.Record({ 'message' : IDL.Opt(IDL.Text), - 'proposal_id' : IDL.Opt(NeuronId), + 'proposal_id' : IDL.Opt(ProposalId), }); const StakeMaturityResponse = IDL.Record({ 'maturity_e8s' : IDL.Nat64, @@ -1024,9 +1025,10 @@ export const init = ({ IDL }) => { 'SetDissolveTimestamp' : SetDissolveTimestamp, }); const Configure = IDL.Record({ 'operation' : IDL.Opt(Operation) }); + const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RegisterVote = IDL.Record({ 'vote' : IDL.Int32, - 'proposal' : IDL.Opt(NeuronId), + 'proposal' : IDL.Opt(ProposalId), }); const Merge = IDL.Record({ 'source_neuron_id' : IDL.Opt(NeuronId) }); const DisburseToNeuron = IDL.Record({ @@ -1412,7 +1414,7 @@ export const init = ({ IDL }) => { 'total_available_e8s_equivalent' : IDL.Nat64, 'latest_round_available_e8s_equivalent' : IDL.Opt(IDL.Nat64), 'distributed_e8s_equivalent' : IDL.Nat64, - 'settled_proposals' : IDL.Vec(NeuronId), + 'settled_proposals' : IDL.Vec(ProposalId), }); const NeuronStakeTransfer = IDL.Record({ 'to_subaccount' : IDL.Vec(IDL.Nat8), @@ -1515,7 +1517,7 @@ export const init = ({ IDL }) => { 'current_deadline_timestamp_seconds' : IDL.Nat64, }); const ProposalData = IDL.Record({ - 'id' : IDL.Opt(NeuronId), + 'id' : IDL.Opt(ProposalId), 'failure_reason' : IDL.Opt(GovernanceError), 'ballots' : IDL.Vec(IDL.Tuple(IDL.Nat64, Ballot)), 'proposal_timestamp_seconds' : IDL.Nat64, @@ -1552,7 +1554,7 @@ export const init = ({ IDL }) => { }); const BallotInfo = IDL.Record({ 'vote' : IDL.Int32, - 'proposal_id' : IDL.Opt(NeuronId), + 'proposal_id' : IDL.Opt(ProposalId), }); const DissolveState = IDL.Variant({ 'DissolveDelaySeconds' : IDL.Nat64, diff --git a/packages/nns/candid/governance_test.d.ts b/packages/nns/candid/governance_test.d.ts index 1fed72aaf..fdfe19b46 100644 --- a/packages/nns/candid/governance_test.d.ts +++ b/packages/nns/candid/governance_test.d.ts @@ -40,7 +40,7 @@ export interface Ballot { } export interface BallotInfo { vote: number; - proposal_id: [] | [NeuronId]; + proposal_id: [] | [ProposalId]; } export type By = | { NeuronIdOrSubaccount: {} } @@ -206,7 +206,7 @@ export interface FollowersMap { followers_map: Array<[bigint, Followers]>; } export interface GetNeuronsFundAuditInfoRequest { - nns_proposal_id: [] | [NeuronId]; + nns_proposal_id: [] | [ProposalId]; } export interface GetNeuronsFundAuditInfoResponse { result: [] | [Result_6]; @@ -368,7 +368,7 @@ export interface ListNodeProvidersResponse { export interface ListProposalInfo { include_reward_status: Int32Array | number[]; omit_large_fields: [] | [boolean]; - before_proposal: [] | [NeuronId]; + before_proposal: [] | [ProposalId]; limit: number; exclude_topic: Int32Array | number[]; include_all_manage_neuron_proposals: [] | [boolean]; @@ -385,7 +385,7 @@ export interface MakeProposalRequest { } export interface MakeProposalResponse { message: [] | [string]; - proposal_id: [] | [NeuronId]; + proposal_id: [] | [ProposalId]; } export interface MakingSnsProposal { proposal: [] | [Proposal]; @@ -672,7 +672,7 @@ export type ProposalActionRequest = | { AddOrRemoveNodeProvider: AddOrRemoveNodeProvider } | { Motion: Motion }; export interface ProposalData { - id: [] | [NeuronId]; + id: [] | [ProposalId]; failure_reason: [] | [GovernanceError]; ballots: Array<[bigint, Ballot]>; proposal_timestamp_seconds: bigint; @@ -690,8 +690,11 @@ export interface ProposalData { executed_timestamp_seconds: bigint; original_total_community_fund_maturity_e8s_equivalent: [] | [bigint]; } +export interface ProposalId { + id: bigint; +} export interface ProposalInfo { - id: [] | [NeuronId]; + id: [] | [ProposalId]; status: number; topic: number; failure_reason: [] | [GovernanceError]; @@ -711,7 +714,7 @@ export interface ProposalInfo { } export interface RegisterVote { vote: number; - proposal: [] | [NeuronId]; + proposal: [] | [ProposalId]; } export interface RemoveHotKey { hot_key_to_remove: [] | [Principal]; @@ -748,7 +751,7 @@ export interface RewardEvent { total_available_e8s_equivalent: bigint; latest_round_available_e8s_equivalent: [] | [bigint]; distributed_e8s_equivalent: bigint; - settled_proposals: Array; + settled_proposals: Array; } export type RewardMode = | { RewardToNeuron: RewardToNeuron } diff --git a/packages/nns/candid/governance_test.did b/packages/nns/candid/governance_test.did index efae9cb48..2b696b4a9 100644 --- a/packages/nns/candid/governance_test.did +++ b/packages/nns/candid/governance_test.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/nns/governance/canister/governance_test.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/nns/governance/canister/governance_test.did' by import-candid type AccountIdentifier = record { hash : blob; }; @@ -45,7 +45,7 @@ type Ballot = record { type BallotInfo = record { vote : int32; - proposal_id : opt NeuronId; + proposal_id : opt ProposalId; }; type By = variant { @@ -256,7 +256,7 @@ type FollowersMap = record { } }; type GetNeuronsFundAuditInfoRequest = record { - nns_proposal_id : opt NeuronId; + nns_proposal_id : opt ProposalId; }; type GetNeuronsFundAuditInfoResponse = record { @@ -440,7 +440,7 @@ type ListNodeProvidersResponse = record { type ListProposalInfo = record { include_reward_status : vec int32; omit_large_fields : opt bool; - before_proposal : opt NeuronId; + before_proposal : opt ProposalId; limit : nat32; exclude_topic : vec int32; include_all_manage_neuron_proposals : opt bool; @@ -460,7 +460,7 @@ type MakeProposalRequest = record { type MakeProposalResponse = record { message : opt text; - proposal_id : opt NeuronId; + proposal_id : opt ProposalId; }; type MakingSnsProposal = record { @@ -604,6 +604,10 @@ type NeuronId = record { id : nat64; }; +type ProposalId = record { + id : nat64; +}; + type NeuronIdOrSubaccount = variant { Subaccount : blob; NeuronId : NeuronId; @@ -791,7 +795,7 @@ type ProposalActionRequest = variant { }; type ProposalData = record { - id : opt NeuronId; + id : opt ProposalId; failure_reason : opt GovernanceError; ballots : vec record { nat64; Ballot }; proposal_timestamp_seconds : nat64; @@ -811,7 +815,7 @@ type ProposalData = record { }; type ProposalInfo = record { - id : opt NeuronId; + id : opt ProposalId; status : int32; topic : int32; failure_reason : opt GovernanceError; @@ -832,7 +836,7 @@ type ProposalInfo = record { type RegisterVote = record { vote : int32; - proposal : opt NeuronId; + proposal : opt ProposalId; }; type RemoveHotKey = record { @@ -911,7 +915,7 @@ type RewardEvent = record { total_available_e8s_equivalent : nat64; latest_round_available_e8s_equivalent : opt nat64; distributed_e8s_equivalent : nat64; - settled_proposals : vec NeuronId; + settled_proposals : vec ProposalId; }; type RewardMode = variant { diff --git a/packages/nns/candid/governance_test.idl.js b/packages/nns/candid/governance_test.idl.js index 7e98402f1..c43f2fcaa 100644 --- a/packages/nns/candid/governance_test.idl.js +++ b/packages/nns/candid/governance_test.idl.js @@ -59,9 +59,10 @@ export const idlFactory = ({ IDL }) => { 'SetDissolveTimestamp' : SetDissolveTimestamp, }); const Configure = IDL.Record({ 'operation' : IDL.Opt(Operation) }); + const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RegisterVote = IDL.Record({ 'vote' : IDL.Int32, - 'proposal' : IDL.Opt(NeuronId), + 'proposal' : IDL.Opt(ProposalId), }); const Merge = IDL.Record({ 'source_neuron_id' : IDL.Opt(NeuronId) }); const DisburseToNeuron = IDL.Record({ @@ -447,7 +448,7 @@ export const idlFactory = ({ IDL }) => { 'total_available_e8s_equivalent' : IDL.Nat64, 'latest_round_available_e8s_equivalent' : IDL.Opt(IDL.Nat64), 'distributed_e8s_equivalent' : IDL.Nat64, - 'settled_proposals' : IDL.Vec(NeuronId), + 'settled_proposals' : IDL.Vec(ProposalId), }); const NeuronStakeTransfer = IDL.Record({ 'to_subaccount' : IDL.Vec(IDL.Nat8), @@ -550,7 +551,7 @@ export const idlFactory = ({ IDL }) => { 'current_deadline_timestamp_seconds' : IDL.Nat64, }); const ProposalData = IDL.Record({ - 'id' : IDL.Opt(NeuronId), + 'id' : IDL.Opt(ProposalId), 'failure_reason' : IDL.Opt(GovernanceError), 'ballots' : IDL.Vec(IDL.Tuple(IDL.Nat64, Ballot)), 'proposal_timestamp_seconds' : IDL.Nat64, @@ -587,7 +588,7 @@ export const idlFactory = ({ IDL }) => { }); const BallotInfo = IDL.Record({ 'vote' : IDL.Int32, - 'proposal_id' : IDL.Opt(NeuronId), + 'proposal_id' : IDL.Opt(ProposalId), }); const DissolveState = IDL.Variant({ 'DissolveDelaySeconds' : IDL.Nat64, @@ -678,7 +679,7 @@ export const idlFactory = ({ IDL }) => { }); const Result_5 = IDL.Variant({ 'Ok' : NeuronInfo, 'Err' : GovernanceError }); const GetNeuronsFundAuditInfoRequest = IDL.Record({ - 'nns_proposal_id' : IDL.Opt(NeuronId), + 'nns_proposal_id' : IDL.Opt(ProposalId), }); const NeuronsFundAuditInfo = IDL.Record({ 'final_neurons_fund_participation' : IDL.Opt(NeuronsFundParticipation), @@ -697,7 +698,7 @@ export const idlFactory = ({ IDL }) => { 'Err' : GovernanceError, }); const ProposalInfo = IDL.Record({ - 'id' : IDL.Opt(NeuronId), + 'id' : IDL.Opt(ProposalId), 'status' : IDL.Int32, 'topic' : IDL.Int32, 'failure_reason' : IDL.Opt(GovernanceError), @@ -744,7 +745,7 @@ export const idlFactory = ({ IDL }) => { const ListProposalInfo = IDL.Record({ 'include_reward_status' : IDL.Vec(IDL.Int32), 'omit_large_fields' : IDL.Opt(IDL.Bool), - 'before_proposal' : IDL.Opt(NeuronId), + 'before_proposal' : IDL.Opt(ProposalId), 'limit' : IDL.Nat32, 'exclude_topic' : IDL.Vec(IDL.Int32), 'include_all_manage_neuron_proposals' : IDL.Opt(IDL.Bool), @@ -814,7 +815,7 @@ export const idlFactory = ({ IDL }) => { }); const MakeProposalResponse = IDL.Record({ 'message' : IDL.Opt(IDL.Text), - 'proposal_id' : IDL.Opt(NeuronId), + 'proposal_id' : IDL.Opt(ProposalId), }); const StakeMaturityResponse = IDL.Record({ 'maturity_e8s' : IDL.Nat64, @@ -1040,9 +1041,10 @@ export const init = ({ IDL }) => { 'SetDissolveTimestamp' : SetDissolveTimestamp, }); const Configure = IDL.Record({ 'operation' : IDL.Opt(Operation) }); + const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RegisterVote = IDL.Record({ 'vote' : IDL.Int32, - 'proposal' : IDL.Opt(NeuronId), + 'proposal' : IDL.Opt(ProposalId), }); const Merge = IDL.Record({ 'source_neuron_id' : IDL.Opt(NeuronId) }); const DisburseToNeuron = IDL.Record({ @@ -1428,7 +1430,7 @@ export const init = ({ IDL }) => { 'total_available_e8s_equivalent' : IDL.Nat64, 'latest_round_available_e8s_equivalent' : IDL.Opt(IDL.Nat64), 'distributed_e8s_equivalent' : IDL.Nat64, - 'settled_proposals' : IDL.Vec(NeuronId), + 'settled_proposals' : IDL.Vec(ProposalId), }); const NeuronStakeTransfer = IDL.Record({ 'to_subaccount' : IDL.Vec(IDL.Nat8), @@ -1531,7 +1533,7 @@ export const init = ({ IDL }) => { 'current_deadline_timestamp_seconds' : IDL.Nat64, }); const ProposalData = IDL.Record({ - 'id' : IDL.Opt(NeuronId), + 'id' : IDL.Opt(ProposalId), 'failure_reason' : IDL.Opt(GovernanceError), 'ballots' : IDL.Vec(IDL.Tuple(IDL.Nat64, Ballot)), 'proposal_timestamp_seconds' : IDL.Nat64, @@ -1568,7 +1570,7 @@ export const init = ({ IDL }) => { }); const BallotInfo = IDL.Record({ 'vote' : IDL.Int32, - 'proposal_id' : IDL.Opt(NeuronId), + 'proposal_id' : IDL.Opt(ProposalId), }); const DissolveState = IDL.Variant({ 'DissolveDelaySeconds' : IDL.Nat64, diff --git a/packages/nns/candid/sns_wasm.did b/packages/nns/candid/sns_wasm.did index 9a0d08c30..6d5c5639c 100644 --- a/packages/nns/candid/sns_wasm.did +++ b/packages/nns/candid/sns_wasm.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/nns/sns-wasm/canister/sns-wasm.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/nns/sns-wasm/canister/sns-wasm.did' by import-candid type AddWasmRequest = record { hash : blob; wasm : opt SnsWasm; diff --git a/packages/sns/candid/sns_governance.certified.idl.js b/packages/sns/candid/sns_governance.certified.idl.js index 12bad57ce..cab6d0531 100644 --- a/packages/sns/candid/sns_governance.certified.idl.js +++ b/packages/sns/candid/sns_governance.certified.idl.js @@ -1,5 +1,19 @@ /* Do not edit. Compiled with ./scripts/compile-idl-js from packages/sns/candid/sns_governance.did */ export const idlFactory = ({ IDL }) => { + const Version = IDL.Record({ + 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), + 'root_wasm_hash' : IDL.Vec(IDL.Nat8), + 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), + 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), + 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), + 'index_wasm_hash' : IDL.Vec(IDL.Nat8), + }); + const Versions = IDL.Record({ 'versions' : IDL.Vec(Version) }); + const CachedUpgradeSteps = IDL.Record({ + 'upgrade_steps' : IDL.Opt(Versions), + 'response_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'requested_timestamp_seconds' : IDL.Opt(IDL.Nat64), + }); const GenericNervousSystemFunction = IDL.Record({ 'validator_canister_id' : IDL.Opt(IDL.Principal), 'target_canister_id' : IDL.Opt(IDL.Principal), @@ -81,14 +95,6 @@ export const idlFactory = ({ IDL }) => { 'maturity_modulation_disabled' : IDL.Opt(IDL.Bool), 'max_number_of_principals_per_neuron' : IDL.Opt(IDL.Nat64), }); - const Version = IDL.Record({ - 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), - 'root_wasm_hash' : IDL.Vec(IDL.Nat8), - 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), - 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), - 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), - 'index_wasm_hash' : IDL.Vec(IDL.Nat8), - }); const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RewardEvent = IDL.Record({ 'rounds_since_last_distribution' : IDL.Opt(IDL.Nat64), @@ -357,6 +363,7 @@ export const idlFactory = ({ IDL }) => { }); const Governance = IDL.Record({ 'root_canister_id' : IDL.Opt(IDL.Principal), + 'cached_upgrade_steps' : IDL.Opt(CachedUpgradeSteps), 'id_to_nervous_system_functions' : IDL.Vec( IDL.Tuple(IDL.Nat64, NervousSystemFunction) ), @@ -374,8 +381,8 @@ export const idlFactory = ({ IDL }) => { 'proposals' : IDL.Vec(IDL.Tuple(IDL.Nat64, ProposalData)), 'in_flight_commands' : IDL.Vec(IDL.Tuple(IDL.Text, NeuronInFlightCommand)), 'sns_metadata' : IDL.Opt(ManageSnsMetadata), - 'migrated_root_wasm_memory_limit' : IDL.Opt(IDL.Bool), 'neurons' : IDL.Vec(IDL.Tuple(IDL.Text, Neuron)), + 'target_version' : IDL.Opt(Version), 'genesis_timestamp_seconds' : IDL.Nat64, }); const Principals = IDL.Record({ 'principals' : IDL.Vec(IDL.Principal) }); @@ -463,6 +470,12 @@ export const idlFactory = ({ IDL }) => { const GetSnsInitializationParametersResponse = IDL.Record({ 'sns_initialization_parameters' : IDL.Text, }); + const GetUpgradeJournalRequest = IDL.Record({}); + const GetUpgradeJournalResponse = IDL.Record({ + 'upgrade_steps' : IDL.Opt(Versions), + 'response_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'target_version' : IDL.Opt(Version), + }); const ListNervousSystemFunctionsResponse = IDL.Record({ 'reserved_ids' : IDL.Vec(IDL.Nat64), 'functions' : IDL.Vec(NervousSystemFunction), @@ -581,6 +594,11 @@ export const idlFactory = ({ IDL }) => { [GetSnsInitializationParametersResponse], [], ), + 'get_upgrade_journal' : IDL.Func( + [GetUpgradeJournalRequest], + [GetUpgradeJournalResponse], + [], + ), 'list_nervous_system_functions' : IDL.Func( [], [ListNervousSystemFunctionsResponse], @@ -593,6 +611,20 @@ export const idlFactory = ({ IDL }) => { }); }; export const init = ({ IDL }) => { + const Version = IDL.Record({ + 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), + 'root_wasm_hash' : IDL.Vec(IDL.Nat8), + 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), + 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), + 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), + 'index_wasm_hash' : IDL.Vec(IDL.Nat8), + }); + const Versions = IDL.Record({ 'versions' : IDL.Vec(Version) }); + const CachedUpgradeSteps = IDL.Record({ + 'upgrade_steps' : IDL.Opt(Versions), + 'response_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'requested_timestamp_seconds' : IDL.Opt(IDL.Nat64), + }); const GenericNervousSystemFunction = IDL.Record({ 'validator_canister_id' : IDL.Opt(IDL.Principal), 'target_canister_id' : IDL.Opt(IDL.Principal), @@ -674,14 +706,6 @@ export const init = ({ IDL }) => { 'maturity_modulation_disabled' : IDL.Opt(IDL.Bool), 'max_number_of_principals_per_neuron' : IDL.Opt(IDL.Nat64), }); - const Version = IDL.Record({ - 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), - 'root_wasm_hash' : IDL.Vec(IDL.Nat8), - 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), - 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), - 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), - 'index_wasm_hash' : IDL.Vec(IDL.Nat8), - }); const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RewardEvent = IDL.Record({ 'rounds_since_last_distribution' : IDL.Opt(IDL.Nat64), @@ -950,6 +974,7 @@ export const init = ({ IDL }) => { }); const Governance = IDL.Record({ 'root_canister_id' : IDL.Opt(IDL.Principal), + 'cached_upgrade_steps' : IDL.Opt(CachedUpgradeSteps), 'id_to_nervous_system_functions' : IDL.Vec( IDL.Tuple(IDL.Nat64, NervousSystemFunction) ), @@ -967,8 +992,8 @@ export const init = ({ IDL }) => { 'proposals' : IDL.Vec(IDL.Tuple(IDL.Nat64, ProposalData)), 'in_flight_commands' : IDL.Vec(IDL.Tuple(IDL.Text, NeuronInFlightCommand)), 'sns_metadata' : IDL.Opt(ManageSnsMetadata), - 'migrated_root_wasm_memory_limit' : IDL.Opt(IDL.Bool), 'neurons' : IDL.Vec(IDL.Tuple(IDL.Text, Neuron)), + 'target_version' : IDL.Opt(Version), 'genesis_timestamp_seconds' : IDL.Nat64, }); return [Governance]; diff --git a/packages/sns/candid/sns_governance.d.ts b/packages/sns/candid/sns_governance.d.ts index 6ee7849d7..146a5f918 100644 --- a/packages/sns/candid/sns_governance.d.ts +++ b/packages/sns/candid/sns_governance.d.ts @@ -44,6 +44,11 @@ export interface Ballot { voting_power: bigint; } export type By = { MemoAndController: MemoAndController } | { NeuronId: {} }; +export interface CachedUpgradeSteps { + upgrade_steps: [] | [Versions]; + response_timestamp_seconds: [] | [bigint]; + requested_timestamp_seconds: [] | [bigint]; +} export interface CanisterStatusResultV2 { status: CanisterStatusType; memory_size: bigint; @@ -217,8 +222,15 @@ export interface GetRunningSnsVersionResponse { export interface GetSnsInitializationParametersResponse { sns_initialization_parameters: string; } +export type GetUpgradeJournalRequest = {}; +export interface GetUpgradeJournalResponse { + upgrade_steps: [] | [Versions]; + response_timestamp_seconds: [] | [bigint]; + target_version: [] | [Version]; +} export interface Governance { root_canister_id: [] | [Principal]; + cached_upgrade_steps: [] | [CachedUpgradeSteps]; id_to_nervous_system_functions: Array<[bigint, NervousSystemFunction]>; metrics: [] | [GovernanceCachedMetrics]; maturity_modulation: [] | [MaturityModulation]; @@ -234,8 +246,8 @@ export interface Governance { proposals: Array<[bigint, ProposalData]>; in_flight_commands: Array<[string, NeuronInFlightCommand]>; sns_metadata: [] | [ManageSnsMetadata]; - migrated_root_wasm_memory_limit: [] | [boolean]; neurons: Array<[string, Neuron]>; + target_version: [] | [Version]; genesis_timestamp_seconds: bigint; } export interface GovernanceCachedMetrics { @@ -571,6 +583,9 @@ export interface Version { governance_wasm_hash: Uint8Array | number[]; index_wasm_hash: Uint8Array | number[]; } +export interface Versions { + versions: Array; +} export interface VotingRewardsParameters { final_reward_rate_basis_points: [] | [bigint]; initial_reward_rate_basis_points: [] | [bigint]; @@ -600,6 +615,10 @@ export interface _SERVICE { [{}], GetSnsInitializationParametersResponse >; + get_upgrade_journal: ActorMethod< + [GetUpgradeJournalRequest], + GetUpgradeJournalResponse + >; list_nervous_system_functions: ActorMethod< [], ListNervousSystemFunctionsResponse diff --git a/packages/sns/candid/sns_governance.did b/packages/sns/candid/sns_governance.did index 49d8f49db..072f7f83c 100644 --- a/packages/sns/candid/sns_governance.did +++ b/packages/sns/candid/sns_governance.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/sns/governance/canister/governance.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/sns/governance/canister/governance.did' by import-candid type Account = record { owner : opt principal; subaccount : opt Subaccount; @@ -265,6 +265,12 @@ type GetSnsInitializationParametersResponse = record { sns_initialization_parameters : text; }; +type CachedUpgradeSteps = record { + upgrade_steps : opt Versions; + requested_timestamp_seconds : opt nat64; + response_timestamp_seconds : opt nat64; +}; + type Governance = record { root_canister_id : opt principal; id_to_nervous_system_functions : vec record { nat64; NervousSystemFunction }; @@ -274,6 +280,7 @@ type Governance = record { parameters : opt NervousSystemParameters; is_finalizing_disburse_maturity : opt bool; deployed_version : opt Version; + cached_upgrade_steps : opt CachedUpgradeSteps; sns_initialization_parameters : text; latest_reward_event : opt RewardEvent; pending_version : opt UpgradeInProgress; @@ -284,7 +291,7 @@ type Governance = record { sns_metadata : opt ManageSnsMetadata; neurons : vec record { text; Neuron }; genesis_timestamp_seconds : nat64; - migrated_root_wasm_memory_limit : opt bool; + target_version: opt Version; }; type GovernanceCachedMetrics = record { @@ -689,6 +696,8 @@ type Version = record { index_wasm_hash : blob; }; +type Versions = record { versions : vec Version }; + type VotingRewardsParameters = record { final_reward_rate_basis_points : opt nat64; initial_reward_rate_basis_points : opt nat64; @@ -700,6 +709,14 @@ type WaitForQuietState = record { current_deadline_timestamp_seconds : nat64; }; +type GetUpgradeJournalRequest = record {}; + +type GetUpgradeJournalResponse = record { + upgrade_steps : opt Versions; + response_timestamp_seconds : opt nat64; + target_version : opt Version; +}; + service : (Governance) -> { claim_swap_neurons : (ClaimSwapNeuronsRequest) -> (ClaimSwapNeuronsResponse); fail_stuck_upgrade_in_progress : (record {}) -> (record {}); @@ -716,6 +733,7 @@ service : (Governance) -> { get_sns_initialization_parameters : (record {}) -> ( GetSnsInitializationParametersResponse, ) query; + get_upgrade_journal : (GetUpgradeJournalRequest) -> (GetUpgradeJournalResponse) query; list_nervous_system_functions : () -> ( ListNervousSystemFunctionsResponse, ) query; diff --git a/packages/sns/candid/sns_governance.idl.js b/packages/sns/candid/sns_governance.idl.js index 122e39cca..8d19e7275 100644 --- a/packages/sns/candid/sns_governance.idl.js +++ b/packages/sns/candid/sns_governance.idl.js @@ -1,5 +1,19 @@ /* Do not edit. Compiled with ./scripts/compile-idl-js from packages/sns/candid/sns_governance.did */ export const idlFactory = ({ IDL }) => { + const Version = IDL.Record({ + 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), + 'root_wasm_hash' : IDL.Vec(IDL.Nat8), + 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), + 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), + 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), + 'index_wasm_hash' : IDL.Vec(IDL.Nat8), + }); + const Versions = IDL.Record({ 'versions' : IDL.Vec(Version) }); + const CachedUpgradeSteps = IDL.Record({ + 'upgrade_steps' : IDL.Opt(Versions), + 'response_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'requested_timestamp_seconds' : IDL.Opt(IDL.Nat64), + }); const GenericNervousSystemFunction = IDL.Record({ 'validator_canister_id' : IDL.Opt(IDL.Principal), 'target_canister_id' : IDL.Opt(IDL.Principal), @@ -81,14 +95,6 @@ export const idlFactory = ({ IDL }) => { 'maturity_modulation_disabled' : IDL.Opt(IDL.Bool), 'max_number_of_principals_per_neuron' : IDL.Opt(IDL.Nat64), }); - const Version = IDL.Record({ - 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), - 'root_wasm_hash' : IDL.Vec(IDL.Nat8), - 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), - 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), - 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), - 'index_wasm_hash' : IDL.Vec(IDL.Nat8), - }); const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RewardEvent = IDL.Record({ 'rounds_since_last_distribution' : IDL.Opt(IDL.Nat64), @@ -357,6 +363,7 @@ export const idlFactory = ({ IDL }) => { }); const Governance = IDL.Record({ 'root_canister_id' : IDL.Opt(IDL.Principal), + 'cached_upgrade_steps' : IDL.Opt(CachedUpgradeSteps), 'id_to_nervous_system_functions' : IDL.Vec( IDL.Tuple(IDL.Nat64, NervousSystemFunction) ), @@ -374,8 +381,8 @@ export const idlFactory = ({ IDL }) => { 'proposals' : IDL.Vec(IDL.Tuple(IDL.Nat64, ProposalData)), 'in_flight_commands' : IDL.Vec(IDL.Tuple(IDL.Text, NeuronInFlightCommand)), 'sns_metadata' : IDL.Opt(ManageSnsMetadata), - 'migrated_root_wasm_memory_limit' : IDL.Opt(IDL.Bool), 'neurons' : IDL.Vec(IDL.Tuple(IDL.Text, Neuron)), + 'target_version' : IDL.Opt(Version), 'genesis_timestamp_seconds' : IDL.Nat64, }); const Principals = IDL.Record({ 'principals' : IDL.Vec(IDL.Principal) }); @@ -463,6 +470,12 @@ export const idlFactory = ({ IDL }) => { const GetSnsInitializationParametersResponse = IDL.Record({ 'sns_initialization_parameters' : IDL.Text, }); + const GetUpgradeJournalRequest = IDL.Record({}); + const GetUpgradeJournalResponse = IDL.Record({ + 'upgrade_steps' : IDL.Opt(Versions), + 'response_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'target_version' : IDL.Opt(Version), + }); const ListNervousSystemFunctionsResponse = IDL.Record({ 'reserved_ids' : IDL.Vec(IDL.Nat64), 'functions' : IDL.Vec(NervousSystemFunction), @@ -585,6 +598,11 @@ export const idlFactory = ({ IDL }) => { [GetSnsInitializationParametersResponse], ['query'], ), + 'get_upgrade_journal' : IDL.Func( + [GetUpgradeJournalRequest], + [GetUpgradeJournalResponse], + ['query'], + ), 'list_nervous_system_functions' : IDL.Func( [], [ListNervousSystemFunctionsResponse], @@ -601,6 +619,20 @@ export const idlFactory = ({ IDL }) => { }); }; export const init = ({ IDL }) => { + const Version = IDL.Record({ + 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), + 'root_wasm_hash' : IDL.Vec(IDL.Nat8), + 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), + 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), + 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), + 'index_wasm_hash' : IDL.Vec(IDL.Nat8), + }); + const Versions = IDL.Record({ 'versions' : IDL.Vec(Version) }); + const CachedUpgradeSteps = IDL.Record({ + 'upgrade_steps' : IDL.Opt(Versions), + 'response_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'requested_timestamp_seconds' : IDL.Opt(IDL.Nat64), + }); const GenericNervousSystemFunction = IDL.Record({ 'validator_canister_id' : IDL.Opt(IDL.Principal), 'target_canister_id' : IDL.Opt(IDL.Principal), @@ -682,14 +714,6 @@ export const init = ({ IDL }) => { 'maturity_modulation_disabled' : IDL.Opt(IDL.Bool), 'max_number_of_principals_per_neuron' : IDL.Opt(IDL.Nat64), }); - const Version = IDL.Record({ - 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), - 'root_wasm_hash' : IDL.Vec(IDL.Nat8), - 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), - 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), - 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), - 'index_wasm_hash' : IDL.Vec(IDL.Nat8), - }); const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RewardEvent = IDL.Record({ 'rounds_since_last_distribution' : IDL.Opt(IDL.Nat64), @@ -958,6 +982,7 @@ export const init = ({ IDL }) => { }); const Governance = IDL.Record({ 'root_canister_id' : IDL.Opt(IDL.Principal), + 'cached_upgrade_steps' : IDL.Opt(CachedUpgradeSteps), 'id_to_nervous_system_functions' : IDL.Vec( IDL.Tuple(IDL.Nat64, NervousSystemFunction) ), @@ -975,8 +1000,8 @@ export const init = ({ IDL }) => { 'proposals' : IDL.Vec(IDL.Tuple(IDL.Nat64, ProposalData)), 'in_flight_commands' : IDL.Vec(IDL.Tuple(IDL.Text, NeuronInFlightCommand)), 'sns_metadata' : IDL.Opt(ManageSnsMetadata), - 'migrated_root_wasm_memory_limit' : IDL.Opt(IDL.Bool), 'neurons' : IDL.Vec(IDL.Tuple(IDL.Text, Neuron)), + 'target_version' : IDL.Opt(Version), 'genesis_timestamp_seconds' : IDL.Nat64, }); return [Governance]; diff --git a/packages/sns/candid/sns_governance_test.certified.idl.js b/packages/sns/candid/sns_governance_test.certified.idl.js index dcf43356d..5d2e21dab 100644 --- a/packages/sns/candid/sns_governance_test.certified.idl.js +++ b/packages/sns/candid/sns_governance_test.certified.idl.js @@ -1,5 +1,19 @@ /* Do not edit. Compiled with ./scripts/compile-idl-js from packages/sns/candid/sns_governance_test.did */ export const idlFactory = ({ IDL }) => { + const Version = IDL.Record({ + 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), + 'root_wasm_hash' : IDL.Vec(IDL.Nat8), + 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), + 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), + 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), + 'index_wasm_hash' : IDL.Vec(IDL.Nat8), + }); + const Versions = IDL.Record({ 'versions' : IDL.Vec(Version) }); + const CachedUpgradeSteps = IDL.Record({ + 'upgrade_steps' : IDL.Opt(Versions), + 'response_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'requested_timestamp_seconds' : IDL.Opt(IDL.Nat64), + }); const GenericNervousSystemFunction = IDL.Record({ 'validator_canister_id' : IDL.Opt(IDL.Principal), 'target_canister_id' : IDL.Opt(IDL.Principal), @@ -81,14 +95,6 @@ export const idlFactory = ({ IDL }) => { 'maturity_modulation_disabled' : IDL.Opt(IDL.Bool), 'max_number_of_principals_per_neuron' : IDL.Opt(IDL.Nat64), }); - const Version = IDL.Record({ - 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), - 'root_wasm_hash' : IDL.Vec(IDL.Nat8), - 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), - 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), - 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), - 'index_wasm_hash' : IDL.Vec(IDL.Nat8), - }); const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RewardEvent = IDL.Record({ 'rounds_since_last_distribution' : IDL.Opt(IDL.Nat64), @@ -357,6 +363,7 @@ export const idlFactory = ({ IDL }) => { }); const Governance = IDL.Record({ 'root_canister_id' : IDL.Opt(IDL.Principal), + 'cached_upgrade_steps' : IDL.Opt(CachedUpgradeSteps), 'id_to_nervous_system_functions' : IDL.Vec( IDL.Tuple(IDL.Nat64, NervousSystemFunction) ), @@ -374,8 +381,8 @@ export const idlFactory = ({ IDL }) => { 'proposals' : IDL.Vec(IDL.Tuple(IDL.Nat64, ProposalData)), 'in_flight_commands' : IDL.Vec(IDL.Tuple(IDL.Text, NeuronInFlightCommand)), 'sns_metadata' : IDL.Opt(ManageSnsMetadata), - 'migrated_root_wasm_memory_limit' : IDL.Opt(IDL.Bool), 'neurons' : IDL.Vec(IDL.Tuple(IDL.Text, Neuron)), + 'target_version' : IDL.Opt(Version), 'genesis_timestamp_seconds' : IDL.Nat64, }); const AddMaturityRequest = IDL.Record({ @@ -385,6 +392,10 @@ export const idlFactory = ({ IDL }) => { const AddMaturityResponse = IDL.Record({ 'new_maturity_e8s' : IDL.Opt(IDL.Nat64), }); + const AdvanceTargetVersionRequest = IDL.Record({ + 'target_version' : IDL.Opt(Version), + }); + const AdvanceTargetVersionResponse = IDL.Record({}); const Principals = IDL.Record({ 'principals' : IDL.Vec(IDL.Principal) }); const NeuronsFund = IDL.Record({ 'nns_neuron_hotkeys' : IDL.Opt(Principals), @@ -470,6 +481,12 @@ export const idlFactory = ({ IDL }) => { const GetSnsInitializationParametersResponse = IDL.Record({ 'sns_initialization_parameters' : IDL.Text, }); + const GetUpgradeJournalRequest = IDL.Record({}); + const GetUpgradeJournalResponse = IDL.Record({ + 'upgrade_steps' : IDL.Opt(Versions), + 'response_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'target_version' : IDL.Opt(Version), + }); const ListNervousSystemFunctionsResponse = IDL.Record({ 'reserved_ids' : IDL.Vec(IDL.Nat64), 'functions' : IDL.Vec(NervousSystemFunction), @@ -552,6 +569,11 @@ export const idlFactory = ({ IDL }) => { const SetMode = IDL.Record({ 'mode' : IDL.Int32 }); return IDL.Service({ 'add_maturity' : IDL.Func([AddMaturityRequest], [AddMaturityResponse], []), + 'advance_target_version' : IDL.Func( + [AdvanceTargetVersionRequest], + [AdvanceTargetVersionResponse], + [], + ), 'claim_swap_neurons' : IDL.Func( [ClaimSwapNeuronsRequest], [ClaimSwapNeuronsResponse], @@ -593,6 +615,11 @@ export const idlFactory = ({ IDL }) => { [GetSnsInitializationParametersResponse], [], ), + 'get_upgrade_journal' : IDL.Func( + [GetUpgradeJournalRequest], + [GetUpgradeJournalResponse], + [], + ), 'list_nervous_system_functions' : IDL.Func( [], [ListNervousSystemFunctionsResponse], @@ -607,6 +634,20 @@ export const idlFactory = ({ IDL }) => { }); }; export const init = ({ IDL }) => { + const Version = IDL.Record({ + 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), + 'root_wasm_hash' : IDL.Vec(IDL.Nat8), + 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), + 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), + 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), + 'index_wasm_hash' : IDL.Vec(IDL.Nat8), + }); + const Versions = IDL.Record({ 'versions' : IDL.Vec(Version) }); + const CachedUpgradeSteps = IDL.Record({ + 'upgrade_steps' : IDL.Opt(Versions), + 'response_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'requested_timestamp_seconds' : IDL.Opt(IDL.Nat64), + }); const GenericNervousSystemFunction = IDL.Record({ 'validator_canister_id' : IDL.Opt(IDL.Principal), 'target_canister_id' : IDL.Opt(IDL.Principal), @@ -688,14 +729,6 @@ export const init = ({ IDL }) => { 'maturity_modulation_disabled' : IDL.Opt(IDL.Bool), 'max_number_of_principals_per_neuron' : IDL.Opt(IDL.Nat64), }); - const Version = IDL.Record({ - 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), - 'root_wasm_hash' : IDL.Vec(IDL.Nat8), - 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), - 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), - 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), - 'index_wasm_hash' : IDL.Vec(IDL.Nat8), - }); const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RewardEvent = IDL.Record({ 'rounds_since_last_distribution' : IDL.Opt(IDL.Nat64), @@ -964,6 +997,7 @@ export const init = ({ IDL }) => { }); const Governance = IDL.Record({ 'root_canister_id' : IDL.Opt(IDL.Principal), + 'cached_upgrade_steps' : IDL.Opt(CachedUpgradeSteps), 'id_to_nervous_system_functions' : IDL.Vec( IDL.Tuple(IDL.Nat64, NervousSystemFunction) ), @@ -981,8 +1015,8 @@ export const init = ({ IDL }) => { 'proposals' : IDL.Vec(IDL.Tuple(IDL.Nat64, ProposalData)), 'in_flight_commands' : IDL.Vec(IDL.Tuple(IDL.Text, NeuronInFlightCommand)), 'sns_metadata' : IDL.Opt(ManageSnsMetadata), - 'migrated_root_wasm_memory_limit' : IDL.Opt(IDL.Bool), 'neurons' : IDL.Vec(IDL.Tuple(IDL.Text, Neuron)), + 'target_version' : IDL.Opt(Version), 'genesis_timestamp_seconds' : IDL.Nat64, }); return [Governance]; diff --git a/packages/sns/candid/sns_governance_test.d.ts b/packages/sns/candid/sns_governance_test.d.ts index 4512ac115..47e847b4d 100644 --- a/packages/sns/candid/sns_governance_test.d.ts +++ b/packages/sns/candid/sns_governance_test.d.ts @@ -42,6 +42,10 @@ export interface AddNeuronPermissions { permissions_to_add: [] | [NeuronPermissionList]; principal_id: [] | [Principal]; } +export interface AdvanceTargetVersionRequest { + target_version: [] | [Version]; +} +export type AdvanceTargetVersionResponse = {}; export interface Amount { e8s: bigint; } @@ -51,6 +55,11 @@ export interface Ballot { voting_power: bigint; } export type By = { MemoAndController: MemoAndController } | { NeuronId: {} }; +export interface CachedUpgradeSteps { + upgrade_steps: [] | [Versions]; + response_timestamp_seconds: [] | [bigint]; + requested_timestamp_seconds: [] | [bigint]; +} export interface CanisterStatusResultV2 { status: CanisterStatusType; memory_size: bigint; @@ -224,8 +233,15 @@ export interface GetRunningSnsVersionResponse { export interface GetSnsInitializationParametersResponse { sns_initialization_parameters: string; } +export type GetUpgradeJournalRequest = {}; +export interface GetUpgradeJournalResponse { + upgrade_steps: [] | [Versions]; + response_timestamp_seconds: [] | [bigint]; + target_version: [] | [Version]; +} export interface Governance { root_canister_id: [] | [Principal]; + cached_upgrade_steps: [] | [CachedUpgradeSteps]; id_to_nervous_system_functions: Array<[bigint, NervousSystemFunction]>; metrics: [] | [GovernanceCachedMetrics]; maturity_modulation: [] | [MaturityModulation]; @@ -241,8 +257,8 @@ export interface Governance { proposals: Array<[bigint, ProposalData]>; in_flight_commands: Array<[string, NeuronInFlightCommand]>; sns_metadata: [] | [ManageSnsMetadata]; - migrated_root_wasm_memory_limit: [] | [boolean]; neurons: Array<[string, Neuron]>; + target_version: [] | [Version]; genesis_timestamp_seconds: bigint; } export interface GovernanceCachedMetrics { @@ -582,6 +598,9 @@ export interface Version { governance_wasm_hash: Uint8Array | number[]; index_wasm_hash: Uint8Array | number[]; } +export interface Versions { + versions: Array; +} export interface VotingRewardsParameters { final_reward_rate_basis_points: [] | [bigint]; initial_reward_rate_basis_points: [] | [bigint]; @@ -593,6 +612,10 @@ export interface WaitForQuietState { } export interface _SERVICE { add_maturity: ActorMethod<[AddMaturityRequest], AddMaturityResponse>; + advance_target_version: ActorMethod< + [AdvanceTargetVersionRequest], + AdvanceTargetVersionResponse + >; claim_swap_neurons: ActorMethod< [ClaimSwapNeuronsRequest], ClaimSwapNeuronsResponse @@ -612,6 +635,10 @@ export interface _SERVICE { [{}], GetSnsInitializationParametersResponse >; + get_upgrade_journal: ActorMethod< + [GetUpgradeJournalRequest], + GetUpgradeJournalResponse + >; list_nervous_system_functions: ActorMethod< [], ListNervousSystemFunctionsResponse diff --git a/packages/sns/candid/sns_governance_test.did b/packages/sns/candid/sns_governance_test.did index 46066af29..092437a4f 100644 --- a/packages/sns/candid/sns_governance_test.did +++ b/packages/sns/candid/sns_governance_test.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/sns/governance/canister/governance_test.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/sns/governance/canister/governance_test.did' by import-candid type Account = record { owner : opt principal; subaccount : opt Subaccount; @@ -274,6 +274,12 @@ type GetSnsInitializationParametersResponse = record { sns_initialization_parameters : text; }; +type CachedUpgradeSteps = record { + upgrade_steps : opt Versions; + requested_timestamp_seconds : opt nat64; + response_timestamp_seconds : opt nat64; +}; + type Governance = record { root_canister_id : opt principal; id_to_nervous_system_functions : vec record { nat64; NervousSystemFunction }; @@ -283,6 +289,7 @@ type Governance = record { parameters : opt NervousSystemParameters; is_finalizing_disburse_maturity : opt bool; deployed_version : opt Version; + cached_upgrade_steps : opt CachedUpgradeSteps; sns_initialization_parameters : text; latest_reward_event : opt RewardEvent; pending_version : opt UpgradeInProgress; @@ -293,7 +300,7 @@ type Governance = record { sns_metadata : opt ManageSnsMetadata; neurons : vec record { text; Neuron }; genesis_timestamp_seconds : nat64; - migrated_root_wasm_memory_limit : opt bool; + target_version: opt Version; }; type GovernanceCachedMetrics = record { @@ -703,6 +710,8 @@ type Version = record { index_wasm_hash : blob; }; +type Versions = record { versions : vec Version }; + type VotingRewardsParameters = record { final_reward_rate_basis_points : opt nat64; initial_reward_rate_basis_points : opt nat64; @@ -714,6 +723,17 @@ type WaitForQuietState = record { current_deadline_timestamp_seconds : nat64; }; +type GetUpgradeJournalRequest = record {}; + +type GetUpgradeJournalResponse = record { + upgrade_steps : opt Versions; + response_timestamp_seconds : opt nat64; + target_version : opt Version; +}; + +type AdvanceTargetVersionRequest = record { target_version : opt Version; }; +type AdvanceTargetVersionResponse = record {}; + service : (Governance) -> { add_maturity : (AddMaturityRequest) -> (AddMaturityResponse); claim_swap_neurons : (ClaimSwapNeuronsRequest) -> (ClaimSwapNeuronsResponse); @@ -731,6 +751,7 @@ service : (Governance) -> { get_sns_initialization_parameters : (record {}) -> ( GetSnsInitializationParametersResponse, ) query; + get_upgrade_journal : (GetUpgradeJournalRequest) -> (GetUpgradeJournalResponse) query; list_nervous_system_functions : () -> ( ListNervousSystemFunctionsResponse, ) query; @@ -740,4 +761,5 @@ service : (Governance) -> { mint_tokens : (MintTokensRequest) -> (record {}); set_mode : (SetMode) -> (record {}); update_neuron : (Neuron) -> (opt GovernanceError); + advance_target_version : (AdvanceTargetVersionRequest) -> (AdvanceTargetVersionResponse); } diff --git a/packages/sns/candid/sns_governance_test.idl.js b/packages/sns/candid/sns_governance_test.idl.js index aa1a91473..70e98d54d 100644 --- a/packages/sns/candid/sns_governance_test.idl.js +++ b/packages/sns/candid/sns_governance_test.idl.js @@ -1,5 +1,19 @@ /* Do not edit. Compiled with ./scripts/compile-idl-js from packages/sns/candid/sns_governance_test.did */ export const idlFactory = ({ IDL }) => { + const Version = IDL.Record({ + 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), + 'root_wasm_hash' : IDL.Vec(IDL.Nat8), + 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), + 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), + 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), + 'index_wasm_hash' : IDL.Vec(IDL.Nat8), + }); + const Versions = IDL.Record({ 'versions' : IDL.Vec(Version) }); + const CachedUpgradeSteps = IDL.Record({ + 'upgrade_steps' : IDL.Opt(Versions), + 'response_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'requested_timestamp_seconds' : IDL.Opt(IDL.Nat64), + }); const GenericNervousSystemFunction = IDL.Record({ 'validator_canister_id' : IDL.Opt(IDL.Principal), 'target_canister_id' : IDL.Opt(IDL.Principal), @@ -81,14 +95,6 @@ export const idlFactory = ({ IDL }) => { 'maturity_modulation_disabled' : IDL.Opt(IDL.Bool), 'max_number_of_principals_per_neuron' : IDL.Opt(IDL.Nat64), }); - const Version = IDL.Record({ - 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), - 'root_wasm_hash' : IDL.Vec(IDL.Nat8), - 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), - 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), - 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), - 'index_wasm_hash' : IDL.Vec(IDL.Nat8), - }); const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RewardEvent = IDL.Record({ 'rounds_since_last_distribution' : IDL.Opt(IDL.Nat64), @@ -357,6 +363,7 @@ export const idlFactory = ({ IDL }) => { }); const Governance = IDL.Record({ 'root_canister_id' : IDL.Opt(IDL.Principal), + 'cached_upgrade_steps' : IDL.Opt(CachedUpgradeSteps), 'id_to_nervous_system_functions' : IDL.Vec( IDL.Tuple(IDL.Nat64, NervousSystemFunction) ), @@ -374,8 +381,8 @@ export const idlFactory = ({ IDL }) => { 'proposals' : IDL.Vec(IDL.Tuple(IDL.Nat64, ProposalData)), 'in_flight_commands' : IDL.Vec(IDL.Tuple(IDL.Text, NeuronInFlightCommand)), 'sns_metadata' : IDL.Opt(ManageSnsMetadata), - 'migrated_root_wasm_memory_limit' : IDL.Opt(IDL.Bool), 'neurons' : IDL.Vec(IDL.Tuple(IDL.Text, Neuron)), + 'target_version' : IDL.Opt(Version), 'genesis_timestamp_seconds' : IDL.Nat64, }); const AddMaturityRequest = IDL.Record({ @@ -385,6 +392,10 @@ export const idlFactory = ({ IDL }) => { const AddMaturityResponse = IDL.Record({ 'new_maturity_e8s' : IDL.Opt(IDL.Nat64), }); + const AdvanceTargetVersionRequest = IDL.Record({ + 'target_version' : IDL.Opt(Version), + }); + const AdvanceTargetVersionResponse = IDL.Record({}); const Principals = IDL.Record({ 'principals' : IDL.Vec(IDL.Principal) }); const NeuronsFund = IDL.Record({ 'nns_neuron_hotkeys' : IDL.Opt(Principals), @@ -470,6 +481,12 @@ export const idlFactory = ({ IDL }) => { const GetSnsInitializationParametersResponse = IDL.Record({ 'sns_initialization_parameters' : IDL.Text, }); + const GetUpgradeJournalRequest = IDL.Record({}); + const GetUpgradeJournalResponse = IDL.Record({ + 'upgrade_steps' : IDL.Opt(Versions), + 'response_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'target_version' : IDL.Opt(Version), + }); const ListNervousSystemFunctionsResponse = IDL.Record({ 'reserved_ids' : IDL.Vec(IDL.Nat64), 'functions' : IDL.Vec(NervousSystemFunction), @@ -552,6 +569,11 @@ export const idlFactory = ({ IDL }) => { const SetMode = IDL.Record({ 'mode' : IDL.Int32 }); return IDL.Service({ 'add_maturity' : IDL.Func([AddMaturityRequest], [AddMaturityResponse], []), + 'advance_target_version' : IDL.Func( + [AdvanceTargetVersionRequest], + [AdvanceTargetVersionResponse], + [], + ), 'claim_swap_neurons' : IDL.Func( [ClaimSwapNeuronsRequest], [ClaimSwapNeuronsResponse], @@ -597,6 +619,11 @@ export const idlFactory = ({ IDL }) => { [GetSnsInitializationParametersResponse], ['query'], ), + 'get_upgrade_journal' : IDL.Func( + [GetUpgradeJournalRequest], + [GetUpgradeJournalResponse], + ['query'], + ), 'list_nervous_system_functions' : IDL.Func( [], [ListNervousSystemFunctionsResponse], @@ -615,6 +642,20 @@ export const idlFactory = ({ IDL }) => { }); }; export const init = ({ IDL }) => { + const Version = IDL.Record({ + 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), + 'root_wasm_hash' : IDL.Vec(IDL.Nat8), + 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), + 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), + 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), + 'index_wasm_hash' : IDL.Vec(IDL.Nat8), + }); + const Versions = IDL.Record({ 'versions' : IDL.Vec(Version) }); + const CachedUpgradeSteps = IDL.Record({ + 'upgrade_steps' : IDL.Opt(Versions), + 'response_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'requested_timestamp_seconds' : IDL.Opt(IDL.Nat64), + }); const GenericNervousSystemFunction = IDL.Record({ 'validator_canister_id' : IDL.Opt(IDL.Principal), 'target_canister_id' : IDL.Opt(IDL.Principal), @@ -696,14 +737,6 @@ export const init = ({ IDL }) => { 'maturity_modulation_disabled' : IDL.Opt(IDL.Bool), 'max_number_of_principals_per_neuron' : IDL.Opt(IDL.Nat64), }); - const Version = IDL.Record({ - 'archive_wasm_hash' : IDL.Vec(IDL.Nat8), - 'root_wasm_hash' : IDL.Vec(IDL.Nat8), - 'swap_wasm_hash' : IDL.Vec(IDL.Nat8), - 'ledger_wasm_hash' : IDL.Vec(IDL.Nat8), - 'governance_wasm_hash' : IDL.Vec(IDL.Nat8), - 'index_wasm_hash' : IDL.Vec(IDL.Nat8), - }); const ProposalId = IDL.Record({ 'id' : IDL.Nat64 }); const RewardEvent = IDL.Record({ 'rounds_since_last_distribution' : IDL.Opt(IDL.Nat64), @@ -972,6 +1005,7 @@ export const init = ({ IDL }) => { }); const Governance = IDL.Record({ 'root_canister_id' : IDL.Opt(IDL.Principal), + 'cached_upgrade_steps' : IDL.Opt(CachedUpgradeSteps), 'id_to_nervous_system_functions' : IDL.Vec( IDL.Tuple(IDL.Nat64, NervousSystemFunction) ), @@ -989,8 +1023,8 @@ export const init = ({ IDL }) => { 'proposals' : IDL.Vec(IDL.Tuple(IDL.Nat64, ProposalData)), 'in_flight_commands' : IDL.Vec(IDL.Tuple(IDL.Text, NeuronInFlightCommand)), 'sns_metadata' : IDL.Opt(ManageSnsMetadata), - 'migrated_root_wasm_memory_limit' : IDL.Opt(IDL.Bool), 'neurons' : IDL.Vec(IDL.Tuple(IDL.Text, Neuron)), + 'target_version' : IDL.Opt(Version), 'genesis_timestamp_seconds' : IDL.Nat64, }); return [Governance]; diff --git a/packages/sns/candid/sns_root.did b/packages/sns/candid/sns_root.did index 694d72564..4f1c12ec3 100644 --- a/packages/sns/candid/sns_root.did +++ b/packages/sns/candid/sns_root.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/sns/root/canister/root.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/sns/root/canister/root.did' by import-candid type CanisterCallError = record { code : opt int32; description : text; diff --git a/packages/sns/candid/sns_swap.certified.idl.js b/packages/sns/candid/sns_swap.certified.idl.js index b7e40fb30..f1cc56eda 100644 --- a/packages/sns/candid/sns_swap.certified.idl.js +++ b/packages/sns/candid/sns_swap.certified.idl.js @@ -246,6 +246,11 @@ export const idlFactory = ({ IDL }) => { 'neuron_attributes' : IDL.Opt(NeuronAttributes), 'investor' : IDL.Opt(Investor), }); + const Timers = IDL.Record({ + 'last_spawned_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'last_reset_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'requires_periodic_tasks' : IDL.Opt(IDL.Bool), + }); const CfNeuron = IDL.Record({ 'has_created_neuron_recipes' : IDL.Opt(IDL.Bool), 'hotkeys' : IDL.Opt(Principals), @@ -263,6 +268,7 @@ export const idlFactory = ({ IDL }) => { 'next_ticket_id' : IDL.Opt(IDL.Nat64), 'decentralization_sale_open_timestamp_seconds' : IDL.Opt(IDL.Nat64), 'finalize_swap_in_progress' : IDL.Opt(IDL.Bool), + 'timers' : IDL.Opt(Timers), 'cf_participants' : IDL.Vec(CfParticipant), 'init' : IDL.Opt(Init), 'already_tried_to_auto_finalize' : IDL.Opt(IDL.Bool), @@ -406,6 +412,7 @@ export const idlFactory = ({ IDL }) => { [RefreshBuyerTokensResponse], [], ), + 'reset_timers' : IDL.Func([IDL.Record({})], [IDL.Record({})], []), }); }; export const init = ({ IDL }) => { diff --git a/packages/sns/candid/sns_swap.d.ts b/packages/sns/candid/sns_swap.d.ts index 928159b2c..7297fb1cc 100644 --- a/packages/sns/candid/sns_swap.d.ts +++ b/packages/sns/candid/sns_swap.d.ts @@ -325,6 +325,7 @@ export interface Swap { next_ticket_id: [] | [bigint]; decentralization_sale_open_timestamp_seconds: [] | [bigint]; finalize_swap_in_progress: [] | [boolean]; + timers: [] | [Timers]; cf_participants: Array; init: [] | [Init]; already_tried_to_auto_finalize: [] | [boolean]; @@ -351,6 +352,11 @@ export interface Ticket { account: [] | [Icrc1Account]; amount_icp_e8s: bigint; } +export interface Timers { + last_spawned_timestamp_seconds: [] | [bigint]; + last_reset_timestamp_seconds: [] | [bigint]; + requires_periodic_tasks: [] | [boolean]; +} export interface TransferableAmount { transfer_fee_paid_e8s: [] | [bigint]; transfer_start_timestamp_seconds: bigint; @@ -395,6 +401,7 @@ export interface _SERVICE { [RefreshBuyerTokensRequest], RefreshBuyerTokensResponse >; + reset_timers: ActorMethod<[{}], {}>; } export declare const idlFactory: IDL.InterfaceFactory; export declare const init: (args: { IDL: typeof IDL }) => IDL.Type[]; diff --git a/packages/sns/candid/sns_swap.did b/packages/sns/candid/sns_swap.did index 8b49e6ac0..89fd17196 100644 --- a/packages/sns/candid/sns_swap.did +++ b/packages/sns/candid/sns_swap.did @@ -1,4 +1,4 @@ -// Generated from IC repo commit c43a488 (2024-09-27 tags: release-2024-09-26_01-31-no-canister-snapshots) 'rs/sns/swap/canister/swap.did' by import-candid +// Generated from IC repo commit 3c76b91 (2024-10-17 tags: release-2024-10-17_03-07-scheduler-changes-guestos-revert) 'rs/sns/swap/canister/swap.did' by import-candid type BuyerState = record { icp : opt TransferableAmount; has_created_neuron_recipes : opt bool; @@ -413,6 +413,13 @@ type Swap = record { buyers : vec record { text; BuyerState }; params : opt Params; open_sns_token_swap_proposal_id : opt nat64; + timers : opt Timers; +}; + +type Timers = record { + requires_periodic_tasks : opt bool; + last_reset_timestamp_seconds : opt nat64; + last_spawned_timestamp_seconds : opt nat64; }; type SweepResult = record { @@ -467,4 +474,5 @@ service : (Init) -> { refresh_buyer_tokens : (RefreshBuyerTokensRequest) -> ( RefreshBuyerTokensResponse, ); + reset_timers : (record {}) -> (record {}); } diff --git a/packages/sns/candid/sns_swap.idl.js b/packages/sns/candid/sns_swap.idl.js index 245b4c647..c955b23f4 100644 --- a/packages/sns/candid/sns_swap.idl.js +++ b/packages/sns/candid/sns_swap.idl.js @@ -246,6 +246,11 @@ export const idlFactory = ({ IDL }) => { 'neuron_attributes' : IDL.Opt(NeuronAttributes), 'investor' : IDL.Opt(Investor), }); + const Timers = IDL.Record({ + 'last_spawned_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'last_reset_timestamp_seconds' : IDL.Opt(IDL.Nat64), + 'requires_periodic_tasks' : IDL.Opt(IDL.Bool), + }); const CfNeuron = IDL.Record({ 'has_created_neuron_recipes' : IDL.Opt(IDL.Bool), 'hotkeys' : IDL.Opt(Principals), @@ -263,6 +268,7 @@ export const idlFactory = ({ IDL }) => { 'next_ticket_id' : IDL.Opt(IDL.Nat64), 'decentralization_sale_open_timestamp_seconds' : IDL.Opt(IDL.Nat64), 'finalize_swap_in_progress' : IDL.Opt(IDL.Bool), + 'timers' : IDL.Opt(Timers), 'cf_participants' : IDL.Vec(CfParticipant), 'init' : IDL.Opt(Init), 'already_tried_to_auto_finalize' : IDL.Opt(IDL.Bool), @@ -414,6 +420,7 @@ export const idlFactory = ({ IDL }) => { [RefreshBuyerTokensResponse], [], ), + 'reset_timers' : IDL.Func([IDL.Record({})], [IDL.Record({})], []), }); }; export const init = ({ IDL }) => {