feat: use compact topos subnet with full nodes (#37)

Signed-off-by: Simon Paitrault <[email protected]> Co-authored-by: Monir Hadji <[email protected]> Co-authored-by: Simon Paitrault <[email protected]>
topos-protocol · Nov 28, 2023 · d6a6459 · d6a6459
1 parent 1b38c89
commit d6a6459
Show file tree

Hide file tree

Showing 21 changed files with 156 additions and 461 deletions.
diff --git a/.env b/.env
@@ -1,4 +1,4 @@
-COMPOSE_FILE=network.yml:contracts.yml:subnet-topos.yml:subnet-incal.yml:tce.yml:executor-service.yml
+COMPOSE_FILE=network.yml:contracts.yml:subnet-topos.yml:subnet-incal.yml:executor-service.yml
 COMPOSE_PROJECT_NAME=infra
 
 # Topos Subnet
@@ -12,7 +12,6 @@ INCAL_LOGO_URL=https://toposware.com/logo-incal.svg
 
 # Generic
 PRICE_LIMIT=0
-# PRICE_LIMIT=100000
 
 # Executor Service
 AUTH0_AUDIENCE=https://executor.demo.toposware.com
@@ -23,5 +22,5 @@ REDIS_PORT=6379
 # Stack version
 TOPOS_EDGE_VERSION=1.3.0-topos
 TOPOS_MESSAGING_PROTOCOL_CONTRACTS_VERSION=2.0.0
-TOPOS_VERSION=0.0.10
+TOPOS_VERSION=0.0.10-rc7
 EXECUTOR_SERVICE_VERSION=1.0.0
diff --git a/.github/workflows/test:e2e.yml b/.github/workflows/test:e2e.yml
@@ -17,4 +17,5 @@ jobs:
           workflow_file_name: frontend:erc20-messaging.yml
           ref: main
           wait_interval: 60
-          client_payload: '{ "local-erc20-messaging-infra-ref": "${{ github.head_ref }}" }'
+          # Remove topos-docker-tag when https://github.com/topos-protocol/topos/pull/386 is merged
+          client_payload: '{ "local-erc20-messaging-infra-ref": "${{ github.head_ref }}", "topos-docker-tag": "pr-386" }'
diff --git a/contracts.yml b/contracts.yml
@@ -25,10 +25,10 @@ services:
       - INCAL_CHAIN_ID=${INCAL_CHAIN_ID}
       - INCAL_LOGO_URL=${INCAL_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-subnet-registrator http://topos-node-1:8545 $(cat /data/topos/data-1/consensus/validator.key) $SUBNET_REGISTRATOR_SALT 4000000) >> /contracts/.env &&
+      npx ts-node scripts/deploy-topos-msg-protocol http://topos-node-1:8545 $(cat /data/topos/node/node-1/consensus/validator.key) > /contracts/.env &&
+      echo export SUBNET_REGISTRATOR_CONTRACT_ADDRESS=$(npx ts-node scripts/deploy-subnet-registrator http://topos-node-1:8545 $(cat /data/topos/node/node-1/consensus/validator.key) $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 http://localhost:$INCAL_HOST_PORT ws://localhost:$INCAL_HOST_PORT/ws INCA $INCAL_LOGO_URL $(cat /data/topos/data-1/consensus/validator.key) $(cat /data/incal/data-1/consensus/validator.key)"
+      npm run register-subnet http://topos-node-1:8545 $(printenv SUBNET_REGISTRATOR_CONTRACT_ADDRESS) Incal $INCAL_CHAIN_ID http://localhost:$INCAL_HOST_PORT ws://localhost:$INCAL_HOST_PORT/ws INCA $INCAL_LOGO_URL $(cat /data/topos/node/node-1/consensus/validator.key) $(cat /data/incal/data-1/consensus/validator.key)"
     volumes:
       - contracts:/contracts
       - topos-data:/data/topos

diff --git a/libp2p_keys.json b/libp2p_keys.json
diff --git a/node_config/node/boot/config.toml b/node_config/node/boot/config.toml
@@ -4,10 +4,15 @@ role = "validator"
 subnet = "topos"
 
 [edge]
+libp2p="0.0.0.0:1478"
+jsonrpc="0.0.0.0:8545"
+prometheus="0.0.0.0:5001"
+price-limit="0"
 
 [tce]
 db-path = "tce_rocksdb"
 graphql-api-addr = "0.0.0.0:4030"
 grpc-api-addr = "0.0.0.0:1340"
 libp2p-api-addr = "0.0.0.0:9090"
 metrics-api-addr = "0.0.0.0:3030"
+minimum-tce-cluster-size = 2
diff --git a/node_config/node/boot/consensus/validator-bls.key b/node_config/node/boot/consensus/validator-bls.key
diff --git a/node_config/node/boot/consensus/validator.key b/node_config/node/boot/consensus/validator.key
diff --git a/node_config/node/boot/libp2p/libp2p.key b/node_config/node/boot/libp2p/libp2p.key
diff --git a/node_config/node/sequencer-incal/config.toml b/node_config/node/sequencer-incal/config.toml
@@ -6,4 +6,4 @@ subnet = "incal"
 [sequencer]
 subnet-contract-address = "0x4fD352f266E184eB369f9B6C94Ee838577547688"
 subnet-jsonrpc-http = "http://incal-node-1:8545"
-tce-grpc-endpoint = "http://infra-tce-boot-1:1340"
+tce-grpc-endpoint = "http://topos-node-1:1340"
diff --git a/node_config/node/sequencer-topos/config.toml b/node_config/node/sequencer-topos/config.toml
@@ -7,4 +7,4 @@ subnet = "topos-sequencer"
 [sequencer]
 subnet-contract-address = "0x4fD352f266E184eB369f9B6C94Ee838577547688"
 subnet-jsonrpc-http = "http://topos-node-1:8545"
-tce-grpc-endpoint = "http://infra-tce-peer-1:1340"
+tce-grpc-endpoint = "http://topos-node-1:1340"
diff --git a/node_config/node/test/config.toml b/node_config/node/test/config.toml
diff --git a/node_config/node/test/consensus/validator-bls.key b/node_config/node/test/consensus/validator-bls.key
diff --git a/node_config/node/test/consensus/validator.key b/node_config/node/test/consensus/validator.key
diff --git a/node_config/node/test/libp2p/libp2p.key b/node_config/node/test/libp2p/libp2p.key
diff --git a/node_config/subnet/incal/genesis.json b/node_config/subnet/incal/genesis.json