Submitter Assemble Batch

contracts/deploy/020-ContractInit.ts

@@ -57,18 +57,32 @@ export const ContractInit = async (
         // submitter and challenger
         const submitter: string = config.rollupProposer
         const challenger: string = config.rollupChallenger
+        const rollupDelayPeriod: number = config.rollupDelayPeriod
+
         if (!ethers.utils.isAddress(submitter)
             || !ethers.utils.isAddress(challenger)
         ) {
             console.error('please check your address')
             return ''
         }
+        if (rollupDelayPeriod==0){
+            console.error('rollupDelayPeriod cannot set zero')
+            return ''
+        }
         let res = await Rollup.importGenesisBatch(batchHeader)
         let rec = await res.wait()
         console.log(`importGenesisBatch(%s) ${rec.status == 1 ? "success" : "failed"}`, batchHeader)
         res = await Rollup.addChallenger(challenger)
         rec = await res.wait()
         console.log(`addChallenger(%s) ${rec.status == 1 ? "success" : "failed"}`, challenger)
+
+        res =await Rollup.initialize2("0x0000000000000000000000000000000000000000000000000000000000000001")
+        rec = await res.wait()
+        console.log(`initialize2(%s) ${rec.status == 1 ? "success" : "failed"}`)
+
+        res = await Rollup.initialize3(rollupDelayPeriod)
+        rec = await res.wait()
+        console.log(`initialize3(%s) ${rec.status == 1 ? "success" : "failed"}`)
     }
 
     // ------------------ staking init -----------------

contracts/src/deploy-config/l1.ts

@@ -23,11 +23,13 @@ const config = {
     finalizationPeriodSeconds: 10,
     rollupProofWindow: 86400,
     proofRewardPercent: 70,
+    rollupDelayPeriod: 86400,
+
     // challenge config
     rollupProposer: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
     rollupChallenger: '0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65',
     // genesis config
-    batchHeader: '0x0000000000000000000000000000000000000000000000000043a758882ae97327ffcc63373e26fcd144a5a738eac834c167175d69713780c0010657f37554c781402a22917dee2f75def7ab966d7b770905398eba3c444014000000000000000000000000000000000000000000000000000000000000000020cd420e20d610897b8f2c5ac5259ab8b57cce1074212cec2815b2b73ff93d9f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+    batchHeader: '0x00000000000000000000000000000000000000000000000000886e14341b355178d11a2c9f985f60a1a195973078b688a11aeaebb0c95db595010657f37554c781402a22917dee2f75def7ab966d7b770905398eba3c44401400000000000000000000000000000000000000000000000000000000000000002d20dde82426d971e398b3cba11ebb60d0d740b799f85e2f95fd12a1faad8e2f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
 
     // staking config
     // staking Cross-Chain config

node/types/blob.go

@@ -153,11 +153,11 @@ func DecodeTxsFromBytes(txsBytes []byte) (eth.Transactions, error) {
 				return nil, err
 			}
 			innerTx = new(eth.SetCodeTx)
-		case eth.AltFeeTxType:
+		case eth.MorphTxType:
 			if err := binary.Read(reader, binary.BigEndian, &firstByte); err != nil {
 				return nil, err
 			}
-			innerTx = new(eth.AltFeeTx)
+			innerTx = new(eth.MorphTx)
 		default:
 			if firstByte <= 0xf7 { // legacy tx first byte must be greater than 0xf7(247)
 				return nil, fmt.Errorf("not supported tx type: %d", firstByte)

tx-submitter/.gitignore

@@ -29,6 +29,7 @@ tx-submitter
 **/tx-submitter
 build/
 *debug_bin*
+submitter-leveldb
 
 # Config and Environment files
 .env*

tx-submitter/Makefile

@@ -23,7 +23,7 @@ clean:
 	rm tx-submitter
 
 test:
-	go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 ./...
+	go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 $$(go list ./... | grep -v '/batch')
 
 lint:
 	GOBIN=$(PWD)/build/bin go run ../build/lint.go