Pin to gibraltar release

EspressoSystems · Jan 19, 2024 · ce7da8a · ce7da8a
1 parent 92a0550
commit ce7da8a
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 36 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,9 +16,6 @@
 [submodule "blockscout"]
 	path = blockscout
 	url = https://github.com/blockscout/blockscout.git
-[submodule "espresso-sequencer"]
-	path = espresso-sequencer
-	url = https://github.com/EspressoSystems/espresso-sequencer.git
 [submodule "packages/contracts-bedrock/lib/safe-contracts"]
 	path = packages/contracts-bedrock/lib/safe-contracts
 	url = https://github.com/safe-global/safe-contracts

diff --git a/espresso-sequencer b/espresso-sequencer
diff --git a/flake.nix b/flake.nix
@@ -81,6 +81,7 @@
 
             # Docker
             docker-compose # provides the `docker-compose` command
+            docker-buildx
 
             # Python
             (python3.withPackages (ps: with ps; [ ]))

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	github.com/BurntSushi/toml v1.3.2
-	github.com/EspressoSystems/espresso-sequencer-go v0.0.1
+	github.com/EspressoSystems/espresso-sequencer-go v0.0.4-0.20240119201042-f10be20e9982
 	github.com/btcsuite/btcd v0.23.3
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0

diff --git a/go.sum b/go.sum
@@ -14,8 +14,8 @@ github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8=
 github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
-github.com/EspressoSystems/espresso-sequencer-go v0.0.1 h1:8Es2XVLJQoHvq9m4A7MfB3s33cZZmmiM/QhjZ9iiSxw=
-github.com/EspressoSystems/espresso-sequencer-go v0.0.1/go.mod h1:T3MyQRnfbCSTBhAAG2WASmVPCwWkl0/sPKKY5Z1ewtg=
+github.com/EspressoSystems/espresso-sequencer-go v0.0.4-0.20240119201042-f10be20e9982 h1:FfnfjZpPSGrsXLjvhv5MxnRLNtMNuqre/fZN3u9+dJM=
+github.com/EspressoSystems/espresso-sequencer-go v0.0.4-0.20240119201042-f10be20e9982/go.mod h1:T3MyQRnfbCSTBhAAG2WASmVPCwWkl0/sPKKY5Z1ewtg=
 github.com/EspressoSystems/op-geth v1.2.6-espresso h1:nqdw9EvEn5K37vvSTPeOkTow2AwTqxLD68Qv055OwcY=
 github.com/EspressoSystems/op-geth v1.2.6-espresso/go.mod h1:12W+vBetjYbDj5D2+V8hizke5yWuLrUDf7UmVkXTnCQ=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=

diff --git a/op-e2e/docker-compose.yml b/op-e2e/docker-compose.yml
@@ -4,7 +4,7 @@ version: '3.4'
 
 services:
   op-geth-proxy:
-    image: ghcr.io/espressosystems/op-espresso-integration/op-geth-proxy:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/op-geth-proxy:release-gibraltar
     build:
       context: ../
       dockerfile: ./op-geth-proxy/Dockerfile
@@ -19,7 +19,7 @@ services:
       - "host.docker.internal:host-gateway"
 
   orchestrator:
-    image: ghcr.io/espressosystems/espresso-sequencer/orchestrator:main
+    image: ghcr.io/espressosystems/espresso-sequencer/orchestrator:release-gibraltar
     ports:
       - "8080"
     environment:
@@ -31,7 +31,7 @@ services:
       - RUST_LOG
 
   da-server:
-    image: ghcr.io/espressosystems/espresso-sequencer/web-server:main
+    image: ghcr.io/espressosystems/espresso-sequencer/web-server:release-gibraltar
     ports:
       - "8080"
     environment:
@@ -42,7 +42,7 @@ services:
         condition: service_healthy
 
   consensus-server:
-    image: ghcr.io/espressosystems/espresso-sequencer/web-server:main
+    image: ghcr.io/espressosystems/espresso-sequencer/web-server:release-gibraltar
     ports:
       - "8080"
     environment:
@@ -53,7 +53,7 @@ services:
         condition: service_healthy
 
   sequencer0:
-    image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main
+    image: ghcr.io/espressosystems/espresso-sequencer/sequencer:release-gibraltar
     ports:
       - "8080"
     # Run the API server (with options taken from the environment) and the optional submission API
