From 54c52c37ce3d193f3ea3a2187bcca819948139c9 Mon Sep 17 00:00:00 2001 From: Nic-dorman Date: Thu, 9 Apr 2026 15:01:18 +0100 Subject: [PATCH] fix: handle ant-node payment_vault_address unification in start scripts ant-node unified data_payments_address + merkle_payments_address into a single payment_vault_address. All three start scripts now try the new key first, falling back to old keys for backward compatibility. Co-Authored-By: Claude Opus 4.6 (1M context) --- ant-dev/src/ant_dev/cmd_start.py | 6 +++--- scripts/start-local.ps1 | 5 +++-- scripts/start-local.sh | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ant-dev/src/ant_dev/cmd_start.py b/ant-dev/src/ant_dev/cmd_start.py index 02225a6..652b50f 100644 --- a/ant-dev/src/ant_dev/cmd_start.py +++ b/ant-dev/src/ant_dev/cmd_start.py @@ -126,9 +126,9 @@ def run(args) -> None: evm = manifest["evm"] antd_env["EVM_RPC_URL"] = evm.get("rpc_url", "") antd_env["EVM_PAYMENT_TOKEN_ADDRESS"] = evm.get("payment_token_address", "") - antd_env["EVM_DATA_PAYMENTS_ADDRESS"] = evm.get("data_payments_address", "") - if evm.get("merkle_payments_address"): - antd_env["EVM_MERKLE_PAYMENTS_ADDRESS"] = evm["merkle_payments_address"] + # ant-node >=0.10 unified into payment_vault_address + antd_env["EVM_DATA_PAYMENTS_ADDRESS"] = evm.get("payment_vault_address", evm.get("data_payments_address", "")) + antd_env["EVM_MERKLE_PAYMENTS_ADDRESS"] = evm.get("payment_vault_address", evm.get("merkle_payments_address", "")) antd_cmd = ["cargo", "run", "--", "--network", "local"] antd_proc = start_process(antd_cmd, cwd=antd_dir, env=antd_env, log_file=LOG_FILE) diff --git a/scripts/start-local.ps1 b/scripts/start-local.ps1 index 67e8775..d60e3e9 100644 --- a/scripts/start-local.ps1 +++ b/scripts/start-local.ps1 @@ -89,8 +89,9 @@ $bootstrapPeers = ($manifest.bootstrap -join ",") $walletKey = $manifest.evm.wallet_private_key -replace '^0x', '' $evmRpcUrl = $manifest.evm.rpc_url $evmTokenAddr = $manifest.evm.payment_token_address -$evmPaymentsAddr = $manifest.evm.data_payments_address -$evmMerkleAddr = if ($manifest.evm.merkle_payments_address) { $manifest.evm.merkle_payments_address } else { "" } +# ant-node >=0.10 unified data_payments_address + merkle_payments_address into payment_vault_address +$evmPaymentsAddr = if ($manifest.evm.payment_vault_address) { $manifest.evm.payment_vault_address } elseif ($manifest.evm.data_payments_address) { $manifest.evm.data_payments_address } else { "" } +$evmMerkleAddr = if ($manifest.evm.payment_vault_address) { $manifest.evm.payment_vault_address } elseif ($manifest.evm.merkle_payments_address) { $manifest.evm.merkle_payments_address } else { "" } Write-Host " Devnet ready: $($manifest.node_count) nodes, base port $($manifest.base_port)" -ForegroundColor Green Write-Host " EVM: $evmRpcUrl" -ForegroundColor Green diff --git a/scripts/start-local.sh b/scripts/start-local.sh index e7d0a5f..aa41afb 100644 --- a/scripts/start-local.sh +++ b/scripts/start-local.sh @@ -98,8 +98,9 @@ print(k[2:] if k.startswith('0x') else k) EVM_RPC_URL=$(python -c "import json; print(json.load(open('$MANIFEST_FILE'))['evm']['rpc_url'])" 2>/dev/null) EVM_TOKEN_ADDR=$(python -c "import json; print(json.load(open('$MANIFEST_FILE'))['evm']['payment_token_address'])" 2>/dev/null) -EVM_PAYMENTS_ADDR=$(python -c "import json; print(json.load(open('$MANIFEST_FILE'))['evm']['data_payments_address'])" 2>/dev/null) -EVM_MERKLE_ADDR=$(python -c "import json; print(json.load(open('$MANIFEST_FILE'))['evm'].get('merkle_payments_address', ''))" 2>/dev/null) +# ant-node >=0.10 unified data_payments_address + merkle_payments_address into payment_vault_address +EVM_PAYMENTS_ADDR=$(python -c "import json; e=json.load(open('$MANIFEST_FILE'))['evm']; print(e.get('payment_vault_address', e.get('data_payments_address', '')))" 2>/dev/null) +EVM_MERKLE_ADDR=$(python -c "import json; e=json.load(open('$MANIFEST_FILE'))['evm']; print(e.get('payment_vault_address', e.get('merkle_payments_address', '')))" 2>/dev/null) NODE_COUNT=$(python -c "import json; print(json.load(open('$MANIFEST_FILE')).get('node_count', '?'))" 2>/dev/null) BASE_PORT=$(python -c "import json; print(json.load(open('$MANIFEST_FILE')).get('base_port', '?'))" 2>/dev/null)