Bump rollups to 0.8.0 with broker in offchain arch

cartesi · Dec 6, 2022 · 391801b · 391801b
1 parent 5768015
commit 391801b
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 41 deletions.
diff --git a/deploy-testnet.yml b/deploy-testnet.yml
@@ -8,7 +8,7 @@ services:
       - machine:/opt/cartesi/share/dapp-bin
 
   deployer:
-    image: cartesi/rollups-cli:0.7.0
+    image: cartesi/rollups-cli:0.8.0
     depends_on:
       machine:
         condition: service_started

diff --git a/docker-compose-testnet.yml b/docker-compose-testnet.yml
@@ -10,15 +10,11 @@ x-credentials: &postgres-config
 
 services:
   rollups_dispatcher:
-    image: cartesi/rollups-dispatcher:0.7.0
+    image: cartesi/rollups-dispatcher:0.8.0
     command:
       [
         "--rd-dapp-contract-address-file",
         "/deployments/${NETWORK:?undefined NETWORK}/${DAPP_NAME:?undefined DAPP_NAME}.json",
-        "--mm-endpoint",
-        "http://server_manager:5001",
-        "--mm-session-id",
-        "default_rollups_id",
         "--rd-initial-epoch",
         "0",
         "--sc-grpc-endpoint",
@@ -35,22 +31,23 @@ services:
         "${TX_LEGACY:-false}",
         "--tx-default-confirmations",
         "${BLOCK_CONFIRMATIONS_TX:?undefined BLOCK_CONFIRMATIONS_TX}",
+        "--redis-endpoint",
+        "redis://redis:6379",
       ]
     restart: always
     depends_on:
       state_server:
         condition: service_healthy
-      server_manager:
+      redis:
         condition: service_healthy
     environment:
       RUST_LOG: info
     volumes:
       - blockchain-data:/opt/cartesi/share/blockchain:ro
-      - ./config:/opt/cartesi/share/config/
       - ./deployments:/deployments
 
   state_server:
