From 3d51bfda4559ef1e1f06ba7d982bb71c1b5630bb Mon Sep 17 00:00:00 2001 From: Marcel Moura <5615598+marcelstanley@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:20:50 -0300 Subject: [PATCH] wip(build): move foundry back to Nightly (2024-07-19) --- build/compose-experimental.yaml | 37 ++++++++++++++++ build/compose-experimental.yaml.diff | 64 ++++++++++++++++++++++++++++ build/docker-bake.hcl | 2 +- 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 build/compose-experimental.yaml create mode 100755 build/compose-experimental.yaml.diff diff --git a/build/compose-experimental.yaml b/build/compose-experimental.yaml new file mode 100644 index 000000000..53c88d948 --- /dev/null +++ b/build/compose-experimental.yaml @@ -0,0 +1,37 @@ +# This compose file contains the redis and authority-claimer containers. + +name: rollups-node +services: + + node: + environment: + CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_ENABLED: "true" + CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_REDIS_ENDPOINT: "redis://redis:6379" + + redis: + image: redis:7-alpine + ports: + - 6379:6379 + + claimer: + image: "cartesi/rollups-node:devel" + command: + - "/bin/bash" + - "-c" + - | + redis-cli -u redis://redis:6379 SADD experimental-dapp-addresses-config "7C54E3f7A8070a54223469965A871fB8f6f88c22" + cartesi-rollups-authority-claimer + depends_on: + - redis + environment: + TX_PROVIDER_HTTP_ENDPOINT: "http://devnet:8545" + TX_DEFAULT_CONFIRMATIONS: "1" + TX_CHAIN_IS_LEGACY: "false" + TX_CHAIN_ID: "31337" + RUST_LOG: "info" + LOG_ENABLE_TIMESTAMP: "false" + HISTORY_ADDRESS: "0x325272217ae6815b494bF38cED004c5Eb8a7CdA7" + GENESIS_BLOCK: "20" + AUTHORITY_ADDRESS: "0x58c93F83fb3304730C95aad2E360cdb88b782010" + REDIS_ENDPOINT: "redis://redis:6379" + TX_SIGNING_MNEMONIC: "test test test test test test test test test test test junk" diff --git a/build/compose-experimental.yaml.diff b/build/compose-experimental.yaml.diff new file mode 100755 index 000000000..4a11f54f5 --- /dev/null +++ b/build/compose-experimental.yaml.diff @@ -0,0 +1,64 @@ +diff --git a/Makefile b/Makefile +index ac3fea1a..b0416ea4 100644 +--- a/Makefile ++++ b/Makefile +@@ -85,6 +85,16 @@ docker-run-sepolia: docker-clean ## Run the node with the sepolia testnet + -f ./build/compose-sepolia.yaml \ + up + ++.PHONY: docker-run-experimental ++docker-run-experimental: docker-clean ## Run the node with CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_ENABLED=true ++ @docker compose \ ++ -f ./build/compose-database.yaml \ ++ -f ./build/compose-devnet.yaml \ ++ -f ./build/compose-snapshot.yaml \ ++ -f ./build/compose-node.yaml \ ++ -f ./build/compose-experimental.yaml \ ++ up --force-recreate ++ + .PHONY: docker-clean + docker-clean: ## Remove the containers and volumes from previous compose run + @docker compose \ +diff --git a/build/compose-experimental.yaml b/build/compose-experimental.yaml +new file mode 100644 +index 00000000..53c88d94 +--- /dev/null ++++ b/build/compose-experimental.yaml +@@ -0,0 +1,37 @@ ++# This compose file contains the redis and authority-claimer containers. ++ ++name: rollups-node ++services: ++ ++ node: ++ environment: ++ CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_ENABLED: "true" ++ CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_REDIS_ENDPOINT: "redis://redis:6379" ++ ++ redis: ++ image: redis:7-alpine ++ ports: ++ - 6379:6379 ++ ++ claimer: ++ image: "cartesi/rollups-node:devel" ++ command: ++ - "/bin/bash" ++ - "-c" ++ - | ++ redis-cli -u redis://redis:6379 SADD experimental-dapp-addresses-config "7C54E3f7A8070a54223469965A871fB8f6f88c22" ++ cartesi-rollups-authority-claimer ++ depends_on: ++ - redis ++ environment: ++ TX_PROVIDER_HTTP_ENDPOINT: "http://devnet:8545" ++ TX_DEFAULT_CONFIRMATIONS: "1" ++ TX_CHAIN_IS_LEGACY: "false" ++ TX_CHAIN_ID: "31337" ++ RUST_LOG: "info" ++ LOG_ENABLE_TIMESTAMP: "false" ++ HISTORY_ADDRESS: "0x325272217ae6815b494bF38cED004c5Eb8a7CdA7" ++ GENESIS_BLOCK: "20" ++ AUTHORITY_ADDRESS: "0x58c93F83fb3304730C95aad2E360cdb88b782010" ++ REDIS_ENDPOINT: "redis://redis:6379" ++ TX_SIGNING_MNEMONIC: "test test test test test test test test test test test junk" diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl index 1054d56cc..4afc30343 100644 --- a/build/docker-bake.hcl +++ b/build/docker-bake.hcl @@ -21,7 +21,7 @@ target "common" { BASE_IMAGE = "debian:bookworm-20240311-slim" RUST_VERSION = "1.78.0" GO_VERSION = "1.22.1" - FOUNDRY_NIGHTLY_VERSION = "0d8302880b79fa9c3c4aa52ab446583dece19a34" + FOUNDRY_NIGHTLY_VERSION = "e90348416c3a831ab75bb43f6fa5f0a0be4106c4" MACHINE_EMULATOR_VERSION = "0.18.1" MACHINE_TOOLS_VERSION = "0.16.1" MACHINE_IMAGE_KERNEL_VERSION = "0.20.0"