save

dfinity · Nov 1, 2024 · 587785a · 587785a
1 parent 0c58eee
commit 587785a
Show file tree

Hide file tree

Showing 8 changed files with 144 additions and 63 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dfx.json b/dfx.json
@@ -1,24 +1,120 @@
 {
   "canisters": {
-    "nns-dapp": {
+    "internet_identity": {
+      "candid": "candid/internet_identity.did",
       "type": "custom",
+      "wasm": "internet_identity_dev.wasm"
+    },
+    "nns-cycles-minting": {
+      "build": "",
+      "candid": "candid/nns-cycles-minting.did",
+      "remote": {
+        "id": {
+          "ic": "rkp4c-7iaaa-aaaaa-aaaca-cai",
+          "local": "rkp4c-7iaaa-aaaaa-aaaca-cai"
+        }
+      },
+      "type": "custom",
+      "wasm": ""
+    },
+    "nns-dapp": {
       "candid": "candid/nns-dapp.did",
+      "type": "custom",
       "wasm": "nns-dapp.wasm"
     },
-    "internet_identity": {
+    "nns-genesis-token": {
+      "build": "",
+      "candid": "candid/nns-genesis-token.did",
+      "remote": {
+        "id": {
+          "ic": "renrk-eyaaa-aaaaa-aaada-cai",
+          "local": "renrk-eyaaa-aaaaa-aaada-cai"
+        }
+      },
       "type": "custom",
-      "candid": "candid/internet_identity.did",
-      "wasm": "internet_identity_dev.wasm"
+      "wasm": ""
     },
-    "sns_aggregator": {
+    "nns-governance": {
+      "build": "",
+      "candid": "candid/nns-governance.did",
+      "remote": {
+        "id": {
+          "ic": "rrkah-fqaaa-aaaaa-aaaaq-cai",
+          "local": "rrkah-fqaaa-aaaaa-aaaaq-cai"
+        }
+      },
       "type": "custom",
+      "wasm": ""
+    },
+    "nns-ledger": {
+      "build": "",
+      "candid": "candid/nns-ledger.did",
+      "remote": {
+        "id": {
+          "ic": "ryjl3-tyaaa-aaaaa-aaaba-cai",
+          "local": "ryjl3-tyaaa-aaaaa-aaaba-cai"
+        }
+      },
+      "type": "custom",
+      "wasm": ""
+    },
+    "nns-lifeline": {
+      "build": "",
+      "candid": "candid/nns-lifeline.did",
+      "remote": {
+        "id": {
+          "ic": "rno2w-sqaaa-aaaaa-aaacq-cai",
+          "local": "rno2w-sqaaa-aaaaa-aaacq-cai"
+        }
+      },
+      "type": "custom",
+      "wasm": ""
+    },
+    "nns-registry": {
+      "build": "",
+      "candid": "candid/nns-registry.did",
+      "remote": {
+        "id": {
+          "ic": "rwlgt-iiaaa-aaaaa-aaaaa-cai",
+          "local": "rwlgt-iiaaa-aaaaa-aaaaa-cai"
+        }
+      },
+      "type": "custom",
+      "wasm": ""
+    },
+    "nns-root": {
+      "build": "",
+      "candid": "candid/nns-root.did",
+      "remote": {
+        "id": {
+          "ic": "r7inp-6aaaa-aaaaa-aaabq-cai",
+          "local": "r7inp-6aaaa-aaaaa-aaabq-cai"
+        }
+      },
+      "type": "custom",
+      "wasm": ""
+    },
+    "nns-sns-wasm": {
+      "build": "",
+      "candid": "candid/nns-sns-wasm.did",
+      "remote": {
+        "id": {
+          "ic": "qaa6y-5yaaa-aaaaa-aaafa-cai",
+          "local": "qaa6y-5yaaa-aaaaa-aaafa-cai"
+        }
+      },
+      "type": "custom",
+      "wasm": ""
+    },
+    "sns_aggregator": {
       "candid": "candid/sns_aggregator.did",
+      "type": "custom",
       "wasm": "sns_aggregator.wasm"
     },
     "test": {
       "candid": "candid/test.did",
-      "type": "rust",
-      "package": "test"
+      "package": "test",
+      "type": "rust"
     }
   }
 }
diff --git a/initial_neurons.csv.orig b/initial_neurons.csv.orig
@@ -1,18 +1,18 @@
-neuron_id;owner_id;created_ts_ns;duration_to_dissolution_ns;staked_icpt;earnings;follows;not_for_profit;memo;maturity_e8s_equivalent;kyc_verified
-1;xz7xb-e726u-vsihc-fukxg-pfzzd-3cjix-gluc6-p4shw-sz4aw-ufgi3-yqe;0;15780000000000000;0;C;;false;0;0;false
-2;mccsf-b32dl-n42k3-57eqk-6fnii-ojxhg-ukyw7-cstu4-4u3eq-s64id-pqe;0;15780000000000000;0;C;;false;0;100000000;false
-3;apudj-s5mmx-ddrec-sawcm-gsc5c-52sdk-4fs3k-ftmay-omsbn-t27lg-zae;0;15780000000000000;0;C;;false;0;500000000;false
-4;so5fh-cx7bf-jhqti-t77pu-uxt2p-x7mb5-ybpkg-sp32z-m7lfw-4n7gy-cae;0;15780000000000000;0;C;;false;0;1000000000;false
-5;fy5ch-dwxhf-gffsr-z7eum-7iqom-t727t-roth5-zxp7t-6n5di-mtkzo-7qe;0;15780000000000000;0;C;;false;0;10000000000;false
-6;se4ei-zaxs6-lnq3z-oo6bp-ci2ed-isads-fe2by-pnjrj-i5fsp-sorcl-uqe;0;15780000000000000;0;C;;false;0;100000000000;false
-7;e6xcz-i3oe4-3gp2e-w2g6u-vtdey-sb6dw-vzh5m-2qb4l-dc6ff-to6ll-5qe;0;15780000000000000;0;C;;false;0;1000000000000;false
-8;72sl6-z6gmp-tuvar-hngo2-7gjov-jn43j-omkrv-2wx6k-fzcgj-sujmh-zae;0;15780000000000000;0;C;;false;0;10000000000000;false
-9;2z6y4-6y7zq-vporp-tiumu-j3qhw-6og2g-sxvxh-e57qp-aevbm-gacrr-yae;0;15780000000000000;0;C;;false;0;100000000000000;false
-10;3uigu-x6rsf-lwlyz-fauii-ewr7t-7vcmr-cfbcs-pye3t-oyh3o-5v23u-iae;0;15780000000000000;0;C;;false;0;100000000000000;false
-449479075714955186;b2ucp-4x6ou-zvxwi-niymn-pvllt-rdxqr-wi4zj-jat5l-ijt2s-vv4f5-4ae;0;31536000000000000;100;D;;false;0;10000000000;false
-3001;py6h5-6xdbk-bpdsi-7vcmw-f3yss-vaa7w-id2rh-knbzp-4hdmp-gxhxn-jae;0;15780000000000000;0;C;;false;0;9000000000;false
-3002;6s5du-wqkks-6ljxw-wucs5-yharn-fqcxm-3evkn-ffa3f-iheap-7drpi-uae;0;15780000000000000;0;C;;false;0;90000000000;false
-3003;l3mxb-xrmim-b4pej-jpoko-j2ise-baark-y53yo-c647u-rg6uf-2nxpr-pqe;0;15780000000000000;0;C;;false;0;900000000000;false
-3004;2rifv-b6jdw-zde6b-3vxyz-xfulb-77gft-fngo4-5j74e-6vfbn-zwlnk-3ae;0;15780000000000000;0;C;;false;0;9000000000000;false
-3005;wrrod-le7l3-tv5ya-3qtyl-2t7ik-dqjoi-mrr6y-nw7gx-bxiy6-ilo54-nqe;0;15780000000000000;0;C;;false;0;90000000000000;false
-3006;7tkm4-zxi5p-gyfc5-zwtss-hrc6x-uf25u-4qngv-pb3fo-evr5u-wfejc-sae;0;15780000000000000;0;C;;false;0;900000000000000;false
+neuron_id;owner_id;created_ts_ns;dissolve_delay_s;staked_icpt;follows;not_for_profit;maturity_e8s_equivalent
+1;xz7xb-e726u-vsihc-fukxg-pfzzd-3cjix-gluc6-p4shw-sz4aw-ufgi3-yqe;0;15780000000000000;0;;false;0
+2;mccsf-b32dl-n42k3-57eqk-6fnii-ojxhg-ukyw7-cstu4-4u3eq-s64id-pqe;0;15780000000000000;0;;false;100000000
+3;apudj-s5mmx-ddrec-sawcm-gsc5c-52sdk-4fs3k-ftmay-omsbn-t27lg-zae;0;15780000000000000;0;;false;500000000
+4;so5fh-cx7bf-jhqti-t77pu-uxt2p-x7mb5-ybpkg-sp32z-m7lfw-4n7gy-cae;0;15780000000000000;0;;false;1000000000
+5;fy5ch-dwxhf-gffsr-z7eum-7iqom-t727t-roth5-zxp7t-6n5di-mtkzo-7qe;0;15780000000000000;0;;false;10000000000
+6;se4ei-zaxs6-lnq3z-oo6bp-ci2ed-isads-fe2by-pnjrj-i5fsp-sorcl-uqe;0;15780000000000000;0;;false;100000000000
+7;e6xcz-i3oe4-3gp2e-w2g6u-vtdey-sb6dw-vzh5m-2qb4l-dc6ff-to6ll-5qe;0;15780000000000000;0;;false;1000000000000
+8;72sl6-z6gmp-tuvar-hngo2-7gjov-jn43j-omkrv-2wx6k-fzcgj-sujmh-zae;0;15780000000000000;0;;false;10000000000000
+9;2z6y4-6y7zq-vporp-tiumu-j3qhw-6og2g-sxvxh-e57qp-aevbm-gacrr-yae;0;15780000000000000;0;;false;100000000000000
+10;3uigu-x6rsf-lwlyz-fauii-ewr7t-7vcmr-cfbcs-pye3t-oyh3o-5v23u-iae;0;15780000000000000;0;;false;100000000000000
+449479075714955186;b2ucp-4x6ou-zvxwi-niymn-pvllt-rdxqr-wi4zj-jat5l-ijt2s-vv4f5-4ae;0;31536000000000000;100;;false;10000000000
+3001;hol7n-gtwzb-buu75-q3zrr-pqze3-pba4m-d2wss-lr5fo-nm4x6-m3ffv-bae;0;15780000000000000;0;;false;9000000000
+3002;y7e3b-a3irj-4i5ra-gljbg-7y3e6-w4icm-fydkk-e6hxw-h5usa-x2vfl-xqe;0;15780000000000000;0;;false;90000000000
+3003;uomfj-wba5i-ci5gj-yhuna-li2lb-qb3z6-6lzwr-6erii-6iu7c-kdzgy-bae;0;15780000000000000;0;;false;900000000000
+3004;wl2t7-m6zav-y7lh2-q3xnm-6itvx-dgspm-gg47g-nwqrx-th7t2-fjlk5-oae;0;15780000000000000;0;;false;9000000000000
+3005;yie43-s6m5a-sntag-e23dy-7tf46-h7q7z-5im7c-5o6up-myjis-ruyjt-jae;0;15780000000000000;0;;false;90000000000000
+3006;vnkc3-jzx5m-a4kry-wrrim-3yonj-nimst-weddy-k3gha-ysu3a-3y4ms-dqe;0;15780000000000000;0;;false;900000000000000
diff --git a/run_basic_scenario.sh b/run_basic_scenario.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -euo pipefail
+set -xeuo pipefail
 
 cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
 
@@ -26,27 +26,12 @@ jq -r '.ledger_canister_id' -e sns_canister_ids.json
 jq -r '.root_canister_id' -e sns_canister_ids.json
 jq -r '.swap_canister_id' -e sns_canister_ids.json
 
-# Assert the SNS swap lifecycle is in the OPEN state.
-(
-    # Run the command and capture the output
-    swap_state=$(./get_sns_swap_state.sh | ./bin/idl2json)
-
-    # Extract the lifecycle value
-    lifecycle=$(echo "$swap_state" | jq -r '.swap[0].lifecycle')
-
-    # Log the output and extracted lifecycle value
-    echo "swap_state: ${swap_state}"
-
-    # Check if the lifecycle is in the OPEN state (2)
-    if [ "${lifecycle}" == "2" ]; then
-        echo "SNS swap lifecycle is in the OPEN state (2)!"
-    else
-        echo "ERROR - SNS swap lifecycle is not in the OPEN state"
-        echo "Expected: 2 (OPEN state)"
-        echo "Actual: ${lifecycle}"
-        exit 1
-    fi
-)
+# Await Swap lifecycle to be in state 2 (OPEN).
+# See https://github.com/dfinity/ic/blob/master/rs/sns/swap/proto/ic_sns_swap/pb/v1/swap.proto#L17
+while [ "$(./get_sns_swap_state.sh | ./bin/idl2json | jq -r '.swap[0].lifecycle')" != "2" ]; do
+    sleep 1
+    echo "Awaiting Swap to open ..."
+done
 
 # Assert that the test canister is indeed registered.
 [ "$(./get_sns_canisters.sh | ./bin/idl2json | jq -r '.dapps[0]')" == "$(./bin/dfx canister id test)" ] && echo "OK" || exit 1
@@ -62,8 +47,8 @@ jq -r '.swap_canister_id' -e sns_canister_ids.json
 # Participate in SNS swap
 ./participate_sns_swap.sh
 
-# Wait for the SNS swap lifecycle is in the COMPLETED state.
-# This happens when the heartbeat of the SNS Swap canister is executed.
+# Await Swap lifecycle to be in state 2 (OPEN).
+# See https://github.com/dfinity/ic/blob/master/rs/sns/swap/proto/ic_sns_swap/pb/v1/swap.proto#L17
 while [ "$(./get_sns_swap_state.sh | ./bin/idl2json | jq -r '.swap[0].lifecycle')" != "3" ]; do sleep 1; done
 
 # Upgrade test canister (II)

diff --git a/settings.sh b/settings.sh
@@ -31,7 +31,7 @@ export SNS_AGGREGATOR_RELEASE="proposal-129614-agg"
 # $ ./gitlab-ci/src/artifacts/newest_sha_with_disk_image.sh origin/master
 # from the IC monorepo: https://github.com/dfinity/ic
 # if you change IC_COMMIT, then you need to rerun `source install.sh`
-export IC_COMMIT="2b3b69ee4bdad75776a0ed668aa53500600af044"
+export IC_COMMIT="ce465b8bd96f7706b9480fdfc10cda0a67f5f0f7"
 
 export TESTNET="local"
 

diff --git a/setup_locally.sh b/setup_locally.sh
@@ -9,7 +9,6 @@ cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
 for canister in cycles-minting-canister genesis-token-canister governance-canister governance-canister_test ic-ckbtc-minter identity-canister ledger-canister_notify-method lifeline_canister nns-ui-canister registry-canister root-canister sns-wasm-canister sns-root-canister "sns-governance-canister${CANISTER_TEST}" sns-swap-canister ic-icrc1-ledger ic-icrc1-archive ic-icrc1-index-ng
 do
   curl -L "https://download.dfinity.systems/ic/${IC_COMMIT}/canisters/${canister}.wasm.gz" -o "${canister}.wasm"
-  # gzip -d "${canister}.wasm.gz"
 done
 
 mv "./ic-icrc1-index-ng.wasm" "ic-icrc1-index.wasm"

diff --git a/test/Cargo.toml b/test/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 candid = "0.10.7"
-ic-cdk = "0.13.2"
+ic-cdk = "0.16.0"
 serde = "1"
 wee_alloc = "0.4.3"
 lazy_static = "1.4.0"
diff --git a/upgrade_dapp.sh b/upgrade_dapp.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -euo pipefail
+set -xeuo pipefail
 
 CURRENTDIR="$(pwd)"