From c44ee1d46018eaab1e78e092393b3c75aa2ab82d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Dan?= Date: Tue, 29 Aug 2023 14:57:09 +0200 Subject: [PATCH] chore: remove Edena (#22) --- .env | 9 +-- contracts.yml | 30 +-------- subnet-edena.yml | 163 ----------------------------------------------- 3 files changed, 3 insertions(+), 199 deletions(-) delete mode 100644 subnet-edena.yml diff --git a/.env b/.env index 31b1d16..0fd19d9 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -COMPOSE_FILE=network.yml:contracts.yml:subnet-topos.yml:subnet-incal.yml:subnet-edena.yml:tce.yml:executor-service.yml +COMPOSE_FILE=network.yml:contracts.yml:subnet-topos.yml:subnet-incal.yml:tce.yml:executor-service.yml COMPOSE_PROJECT_NAME=infra # Topos Subnet @@ -8,12 +8,7 @@ TOPOS_CHAIN_ID=2357 # Incal INCAL_HOST_PORT=20002 INCAL_CHAIN_ID=2358 -INCAL_LOGO_URL=https://tinyurl.com/23c2y3pp - -# Edena -EDENA_HOST_PORT=30002 -EDENA_CHAIN_ID=2359 -EDENA_LOGO_URL=https://tinyurl.com/3f7vx76p +INCAL_LOGO_URL=https://toposware.com/logo-incal.svg # Executor Service AUTH0_AUDIENCE=https://executor.demo.toposware.com diff --git a/contracts.yml b/contracts.yml index 144cc87..88c42e4 100644 --- a/contracts.yml +++ b/contracts.yml @@ -24,20 +24,15 @@ services: - INCAL_HOST_PORT=${INCAL_HOST_PORT} - INCAL_CHAIN_ID=${INCAL_CHAIN_ID} - INCAL_LOGO_URL=${INCAL_LOGO_URL} - - EDENA_HOST_PORT=${EDENA_HOST_PORT} - - EDENA_CHAIN_ID=${EDENA_CHAIN_ID} - - EDENA_LOGO_URL=${EDENA_LOGO_URL} command: bash -c " npx ts-node scripts/deploy-topos-msg-protocol http://topos-node-1:8545 $(cat /data/topos/data-1/consensus/validator.key) > /contracts/.env && echo export SUBNET_REGISTRATOR_CONTRACT_ADDRESS=$(npx ts-node scripts/deploy http://topos-node-1:8545 artifacts/contracts/topos-core/SubnetRegistrator.sol/SubnetRegistrator.json $SUBNET_REGISTRATOR_SALT 4000000) >> /contracts/.env && source /contracts/.env && - npm run register-subnet http://topos-node-1:8545 $(printenv SUBNET_REGISTRATOR_CONTRACT_ADDRESS) Incal $INCAL_CHAIN_ID localhost:$INCAL_HOST_PORT INCA $INCAL_LOGO_URL $(cat /data/incal/data-1/consensus/validator.key) && - npm run register-subnet http://topos-node-1:8545 $(printenv SUBNET_REGISTRATOR_CONTRACT_ADDRESS) Edena $EDENA_CHAIN_ID localhost:$EDENA_HOST_PORT EDEN $EDENA_LOGO_URL $(cat /data/edena/data-1/consensus/validator.key)" + npm run register-subnet http://topos-node-1:8545 $(printenv SUBNET_REGISTRATOR_CONTRACT_ADDRESS) Incal $INCAL_CHAIN_ID localhost:$INCAL_HOST_PORT INCA $INCAL_LOGO_URL $(cat /data/incal/data-1/consensus/validator.key)" volumes: - contracts:/contracts - topos-data:/data/topos - incal-data:/data/incal - - edena-data:/data/edena depends_on: contracts-init: condition: service_completed_successfully @@ -45,8 +40,6 @@ services: condition: service_healthy incal-node-1: condition: service_healthy - edena-node-1: - condition: service_healthy networks: - local-erc20-messaging-infra-docker @@ -71,26 +64,5 @@ services: networks: - local-erc20-messaging-infra-docker - contracts-edena: - image: ghcr.io/topos-protocol/topos-smart-contracts:${TOPOS_MESSAGING_PROTOCOL_CONTRACTS_VERSION} - container_name: contracts-edena - init: true - environment: - - PRIVATE_KEY=${PRIVATE_KEY} - - TOKEN_DEPLOYER_SALT=${TOKEN_DEPLOYER_SALT} - - TOPOS_CORE_SALT=${TOPOS_CORE_SALT} - - TOPOS_CORE_PROXY_SALT=${TOPOS_CORE_PROXY_SALT} - - ERC20_MESSAGING_SALT=${ERC20_MESSAGING_SALT} - - SUBNET_REGISTRATOR_SALT=${SUBNET_REGISTRATOR_SALT} - command: bash -c " - npm run deploy:topos-msg-protocol http://edena-node-1:8545 $$(cat /data/edena/data-1/consensus/validator.key)" - volumes: - - edena-data:/data/edena - depends_on: - edena-node-1: - condition: service_healthy - networks: - - local-erc20-messaging-infra-docker - volumes: contracts: diff --git a/subnet-edena.yml b/subnet-edena.yml deleted file mode 100644 index 6f16386..0000000 --- a/subnet-edena.yml +++ /dev/null @@ -1,163 +0,0 @@ -version: "3.3" -services: - # Create keys and genesis - edena-init: - image: ghcr.io/topos-protocol/polygon-edge:${TOPOS_EDGE_VERSION} - container_name: edena-init - init: true - command: ["init", "ibft"] - environment: - - CHAIN_ID=${EDENA_CHAIN_ID} - - BOOTNODE_DOMAIN_NAME=edena-node-1 - depends_on: - contracts-init: - condition: service_completed_successfully - volumes: - - edena-data:/data - - contracts:/contracts - networks: - - local-erc20-messaging-infra-docker - - edena-node-1: - image: ghcr.io/topos-protocol/polygon-edge:${TOPOS_EDGE_VERSION} - container_name: edena-node-1 - init: true - command: - - "server" - - "--data-dir" - - "/data/data-1" - - "--chain" - - "/data/genesis.json" - - "--grpc-address" - - "0.0.0.0:9632" - - "--libp2p" - - "0.0.0.0:1478" - - "--jsonrpc" - - "0.0.0.0:8545" - - "--seal" - healthcheck: - test: ./polygon-edge status | awk '/Number/ {print $$NF}' | tr -d '\n' | grep -v -w "0" - interval: 5s - retries: 10 - depends_on: - edena-init: - condition: service_completed_successfully - volumes: - - edena-data:/data - restart: on-failure - ports: - - "${EDENA_HOST_PORT}:8545" - networks: - - local-erc20-messaging-infra-docker - - edena-node-2: - image: ghcr.io/topos-protocol/polygon-edge:${TOPOS_EDGE_VERSION} - container_name: edena-node-2 - init: true - command: - - "server" - - "--data-dir" - - "/data/data-2" - - "--chain" - - "/data/genesis.json" - - "--grpc-address" - - "0.0.0.0:9632" - - "--libp2p" - - "0.0.0.0:1478" - - "--jsonrpc" - - "0.0.0.0:8545" - - "--seal" - depends_on: - edena-init: - condition: service_completed_successfully - volumes: - - edena-data:/data - restart: on-failure - networks: - - local-erc20-messaging-infra-docker - - edena-node-3: - image: ghcr.io/topos-protocol/polygon-edge:${TOPOS_EDGE_VERSION} - container_name: edena-node-3 - init: true - command: - - "server" - - "--data-dir" - - "/data/data-3" - - "--chain" - - "/data/genesis.json" - - "--grpc-address" - - "0.0.0.0:9632" - - "--libp2p" - - "0.0.0.0:1478" - - "--jsonrpc" - - "0.0.0.0:8545" - - "--seal" - depends_on: - edena-init: - condition: service_completed_successfully - volumes: - - edena-data:/data - restart: on-failure - networks: - - local-erc20-messaging-infra-docker - - edena-node-4: - image: ghcr.io/topos-protocol/polygon-edge:${TOPOS_EDGE_VERSION} - container_name: edena-node-4 - init: true - command: - - "server" - - "--data-dir" - - "/data/data-4" - - "--chain" - - "/data/genesis.json" - - "--grpc-address" - - "0.0.0.0:9632" - - "--libp2p" - - "0.0.0.0:1478" - - "--jsonrpc" - - "0.0.0.0:8545" - - "--seal" - depends_on: - edena-init: - condition: service_completed_successfully - volumes: - - edena-data:/data - restart: on-failure - networks: - - local-erc20-messaging-infra-docker - - edena-sequencer: - image: ghcr.io/topos-protocol/topos:${TOPOS_VERSION} - container_name: edena-sequencer - init: true - volumes: - - contracts:/contracts - - edena-data:/data - depends_on: - tce-boot: - condition: service_healthy - contracts-topos: - condition: service_completed_successfully - contracts-edena: - condition: service_completed_successfully - entrypoint: "" - command: bash -c " - source /contracts/.env && - export SUBNET_CONTRACT_ADDRESS=$(printenv TOPOS_CORE_PROXY_CONTRACT_ADDRESS) && - init.sh boot sequencer run" - environment: - - RUST_LOG=info,topos=debug - - TOOLCHAIN_VERSION=stable - - RUST_BACKTRACE=full - - SUBNET_JSONRPC_ENDPOINT=edena-node-1:8545 - - TOPOS_LOCAL_SUBNET_DATA_DIR=/data/data-1 - - TOPOS_BASE_TCE_API_URL=http://infra-tce-boot-1:1340 - - TOPOS_OTLP_SERVICE_NAME=local-edena-sequencer - - TOPOS_OTLP_AGENT=https://otel-collector.telemetry.devnet-1.toposware.com - networks: - - local-erc20-messaging-infra-docker - -volumes: - edena-data: