Skip to content

fix: handle ant-node payment_vault_address unification #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Nic-dorman wants to merge 1 commit into from
Closed

fix: handle ant-node payment_vault_address unification #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ant-dev/src/ant_dev/cmd_start.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions scripts/start-local.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions scripts/start-local.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down