feat(cli): use cartesi/sdk for anvil/devnet at run command

cartesi · Apr 30, 2024 · 9e21c32 · 9e21c32
1 parent 3b75308
commit 9e21c32
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.changeset/healthy-windows-grin.md b/.changeset/healthy-windows-grin.md
@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": minor
+---
+
+use cartesi/sdk for devnet
diff --git a/apps/cli/src/node/default.env b/apps/cli/src/node/default.env
@@ -11,11 +11,10 @@ CARTESI_BLOCKCHAIN_ID="${CARTESI_BLOCKCHAIN_ID:-31337}"
 CARTESI_BLOCKCHAIN_HTTP_ENDPOINT="${CARTESI_BLOCKCHAIN_HTTP_ENDPOINT:-http://anvil:8545}"
 CARTESI_BLOCKCHAIN_WS_ENDPOINT="${CARTESI_BLOCKCHAIN_WS_ENDPOINT:-ws://anvil:8545}"
 CARTESI_BLOCKCHAIN_IS_LEGACY="${CARTESI_BLOCKCHAIN_IS_LEGACY:-false}"
-CARTESI_BLOCKCHAIN_GENESIS_BLOCK="${CARTESI_BLOCKCHAIN_GENESIS_BLOCK:-1}"
-CARTESI_BLOCKCHAIN_FINALITY_OFFSET="${CARTESI_BLOCKCHAIN_FINALITY_OFFSET:-1}"
+CARTESI_BLOCKCHAIN_FINALITY_OFFSET="${CARTESI_BLOCKCHAIN_FINALITY_OFFSET:-0}"
 CARTESI_CONTRACTS_APPLICATION_ADDRESS="${CARTESI_CONTRACTS_APPLICATION_ADDRESS:-0xab7528bb862fb57e8a2bcd567a2e929a0be56a5e}"
-CARTESI_CONTRACTS_APPLICATION_DEPLOYMENT_BLOCK_NUMBER="${CARTESI_CONTRACTS_APPLICATION_DEPLOYMENT_BLOCK_NUMBER:-1}"
-CARTESI_CONTRACTS_INPUT_BOX_DEPLOYMENT_BLOCK_NUMBER="${CARTESI_CONTRACTS_INPUT_BOX_DEPLOYMENT_BLOCK_NUMBER:-1}"
+CARTESI_CONTRACTS_APPLICATION_DEPLOYMENT_BLOCK_NUMBER="${CARTESI_CONTRACTS_APPLICATION_DEPLOYMENT_BLOCK_NUMBER:-22}"
+CARTESI_CONTRACTS_INPUT_BOX_DEPLOYMENT_BLOCK_NUMBER="${CARTESI_CONTRACTS_INPUT_BOX_DEPLOYMENT_BLOCK_NUMBER:-22}"
 CARTESI_CONTRACTS_HISTORY_ADDRESS="${CARTESI_CONTRACTS_HISTORY_ADDRESS:-0x325272217ae6815b494bf38ced004c5eb8a7cda7}"
 CARTESI_CONTRACTS_AUTHORITY_ADDRESS="${CARTESI_CONTRACTS_AUTHORITY_ADDRESS:-0x58c93f83fb3304730c95aad2e360cdb88b782010}"
 CARTESI_CONTRACTS_INPUT_BOX_ADDRESS="${CARTESI_CONTRACTS_INPUT_BOX_ADDRESS:-0x59b22D57D4f067708AB0c00552767405926dc768}"

diff --git a/apps/cli/src/node/docker-compose-anvil.yaml b/apps/cli/src/node/docker-compose-anvil.yaml
@@ -1,13 +1,11 @@
 services:
     anvil:
-        image: cartesi/devnet:1.6.0
+        image: cartesi/sdk:0.6.0
         command:
             [
-                "anvil",
+                "devnet",
                 "--block-time",
                 "${BLOCK_TIME:-5}",
-                "--load-state",
-                "/usr/share/cartesi/anvil_state.json",
                 "${ANVIL_VERBOSITY:---silent}",
             ]
         healthcheck:
@@ -21,7 +19,7 @@ services:
             - 8545:8545
 
     dapp_deployer:
-        image: cartesi/devnet:1.6.0
+        image: cartesi/sdk:0.6.0
         restart: on-failure
         depends_on:
             anvil: