feat(registry): update to new contract id for registry (#478)

* fix(registry): root sub_reg events in constructor should go first

* feat(registry): update to new contract id for registry

* fix: update the contract id tests and add expect_test to regenerate in future

* fix: update to new contract id again and fix clippy

* feat: add dry run options and update tests

* fix: revert toolchain

* fix: add root registry arg to deploy script

* fix: update to 0.6.1

* fix: skip batch if no contracts provided

* feat: add shellcheck and use .salt file as source of truth

* fix: resolve shellcheck warnings in deploy scripts

- deploy.sh: drop useless cat (SC2002)
- deploy_initial_registries.sh: remove dead INITIAL_BATCH var (SC2034)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix: ensure that the registry CLI is up to date

* Apply suggestions from code review

Co-authored-by: Chad Ostrowski <221614+chadoh@users.noreply.github.com>

* feat: upgrade contract to newest soroban-sdk

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: Chad Ostrowski <221614+chadoh@users.noreply.github.com>

Author: 3 people

Cargo.lock

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
+if ! command -v shellcheck >/dev/null 2>&1; then
+    echo "error: shellcheck is not installed" >&2
+    echo "install with: apt install shellcheck | brew install shellcheck" >&2
+    exit 127
+fi
+
+mapfile -d '' scripts < <(
+    find . \
+        \( -path ./target -o -path ./node_modules -o -path '*/target' -o -path '*/node_modules' \) -prune \
+        -o -type f -name '*.sh' -print0
+)
+
+if [ "${#scripts[@]}" -eq 0 ]; then
+    echo "no shell scripts found"
+    exit 0
+fi
+
+echo "checking ${#scripts[@]} script(s) with shellcheck $(shellcheck --version | awk '/^version:/ {print $2}')"
+
+fail=0
+for script in "${scripts[@]}"; do
+    echo "-> $script"
+    if ! shellcheck -x "$script"; then
+        fail=1
+    fi
+done
+
+if [ "$fail" -ne 0 ]; then
+    echo "shellcheck found issues" >&2
+    exit 1
+fi
+
+echo "all scripts passed"

check-shell.sh

@@ -0,0 +1 @@
+2026-04-24T13:41:00

contracts/registry/.salt

@@ -1,7 +1,7 @@
 [package]
 name = "registry"
 description = "A crate for managing and deploying smart contracts on the Soroban blockchain."
-version = "0.6.1"
+version = "0.6.2"
 authors = ["The Aha Company <hello@theaha.co>"]
 license = "Apache-2.0"
 rust-version = "1.69"

contracts/registry/Cargo.toml

@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+set -e
+
+PATH=./target/bin:$PATH
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$SCRIPT_DIR/../.."
+
+DRY_RUN=0
+for arg in "$@"; do
+    case "$arg" in
+        --dry-run|-n)
+            DRY_RUN=1
+            ;;
+        -h|--help)
+            echo "Usage: $0 [--dry-run|-n]"
+            exit 0
+            ;;
+        *)
+            echo "Unknown option: $arg" >&2
+            echo "Usage: $0 [--dry-run|-n]" >&2
+            exit 1
+            ;;
+    esac
+done
+
+run() {
+    if [ "$DRY_RUN" -eq 1 ]; then
+        printf '[dry-run] '
+        printf '%q ' "$@"
+        printf '\n'
+    else
+        "$@"
+    fi
+}
+
+# sha256 -s verified
+#
+
+registry_version() {
+     awk -F'"' '/^version[[:space:]]*=/ { print $2; exit }' \
+         "$REPO_ROOT/contracts/registry/Cargo.toml"
+}
+VERSION=v$(registry_version)
+WASM_URL="https://github.com/theahaco/scaffold-stellar/releases/download/registry-$VERSION/registry_$VERSION.wasm"
+WASM_PATH="$REPO_ROOT/target/stellar/registry_$VERSION.wasm"
+
+
+if [ "$DRY_RUN" -eq 1 ]; then
+    echo "[dry-run] curl -L $WASM_URL > $WASM_PATH"
+else
+    curl -L "$WASM_URL" > "$WASM_PATH"
+fi
+
+
+SALT=$(shasum -a 256 < "$SCRIPT_DIR/.salt" | awk '{print $1}')
+
+ADMIN=theahaco
+ADDRESS=GAMPJROHOAW662FINQ4XQOY2ULX5IEGYXCI4SMZYE75EHQBR6PSTJG3M
+
+run stellar contract deploy --alias registry \
+                        --wasm "$WASM_PATH" \
+                        --source "$ADMIN" \
+                        --salt "$SALT" \
+                        -- \
+                        --admin "$ADMIN" \
+                        --manager "\"$ADDRESS\""
+
+run just registry publish  --wasm "$WASM_PATH" \
+                         --author "$ADMIN" \
+                         --source "$ADMIN"

contracts/registry/deploy.sh

@@ -1,37 +1,77 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-ADMIN="\"GAMPJROHOAW662FINQ4XQOY2ULX5IEGYXCI4SMZYE75EHQBR6PSTJG3M\""
+DRY_RUN=0
+for arg in "$@"; do
+    case "$arg" in
+        --dry-run|-n)
+            DRY_RUN=1
+            ;;
+        -h|--help)
+            echo "Usage: $0 [--dry-run|-n]"
+            exit 0
+            ;;
+        *)
+            echo "Unknown option: $arg" >&2
+            echo "Usage: $0 [--dry-run|-n]" >&2
+            exit 1
+            ;;
+    esac
+done
+
+run() {
+    if [ "$DRY_RUN" -eq 1 ]; then
+        printf '[dry-run] '
+        printf '%q ' "$@"
+        printf '\n'
+    else
+        "$@"
+    fi
+}
+
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+## build so that we use the latest registry
+cargo build --package stellar-registry-cli
+PATH=$SCRIPT_DIR/../../target/debug:$PATH
+
+ROOT_REGISTRY=$(stellar registry fetch-contract-id registry)
+
+ADMIN=theahaco
+MANAGER="\"$(stellar keys public-key $ADMIN)\""
 INITIAL_CONTRACTS="$SCRIPT_DIR/initial_contracts.json"
-INITIAL_BATCH="$SCRIPT_DIR/initial_batch.json"
 
-# Prints (does not execute) the commands to deploy a named registry.
+# Deploys a named registry if it isn't already registered. Always ensures the
+# local stellar alias exists.
 deploy () {
     local name="$1"
-    stellar registry deploy --contract-name "$name" --wasm-name registry -- --admin theahaco --manager "$ADMIN"
-    stellar registry create-alias "$name"
+    if existing_id=$(stellar registry fetch-contract-id "$name" 2>/dev/null) && [ -n "$existing_id" ]; then
+        echo "Contract '$name' already registered (id: $existing_id); skipping deploy"
+    else
+        run stellar registry deploy --contract-name "$name" --wasm-name registry -- \
+                                    --admin $ADMIN \
+                                    --manager "$MANAGER" \
+                                    --root "\"$ROOT_REGISTRY\""
+    fi
+    run stellar registry create-alias "$name" --force
 }
 
 # Prints (does not execute) the batch-register invocation for the given
 # registry contract alias and the JSON array of [name, address, owner] tuples.
 batch_register () {
     local alias="$1"
     local contracts_json="$2"
-    stellar contract invoke --id "$alias" --source theahaco -- batch-register --contracts "$contracts_json"
+    run stellar contract invoke --id "$alias" --source theahaco -- batch-register --contracts "$contracts_json"
+    run stellar contract invoke --id "$alias" --source theahaco -- process_batch --limit 10
 }
 
 # Per-project registries from initial_contracts.json:
 # each top-level entry is {"<name>": [[name, address, owner], ...]}.
 while IFS= read -r name; do
