From d660887f35f89dc8a20ed8afd916db3b2f67451d Mon Sep 17 00:00:00 2001 From: Roy Crihfield Date: Mon, 9 Sep 2024 16:56:40 +0800 Subject: [PATCH] clean up whitespace --- nitro-bridge-demo.md | 33 +++++++++++++++---- .../compose/docker-compose-nitro-bridge.yml | 4 +-- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/nitro-bridge-demo.md b/nitro-bridge-demo.md index fc9c00b..aa47153 100644 --- a/nitro-bridge-demo.md +++ b/nitro-bridge-demo.md @@ -301,7 +301,13 @@ - Create a deployment spec-file for L1 nitro contract: ```bash - laconic-so --stack ~/cerc/nitro-stack/stack-orchestrator/stacks/nitro-contracts deploy init --output nitro-contracts-spec.yml --config "GETH_URL=http://host.docker.internal:8545,GETH_DEPLOYER_PK=888814df89c4358d7ddb3fa4b0213e7331239a80e1f013eaa7b2deca2a41a218,GETH_CHAIN_ID=1212,TOKEN_NAME=LaconicNetworkToken,TOKEN_SYMBOL=LNT,INITIAL_TOKEN_SUPPLY=129600" + laconic-so --stack ~/cerc/nitro-stack/stack-orchestrator/stacks/nitro-contracts deploy init --output nitro-contracts-spec.yml --config "\ + GETH_URL=http://host.docker.internal:8545,\ + GETH_DEPLOYER_PK=888814df89c4358d7ddb3fa4b0213e7331239a80e1f013eaa7b2deca2a41a218,\ + GETH_CHAIN_ID=1212,\ + TOKEN_NAME=LaconicNetworkToken,\ + TOKEN_SYMBOL=LNT,\ + INITIAL_TOKEN_SUPPLY=129600" ``` - Create a deployment `nitro-contracts` from the spec file @@ -315,7 +321,7 @@ ```bash laconic-so deployment --dir nitro-contracts-deployment start - # Check the l1 nitro contract deployments + # Check the L1 nitro contract deployments laconic-so deployment --dir nitro-contracts-deployment logs nitro-contracts -f ``` @@ -335,7 +341,20 @@ - Create a spec-file for the deployment, map container ports to host ports and set env variables: ```bash - laconic-so --stack ~/cerc/nitro-stack/stack-orchestrator/stacks/bridge deploy init --map-ports-to-host any-same --output bridge-nitro-spec.yml --config "NITRO_L1_CHAIN_URL=ws://host.docker.internal:8546,NITRO_L2_CHAIN_URL=ws://host.docker.internal:9546,NITRO_CHAIN_PK=888814df89c4358d7ddb3fa4b0213e7331239a80e1f013eaa7b2deca2a41a218,NITRO_SC_PK=0279651921cd800ac560c21ceea27aab0107b67daf436cdd25ce84cad30159b4,OPTIMISM_URL=http://host.docker.internal:9545,OPTIMISM_DEPLOYER_PK=$ACCOUNT_PK,TOKEN_NAME=LaconicNetworkToken,TOKEN_SYMBOL=LNT,INITIAL_TOKEN_SUPPLY=129600,NA_ADDRESS=$NA_ADDRESS,VPA_ADDRESS=$VPA_ADDRESS,CA_ADDRESS=$CA_ADDRESS,L1_ASSET_ADDRESS=$L1_ASSET_ADDRESS" + laconic-so --stack ~/cerc/nitro-stack/stack-orchestrator/stacks/bridge deploy init --map-ports-to-host any-same --output bridge-nitro-spec.yml --config "\ + NITRO_L1_CHAIN_URL=ws://host.docker.internal:8546,\ + NITRO_L2_CHAIN_URL=ws://host.docker.internal:9546,\ + NITRO_CHAIN_PK=888814df89c4358d7ddb3fa4b0213e7331239a80e1f013eaa7b2deca2a41a218,\ + NITRO_SC_PK=0279651921cd800ac560c21ceea27aab0107b67daf436cdd25ce84cad30159b4,\ + OPTIMISM_URL=http://host.docker.internal:9545,\ + OPTIMISM_DEPLOYER_PK=$ACCOUNT_PK,\ + TOKEN_NAME=LaconicNetworkToken,\ + TOKEN_SYMBOL=LNT,\ + INITIAL_TOKEN_SUPPLY=129600,\ + NA_ADDRESS=$NA_ADDRESS,\ + VPA_ADDRESS=$VPA_ADDRESS,\ + CA_ADDRESS=$CA_ADDRESS,\ + L1_ASSET_ADDRESS=$L1_ASSET_ADDRESS" ``` - Create a deployment from the spec file: @@ -558,7 +577,7 @@ - Once direct-fund objective is complete, bridge will create mirrored channel on L2 - Check node A' logs to see bridged-fund objective completed - + ```bash laconic-so deployment --dir l2alice-nitro-deployment logs nitro-node -f --tail 30 @@ -731,7 +750,7 @@ ``` - Check largest voucher received on the payment channel - + ```bash laconic-so deployment --dir l2charlie-nitro-deployment exec nitro-rpc-client "nitro-rpc-client get-voucher $PAYMENT_CHANNEL_ID -p 4005 -h nitro-node" @@ -740,7 +759,7 @@ # Amount: 200, # ChannelId: '0xb29aeb32c9495a793ebf7bd116232075d1e7bfe89fc82281c7d498e3ffd3e3bf', # Signature: '0x8fbdb9bb91932b422c30cc07bf422e4f1c3ae1be1b60e01bbfcb193ae5c8f5b0571de84667d87b5ef9b737287faa0ddf41f1f9fc159673205679622c69fd69d81b' - # } + # } ``` - Check payment channel status again to view updated channel state @@ -775,7 +794,7 @@ ```bash laconic-so deployment --dir l2alice-nitro-deployment exec nitro-rpc-client "nitro-rpc-client get-all-ledger-channels -p 4005 -h nitro-node" - # Expected output: + # Expected output: # [ # { # "ID": "0x6a9f5ccf1fa802525d794f4a899897f947615f6acc7141e61e056a8bfca29179", diff --git a/stack-orchestrator/compose/docker-compose-nitro-bridge.yml b/stack-orchestrator/compose/docker-compose-nitro-bridge.yml index 19441ba..e92bb44 100644 --- a/stack-orchestrator/compose/docker-compose-nitro-bridge.yml +++ b/stack-orchestrator/compose/docker-compose-nitro-bridge.yml @@ -3,7 +3,7 @@ name: nitro-bridge services: l2-nitro-contracts: image: cerc/nitro-client:local - restart: on-failure + restart: on-failure environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} OPTIMISM_DEPLOYER_PK: ${OPTIMISM_DEPLOYER_PK} @@ -27,7 +27,7 @@ services: restart: unless-stopped depends_on: l2-nitro-contracts: - condition: service_started + condition: service_started environment: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} OPTIMISM_CHAIN_ID: ${OPTIMISM_CHAIN_ID:-42069}