fix: init script does not respect duplicate chain ids

near · Mar 4, 2024 · b7cd1ab · b7cd1ab
1 parent a3e0bb8
commit b7cd1ab
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/nearx/contract/script/RequestSync.s.sol b/nearx/contract/script/RequestSync.s.sol
@@ -6,7 +6,6 @@ import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.s
 import {DevOpsTools} from "lib/foundry-devops/src/DevOpsTools.sol";
 import {NearX, decodePackedIds, TransactionOrReceiptId} from "../src/NearX.sol";
 
-// TODO: refactor for 128, taking the input fixture
 contract RequestSync is Script {
     function run() external {
         address mostRecentlyDeployedProxy = DevOpsTools

diff --git a/nearx/contract/script/RequestVerify.s.sol b/nearx/contract/script/RequestVerify.s.sol
@@ -6,7 +6,6 @@ import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.s
 import {DevOpsTools} from "lib/foundry-devops/src/DevOpsTools.sol";
 import {NearX, decodePackedIds, TransactionOrReceiptId} from "../src/NearX.sol";
 
-// TODO: refactor for 128, taking the input fixture
 contract RequestVerify is Script {
     function run() external {
         address mostRecentlyDeployedProxy = DevOpsTools

diff --git a/scripts/forge-script.sh b/scripts/forge-script.sh
@@ -6,9 +6,9 @@ then
 fi
 
 export VERSION="${VERSION:-v0.0.3}"
-export ETH_RPC="${ETH_RPC:-https://rpc.goerli.eth.gateway.fm}"
+export ETH_RPC="${ETH_RPC:-https://rpc.sepolia.eth.gateway.fm}"
 export NEAR_CHECKPOINT_HEADER_HASH="${NEAR_CHECKPOINT_HEADER_HASH:=0x63b87190ffbaa36d7dab50f918fe36f70ab26910a0e9d797161e2356561598e3}"
-export CHAIN_ID=${CHAIN_ID:=5}
+export CHAIN_ID=${CHAIN_ID:=11155111}
 
 if [ -z "$ETH_PRIVATE_KEY" ]; then
   echo "You need to set ETH_PRIVATE_KEY"
@@ -42,7 +42,8 @@ function pullDeployment() {
   echo "Getting deployments"
   (cd "api/NEAR Light Client" && npx -y @usebruno/cli run "Succinct/Get Deployments.bru" --env testnet -o /tmp/result.json)
   RESULT=$(cat /tmp/result.json | jq '.results[0].response.data')
-  echo $RESULT | jq .
+  RESULT=$(echo $RESULT | jq -r "[.[] | select(.chain_id == $CHAIN_ID)]")
+  echo $RESULT
 }
 
 function extractInfo() {