-    image: cartesi/rollups-state-server:0.7.0
+    image: cartesi/rollups-state-server:0.8.0
     command:
       [
         "--sf-genesis-block",
@@ -72,10 +69,38 @@ services:
       retries: 5
     volumes:
       - blockchain-data:/opt/cartesi/share/blockchain:ro
-      - ./config:/opt/cartesi/share/config/
     environment:
       RUST_LOG: info
 
+  server_manager_broker_proxy:
+    image: cartesi/rollups-server-manager-broker-proxy:0.8.0
+    command:
+      [
+        "--chain-id",
+        "${CHAIN_ID:?undefined CHAIN_ID}",
+        "--dapp-contract-address-file",
+        "/deployments/${NETWORK:?undefined NETWORK}/${DAPP_NAME:?undefined DAPP_NAME}.json",
+        "--redis-endpoint",
+        "redis://redis:6379",
+        "--server-manager-endpoint",
+        "http://server_manager:5001",
+        "--session-id",
+        "default_rollups_id",
+      ]
+    restart: always
+    healthcheck:
+      test: ["CMD", "curl", "--fail", "localhost:8080/healthz"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    depends_on:
+      redis:
+        condition: service_healthy
+      server_manager:
+        condition: service_healthy
+    volumes:
+      - ./deployments:/deployments
+
   server_manager:
     restart: always
     healthcheck:
@@ -87,7 +112,7 @@ services:
       - machine:/opt/cartesi/share/dapp-bin
 
   rollups_inspect_server:
-    image: cartesi/rollups-inspect-server:0.7.0
+    image: cartesi/rollups-inspect-server:0.8.0
     command:
       [
         "--inspect-server-address",
@@ -107,7 +132,7 @@ services:
       RUST_LOG: info
 
   rollups_indexer:
-    image: cartesi/rollups-indexer:0.7.0
+    image: cartesi/rollups-indexer:0.8.0
     command:
       [
         "--dapp-contract-address-file",
@@ -138,11 +163,10 @@ services:
       RUST_LOG: info
     volumes:
       - blockchain-data:/opt/cartesi/share/blockchain
-      - ./config:/opt/cartesi/share/config/
       - ./deployments:/deployments
 
   query_server:
-    image: cartesi/query-server:0.7.0
+    image: cartesi/query-server:0.8.0
     ports:
       - "4000:4000"
     depends_on:
@@ -168,7 +192,21 @@ services:
     volumes:
       - database-data:/var/lib/postgresql/data
 
+  redis:
+    image: redis:6-alpine
+    ports:
+      - 6379:6379
+    restart: always
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    volumes:
+      - redis-data:/data
+
 volumes:
   blockchain-data: {}
   machine: {}
   database-data: {}
+  redis-data: {}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,7 +10,7 @@ x-credentials: &postgres-config
 
 services:
   hardhat:
-    image: cartesi/rollups-hardhat:0.7.0
+    image: cartesi/rollups-hardhat:0.8.0
     command:
       [
         "node",
@@ -33,15 +33,11 @@ services:
       - ./deployments:/app/deployments
 
   rollups_dispatcher:
-    image: cartesi/rollups-dispatcher:0.7.0
+    image: cartesi/rollups-dispatcher:0.8.0
     command:
       [
         "--rd-dapp-contract-address-file",
         "/deployments/localhost/dapp.json",
-        "--mm-endpoint",
-        "http://server_manager:5001",
-        "--mm-session-id",
-        "default_rollups_id",
         "--rd-initial-epoch",
         "0",
         "--sc-grpc-endpoint",
@@ -58,6 +54,8 @@ services:
         "${TX_LEGACY:-false}",
         "--tx-default-confirmations",
         "2",
+        "--redis-endpoint",
+        "redis://redis:6379",
       ]
     restart: always
     depends_on:
@@ -67,7 +65,7 @@ services:
         condition: service_completed_successfully
       state_server:
         condition: service_healthy
-      server_manager:
+      redis:
         condition: service_healthy
     environment:
       RUST_LOG: info
@@ -76,7 +74,7 @@ services:
       - ./deployments:/deployments
 
   state_server:
-    image: cartesi/rollups-state-server:0.7.0
+    image: cartesi/rollups-state-server:0.8.0
     command: [
         "--sf-genesis-block",
         "0x1",
@@ -103,6 +101,35 @@ services:
     environment:
       RUST_LOG: info
 
+  server_manager_broker_proxy:
+    image: cartesi/rollups-server-manager-broker-proxy:0.8.0
+    command:
+      [
+        "--chain-id",
+        "31337",
+        "--dapp-contract-address-file",
+        "/deployments/localhost/dapp.json",
+        "--redis-endpoint",
+        "redis://redis:6379",
+        "--server-manager-endpoint",
+        "http://server_manager:5001",
+        "--session-id",
+        "default_rollups_id",
+      ]
+    restart: always
+    healthcheck:
+      test: ["CMD", "curl", "--fail", "localhost:8080/healthz"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    depends_on:
+      redis:
+        condition: service_healthy
+      server_manager:
+        condition: service_healthy
+    volumes:
+      - ./deployments:/deployments
+
   server_manager:
     restart: always
     ports:
@@ -116,7 +143,7 @@ services:
       - machine:/opt/cartesi/share/dapp-bin
 
   deployer:
-    image: cartesi/rollups-cli:0.7.0
+    image: cartesi/rollups-cli:0.8.0
     restart: on-failure
     depends_on:
       hardhat:
@@ -173,7 +200,7 @@ services:
       ]
 
   rollups_inspect_server:
-    image: cartesi/rollups-inspect-server:0.7.0
+    image: cartesi/rollups-inspect-server:0.8.0
     command:
       [
         "--inspect-server-address",
@@ -193,7 +220,7 @@ services:
       RUST_LOG: info
 
   rollups_indexer:
-    image: cartesi/rollups-indexer:0.7.0
+    image: cartesi/rollups-indexer:0.8.0
     command:
       [
         "--dapp-contract-address-file",
@@ -231,7 +258,7 @@ services:
       - ./deployments:/deployments
 
   query_server:
-    image: cartesi/query-server:0.7.0
+    image: cartesi/query-server:0.8.0
     ports:
       - "4000:4000"
     depends_on:
@@ -257,7 +284,21 @@ services:
     volumes:
       - database-data:/var/lib/postgresql/data
 
+  redis:
+    image: redis:6-alpine
+    ports:
+      - 6379:6379
+    restart: always
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    volumes:
+      - redis-data:/data
+
 volumes:
   blockchain-data: {}
   machine: {}
   database-data: {}
+  redis-data: {}
diff --git a/frontend-console/package.json b/frontend-console/package.json
@@ -32,7 +32,7 @@
         "typescript": "^4.8.3"
     },
     "dependencies": {
-        "@cartesi/rollups": "^0.7.0",
+        "@cartesi/rollups": "^0.8.0",
         "@ethersproject/providers": "^5.7.1",
         "@urql/core": "^3.0.3",
         "cross-fetch": "^3.1.5",

diff --git a/frontend-console/yarn.lock b/frontend-console/yarn.lock
@@ -490,26 +490,26 @@
     "@babel/helper-validator-identifier" "^7.18.6"
     to-fast-properties "^2.0.0"
 
-"@cartesi/rollups@^0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@cartesi/rollups/-/rollups-0.7.0.tgz#e721f4eb5ab1b263aefc7f0819bf4c4aa8fa2d49"
-  integrity sha512-U4yZ8C2K7mJORia1qGpUAFx3XumGk7Hrmrtw2EcGgZvJ09M1BWq4dh65g0+QOodVgDSDHk6qrvZl1KU9cYqlow==
+"@cartesi/rollups@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@cartesi/rollups/-/rollups-0.8.0.tgz#216ce5162cae593b2e583abfc4ee8ea721889653"
+  integrity sha512-Tl4LHIfD7dr1sGMhCgRWOzA7FLyMjw8coAhbOXmtBzfLz7aODRI0iNb02CeXHXjwJlG2K6bPrNgFvJvr57kdSw==
   dependencies:
-    "@cartesi/token" "^1.7.0"
-    "@cartesi/util" "^5.0.0"
+    "@cartesi/token" "^1.7.1"
+    "@cartesi/util" "^5.0.1"
     "@openzeppelin/contracts" "^4.7.1"
 
-"@cartesi/token@^1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@cartesi/token/-/token-1.7.0.tgz#ed7ca1ca6fcfe1685370433e2cad4fbc3fa66f09"
-  integrity sha512-CkzVizL1xyYEDkXil19Dv4JDvY7aJIcNCJP+oLbetWxaYXvs2bRDEqRzIrLz1/bedTQasTPqee9hwgVQJtpjOw==
+"@cartesi/token@^1.7.1":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@cartesi/token/-/token-1.7.1.tgz#9ffdd8479ea2688fc7de44fa42fe913806f94a52"
+  integrity sha512-y9LQFtJLs67aGQkNF5jrvAV+gkOXzBav01rONN2wLN0DOdYRwq+3YYSL3Z0iZWqEZ8fOg0H2gTEshVTPTDS0QA==
   dependencies:
     "@openzeppelin/contracts" "^2.5.0"
 
-"@cartesi/util@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@cartesi/util/-/util-5.0.0.tgz#98b1d85aa9949fab3e0b6f1e630026375c31cc6b"
-  integrity sha512-JUZqvlPQgAA6SpHU0svnK3us2k112CN2o1QI4C4BHnqc0QdSDHyw6qlfVGic1DlUq1rVq8c68I4XvsgChn3ZgQ==
+"@cartesi/util@^5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@cartesi/util/-/util-5.0.1.tgz#953916125122595488c366df0895e5bb79897b55"
+  integrity sha512-KCUHKvjCiZMWo4FojBrZ/2/RHbSiE948IndG8nqEcpYh4CHlumHoKSZKdfoxWBArs12MhupT3v50Pt9e4c5/Hw==
   dependencies:
     "@openzeppelin/contracts" "3.2.1-solc-0.7"