@@ -74,7 +74,7 @@ services:
       - "host.docker.internal:host-gateway"
 
   sequencer1:
-    image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main
+    image: ghcr.io/espressosystems/espresso-sequencer/sequencer:release-gibraltar
     ports:
       - "8080"
     command: sequencer -- http -- query-fs -- status
@@ -93,7 +93,7 @@ services:
       - "host.docker.internal:host-gateway"
 
   commitment-task:
-    image: ghcr.io/espressosystems/espresso-sequencer/commitment-task:main
+    image: ghcr.io/espressosystems/espresso-sequencer/commitment-task:release-gibraltar
     command: commitment-task --deploy
     environment:
     - ESPRESSO_SEQUENCER_URL=http://sequencer0:8080

diff --git a/op-node/rollup/driver/sequencer_test.go b/op-node/rollup/driver/sequencer_test.go
@@ -325,6 +325,14 @@ var _ derive.EspressoL1Provider = (*TestSequencer)(nil)
 
 // Implement Espresso QueryService interface for TestSequencer.
 
+func (s *TestSequencer) FetchLatestBlockHeight(ctx context.Context) (uint64, error) {
+	return uint64(len(s.espresso.Blocks)), nil
+}
+
+func (s *TestSequencer) FetchHeaderByHeight(ctx context.Context, height uint64) (espresso.Header, error) {
+	return *s.espressoBlock(height), nil
+}
+
 func (s *TestSequencer) FetchHeadersForWindow(ctx context.Context, start uint64, end uint64) (espressoClient.WindowStart, error) {
 	// Find the start of the range.
 	for i := uint64(0); ; i += 1 {

diff --git a/ops-bedrock/demo-docker-compose.yml b/ops-bedrock/demo-docker-compose.yml
@@ -17,7 +17,7 @@ volumes:
 
 services:
   op-l2:
-    image: ghcr.io/espressosystems/op-espresso-integration/l2:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/l2:release-gibraltar
     build:
       context: .
       dockerfile: Dockerfile.l2
@@ -35,7 +35,7 @@ services:
       - "--authrpc.jwtsecret=/config/test-jwt-secret.txt"
 
   op-node:
-    image: ghcr.io/espressosystems/op-espresso-integration/op-node:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/op-node:release-gibraltar
     depends_on:
       - op-l2
     build:
@@ -80,7 +80,7 @@ services:
       - op_log:/op_log
 
   op-proposer:
-    image: ghcr.io/espressosystems/op-espresso-integration/op-proposer:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/op-proposer:release-gibraltar
     depends_on:
       - op-l2
       - op-node
@@ -103,7 +103,7 @@ services:
       OP_PROPOSER_ALLOW_NON_FINALIZED: "true"
 
   op-batcher:
-    image: ghcr.io/espressosystems/op-espresso-integration/op-batcher:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/op-batcher:release-gibraltar
     depends_on:
       - op-l2
       - op-node
@@ -131,7 +131,7 @@ services:
     stop_grace_period: 1s
 
   op-geth-proxy:
-    image: ghcr.io/espressosystems/op-espresso-integration/op-geth-proxy:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/op-geth-proxy:release-gibraltar
     build:
       context: ../
       dockerfile: ./op-geth-proxy/Dockerfile

diff --git a/ops-bedrock/docker-compose.yml b/ops-bedrock/docker-compose.yml
@@ -33,7 +33,7 @@ services:
   #
 
   l1:
-    image: ghcr.io/espressosystems/op-espresso-integration/l1:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/l1:release-gibraltar
     build:
       context: .
       dockerfile: Dockerfile.l1
@@ -64,7 +64,7 @@ services:
   #
 
   op1-l2:
-    image: ghcr.io/espressosystems/op-espresso-integration/l2:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/l2:release-gibraltar
     build:
       context: .
       dockerfile: Dockerfile.l2
@@ -84,7 +84,7 @@ services:
       GETH_MINER_RECOMMIT: 100ms
 
   op1-node:
-    image: ghcr.io/espressosystems/op-espresso-integration/op-node:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/op-node:release-gibraltar
     depends_on:
       - op_stack_go_builder
       - l1
@@ -133,7 +133,7 @@ services:
       - op1_log:/op_log
 
   op1-proposer:
-    image: ghcr.io/espressosystems/op-espresso-integration/op-proposer:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/op-proposer:release-gibraltar
     depends_on:
       - op_stack_go_builder
       - l1
@@ -162,7 +162,7 @@ services:
       OP_PROPOSER_RPC_ENABLE_ADMIN: "true"
 
   op1-batcher:
-    image: ghcr.io/espressosystems/op-espresso-integration/op-batcher:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/op-batcher:release-gibraltar
     depends_on:
       - op_stack_go_builder
       - l1
@@ -195,7 +195,7 @@ services:
     stop_grace_period: 1s
 
   op1-geth-proxy:
-    image: ghcr.io/espressosystems/op-espresso-integration/op-geth-proxy:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/op-geth-proxy:release-gibraltar
     build:
       context: ../
       dockerfile: ./op-geth-proxy/Dockerfile
@@ -330,7 +330,7 @@ services:
   #
 
   op2-l2:
-    image: ghcr.io/espressosystems/op-espresso-integration/l2:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/l2:release-gibraltar
     build:
       context: .
       dockerfile: Dockerfile.l2
@@ -348,7 +348,7 @@ services:
       - "--authrpc.jwtsecret=/config/test-jwt-secret.txt"
 
   op2-node:
-    image: ghcr.io/espressosystems/op-espresso-integration/op-node:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/op-node:release-gibraltar
     depends_on:
       - l1
       - op2-l2
@@ -394,7 +394,7 @@ services:
       - op2_log:/op_log
 
   op2-proposer:
-    image: ghcr.io/espressosystems/op-espresso-integration/op-proposer:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/op-proposer:release-gibraltar
     depends_on:
       - l1
       - op2-l2
@@ -419,7 +419,7 @@ services:
       OP_PROPOSER_ALLOW_NON_FINALIZED: "true"
 
   op2-batcher:
-    image: ghcr.io/espressosystems/op-espresso-integration/op-batcher:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/op-batcher:release-gibraltar
     depends_on:
       - l1
       - op2-l2
@@ -448,7 +448,7 @@ services:
     stop_grace_period: 1s
 
   op2-geth-proxy:
-    image: ghcr.io/espressosystems/op-espresso-integration/op-geth-proxy:integration
+    image: ghcr.io/espressosystems/op-espresso-integration/op-geth-proxy:release-gibraltar
     build:
       context: ../
       dockerfile: ./op-geth-proxy/Dockerfile
@@ -568,7 +568,7 @@ services:
   #
 
   orchestrator:
-    image: ghcr.io/espressosystems/espresso-sequencer/orchestrator:main
+    image: ghcr.io/espressosystems/espresso-sequencer/orchestrator:release-gibraltar
     ports:
       - "8080"
     environment:
@@ -581,7 +581,7 @@ services:
     stop_grace_period: 1s
 
   da-server:
-    image: ghcr.io/espressosystems/espresso-sequencer/web-server:main
+    image: ghcr.io/espressosystems/espresso-sequencer/web-server:release-gibraltar
     ports:
       - "8080"
     environment:
@@ -593,7 +593,7 @@ services:
     stop_grace_period: 1s
 
   consensus-server:
-    image: ghcr.io/espressosystems/espresso-sequencer/web-server:main
+    image: ghcr.io/espressosystems/espresso-sequencer/web-server:release-gibraltar
     ports:
       - "8080"
     environment:
@@ -605,7 +605,7 @@ services:
     stop_grace_period: 1s
 
   commitment-task:
-    image: ghcr.io/espressosystems/espresso-sequencer/commitment-task:main
+    image: ghcr.io/espressosystems/espresso-sequencer/commitment-task:release-gibraltar
     command: commitment-task --deploy
     environment:
     - ESPRESSO_SEQUENCER_URL=http://sequencer0:8080
@@ -622,7 +622,7 @@ services:
     stop_grace_period: 1s
 
   sequencer0:
-    image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main
+    image: ghcr.io/espressosystems/espresso-sequencer/sequencer:release-gibraltar
     ports:
       - "50000:8080"
     # Run the API server (with options taken from the environment) and the optional submission API
@@ -644,7 +644,7 @@ services:
     stop_grace_period: 1s
 
   sequencer1:
-    image: ghcr.io/espressosystems/espresso-sequencer/sequencer:main
+    image: ghcr.io/espressosystems/espresso-sequencer/sequencer:release-gibraltar
     ports:
       - "8080"
     command: sequencer -- http -- query-fs -- status