diff --git a/nitro-bridge-demo.md b/nitro-bridge-demo.md index 62b6b97..914bff2 100644 --- a/nitro-bridge-demo.md +++ b/nitro-bridge-demo.md @@ -264,7 +264,7 @@ ```bash export GETH_CHAIN_ID="1212" - export L1_ASSET_ADDRESS=$(laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "jq -r '.\"$GETH_CHAIN_ID\"[0].contracts.Token.address' /app/deployment/nitro-addresses.json") + export ASSET_ADDRESS=$(laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "jq -r '.\"$GETH_CHAIN_ID\"[0].contracts.Token.address' /app/deployment/nitro-addresses.json") export A_CHAIN_ADDRESS="0xe22AD83A0dE117bA0d03d5E94Eb4E0d80a69C62a" export C_CHAIN_ADDRESS="0xf1ac8Dd1f6D6F5c0dA99097c57ebF50CD99Ce293" @@ -274,10 +274,10 @@ ```bash # Send tokens to Alice - laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "cd packages/nitro-protocol && yarn hardhat transfer --contract $L1_ASSET_ADDRESS --to $A_CHAIN_ADDRESS --amount 1000 --network geth" + laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "cd packages/nitro-protocol && yarn hardhat transfer --contract $ASSET_ADDRESS --to $A_CHAIN_ADDRESS --amount 1000 --network geth" #Send tokens to Charlie - laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "cd packages/nitro-protocol && yarn hardhat transfer --contract $L1_ASSET_ADDRESS --to $C_CHAIN_ADDRESS --amount 1000 --network geth" + laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "cd packages/nitro-protocol && yarn hardhat transfer --contract $ASSET_ADDRESS --to $C_CHAIN_ADDRESS --amount 1000 --network geth" ``` - Get the deployed nitro contract addresses (run in the directory where the deployments were created): @@ -438,13 +438,13 @@ ```bash export BRIDGE_NITRO_ADDRESS=0xBBB676f9cFF8D242e9eaC39D063848807d3D1D94 export GETH_CHAIN_ID="1212" - export L1_ASSET_ADDRESS=$(laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "jq -r '.\"$GETH_CHAIN_ID\"[0].contracts.Token.address' /app/deployment/nitro-addresses.json") + export ASSET_ADDRESS=$(laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "jq -r '.\"$GETH_CHAIN_ID\"[0].contracts.Token.address' /app/deployment/nitro-addresses.json") ``` - Create ledger channel between A and Bridge with custom token ```bash - laconic-so deployment --dir l1alice-nitro-deployment exec nitro-rpc-client "nitro-rpc-client direct-fund $BRIDGE_NITRO_ADDRESS --assetAddress $L1_ASSET_ADDRESS --alphaAmount 1000000 --betaAmount 1000000 -p 4005 -h nitro-node" + laconic-so deployment --dir l1alice-nitro-deployment exec nitro-rpc-client "nitro-rpc-client direct-fund $BRIDGE_NITRO_ADDRESS --assetAddress $ASSET_ADDRESS --alphaAmount 1000000 --betaAmount 1000000 -p 4005 -h nitro-node" # Expected Output: # Objective started DirectFunding-0x161d289a50222caa781db215bb82a3ede4f557217742245525b8e8cbff04ec21 @@ -488,7 +488,7 @@ - Create ledger channel between C and Bridge with custom token ```bash - laconic-so deployment --dir l1charlie-nitro-deployment exec nitro-rpc-client "nitro-rpc-client direct-fund $BRIDGE_NITRO_ADDRESS --assetAddress $L1_ASSET_ADDRESS --alphaAmount 1000000 --betaAmount 1000000 -p 4005 -h nitro-node" + laconic-so deployment --dir l1charlie-nitro-deployment exec nitro-rpc-client "nitro-rpc-client direct-fund $BRIDGE_NITRO_ADDRESS --assetAddress $ASSET_ADDRESS --alphaAmount 1000000 --betaAmount 1000000 -p 4005 -h nitro-node" # Expected Output: # Objective started DirectFunding-0x69a3f09b6f4f94f033cf084e6e4a9453438c45b43606e9a95f5434f4c6527543 @@ -778,20 +778,18 @@ sudo rm -rf nitro-contracts-deployment ``` -- Clean up L1 and L2 deployments: - - Stop deployment and remove volumes: +- Clean up eth stack deployment: + - Stop deployment and remove volume: ```bash # Run where deployments are created - laconic-so deployment --dir fixturenet-optimism-deployment stop --delete-volumes laconic-so deployment --dir fixturenet-eth-deployment stop --delete-volumes ``` - - Clear deployments: + - Clear deployment: ```bash # Run where deployments are created - sudo rm -rf fixturenet-optimism-deployment sudo rm -rf fixturenet-eth-deployment ``` diff --git a/stack-orchestrator/compose/docker-compose-nitro-node.yml b/stack-orchestrator/compose/docker-compose-nitro-node.yml index 1456d8f..ad5f04b 100644 --- a/stack-orchestrator/compose/docker-compose-nitro-node.yml +++ b/stack-orchestrator/compose/docker-compose-nitro-node.yml @@ -19,7 +19,6 @@ services: NA_ADDRESS: ${NA_ADDRESS} CA_ADDRESS: ${CA_ADDRESS} VPA_ADDRESS: ${VPA_ADDRESS} - BRIDGE_ADDRESS: "" NITRO_PUBLIC_RPC_HOST: nitro-node entrypoint: ["bash", "-c", "/app/run-nitro-node.sh"] volumes: diff --git a/stack-orchestrator/config/go-nitro/run-bridge.sh b/stack-orchestrator/config/go-nitro/run-bridge.sh index 9c32052..06dea26 100755 --- a/stack-orchestrator/config/go-nitro/run-bridge.sh +++ b/stack-orchestrator/config/go-nitro/run-bridge.sh @@ -30,7 +30,6 @@ cat < "$bridge_config_file" chainpk = "$NITRO_CHAIN_PK" statechannelpk = "$NITRO_SC_PK" l1chainurl = "$NITRO_CHAIN_URL" -l2chainurl = "$NITRO_CHAIN_URL" nodel1msgport = $NITRO_L1_MSG_PORT nodel2msgport = $NITRO_L2_MSG_PORT rpcport = $NITRO_RPC_PORT @@ -42,9 +41,6 @@ vpaaddress = "${VPA_ADDRESS}" caaddress = "${CA_ADDRESS}" EOF -# Export bridge address -export BRIDGE_ADDRESS="" - # Start bridge echo "Starting nitro-bridge" ./nitro-bridge -config $bridge_config_file