fix: nns-dapp links and cleanup (#70)

* fix: nns-dapp links and cleanup * initial_neurons.csv cleanup * fix build
dfinity · May 22, 2024 · 86970e8 · 86970e8
1 parent 2777ba5
commit 86970e8
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 141 deletions.
diff --git a/cleanup.sh b/cleanup.sh
@@ -7,6 +7,7 @@ cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
 . ./constants.sh install
 
 cp dfx.json.orig dfx.json
+cp initial_neurons.csv.orig initial_neurons.csv
 
 rm -rf .dfx \
     sns_init.yaml \

diff --git a/deploy_sns.sh b/deploy_sns.sh
@@ -30,7 +30,7 @@ then
   curl -L "https://raw.githubusercontent.com/dfinity/ic/${IC_COMMIT}/rs/nns/governance/canister/governance_test.did" -o ./candid/nns-governance.did
   curl -L "https://raw.githubusercontent.com/dfinity/ic/${IC_COMMIT}/rs/sns/governance/canister/governance_test.did" -o ./candid/sns_governance.did
 fi
-curl -L "https://github.com/dfinity/nns-dapp/blob/${IC_COMMIT}/sns_aggregator/sns_aggregator.did" -o ./candid/sns_aggregator.did
+curl -L "https://raw.githubusercontent.com/dfinity/nns-dapp/${NNS_DAPP_RELEASE}/sns_aggregator/sns_aggregator.did" -o ./candid/sns_aggregator.did
 cat <<< $(jq -r 'del(.canisters."internet_identity".remote)' dfx.json) > dfx.json
 cat <<< $(jq -r 'del(.canisters."nns-dapp".remote)' dfx.json) > dfx.json
 cat <<< $(jq -r 'del(.canisters."sns_aggregator".remote)' dfx.json) > dfx.json

diff --git a/dfx.json b/dfx.json
@@ -1,152 +1,24 @@
 {
   "canisters": {
-    "internet_identity": {
-      "build": "",
-      "candid": "candid/internet_identity.did",
-      "type": "custom",
-      "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": {
-      "build": "",
-      "candid": "candid/nns-dapp.did",
-      "type": "custom",
-      "wasm": ""
-    },
-    "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",
-      "wasm": ""
-    },
-    "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": ""
+      "candid": "candid/nns-dapp.did",
+      "wasm": "nns-dapp.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"
-        }
-      },
+    "internet_identity": {
       "type": "custom",
-      "wasm": ""
+      "candid": "candid/internet_identity.did",
+      "wasm": "internet_identity_dev.wasm"
     },
     "sns_aggregator": {
-      "candid": "candid/sns_aggregator.did",
       "type": "custom",
+      "candid": "candid/sns_aggregator.did",
       "wasm": "sns_aggregator.wasm"
     },
-    "sns_governance": {
-      "build": "",
-      "candid": "candid/sns_governance.did",
-      "type": "custom",
-      "wasm": ""
-    },
-    "sns_index": {
-      "build": "",
-      "candid": "candid/sns_index.did",
-      "type": "custom",
-      "wasm": ""
-    },
-    "sns_ledger": {
-      "build": "",
-      "candid": "candid/sns_ledger.did",
-      "type": "custom",
-      "wasm": ""
-    },
-    "sns_root": {
-      "build": "",
-      "candid": "candid/sns_root.did",
-      "type": "custom",
-      "wasm": ""
-    },
-    "sns_swap": {
-      "build": "",
-      "candid": "candid/sns_swap.did",
-      "type": "custom",
-      "wasm": ""
-    },
     "test": {
       "candid": "candid/test.did",
-      "package": "test",
-      "type": "rust"
+      "type": "rust",
+      "package": "test"
     }
   }
 }
diff --git a/dfx.json.orig b/dfx.json.orig
@@ -2,12 +2,12 @@
   "canisters": {
     "nns-dapp": {
       "type": "custom",
-      "candid": "",
+      "candid": "candid/nns-dapp.did",
       "wasm": "nns-dapp.wasm"
     },
     "internet_identity": {
       "type": "custom",
-      "candid": "",
+      "candid": "candid/internet_identity.did",
       "wasm": "internet_identity_dev.wasm"
     },
     "sns_aggregator": {

diff --git a/initial_neurons.csv.orig b/initial_neurons.csv.orig
@@ -0,0 +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
diff --git a/propose_sns.sh b/propose_sns.sh
@@ -48,7 +48,7 @@ then
     curl -L "https://raw.githubusercontent.com/dfinity/ic/${IC_COMMIT}/rs/nns/governance/canister/governance_test.did" -o ./candid/nns-governance.did
     curl -L "https://raw.githubusercontent.com/dfinity/ic/${IC_COMMIT}/rs/sns/governance/canister/governance_test.did" -o ./candid/sns_governance.did
 fi
-curl -L "https://github.com/dfinity/nns-dapp/blob/${IC_COMMIT}/sns_aggregator/sns_aggregator.did" -o ./candid/sns_aggregator.did
+curl -L "https://raw.githubusercontent.com/dfinity/nns-dapp/${NNS_DAPP_RELEASE}/sns_aggregator/sns_aggregator.did" -o ./candid/sns_aggregator.did
 cat <<< $(jq -r 'del(.canisters."internet_identity".remote)' dfx.json) > dfx.json
 cat <<< $(jq -r 'del(.canisters."nns-dapp".remote)' dfx.json) > dfx.json
 cat <<< $(jq -r 'del(.canisters."sns_aggregator".remote)' dfx.json) > dfx.json

diff --git a/setup.sh b/setup.sh
@@ -44,7 +44,9 @@ then
   curl -L "https://raw.githubusercontent.com/dfinity/ic/${IC_COMMIT}/rs/nns/governance/canister/governance_test.did" -o ./candid/nns-governance.did
   curl -L "https://raw.githubusercontent.com/dfinity/ic/${IC_COMMIT}/rs/sns/governance/canister/governance_test.did" -o ./candid/sns_governance.did
 fi
-curl -L "https://github.com/dfinity/nns-dapp/blob/${IC_COMMIT}/sns_aggregator/sns_aggregator.did" -o ./candid/sns_aggregator.did
+curl -L "https://raw.githubusercontent.com/dfinity/internet-identity/${II_RELEASE}/src/internet_identity/internet_identity.did" -o candid/internet_identity.did
+curl -L "https://raw.githubusercontent.com/dfinity/nns-dapp/${NNS_DAPP_RELEASE}/rs/backend/nns-dapp.did" -o candid/nns-dapp.did
+curl -L "https://raw.githubusercontent.com/dfinity/nns-dapp/${NNS_DAPP_RELEASE}/sns_aggregator/sns_aggregator.did" -o ./candid/sns_aggregator.did
 cat <<< $(jq -r 'del(.canisters."internet_identity".remote)' dfx.json) > dfx.json
 cat <<< $(jq -r 'del(.canisters."nns-dapp".remote)' dfx.json) > dfx.json
 cat <<< $(jq -r 'del(.canisters."sns_aggregator".remote)' dfx.json) > dfx.json