cerc-io/stack-orchestrator
17
1
Fork 3
Code Issues 112 Pull Requests 19 Actions Packages Projects Releases 480 Wiki Activity

Fix empty CERC_RELAY_MULTIADDR env variable

Browse Source
This commit is contained in:
Nabarun 2023-10-04 20:30:56 +05:30
parent aba8d086f6
commit 547b795111
6 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/data/compose/docker-compose-ponder.yml
View File

@ -6,8 +6,8 @@ services:
image: cerc/ponder:local image: cerc/ponder:local
working_dir: /app/examples/token-erc20 working_dir: /app/examples/token-erc20
environment: environment:
PONDER_CHAIN_ID: ${PONDER_CHAIN_ID:-99} CERC_PONDER_CHAIN_ID: ${PONDER_CHAIN_ID:-99}
PONDER_RPC_URL_1: ${PONDER_RPC_URL_1:-http://nitro-reverse-payment-proxy:8081} CERC_PONDER_RPC_URL_1: ${PONDER_RPC_URL_1:-http://nitro-reverse-payment-proxy:8081}
CERC_PONDER_NITRO_PK: ${CERC_PONDER_NITRO_PK:-58368d20ff12f17669c06158c21d885897aa56f9be430edc789614bf9851d53f} CERC_PONDER_NITRO_PK: ${CERC_PONDER_NITRO_PK:-58368d20ff12f17669c06158c21d885897aa56f9be430edc789614bf9851d53f}
CERC_PONDER_NITRO_CHAIN_PK: ${CERC_PONDER_NITRO_CHAIN_PK:-fb1e9af328c283ca3e2486e7c24d13582b7912057d8b9542ff41503c85bc05c0} CERC_PONDER_NITRO_CHAIN_PK: ${CERC_PONDER_NITRO_CHAIN_PK:-fb1e9af328c283ca3e2486e7c24d13582b7912057d8b9542ff41503c85bc05c0}
CERC_PONDER_NITRO_CHAIN_URL: ${CERC_PONDER_NITRO_CHAIN_URL:-http://fixturenet-eth-geth-1:8546} CERC_PONDER_NITRO_CHAIN_URL: ${CERC_PONDER_NITRO_CHAIN_URL:-http://fixturenet-eth-geth-1:8546}

2
app/data/config/nitro-contracts/deploy.sh
View File

@ -53,5 +53,5 @@ done
echo "Using CERC_PRIVATE_KEY_DEPLOYER from env" echo "Using CERC_PRIVATE_KEY_DEPLOYER from env"
yarn test:deploy-contracts --chainurl ${CERC_ETH_RPC_ENDPOINT} --key ${CERC_PRIVATE_KEY_DEPLOYER} --addressesFilePath ${nitro_addresses_file} yarn test:deploy-contracts --chainUrl ${CERC_ETH_RPC_ENDPOINT} --key ${CERC_PRIVATE_KEY_DEPLOYER} --addressesFilePath ${nitro_addresses_file}
cat ${nitro_addresses_file} cat ${nitro_addresses_file}

21
app/data/config/ponder/ponder-start.sh
View File

@ -57,15 +57,18 @@ fi
env_file='.env.local' env_file='.env.local'
echo "PONDER_TELEMETRY_DISABLED=true" >> "$env_file" echo "PONDER_TELEMETRY_DISABLED=true" >> "$env_file"
echo "PONDER_LOG_LEVEL=debug" >> "$env_file" echo "PONDER_LOG_LEVEL=debug" >> "$env_file"
echo "PONDER_CHAIN_ID=\"$PONDER_CHAIN_ID\"" > "$env_file" echo "PONDER_CHAIN_ID=\"$CERC_PONDER_CHAIN_ID\"" > "$env_file"
echo "PONDER_RPC_URL_1=\"$PONDER_RPC_URL_1\"" >> "$env_file" echo "PONDER_RPC_URL_1=\"$CERC_PONDER_RPC_URL_1\"" >> "$env_file"
echo "CERC_PONDER_NITRO_PK=\"$CERC_PONDER_NITRO_PK\"" >> "$env_file" echo "PONDER_NITRO_PK=\"$CERC_PONDER_NITRO_PK\"" >> "$env_file"
echo "CERC_PONDER_NITRO_CHAIN_PK=\"$CERC_PONDER_NITRO_CHAIN_PK\"" >> "$env_file" echo "PONDER_NITRO_CHAIN_PK=\"$CERC_PONDER_NITRO_CHAIN_PK\"" >> "$env_file"
echo "CERC_PONDER_NITRO_CHAIN_URL=\"$CERC_PONDER_NITRO_CHAIN_URL\"" >> "$env_file" echo "PONDER_NITRO_CHAIN_URL=\"$CERC_PONDER_NITRO_CHAIN_URL\"" >> "$env_file"
echo "CERC_RELAY_MULTIADDR=\"$CERC_RELAY_MULTIADDR\"" >> "$env_file" echo "RELAY_MULTIADDR -> ${CERC_RELAY_MULTIADDR}"
echo "CERC_UPSTREAM_NITRO_ADDRESS=\"$CERC_UPSTREAM_NITRO_ADDRESS\"" >> "$env_file" echo "RELAY_MULTIADDR=\"$CERC_RELAY_MULTIADDR\"" >> "$env_file"
echo "CERC_UPSTREAM_NITRO_MULTIADDR=\"$CERC_UPSTREAM_NITRO_MULTIADDR\"" >> "$env_file" echo "UPSTREAM_NITRO_ADDRESS=\"$CERC_UPSTREAM_NITRO_ADDRESS\"" >> "$env_file"
echo "CERC_UPSTREAM_NITRO_PAY_AMOUNT=\"$CERC_UPSTREAM_NITRO_PAY_AMOUNT\"" >> "$env_file" echo "UPSTREAM_NITRO_MULTIADDR=\"$CERC_UPSTREAM_NITRO_MULTIADDR\"" >> "$env_file"
echo "UPSTREAM_NITRO_PAY_AMOUNT=\"$CERC_UPSTREAM_NITRO_PAY_AMOUNT\"" >> "$env_file"
cat "$env_file"
# Keep the container running # Keep the container running
tail -f tail -f

14
app/data/config/ponder/ponder.config.ts
View File

@ -12,8 +12,8 @@ export const config: Config = {
pollingInterval: 5000, pollingInterval: 5000,
payments: { payments: {
nitro: { nitro: {
address: process.env.CERC_UPSTREAM_NITRO_ADDRESS!, address: process.env.UPSTREAM_NITRO_ADDRESS!,
multiAddr: process.env.CERC_UPSTREAM_NITRO_MULTIADDR!, multiAddr: process.env.UPSTREAM_NITRO_MULTIADDR!,
fundingAmounts: { fundingAmounts: {
// TODO: Pass amounts from env // TODO: Pass amounts from env
directFund: "1000000000000", directFund: "1000000000000",
@ -25,7 +25,7 @@ export const config: Config = {
"eth_getBlockByNumber", "eth_getBlockByNumber",
"eth_getBlockByHash", "eth_getBlockByHash",
], ],
amount: process.env.CERC_UPSTREAM_NITRO_PAY_AMOUNT!, amount: process.env.UPSTREAM_NITRO_PAY_AMOUNT!,
}, },
}, },
], ],
@ -40,11 +40,11 @@ export const config: Config = {
}, },
], ],
nitro: { nitro: {
privateKey: process.env.CERC_PONDER_NITRO_PK!, privateKey: process.env.PONDER_NITRO_PK!,
chainPrivateKey: process.env.CERC_PONDER_NITRO_CHAIN_PK!, chainPrivateKey: process.env.PONDER_NITRO_CHAIN_PK!,
chainURL: process.env.CERC_PONDER_NITRO_CHAIN_URL!, chainURL: process.env.PONDER_NITRO_CHAIN_URL!,
contractAddresses, contractAddresses,
relayMultiAddr: process.env.CERC_RELAY_MULTIADDR!, relayMultiAddr: process.env.RELAY_MULTIADDR!,
store: "./.ponder/nitro-db", store: "./.ponder/nitro-db",
}, },
}; };

4
app/data/container-build/cerc-nitro-contracts/Dockerfile
View File

@ -7,6 +7,6 @@ WORKDIR /app
COPY . . COPY . .
RUN echo "Installing dependencies" && \ RUN echo "Installing dependencies" && \
yarn yarn && yarn build:node
WORKDIR /app/packages/nitro-util WORKDIR /app/packages/nitro-node

2
app/data/stacks/fixturenet-payments/stack.yml
View File

@ -18,7 +18,7 @@ repos:
- github.com/cerc-io/mobymask-snap - github.com/cerc-io/mobymask-snap
- github.com/cerc-io/mobymask-ui@v0.2.0 - github.com/cerc-io/mobymask-ui@v0.2.0
# ponder repo # ponder repo
- github.com/cerc-io/ponder@laconic - github.com/cerc-io/ponder@ng-nitro-config # TODO: Update after fixes
containers: containers:
# fixturenet images # fixturenet images
- cerc/go-ethereum - cerc/go-ethereum