Merge branch 'master' into shawn/local-l1

This commit is contained in:
Shawn 2023-12-11 20:42:39 -08:00
commit 74560a59e0

View file

@ -1,6 +1,6 @@
version: '3' version: '3'
services: services:
bootnode: geth-bootnode:
build: build:
context: .. context: ..
dockerfile: geth-poa/Dockerfile dockerfile: geth-poa/Dockerfile
@ -9,12 +9,13 @@ services:
- BOOT_KEY=7b548c1c0fbe80ef1eb0aaec2edf26fd20fb0d758e94948cf6c5f2a486e735f6 - BOOT_KEY=7b548c1c0fbe80ef1eb0aaec2edf26fd20fb0d758e94948cf6c5f2a486e735f6
- NET_RESTRICT=172.13.0.0/24 - NET_RESTRICT=172.13.0.0/24
networks: networks:
poa_net: primev_net:
ipv4_address: '172.13.0.100' ipv4_address: '172.29.0.98'
ports: ports:
- 8545:8545 - 8545:8545
- 8546:8546 - 8546:8546
- 6060:6060 # metrics server @ /debug/metrics - 6060:6060 # metrics server @ /debug/metrics
- 6068:6068
volumes: volumes:
- geth-data-bootnode:/data - geth-data-bootnode:/data
profiles: profiles:
@ -51,8 +52,8 @@ services:
- BOOTNODE_ENDPOINT=enode://34a2a388ad31ca37f127bb9ffe93758ee711c5c2277dff6aff2e359bcf2c9509ea55034196788dbd59ed70861f523c1c03d54f1eabb2b4a5c1c129d966fe1e65@172.13.0.100:30301 - BOOTNODE_ENDPOINT=enode://34a2a388ad31ca37f127bb9ffe93758ee711c5c2277dff6aff2e359bcf2c9509ea55034196788dbd59ed70861f523c1c03d54f1eabb2b4a5c1c129d966fe1e65@172.13.0.100:30301
- NET_RESTRICT=172.13.0.0/24 - NET_RESTRICT=172.13.0.0/24
networks: networks:
poa_net: primev_net:
ipv4_address: '172.13.0.2' ipv4_address: '172.29.0.99'
volumes: volumes:
- geth-data-node1:/data - geth-data-node1:/data
profiles: profiles:
@ -90,8 +91,8 @@ services:
- BOOTNODE_ENDPOINT=enode://34a2a388ad31ca37f127bb9ffe93758ee711c5c2277dff6aff2e359bcf2c9509ea55034196788dbd59ed70861f523c1c03d54f1eabb2b4a5c1c129d966fe1e65@172.13.0.100:30301 - BOOTNODE_ENDPOINT=enode://34a2a388ad31ca37f127bb9ffe93758ee711c5c2277dff6aff2e359bcf2c9509ea55034196788dbd59ed70861f523c1c03d54f1eabb2b4a5c1c129d966fe1e65@172.13.0.100:30301
- NET_RESTRICT=172.13.0.0/24 - NET_RESTRICT=172.13.0.0/24
networks: networks:
poa_net: primev_net:
ipv4_address: '172.13.0.3' ipv4_address: '172.29.0.100'
volumes: volumes:
- geth-data-node2:/data - geth-data-node2:/data
profiles: profiles:
@ -181,8 +182,8 @@ services:
environment: environment:
- CONTRACT_DEPLOYER_PRIVATE_KEY=${CONTRACT_DEPLOYER_PRIVATE_KEY} - CONTRACT_DEPLOYER_PRIVATE_KEY=${CONTRACT_DEPLOYER_PRIVATE_KEY}
networks: networks:
poa_net: primev_net:
ipv4_address: '172.13.0.50' ipv4_address: '172.29.0.50'
volumes: volumes:
- hyperlane-deploy-artifacts:/hyperlane-monorepo/artifacts - hyperlane-deploy-artifacts:/hyperlane-monorepo/artifacts
profiles: profiles:
@ -203,8 +204,8 @@ services:
hyperlane-deployer: hyperlane-deployer:
condition: service_healthy condition: service_healthy
networks: networks:
poa_net: primev_net:
ipv4_address: '172.13.0.75' ipv4_address: '172.29.0.75'
volumes: volumes:
- hyperlane-deploy-artifacts:/deploy-artifacts - hyperlane-deploy-artifacts:/deploy-artifacts
- hyperlane-validator1-sigs:/val1-sigs - hyperlane-validator1-sigs:/val1-sigs
@ -226,8 +227,8 @@ services:
hyperlane-deployer: hyperlane-deployer:
condition: service_healthy condition: service_healthy
networks: networks:
poa_net: primev_net:
ipv4_address: '172.13.0.76' ipv4_address: '172.29.0.76'
volumes: volumes:
- hyperlane-deploy-artifacts:/deploy-artifacts - hyperlane-deploy-artifacts:/deploy-artifacts
- hyperlane-validator2-sigs:/val2-sigs - hyperlane-validator2-sigs:/val2-sigs
@ -248,8 +249,8 @@ services:
environment: environment:
- RELAYER_PRIVATE_KEY=${RELAYER_PRIVATE_KEY} - RELAYER_PRIVATE_KEY=${RELAYER_PRIVATE_KEY}
networks: networks:
poa_net: primev_net:
ipv4_address: '172.13.0.77' ipv4_address: '172.29.0.77'
volumes: volumes:
- hyperlane-deploy-artifacts:/deploy-artifacts - hyperlane-deploy-artifacts:/deploy-artifacts
- hyperlane-validator1-sigs:/val1-sigs - hyperlane-validator1-sigs:/val1-sigs
@ -271,8 +272,8 @@ services:
- NEXT_PUBLIC_WALLET_CONNECT_ID=${NEXT_PUBLIC_WALLET_CONNECT_ID} - NEXT_PUBLIC_WALLET_CONNECT_ID=${NEXT_PUBLIC_WALLET_CONNECT_ID}
- L2_NODE_URL=${L2_NODE_URL} - L2_NODE_URL=${L2_NODE_URL}
networks: networks:
poa_net: primev_net:
ipv4_address: '172.13.0.90' ipv4_address: '172.29.0.90'
ports: ports:
- 80:3000 - 80:3000
volumes: volumes:
@ -297,18 +298,14 @@ services:
ports: ports:
- "5000:5000" - "5000:5000"
networks: networks:
poa_net: primev_net:
ipv4_address: 172.13.4.24 ipv4_address: 172.29.4.24
profiles: profiles:
- prod_agents - prod_agents
networks: networks:
poa_net: primev_net:
driver: bridge external: true
ipam:
driver: default
config:
- subnet: 172.13.0.0/16
l1_net: l1_net:
driver: bridge driver: bridge
ipam: ipam: