Merge branch 'main' into aterga-patch-10

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" \

constants.sh

@@ -118,19 +118,33 @@ if [[ "${TESTNET}" == "local" ]]; then
   then
     export REGISTRY_PATH="$(readlink -f "${REGISTRY}")"
   fi
-  REGISTRY="${HOME}/Library/Application Support/org.dfinity.dfx/network/local/state/replicated_state/ic_registry_local_store"
-  if [[ -d "${REGISTRY}" ]]
-  then
-    export REGISTRY_PATH="$(readlink -f "${REGISTRY}")"
+  # Determine the operating system
+  OS_TYPE="$(uname)"
+  if [[ "$OS_TYPE" == "Darwin" ]]; then
+    BASE_PATH="$HOME/Library/Application Support/org.dfinity.dfx/network/local"
+  elif [[ "$OS_TYPE" == "Linux" ]]; then
+    BASE_PATH="$HOME/.local/share/dfx/network/local"
+  else
+    echo "Unsupported OS type: $OS_TYPE"
+    exit 1
   fi
-  REGISTRY="${HOME}/.local/share/dfx/network/local/state/replicated_state/ic_registry_local_store"
-  if [[ -d "${REGISTRY}" ]]
-  then
-    export REGISTRY_PATH="$(readlink -f "${REGISTRY}")"
+
+  # Find the ic_registry_local_store directory within the base path
+  REGISTRY_FOUND=$(find "$BASE_PATH" -type d -name ic_registry_local_store 2>/dev/null)
+
+  if [ $(echo "$REGISTRY_FOUND" | wc -l) -gt 1 ]; then
+      echo "Error: Multiple ic_registry_local_store directories found"
+      exit 1
   fi
+
+  # If the directory is found, set REGISTRY_PATH to its absolute path
+  if [[ -d "$REGISTRY_FOUND" ]]; then
+    export REGISTRY_PATH="$(readlink -f "$REGISTRY_FOUND")"
+  fi
+
   if [[ -z "${REGISTRY_PATH}" ]]
   then
-    echo "Local registry not found!"
+    echo "Error: Local registry not found!"
     exit 1
   fi
   export NNS_SUB="$(ic-regedit snapshot "${REGISTRY_PATH}" | jq -r .nns_subnet_id.principal_id.raw | sed "s/(principal-id)//")"

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

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" \

example_sns_init.yaml

@@ -58,11 +58,11 @@
 # ------------------------------------------------------------------------------
 
 # Name of the SNS project. This may differ from the name of the associated
-# token. Must be a string of max length = 255.
+# token. Must be a string of at most 255 bytes.
 name: Rock Out
 
 # Description of the SNS project.
-# Must be a string of max length = 2,000.
+# Must be a string of at most 2,000 bytes.
 description: >
     A poem co-written with ChatGPT
 
@@ -83,19 +83,22 @@ description: >
 # cropped to a circle.
 logo: logo.png
 
-# URL to the dapp controlled by the SNS project.
-# Must be a string from 10 to 512 bytes.
-url: https://forum.dfinity.org/thread-where-this-sns-is-discussed
+# URL that represents the SNS, usually a dapp controlled by the SNS project.
+# Must be a string from 10 to 512 bytes, and the domain must be HTTPS.
+url: https://mydapp.com
 
 # Metadata for the NNS proposal required to create the SNS. This data will be
 # shown only in the NNS proposal.
 NnsProposal:
     # The title of the NNS proposal. Must be a string of 4 to 256 bytes.
     title: "NNS Proposal to create an SNS named 'Rock Out'"
 
-    # The HTTPS address of additional content required to evaluate the NNS
+    # The HTTPS address of a forum post with additional context required to evaluate the NNS
     # proposal.
-    url: "https://forum.dfinity.org"
+    # This will go in the `url` field of the proposal.
+    # Must be a string of 10 to 2,048 bytes.
+    # The protocol must be HTTPS, and the domain must be forum.dfinity.org.
+    url: "https://forum.dfinity.org/thread-where-this-sns-is-discussed"
 
     # The description of the proposal. Must be a string of 10 to 2,000 bytes.
     summary: >
@@ -396,7 +399,7 @@ Swap:
     # The minimum amount of ICP that each participant must contribute
     # to participate. This field is specified as a token. For instance,
     # "1 token".
-    minimum_participant_icp:     10 tokens
+    minimum_participant_icp:    100 tokens
 
     # The maximum amount of ICP that each participant may contribute
     # to participate. This field is specified as a token. For instance,
@@ -433,7 +436,7 @@ Swap:
         #
         # This value must be greater than or equal to `2`
         # and must not exceed `10`.
-        events: 3
+        events: 2
 
         # The interval at which the schedule will be increased per event. The
         # first neuron in the basket will be unlocked with zero dissolve delay.

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" \

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})"

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 {};})'

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 {})'

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}\"};})"

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})"

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)}})"

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 {})'

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}"

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" \

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

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" \

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" \

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

settings.sh

@@ -35,6 +35,6 @@ export IC_COMMIT="f79476803e097d9fd5f7e67d45f6818348b51ac9"
 
 export TESTNET="local"
 
-export DFX_VERSION="0.19.0"
+export DFX_VERSION="0.22.0"
 export DFX_SNS_VERSION="0.4.1"
 export DFX_NNS_VERSION="0.4.1"

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

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

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" \

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})"

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" \

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")"

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")"

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")"

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}")" ]