diff --git a/.env b/.env index ece5f90..b435b41 100644 --- a/.env +++ b/.env @@ -19,12 +19,19 @@ AUTH0_ISSUER_URL=https://dev-z8x4rhzfosi03fqx.us.auth0.com/ REDIS_HOST=localhost REDIS_PORT=6379 -# Stack version +# Stack version 0.0.11 +# +# Find latest here: https://github.com/topos-protocol/polygon-edge/releases TOPOS_EDGE_VERSION=1.3.0-topos -TOPOS_MESSAGING_PROTOCOL_CONTRACTS_VERSION=3.1.0 -TOPOS_VERSION=0.0.10 -EXECUTOR_SERVICE_VERSION=1.2.0 +# Find latest here: https://github.com/topos-protocol/topos-smart-contracts/releases +TOPOS_MESSAGING_PROTOCOL_CONTRACTS_VERSION=3.2.0 + +# Find latest here: https://github.com/topos-protocol/topos/releases +TOPOS_VERSION=0.0.11 + +# Find latest here: https://github.com/topos-protocol/executor-service/releases +EXECUTOR_SERVICE_VERSION=1.2.0 # TESTS export LOCAL_ERC20_HOME=./ diff --git a/.env.secrets b/.env.secrets new file mode 100644 index 0000000..b6c4d1f --- /dev/null +++ b/.env.secrets @@ -0,0 +1,8 @@ +export PRIVATE_KEY=0xd7e2e00b43c12cf17239d4755ed744df6ca70a933fc7c8bbb7da1342a5ff2e38 +export TOKEN_DEPLOYER_SALT=m1Ln9uF9MGZ2PcR +export TOPOS_CORE_SALT=dCyN8VZz5sXgqMO +export TOPOS_CORE_PROXY_SALT=aRV8Mp9o4xRpLbF +export ERC20_MESSAGING_SALT=ho37cJbGkgI6vnp +export SUBNET_REGISTRATOR_SALT=azsRlXyGu0ty291 +export AUTH0_CLIENT_ID=xVF6EuPDaazQchfjFpGAdcJUpHk2W5I2 +export AUTH0_CLIENT_SECRET=-CrwnrgSx1EaP_oaKAFXFdqrIvA4WK8Pcpd5xC4o3ZfYB4H4V4FPHfEbqpu4KZN8 diff --git a/README.md b/README.md index 5b5cc7d..e51ad34 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,14 @@ https://docs.docker.com/get-docker/ docker compose down -v ``` +*Note*: The `-v` flag is important here to ensure that we clean up storage in between runs. + ## Run If you have a partial or complete existing run, it's recommended to shut down the whole stack (see [Stop](#stop)) before re-running it. +For convenience we have included a `.env.secrets` file with example keys and other info. When starting the stack locally, make sure you `source ./.env.secrets`. + To run the whole stack: ```sh diff --git a/package.json b/package.json index d7966e1..a209319 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "local-erc20-messaging-infra", - "version": "1.0.0", + "version": "2.5.0", "description": "", "author": "", "devDependencies": { diff --git a/subnet-topos.yml b/subnet-topos.yml index 654f53b..425b2db 100644 --- a/subnet-topos.yml +++ b/subnet-topos.yml @@ -36,12 +36,13 @@ services: topos-init: container_name: topos-init - command: sh -c "mkdir -p /data/node/ -p /data/subnet/topos && \ - mv /data/data-1 /data/node/node-1 && \ - mv /data/data-2 /data/node/node-2 && \ - mv /data/data-3 /data/node/node-3 && \ - mv /data/data-4 /data/node/node-4 && \ - mv /data/genesis.json /data/subnet/topos/genesis.json && \ + command: sh -c " + mkdir -p /data/node/ -p /data/subnet/topos && \ + mv -f /data/data-1 /data/node/node-1 && \ + mv -f /data/data-2 /data/node/node-2 && \ + mv -f /data/data-3 /data/node/node-3 && \ + mv -f /data/data-4 /data/node/node-4 && \ + mv -f /data/genesis.json /data/subnet/topos/genesis.json && \ chmod a+rwx /data/* && ls -lRa /data && cat /data/subnet/topos/genesis.json" image: debian:bullseye-slim depends_on: @@ -74,7 +75,7 @@ services: - "--home" - "/data" healthcheck: - test: | + test: | set -e ./topos node status --node http://localhost:1340 /data/polygon-edge status | grep 'Current Block Number (base 10) = .[0-9]*' @@ -153,9 +154,9 @@ services: - "--home" - "/data" healthcheck: - test: | - set -e - ./topos node status --node http://localhost:1340 + test: | + set -e + ./topos node status --node http://localhost:1340 /data/polygon-edge status | grep 'Current Block Number (base 10) = .[0-9]*' interval: 10s start_period: 1s @@ -193,7 +194,7 @@ services: - "--home" - "/data" healthcheck: - test: | + test: | set -e ./topos node status --node http://localhost:1340 /bin/sh /polygon_edge_healthcheck.sh /data