-    CONTRACT_ID=$(stellar registry fetch-contract-id $name)
-    echo WHEN contract_id = \'$CONTRACT_ID\' THEN \'$name\'
-
-    # deploy "$name"
-    # contracts=$(jq -c --arg k "$name" '.[] | select(has($k)) | .[$k]' "$INITIAL_CONTRACTS")
-    # batch_register "$name" "$contracts"
-    # stellar contract invoke --id "$name" -- process-batch --limit 10
+    deploy "$name"
+    contracts=$(jq -c --arg k "$name" '.[] | select(has($k)) | .[$k]' "$INITIAL_CONTRACTS")
+    if [ "$(jq 'length' <<<"$contracts")" -eq 0 ]; then
+        echo "No contracts for '$name'; skipping batch-register"
+        continue
+    fi
+    batch_register "$name" "$contracts"
 done < <(jq -r '.[] | keys[0]' "$INITIAL_CONTRACTS")
-
-# # Top-level contracts batch-registered into the root theahaco registry.
-# batch_register theahaco "$(jq -c '.' "$INITIAL_BATCH")"

contracts/registry/deploy_initial_registries.sh

@@ -1,4 +1,5 @@
 [
+    { "oz": [] },
     {
         "circle": [
             [

contracts/registry/initial_contracts.json

@@ -29,3 +29,6 @@ sha2 = { workspace = true }
 
 dotenvy = "0.15.7"
 # soroban-rpc = "=20.3.3"
+
+[dev-dependencies]
+expect-test = "1.5"

crates/stellar-registry-build/Cargo.toml

@@ -77,49 +77,52 @@ pub fn contract_id(network_passphrase: &str, salt: &str) -> stellar_strkey::Cont
 }
 
 pub fn verified_contract_id(network_passphrase: &str) -> stellar_strkey::Contract {
-    contract_id(network_passphrase, "v0.4.1")
+    contract_id(
+        network_passphrase,
+        include_str!("../../../contracts/registry/.salt").trim(),
+    )
 }
 
 #[cfg(test)]
 mod generate_id {
+    use expect_test::{Expect, expect};
     use stellar_cli::config::network::passphrase::*;
 
-    fn test_contract_id((passphrase, contract_id): (&str, &str)) {
-        assert_eq!(
-            &super::verified_contract_id(passphrase).to_string(),
-            contract_id,
-            "{passphrase}"
-        );
+    /// Run with `UPDATE_EXPECT=1 cargo test` to regenerate the expected contract
+    /// IDs in-place after bumping the registry version or src/registry/.salt
+    fn check(passphrase: &str, expected: &Expect) {
+        expected.assert_eq(&super::verified_contract_id(passphrase).to_string());
     }
+
     #[test]
     fn futurenet() {
-        test_contract_id((
+        check(
             FUTURENET,
-            "CDMAKNALA4EKEA52CP645Y6H5NUM5AZPOPBM5RHOG2SRNHUOAPFHK6P4",
-        ));
+            &expect!["CC6YGVN57L5XC4HDZ7AIUJSURGWGC2EEQDKC6NK4DZ6LUHTZY5WXOTLX"],
+        );
     }
 
     #[test]
     fn testnet() {
-        test_contract_id((
+        check(
             TESTNET,
-            "CCA256DWBJJEEYXAWQHP5N4ZAJ2NW4P5T52LZCGC766Q5XHFVNQBMFZV",
-        ));
+            &expect!["CAAXJETKPYAATU4HVVQUTE2FFBULNFGZNEOC3MS635U5K3GZLAY2HI4M"],
+        );
     }
 
     #[test]
     fn mainnet() {
-        test_contract_id((
+        check(
             MAINNET,
-            "CAYVNQYGQ7IVZBBKMZ46UNRUQIFGBVHVZFCG47CYCMA2SAODDVDVCWMS",
-        ));
+            &expect!["CDU4M3LDIOUJJ5F3YXKJ4EJEP5VPRPG6N2LJ5HOQIMN7MNGL3NS3EGUY"],
+        );
     }
 
     #[test]
     fn local() {
-        test_contract_id((
+        check(
             LOCAL,
-            "CB7GPZFAAJQJYJD63P7HUAVABBSGLRWJB2C35RKR5TQ33AMRSS2XFL3C",
-        ));
+            &expect!["CA55VGAFPIZHOY2X26KANRJYFBWPEXGNLIEHR7Q5TR2576HKHOFPLBTX"],
+        );
     }
 }