Merge pull request #78 from dfinity/@anchpop/remove-sns-import

Remove sns import
dfinity · Aug 19, 2024 · ff2a12c · ff2a12c
2 parents b587554 + 1ba1e71
commit ff2a12c
Show file tree

Hide file tree

Showing 26 changed files with 21 additions and 29 deletions.
diff --git a/add_hot_key.sh b/add_hot_key.sh
@@ -20,7 +20,6 @@ HOTKEY_PRINCIPAL=$(dfx identity get-principal)
 export DEVELOPER_NEURON_ID="$(dfx canister \
   --network "${NETWORK}" \
   call "${SNS_GOVERNANCE_CANISTER_ID}" \
-  --candid candid/sns_governance.did \
   list_neurons "(record {of_principal = opt principal\"${OWNER_PRINCIPAL}\"; limit = 1})" \
     | idl2json \
     | jq -r ".neurons[0].id[0].id" \

diff --git a/deploy_sns.sh b/deploy_sns.sh
@@ -24,7 +24,6 @@ ic-admin  \
    --summary "This proposal whitelists developer's principal to deploy SNS"
 
 ${DFX} nns import --network-mapping "${DX_NETWORK}=mainnet"
-${DFX} sns import
 if [ "${CANISTER_TEST}" == "_test" ]
 then
   curl -L "https://raw.githubusercontent.com/dfinity/ic/${IC_COMMIT}/rs/nns/governance/canister/governance_test.did" -o ./candid/nns-governance.did

diff --git a/developer_neuron_id.sh b/developer_neuron_id.sh
@@ -9,7 +9,6 @@ cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
 echo "$(dfx canister \
     --network "${NETWORK}" \
     call "${SNS_GOVERNANCE_CANISTER_ID}" \
-    --candid candid/sns_governance.did \
     list_neurons "(record {of_principal = opt principal\"${DX_PRINCIPAL}\"; limit = 1})" \
         | idl2json \
         | jq -r ".neurons[0].id[0].id" \

diff --git a/execute_generic_functions_test.sh b/execute_generic_functions_test.sh
@@ -11,7 +11,6 @@ export TEXT="${1:-Hoi}"
 export DEVELOPER_NEURON_ID="$(dfx canister \
    --network "${NETWORK}" \
    call "${SNS_GOVERNANCE_CANISTER_ID}" \
-   --candid candid/sns_governance.did \
    list_neurons "(record {of_principal = opt principal\"${DX_PRINCIPAL}\"; limit = 1})" \
       | idl2json \
       | jq -r ".neurons[0].id[0].id" \

diff --git a/get_all_sns_neurons.sh b/get_all_sns_neurons.sh
@@ -9,5 +9,4 @@ cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
 dfx canister \
     --network "${NETWORK}" \
     call "${SNS_GOVERNANCE_CANISTER_ID}" \
-    --candid candid/sns_governance.did \
     list_neurons "(record {of_principal = null; limit = 0})"
diff --git a/get_last_sns_proposal.sh b/get_last_sns_proposal.sh
@@ -9,5 +9,4 @@ cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
 dfx canister \
     --network "${NETWORK}" \
     call "${SNS_GOVERNANCE_CANISTER_ID}" \
-    --candid candid/sns_governance.did \
     list_proposals '(record {include_reward_status = vec {}; limit = 1:nat32; exclude_type = vec {}; include_status = vec {};})'
diff --git a/get_sns_canisters.sh b/get_sns_canisters.sh
@@ -9,5 +9,4 @@ cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
 dfx canister \
     --network "${NETWORK}" \
     call "${SNS_ROOT_CANISTER_ID}" \
-    --candid candid/sns_root.did \
     list_sns_canisters '(record {})'
diff --git a/get_sns_neuron.sh b/get_sns_neuron.sh
@@ -11,5 +11,4 @@ ID="${1}"
 dfx canister \
     --network "${NETWORK}" \
     call "${SNS_GOVERNANCE_CANISTER_ID}" \
-    --candid candid/sns_governance.did \
     get_neuron "(record {neuron_id = opt record {id = blob \"${ID}\"};})"
diff --git a/get_sns_neurons.sh b/get_sns_neurons.sh
@@ -9,5 +9,4 @@ cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
 dfx canister \
     --network "${NETWORK}" \
     call "${SNS_GOVERNANCE_CANISTER_ID}" \
-    --candid candid/sns_governance.did \
     list_neurons "(record {of_principal = opt principal\"$(dfx identity get-principal)\"; limit = 0})"
diff --git a/get_sns_proposal.sh b/get_sns_proposal.sh
@@ -11,5 +11,4 @@ export ID="${1:-1}"
 dfx canister \
     --network "${NETWORK}" \
     call "${SNS_GOVERNANCE_CANISTER_ID}" \
-    --candid candid/sns_governance.did \
     get_proposal "(record {proposal_id = opt record {id = (${ID}:nat64)}})"
diff --git a/get_sns_swap_state.sh b/get_sns_swap_state.sh
@@ -9,5 +9,4 @@ cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
 dfx canister call \
     --network "${NETWORK}" \
     "${SNS_SWAP_CANISTER_ID}" \
-    --candid candid/sns_swap.did \
     get_state '(record {})'
diff --git a/list_sns_dev_neurons.sh b/list_sns_dev_neurons.sh
@@ -15,7 +15,6 @@ for DEV_IDENT in "${HOME}"/.config/dfx/identity/dev-ident-*; do
   export NEURON_IDS="$(dfx canister \
     --network "${NETWORK}" \
     call "${SNS_GOVERNANCE_CANISTER_ID}" list_neurons \
-    --candid candid/sns_governance.did \
     "(record {of_principal = opt principal\"${DX_PRINCIPAL}\"; limit = 0})")"
   echo "Listing Developer Neurons for Identity ${DEV_IDENT}, Principal ${DX_PRINCIPAL}"
   echo "${NEURON_IDS}"
@@ -26,9 +25,7 @@ CANISTER_DEV_NEURON=n2xex-iyaaa-aaaar-qaaeq-cai
 echo "Listing for ${CANISTER_DEV_NEURON}"
 dfx canister \
   --network "${NETWORK}" \
-  call "${SNS_GOVERNANCE_CANISTER_ID}" \
-  --candid candid/sns_governance.did \
-  list_neurons "(record {of_principal = opt principal\"${CANISTER_DEV_NEURON}\"; limit = 0})"
+  call "${SNS_GOVERNANCE_CANISTER_ID}" \  list_neurons "(record {of_principal = opt principal\"${CANISTER_DEV_NEURON}\"; limit = 0})"
 
 # Switch back to the previous identity
 dfx identity use "${CURRENT_DX_IDENT}"
diff --git a/perform_neuron_operation.sh b/perform_neuron_operation.sh
@@ -9,7 +9,6 @@ cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
 export DEVELOPER_NEURON_ID="$(dfx canister \
    --network "${NETWORK}" \
    call "${SNS_GOVERNANCE_CANISTER_ID}" \
-   --candid candid/sns_governance.did \
    list_neurons "(record {of_principal = opt principal\"${DX_PRINCIPAL}\"; limit = 1})" \
       | idl2json \
       | jq -r ".neurons[0].id[0].id" \

diff --git a/propose_sns.sh b/propose_sns.sh
@@ -42,7 +42,6 @@ dfx canister \
     qaa6y-5yaaa-aaaaa-aaafa-cai # SNS-W canister
 
 ${DFX} nns import --network-mapping "${DX_NETWORK}=mainnet"
-${DFX} sns import
 if [ "${CANISTER_TEST}" == "_test" ]
 then
     curl -L "https://raw.githubusercontent.com/dfinity/ic/${IC_COMMIT}/rs/nns/governance/canister/governance_test.did" -o ./candid/nns-governance.did

diff --git a/register_dapp.sh b/register_dapp.sh
@@ -14,7 +14,6 @@ dfx canister --network "${NETWORK}" update-settings --add-controller "${SNS_ROOT
 export DEVELOPER_NEURON_ID="$(dfx canister \
    --network "${NETWORK}" \
    call "${SNS_GOVERNANCE_CANISTER_ID}" \
-   --candid candid/sns_governance.did \
    list_neurons "(record {of_principal = opt principal\"${DX_PRINCIPAL}\"; limit = 1})" \
       | idl2json \
       | jq -r ".neurons[0].id[0].id" \

diff --git a/register_generic_functions_test.sh b/register_generic_functions_test.sh
@@ -9,7 +9,6 @@ cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
 export DEVELOPER_NEURON_ID="$(dfx canister \
    --network "${NETWORK}" \
    call "${SNS_GOVERNANCE_CANISTER_ID}" \
-   --candid candid/sns_governance.did \
    list_neurons "(record {of_principal = opt principal\"${DX_PRINCIPAL}\"; limit = 1})" \
       | idl2json \
       | jq -r ".neurons[0].id[0].id" \

diff --git a/run_basic_scenario.sh b/run_basic_scenario.sh
@@ -27,7 +27,26 @@ 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.
-[ "$(./get_sns_swap_state.sh | ./bin/idl2json | jq -r '.swap[0].lifecycle')" == "2" ] && echo "OK" || exit 1
+(
+    # 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
+)
 
 # 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

diff --git a/setup.sh b/setup.sh
@@ -38,7 +38,6 @@ fi
 set -uo pipefail
 
 ${DFX} nns import --network-mapping "${DX_NETWORK}=mainnet"
-${DFX} sns import
 if [ "${CANISTER_TEST}" == "_test" ]
 then
   curl -L "https://raw.githubusercontent.com/dfinity/ic/${IC_COMMIT}/rs/nns/governance/canister/governance_test.did" -o ./candid/nns-governance.did

diff --git a/setup_locally.sh b/setup_locally.sh
@@ -24,7 +24,6 @@ ${DFX} extension install nns --version ${DFX_NNS_VERSION} || true
 ${DFX} extension install sns --version ${DFX_SNS_VERSION} || true 
 
 ${DFX} nns import
-${DFX} sns import
 if [ "${CANISTER_TEST}" == "_test" ]
 then
   curl -L "https://raw.githubusercontent.com/dfinity/ic/${IC_COMMIT}/rs/nns/governance/canister/governance_test.did" -o ./candid/nns-governance.did

diff --git a/transfer_sns_treasury_funds.sh b/transfer_sns_treasury_funds.sh
@@ -12,7 +12,6 @@ export TO_PRINCIPAL="${2:-$DX_PRINCIPAL}"
 export DEVELOPER_NEURON_ID="$(dfx canister \
    --network "${NETWORK}" \
    call "${SNS_GOVERNANCE_CANISTER_ID}" \
-   --candid candid/sns_governance.did \
    list_neurons "(record {of_principal = opt principal\"${DX_PRINCIPAL}\"; limit = 1})" \
       | idl2json \
       | jq -r ".neurons[0].id[0].id" \

diff --git a/update_sns_neuron.sh b/update_sns_neuron.sh
@@ -11,5 +11,4 @@ ARG="${1}"
 dfx canister \
     --network "${NETWORK}" \
     call "${SNS_GOVERNANCE_CANISTER_ID}" \
-    --candid candid/sns_governance.did \
     update_neuron "(${ARG})"
diff --git a/upgrade_dapp.sh b/upgrade_dapp.sh
@@ -17,7 +17,6 @@ export ARG="${3:-()}"
 export DEVELOPER_NEURON_ID="$(dfx canister \
   --network "${NETWORK}" \
   call "${SNS_GOVERNANCE_CANISTER_ID}" \
-  --candid candid/sns_governance.did \
   list_neurons "(record {of_principal = opt principal\"${DX_PRINCIPAL}\"; limit = 1})" \
     | idl2json \
     | jq -r ".neurons[0].id[0].id" \

diff --git a/vote_on_sns_proposal.sh b/vote_on_sns_proposal.sh
@@ -20,7 +20,6 @@ do
   export JSON="$(dfx canister \
     --network "${NETWORK}" \
     call "${SNS_GOVERNANCE_CANISTER_ID}" \
-    --candid candid/sns_governance.did \
     list_neurons "(record {of_principal = opt principal\"${DX_PRINCIPAL}\"; limit = 0})" \
       | idl2json \
       | jq -r ".neurons")"

diff --git a/vote_with_developer_neurons.sh b/vote_with_developer_neurons.sh
@@ -18,7 +18,6 @@ for DEV_IDENT in "$HOME"/.config/dfx/identity/dev-ident-*; do
   export JSON="$(dfx canister \
     --network "${NETWORK}" \
     call "${SNS_GOVERNANCE_CANISTER_ID}" \
-    --candid candid/sns_governance.did \
     list_neurons "(record {of_principal = opt principal\"${DX_PRINCIPAL}\"; limit = 0})" \
       | idl2json \
       | jq -r ".neurons")"

diff --git a/vote_with_single_identity.sh b/vote_with_single_identity.sh
@@ -18,7 +18,6 @@ export DX_PRINCIPAL="$(dfx identity get-principal)"
 export JSON="$(dfx canister \
   --network "${NETWORK}" \
   call "${SNS_GOVERNANCE_CANISTER_ID}" \
-  --candid candid/sns_governance.did \
   list_neurons "(record {of_principal = opt principal\"${DX_PRINCIPAL}\"; limit = 0})" \
     | idl2json \
     | jq -r ".neurons")"

diff --git a/wait_for_canister_running.sh b/wait_for_canister_running.sh
@@ -11,7 +11,6 @@ export CID="${1}"
 while [ "$(./bin/dfx canister \
         --network "${NETWORK}" \
         call ${SNS_ROOT_CANISTER_ID} \
-        --candid candid/sns_root.did \
         canister_status "(record {canister_id=principal\"${CID}\"})" \
             | ./bin/idl2json \
             | jq -r '.status')" != "$(echo -e "{\n  \"running\": null\n}")" ]