Adding support for multiple devnet relayers

Makefile

@@ -34,28 +34,28 @@ bootstrap-azero:
 .PHONY: devnet-azero
 devnet-azero: # Run azero devnet
 devnet-azero: bootstrap-azero
-	docker-compose -f ./devnet-azero/devnet-azero-compose.yml up -d
+	docker compose -f ./devnet-azero/devnet-azero-compose.yml up -d
 
 .PHONY: devnet-eth
 devnet-eth: # Run eth devnet
 devnet-eth:
-	docker-compose -f ./devnet-eth/devnet-eth-compose.yml up -d
+	docker compose -f ./devnet-eth/devnet-eth-compose.yml up -d
 
 .PHONY: redis-instance
 redis-instance: # Run a redis instance
 redis-instance:
-	docker-compose -f ./relayer/scripts/redis-compose.yml up -d
+	docker compose -f ./relayer/scripts/redis-compose.yml up -d
 
 .PHONY: local-bridgenet
 local-bridgenet: # Run both devnets + a redis instance
 local-bridgenet: devnet-azero devnet-eth redis-instance
 
 .PHONY: stop-local-bridgenet
 stop-local-bridgenet:
-stop-local-bridgenet:
-	docker-compose -f ./devnet-azero/devnet-azero-compose.yml down && \
-	docker-compose -f ./devnet-eth/devnet-eth-compose.yml down && \
-	docker-compose -f ./relayer/scripts/redis-compose.yml down
+stop-local-bridgenet: stop-relayers
+	docker compose -f ./devnet-azero/devnet-azero-compose.yml down && \
+	docker compose -f ./devnet-eth/devnet-eth-compose.yml down && \
+	docker compose -f ./relayer/scripts/redis-compose.yml down
 
 .PHONY: eth-deps
 eth-deps: # Install eth dependencies
@@ -132,14 +132,35 @@ deploy: deploy-azero deploy-eth
 watch-relayer:
 	cd relayer && cargo watch -s 'cargo clippy' -c
 
-.PHONY: run-relayer
-run-relayer: # Run the relayer
-run-relayer:
-	cd relayer && ./scripts/run.sh
+.PHONY: run-dev-relayers
+run-relayers: # Run the relayer
+run-relayers: build-docker-relayer
+	docker compose -f ./relayer/scripts/devnet-relayers-compose.yml up -d
+
+.PHONY: stop-relayers
+stop-relayers:
+	docker compose -f ./relayer/scripts/devnet-relayers-compose.yml down
 
 .PHONY: bridge
 bridge: # Run the bridge
-bridge: local-bridgenet deploy run-relayer
+bridge: local-bridgenet deploy run-relayers devnet-relayers-logs
+
+.PHONY: bridgenet-bridge
+bridgenet-bridge: # Run the bridge on bridgenet
+bridgenet-bridge: build-docker-relayer redis-instance
+	NETWORK=bridgenet AZERO_ENV=bridgenet make deploy
+	docker compose -f ./relayer/scripts/bridgenet-relayers-compose.yml up -d
+	make bridgenet-relayers-logs
+
+.PHONY: devnet-relayers-logs
+devnet-relayers-logs: # Show the logs of the devnet relayers
+devnet-relayers-logs:
+	docker compose -f ./relayer/scripts/devnet-relayers-compose.yml logs -f
+
+.PHONY: bridgenet-relayers-logs
+bridgenet-relayers-logs: # Show the logs of the bridgenet relayers
+bridgenet-relayers-logs:
+	docker compose -f ./relayer/scripts/bridgenet-relayers-compose.yml logs -f
 
 .PHONY: test-solidity
 test-solidity: # Run solidity tests
@@ -224,20 +245,16 @@ js-format-check: # Check js formatting
 js-format-check:
 	cd eth && npx prettier --check test
 	cd eth && npx prettier --check scripts
-	cd eth && npx prettier --check gulpfile.js
 	cd eth && npx prettier --check hardhat.config.js
 	cd azero && npx prettier --check scripts
-	cd azero && npx prettier --check gulpfile.js
 
 .PHONY: js-format
 js-format: # Format js code
 js-format:
 	cd eth && npx prettier --write test
 	cd eth && npx prettier --write scripts
-	cd eth && npx prettier --write gulpfile.js
 	cd eth && npx prettier --write hardhat.config.js
 	cd azero && npx prettier --write scripts
-	cd azero && npx prettier --write gulpfile.js
 
 .PHONY: format-check
 format-check: # Check code formatting
@@ -246,3 +263,13 @@ format-check: rust-format-check js-format-check
 .PHONY: format
 format: # Format code
 format: rust-format js-format
+
+.PHONY: build-docker-relayer
+build-docker-relayer: # Build relayer docker image
+build-docker-relayer: compile-azero compile-eth
+	cd relayer && cargo build --release
+	cp azero/addresses.json relayer/azero_addresses.json
+	cp eth/addresses.json relayer/eth_addresses.json
+	cp azero/artifacts/most.json relayer/most.json
+	cd relayer && docker build -t most-relayer .
+	rm relayer/azero_addresses.json relayer/eth_addresses.json relayer/most.json

azero/env/bridgenet.json

@@ -1,6 +1,14 @@
 {
   "ws_node": "wss://ws-fe-bridgenet.dev.azero.dev",
-  "authority": "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY",
+  "relayers_keys": [
+    "5GBNeWRhZc2jXu7D55rBimKYDk8PGk8itRYFTPfC8RJLKG5o",
+    "5Dfis6XL8J2P6JHUnUtArnFWndn62SydeP8ee8sG2ky9nfm9",
+    "5F4H97f7nQovyrbiq4ZetaaviNwThSVcFobcA5aGab6167dK"
+  ],
   "authority_seed": "//Alice",
-  "signature_threshold": 1
+  "signature_threshold": 2,
+  "commission_per_dix_mille": 300,
+  "pocket_money": 1000000000000,
+  "minimum_transfer_amount_usd": 50,
+  "relay_gas_usage": 50000
 }

azero/env/dev.json

@@ -1,10 +1,14 @@
 {
   "ws_node": "ws://127.0.0.1:9944",
-  "authority": "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY",
+  "relayers_keys": [
+    "5GBNeWRhZc2jXu7D55rBimKYDk8PGk8itRYFTPfC8RJLKG5o",
+    "5Dfis6XL8J2P6JHUnUtArnFWndn62SydeP8ee8sG2ky9nfm9",
+    "5F4H97f7nQovyrbiq4ZetaaviNwThSVcFobcA5aGab6167dK"
+  ],
   "authority_seed": "//Alice",
-  "signature_threshold": 1,
+  "signature_threshold": 2,
   "commission_per_dix_mille": 300,
   "pocket_money": 1000000000000,
-  "minimum_transfer_amount_usd" : 50,
+  "minimum_transfer_amount_usd": 50,
   "relay_gas_usage": 50000
 }