From f244d12a2f3e05164b50e42dce67a84818258b4a Mon Sep 17 00:00:00 2001
From: Thomas E Lackey <telackey@bozemanpass.com>
Date: Wed, 22 May 2024 23:36:05 -0500
Subject: [PATCH] Add metamask repos and settings

---
 .../config/go-nitro/run-nitro-node.sh         | 32 ++++++++-----------
 stack-orchestrator/config/nitro-auth/bob.env  |  2 ++
 .../stacks/din-payments/stack.yml             |  8 ++---
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/stack-orchestrator/config/go-nitro/run-nitro-node.sh b/stack-orchestrator/config/go-nitro/run-nitro-node.sh
index f0febfb..ea090a6 100755
--- a/stack-orchestrator/config/go-nitro/run-nitro-node.sh
+++ b/stack-orchestrator/config/go-nitro/run-nitro-node.sh
@@ -12,26 +12,22 @@ fi
 nitro_addresses_file="/app/deployment/nitro-addresses.json"
 
 # Check if CERC_NA_ADDRESS environment variable is set
-if [ -n "$CERC_NA_ADDRESS" ]; then
-  echo "CERC_NA_ADDRESS is set to '$CERC_NA_ADDRESS'"
-  echo "CERC_VPA_ADDRESS is set to '$CERC_VPA_ADDRESS'"
-  echo "CERC_CA_ADDRESS is set to '$CERC_CA_ADDRESS'"
-  echo "Using the above Nitro addresses"
-
-  NA_ADDRESS=${CERC_NA_ADDRESS}
-  VPA_ADDRESS=${CERC_VPA_ADDRESS}
-  CA_ADDRESS=${CERC_CA_ADDRESS}
-elif [ -f ${nitro_addresses_file} ]; then
+if [ -z "$CERC_NA_ADDRESS" ] && [ -f ${nitro_addresses_file} ]; then
   echo "Reading Nitro addresses from ${nitro_addresses_file}"
 
-  NA_ADDRESS=$(jq -r '.nitroAdjudicatorAddress' ${nitro_addresses_file})
-  VPA_ADDRESS=$(jq -r '.virtualPaymentAppAddress' ${nitro_addresses_file})
-  CA_ADDRESS=$(jq -r '.consensusAppAddress' ${nitro_addresses_file})
+  CERC_NA_ADDRESS=$(jq -r '.nitroAdjudicatorAddress' ${nitro_addresses_file})
+  CERC_VPA_ADDRESS=$(jq -r '.virtualPaymentAppAddress' ${nitro_addresses_file})
+  CERC_CA_ADDRESS=$(jq -r '.consensusAppAddress' ${nitro_addresses_file})
 else
-  echo "File ${nitro_addresses_file} not found"
+  echo "File ${nitro_addresses_file} not found and CERC_NA_ADDRESS CERC_VPA_ADDRESS CERC_CA_ADDRESS not set."
   exit 1
 fi
 
+echo "CERC_NA_ADDRESS is set to '$CERC_NA_ADDRESS'"
+echo "CERC_VPA_ADDRESS is set to '$CERC_VPA_ADDRESS'"
+echo "CERC_CA_ADDRESS is set to '$CERC_CA_ADDRESS'"
+export CERC_NA_ADDRESS CERC_VPA_ADDRESS CERC_CA_ADDRESS
+
 echo "Running Nitro node"
 
 if [[ "${CERC_GO_NITRO_WAIT_FOR_CHAIN:-true}" == "true" ]]; then
@@ -110,10 +106,10 @@ cd /app
   -publicip "0.0.0.0" \
   -pk ${CERC_NITRO_PK:-$CERC_NITRO_CHAIN_PK} \
   -chainpk ${CERC_NITRO_CHAIN_PK} \
-  -naaddress ${NA_ADDRESS} \
-  -vpaaddress ${VPA_ADDRESS} \
-  -caaddress ${CA_ADDRESS} \
+  -naaddress ${CERC_NA_ADDRESS} \
+  -vpaaddress ${CERC_VPA_ADDRESS} \
+  -caaddress ${CERC_CA_ADDRESS} \
   -usedurablestore=${CERC_NITRO_USE_DURABLE_STORE} \
   -durablestorefolder ${CERC_NITRO_DURABLE_STORE_FOLDER} \
   -bootpeers "${CERC_NITRO_BOOT_PEERS}" \
-  -chainstartblock $CERC_CHAIN_START_BLOCK
\ No newline at end of file
+  -chainstartblock $CERC_CHAIN_START_BLOCK
diff --git a/stack-orchestrator/config/nitro-auth/bob.env b/stack-orchestrator/config/nitro-auth/bob.env
index 056a5c1..e421e96 100644
--- a/stack-orchestrator/config/nitro-auth/bob.env
+++ b/stack-orchestrator/config/nitro-auth/bob.env
@@ -19,3 +19,5 @@ CERC_NITRO_USE_DURABLE_STORE=true
 CERC_NITRO_WS_MSG_PORT=5007
 CERC_NITRO_MSG_PUBLIC_IP=127.0.0.1
 CERC_NITRO_MSG_PUBLIC_PORT=5007
+
+CERC_NITRO_GETH_FREE_METHODS=eth_chainId,eth_blockNumber,net_version,eth_getBlockByNumber,eth_call,eth_getLogs,eth_gasPrice,eth_getTransactionCount,eth_estimateGas,eth_sendRawTransaction
diff --git a/stack-orchestrator/stacks/din-payments/stack.yml b/stack-orchestrator/stacks/din-payments/stack.yml
index fac00e9..3c0074b 100644
--- a/stack-orchestrator/stacks/din-payments/stack.yml
+++ b/stack-orchestrator/stacks/din-payments/stack.yml
@@ -2,12 +2,12 @@ version: "1.0"
 name: din-payments
 description: "Stack to demonstrate payments between various services"
 repos:
-  # for nitro-contracts and ts-nitro example app
-  - github.com/cerc-io/ts-nitro@telackey/nitro-auth-example-app
-  # for go-nitro, nitro-rpc-client, and go-nitro-auth example app
+  - github.com/cerc-io/ts-nitro@telackey/demo-auth
   - github.com/cerc-io/go-nitro@telackey/update
+  - git.vdb.to/cerc-io/eth-json-rpc-nitro
+  - github.com/cerc-io/metamask-core@telackey/nitro-simpler
+  - github.com/cerc-io/metamask-extension@telackey/nitro
 containers:
-  # nitro
   - cerc/nitro-contracts
   - cerc/ts-nitro
   - cerc/go-nitro