SP1 upgrade

.github/workflows/prover.yml

@@ -1,25 +1,25 @@
 name: Prover
 
-on:
-    push:
-        branches:
-            - main
-        paths:
-            - "prover/**"
-            - ".github/workflows/prover.yaml"
-    pull_request:
-        paths:
-            - "prover/**"
-            - ".github/workflows/prover.yaml"
-
-defaults:
-    run:
-        working-directory: "prover"
-
-jobs:
-    check:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-            - name: Run build
-              run: make build-prover
+# on:
+#     push:
+#         branches:
+#             - main
+#         paths:
+#             - "prover/**"
+#             - ".github/workflows/prover.yaml"
+#     pull_request:
+#         paths:
+#             - "prover/**"
+#             - ".github/workflows/prover.yaml"
+#
+# defaults:
+#     run:
+#         working-directory: "prover"
+#
+# jobs:
+#     check:
+#         runs-on: ubuntu-22.04
+#         steps:
+#             - uses: actions/checkout@v3
+#             - name: Run build
+#               run: make build-prover

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "go-ethereum"]
 path = go-ethereum
 url = https://github.com/morph-l2/go-ethereum.git
-branch = main
+branch = remove_ccc

Makefile

@@ -1,7 +1,7 @@
 ################## update dependencies ####################
 
-ETHEREUM_TARGET_VERSION := v0.5.0
-TENDERMINT_TARGET_VERSION := v0.3.0
+ETHEREUM_TARGET_VERSION := v1.10.14-0.20240911055856-0fe4a892721d
+TENDERMINT_TARGET_VERSION := v0.3.1-0.20240911064723-eb4bb5fb2914
 
 ETHEREUM_MODULE_NAME := github.com/morph-l2/go-ethereum
 TENDERMINT_MODULE_NAME := github.com/morph-l2/tendermint
@@ -128,14 +128,10 @@ go-ubuntu-builder:
 
 ################## devnet 4 nodes ####################
 
-devnet-up: submodules go-ubuntu-builder go-rust-builder
+devnet-up: submodules go-ubuntu-builder
 	python3 ops/devnet-morph/main.py --polyrepo-dir=.
 .PHONY: devnet-up
 
-devnet-up-mockccc:
-	python3 ops/devnet-morph/main.py --polyrepo-dir=. --mockccc
-.PHONY: devnet-up-mockccc
-
 devnet-up-debugccc:
 	python3 ops/devnet-morph/main.py --polyrepo-dir=. --debugccc
 .PHONY: devnet-up-debugccc
@@ -179,5 +175,5 @@ start-all-tx-submitter:
 	done
 
 # build geth
-nccc_geth: submodules
+geth: submodules
 	cd go-ethereum && env GO111MODULE=on GOWORK=off go run build/ci.go install ./cmd/geth

bindings/go.mod

@@ -2,9 +2,9 @@ module morph-l2/bindings
 
 go 1.22
 
-replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.0
+replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.1-0.20240911064723-eb4bb5fb2914
 
-require github.com/morph-l2/go-ethereum v0.5.0
+require github.com/morph-l2/go-ethereum v1.10.14-0.20240911055856-0fe4a892721d
 
 require (
 	github.com/VictoriaMetrics/fastcache v1.12.2 // indirect

bindings/go.sum

@@ -109,8 +109,8 @@ github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqky
 github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/morph-l2/go-ethereum v0.5.0 h1:8RmripTA2F92capiLRZTiycSGsj4DR+HGOvwwhgQ58I=
-github.com/morph-l2/go-ethereum v0.5.0/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
+github.com/morph-l2/go-ethereum v1.10.14-0.20240911055856-0fe4a892721d h1:tEYhJ9z2DNp8I6aSD1dyrSz/rqLzwXmjikcNF6yN0o4=
+github.com/morph-l2/go-ethereum v1.10.14-0.20240911055856-0fe4a892721d/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=

contracts/contracts/l1/rollup/IRollup.sol

@@ -8,15 +8,15 @@ interface IRollup {
 
     /// @param version                  The version of current batch.
     /// @param parentBatchHeader        The header of parent batch, see the comments of `BatchHeaderV0Codec`.
-    /// @param chunks                   The list of encoded chunks, see the comments of `ChunkCodec`.
+    /// @param blockContexts            The block contexts of current batch.
     /// @param skippedL1MessageBitmap   The bitmap indicates whether each L1 message is skipped or not.
     /// @param prevStateRoot            The state root of parent batch.
     /// @param postStateRoot            The state root of current batch.
     /// @param withdrawalRoot           The withdraw trie root of current batch.
     struct BatchDataInput {
         uint8 version;
         bytes parentBatchHeader;
-        bytes[] chunks;
+        bytes blockContexts;
         bytes skippedL1MessageBitmap;
         bytes32 prevStateRoot;
         bytes32 postStateRoot;
@@ -113,11 +113,6 @@ interface IRollup {
     /// @param newVerifier  The address of new rollup verifier.
     event UpdateVerifier(address indexed oldVerifier, address indexed newVerifier);
 
-    /// @notice Emitted when the value of `maxNumTxInChunk` is updated.
-    /// @param oldMaxNumTxInChunk   The old value of `maxNumTxInChunk`.
-    /// @param newMaxNumTxInChunk   The new value of `maxNumTxInChunk`.
-    event UpdateMaxNumTxInChunk(uint256 oldMaxNumTxInChunk, uint256 newMaxNumTxInChunk);
-
     /// @notice Emitted when the state of Challenge is updated.
     /// @param batchIndex       The index of the batch.
     /// @param challenger       The address of challenger.