Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -393,8 +393,10 @@ Changed the text in this case to read:

### Replica

Updated replica to elected commit 6de9963fdc752394475149a9659d42f01ab8b0d3.
This incorporates the following executed proposals:
Updated replica to release candidate at commit 9173c5f1b28e140931060b90e9de65b923ee57e6.
This release candidate has not yet been elected.

This also incorporates the following executed proposals:

* [81788](https://dashboard.internetcomputer.org/proposal/81788)
* [81571](https://dashboard.internetcomputer.org/proposal/81571)
Expand Down
Binary file modified e2e/assets/ledger/cycles-minting-canister.wasm
Binary file not shown.
Binary file modified e2e/assets/ledger/genesis-token-canister.wasm
Binary file not shown.
Binary file modified e2e/assets/ledger/governance-canister.wasm
Binary file not shown.
Binary file modified e2e/assets/ledger/governance-canister_test.wasm
Binary file not shown.
30 changes: 30 additions & 0 deletions e2e/assets/ledger/governance.did
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,15 @@ type By = variant {
MemoAndController : ClaimOrRefreshNeuronFromAccount;
Memo : nat64;
};
type CfNeuron = record { nns_neuron_id : nat64; amount_icp_e8s : nat64 };
type CfParticipant = record {
hotkey_principal : text;
cf_neurons : vec CfNeuron;
};
type Change = variant { ToRemove : NodeProvider; ToAdd : NodeProvider };
type ChangeAutoStakeMaturity = record {
requested_setting_for_auto_stake_maturity : bool;
};
type ClaimOrRefresh = record { by : opt By };
type ClaimOrRefreshNeuronFromAccount = record {
controller : opt principal;
Expand All @@ -42,6 +50,7 @@ type Command = variant {
Merge : Merge;
DisburseToNeuron : DisburseToNeuron;
MakeProposal : Proposal;
StakeMaturity : StakeMaturity;
MergeMaturity : MergeMaturity;
Disburse : Disburse;
};
Expand All @@ -56,6 +65,7 @@ type Command_1 = variant {
Merge : record {};
DisburseToNeuron : SpawnResponse;
MakeProposal : MakeProposalResponse;
StakeMaturity : StakeMaturityResponse;
MergeMaturity : MergeMaturityResponse;
Disburse : DisburseResponse;
};
Expand All @@ -65,10 +75,12 @@ type Command_2 = variant {
Configure : Configure;
Merge : Merge;
DisburseToNeuron : DisburseToNeuron;
SyncCommand : record {};
ClaimOrRefreshNeuron : ClaimOrRefresh;
MergeMaturity : MergeMaturity;
Disburse : Disburse;
};
type Committed = record { sns_governance_canister_id : opt principal };
type Configure = record { operation : opt Operation };
type Disburse = record {
to_account : opt AccountIdentifier;
Expand Down Expand Up @@ -182,13 +194,15 @@ type NetworkEconomics = record {
};
type Neuron = record {
id : opt NeuronId;
staked_maturity_e8s_equivalent : opt nat64;
controller : opt principal;
recent_ballots : vec BallotInfo;
kyc_verified : bool;
not_for_profit : bool;
maturity_e8s_equivalent : nat64;
cached_neuron_stake_e8s : nat64;
created_timestamp_seconds : nat64;
auto_stake_maturity : opt bool;
aging_since_timestamp_seconds : nat64;
hot_keys : vec principal;
account : vec nat8;
Expand Down Expand Up @@ -242,6 +256,7 @@ type OpenSnsTokenSwap = record {
type Operation = variant {
RemoveHotKey : RemoveHotKey;
AddHotKey : AddHotKey;
ChangeAutoStakeMaturity : ChangeAutoStakeMaturity;
StopDissolving : record {};
StartDissolving : record {};
IncreaseDissolveDelay : IncreaseDissolveDelay;
Expand All @@ -267,12 +282,14 @@ type Proposal = record {
type ProposalData = record {
id : opt NeuronId;
failure_reason : opt GovernanceError;
cf_participants : vec CfParticipant;
ballots : vec record { nat64; Ballot };
proposal_timestamp_seconds : nat64;
reward_event_round : nat64;
failed_timestamp_seconds : nat64;
reject_cost_e8s : nat64;
latest_tally : opt Tally;
sns_token_swap_lifecycle : opt int32;
decided_timestamp_seconds : nat64;
proposal : opt Proposal;
proposer : opt NeuronId;
Expand Down Expand Up @@ -306,6 +323,7 @@ type Result_2 = variant { Ok : Neuron; Err : GovernanceError };
type Result_3 = variant { Ok : RewardNodeProviders; Err : GovernanceError };
type Result_4 = variant { Ok : NeuronInfo; Err : GovernanceError };
type Result_5 = variant { Ok : NodeProvider; Err : GovernanceError };
type Result_6 = variant { Committed : Committed; Aborted : record {} };
type RewardEvent = record {
day_after_genesis : nat64;
actual_timestamp_seconds : nat64;
Expand Down Expand Up @@ -336,13 +354,22 @@ type SetSnsTokenSwapOpenTimeWindow = record {
request : opt SetOpenTimeWindowRequest;
swap_canister_id : opt principal;
};
type SettleCommunityFundParticipation = record {
result : opt Result_6;
open_sns_token_swap_proposal_id : opt nat64;
};
type Spawn = record {
percentage_to_spawn : opt nat32;
new_controller : opt principal;
nonce : opt nat64;
};
type SpawnResponse = record { created_neuron_id : opt NeuronId };
type Split = record { amount_e8s : nat64 };
type StakeMaturity = record { percentage_to_stake : opt nat32 };
type StakeMaturityResponse = record {
maturity_e8s : nat64;
staked_maturity_e8s : nat64;
};
type Tally = record {
no : nat64;
yes : nat64;
Expand Down Expand Up @@ -383,6 +410,9 @@ service : (Governance) -> {
list_node_providers : () -> (ListNodeProvidersResponse) query;
list_proposals : (ListProposalInfo) -> (ListProposalInfoResponse) query;
manage_neuron : (ManageNeuron) -> (ManageNeuronResponse);
settle_community_fund_participation : (SettleCommunityFundParticipation) -> (
Result,
);
transfer_gtc_neuron : (NeuronId, NeuronId) -> (Result);
update_node_provider : (UpdateNodeProvider) -> (Result);
}
Binary file added e2e/assets/ledger/ic-ckbtc-minter.wasm
Binary file not shown.
Binary file modified e2e/assets/ledger/ic-icrc1-ledger.wasm
Binary file not shown.
Binary file modified e2e/assets/ledger/ic-nns-init_linux
Binary file not shown.
Binary file modified e2e/assets/ledger/ic-nns-init_macos
Binary file not shown.
Binary file modified e2e/assets/ledger/ledger-canister_notify-method.wasm
Binary file not shown.
8 changes: 4 additions & 4 deletions e2e/assets/ledger/ledger.private.did
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type ArchiveOptions = record {
};

// Height of a ledger block.
type BlockHeight = nat64;
type BlockIndex = nat64;

// A number associated with a transaction.
// Can be set by the caller in `send` call as a correlation identifier.
Expand Down Expand Up @@ -53,7 +53,7 @@ type Transfer = variant {
type Transaction = record {
transfer: Transfer;
memo: Memo;
created_at: BlockHeight;
created_at: BlockIndex;
};

// Arguments for the `send_dfx` call.
Expand All @@ -69,7 +69,7 @@ type SendArgs = record {
// Arguments for the `notify` call.
type NotifyCanisterArgs = record {
// The of the block to send a notification about.
block_height: BlockHeight;
block_height: BlockIndex;
// Max fee, should be 10000 e8s.
max_fee: Tokens;
// Subaccount the payment came from.
Expand Down Expand Up @@ -97,7 +97,7 @@ type LedgerCanisterInitPayload = record {
};

service: (LedgerCanisterInitPayload) -> {
send_dfx : (SendArgs) -> (BlockHeight);
send_dfx : (SendArgs) -> (BlockIndex);
notify_dfx: (NotifyCanisterArgs) -> ();
account_balance_dfx : (AccountBalanceArgs) -> (Tokens) query;
}
Binary file modified e2e/assets/ledger/registry-canister.wasm
Binary file not shown.
Binary file modified e2e/assets/ledger/root-canister.wasm
Binary file not shown.
Binary file modified e2e/assets/ledger/sns-wasm-canister.wasm
Binary file not shown.
5 changes: 5 additions & 0 deletions e2e/assets/sns/valid/sns.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ initial_token_distribution:
airdrop_neurons:
- controller: w3i5o-5ylvd-cmm42-pw66i-n6qcw-fw3q7-kk5la-4edui-ozozq-5qq3j-dae
stake_e8s: 100000000
memo: 42
dissolve_delay_seconds: 86400
developer_distribution:
developer_neurons:
- controller: dktcs-d43lz-rosn2-wnwsj-kef34-6kl3i-ux7qb-ka6xr-biref-ykeaj-sqe
stake_e8s: 100000000
memo: 42
dissolve_delay_seconds: 86400
swap_distribution:
initial_swap_amount_e8s: 200000000
total_e8s: 1000000000
Expand All @@ -23,6 +27,7 @@ min_icp_e8s: 100000000
min_participant_icp_e8s: 100000000
min_participants: 1
name: "Car Pedal TESAT Robot"
neuron_minimum_dissolve_delay_to_vote_seconds: 3600
neuron_minimum_stake_e8s: 1000000
proposal_reject_cost_e8s: 100000000
token_name: "maxs awesome TESAT"
Expand Down
9 changes: 5 additions & 4 deletions e2e/tests-dfx/nns.bash
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ nns_canister_id() {
nns-cycles-minting) echo "rkp4c-7iaaa-aaaaa-aaaca-cai" ;;
nns-lifeline) echo "rno2w-sqaaa-aaaaa-aaacq-cai" ;;
nns-genesis-token) echo "renrk-eyaaa-aaaaa-aaada-cai" ;;
# Coming soon:
#nns-ic-ckbtc-minter) echo "qjdve-lqaaa-aaaaa-aaaeq-cai" ;;
nns-sns-wasm) echo "qaa6y-5yaaa-aaaaa-aaafa-cai" ;;
internet_identity) echo "qhbym-qaaaa-aaaaa-aaafq-cai" ;;
nns-dapp) echo "qsgjb-riaaa-aaaaa-aaaga-cai" ;;
Expand All @@ -92,17 +94,16 @@ assert_nns_canister_id_matches() {
}

@test "dfx nns import ids are as expected" {
# TODO: The IC commit currently used by the sdk doesn't have all the canister IDs yet.
# When it does, remove this DFX_IC_SRC override.
export DFX_IC_SRC="https://raw.githubusercontent.com/dfinity/ic/master"
dfx nns import --network-mapping local
dfx nns import
assert_nns_canister_id_matches nns-registry
assert_nns_canister_id_matches nns-governance
assert_nns_canister_id_matches nns-ledger
assert_nns_canister_id_matches nns-root
assert_nns_canister_id_matches nns-cycles-minting
assert_nns_canister_id_matches nns-lifeline
assert_nns_canister_id_matches nns-genesis-token
# Coming soon:
# assert_nns_canister_id_matches nns-ic-ckbtc-minter
assert_nns_canister_id_matches nns-sns-wasm
# TODO: No source provides these canister IDs - yet.
#assert_nns_canister_id_matches internet_identity
Expand Down
Loading