From dd9d51d047ba04979b11571e37ce5c37a75ac3eb Mon Sep 17 00:00:00 2001 From: Adw8 Date: Fri, 11 Oct 2024 12:24:02 +0530 Subject: [PATCH] Update README --- nitro-bridge-demo.md | 6 +++--- .../compose/docker-compose-nitro-rpc-client.yml | 2 +- .../container-build/cerc-go-nitro/Dockerfile | 6 +++++- stack-orchestrator/stacks/bridge/README.md | 6 ------ stack-orchestrator/stacks/nitro-contracts/README.md | 3 ++- stack-orchestrator/stacks/nitro-node/README.md | 8 -------- 6 files changed, 11 insertions(+), 20 deletions(-) diff --git a/nitro-bridge-demo.md b/nitro-bridge-demo.md index 7bddb26..b09a84e 100644 --- a/nitro-bridge-demo.md +++ b/nitro-bridge-demo.md @@ -264,7 +264,7 @@ ```bash export GETH_CHAIN_ID="1212" - 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 ASSET_ADDRESS=$(laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "jq -r '.\"$GETH_CHAIN_ID\"[0].contracts.TestToken.address' /app/deployment/nitro-addresses.json") export A_CHAIN_ADDRESS="0xe22AD83A0dE117bA0d03d5E94Eb4E0d80a69C62a" export C_CHAIN_ADDRESS="0xf1ac8Dd1f6D6F5c0dA99097c57ebF50CD99Ce293" @@ -276,7 +276,7 @@ # Send tokens to Alice 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 + # Send tokens to Charlie 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" ``` @@ -438,7 +438,7 @@ ```bash export BRIDGE_NITRO_ADDRESS=0xBBB676f9cFF8D242e9eaC39D063848807d3D1D94 export GETH_CHAIN_ID="1212" - 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 ASSET_ADDRESS=$(laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "jq -r '.\"$GETH_CHAIN_ID\"[0].contracts.TestToken.address' /app/deployment/nitro-addresses.json") ``` - Create ledger channel between A and Bridge with custom token diff --git a/stack-orchestrator/compose/docker-compose-nitro-rpc-client.yml b/stack-orchestrator/compose/docker-compose-nitro-rpc-client.yml index 4e64070..df4d118 100644 --- a/stack-orchestrator/compose/docker-compose-nitro-rpc-client.yml +++ b/stack-orchestrator/compose/docker-compose-nitro-rpc-client.yml @@ -9,7 +9,7 @@ services: NODE_EXTRA_CA_CERTS: "/app/mkcert-caroot/rootCA.pem" command: ["bash", "-c", "tail -f /dev/null"] healthcheck: - test: ["CMD-SHELL", "nitro-cli --version -p 4005"] + test: ["CMD-SHELL", "nitro-rpc-client --version -p 4005"] interval: 30s timeout: 5s retries: 10 diff --git a/stack-orchestrator/container-build/cerc-go-nitro/Dockerfile b/stack-orchestrator/container-build/cerc-go-nitro/Dockerfile index a695373..4bac47e 100644 --- a/stack-orchestrator/container-build/cerc-go-nitro/Dockerfile +++ b/stack-orchestrator/container-build/cerc-go-nitro/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:latest +FROM debian:bookworm-slim RUN apt-get update RUN apt-get install -y jq netcat-traditional ca-certificates curl @@ -19,3 +19,7 @@ RUN curl -LO https://git.vdb.to/cerc-io/nitro/releases/download/latest/bridge # Make binaries executable RUN chmod +x ./nitro RUN chmod +x ./bridge + +# Verify that binaries are correctly setup +RUN ./nitro help +RUN ./bridge help diff --git a/stack-orchestrator/stacks/bridge/README.md b/stack-orchestrator/stacks/bridge/README.md index c46d0c2..1baa9ba 100644 --- a/stack-orchestrator/stacks/bridge/README.md +++ b/stack-orchestrator/stacks/bridge/README.md @@ -8,12 +8,6 @@ laconic-so fetch-stack git.vdb.to/cerc-io/nitro-stack ``` -- Clone required repositories: - - ```bash - laconic-so --stack ~/cerc/nitro-stack/stack-orchestrator/stacks/bridge setup-repositories - ``` - - Build container images: ```bash diff --git a/stack-orchestrator/stacks/nitro-contracts/README.md b/stack-orchestrator/stacks/nitro-contracts/README.md index 8dc0e92..352b0f2 100644 --- a/stack-orchestrator/stacks/nitro-contracts/README.md +++ b/stack-orchestrator/stacks/nitro-contracts/README.md @@ -11,8 +11,9 @@ - Clone required repositories: ```bash - laconic-so --stack ~/cerc/nitro-stack/stack-orchestrator/stacks/nitro-contracts setup-repositories + laconic-so --stack ~/cerc/nitro-stack/stack-orchestrator/stacks/nitro-contracts setup-repositories --git-ssh --pull ``` + Make sure you have access to the `go-nitro` repository - Build container images: diff --git a/stack-orchestrator/stacks/nitro-node/README.md b/stack-orchestrator/stacks/nitro-node/README.md index f813c07..5d71018 100644 --- a/stack-orchestrator/stacks/nitro-node/README.md +++ b/stack-orchestrator/stacks/nitro-node/README.md @@ -8,14 +8,6 @@ laconic-so fetch-stack git.vdb.to/cerc-io/nitro-stack ``` -- Clone required repositories - - ```bash - laconic-so --stack ~/cerc/nitro-stack/stack-orchestrator/stacks/nitro-node setup-repositories - ``` - - Note: Replace path to nitro stack with actual path - - Build the container image ```bash