feat(protocol): add more protocol/tokenomics tests

.github/workflows/protocol.yml

@@ -32,9 +32,9 @@ jobs:
         working-directory: ./packages/protocol
         run: pnpm test:integration
 
-      # - name: protocol - Tokenomics Tests
-      #   working-directory: ./packages/protocol
-      #   run: pnpm test:tokenomics
+      - name: protocol - Tokenomics Tests
+        working-directory: ./packages/protocol
+        run: pnpm test:tokenomics
 
       - name: protocol - Test Coverage
         working-directory: ./packages/protocol

packages/protocol/contracts/L1/TaikoData.sol

@@ -40,6 +40,7 @@ library TaikoData {
         uint64 initialUncleDelay;
         bool enableTokenomics;
         bool enablePublicInputsCheck;
+        bool enableProofValidation;
     }
 
     struct BlockMetadata {

packages/protocol/contracts/L1/TaikoL1.sol

@@ -279,11 +279,11 @@ contract TaikoL1 is EssentialContract, IHeaderSync, TaikoEvents {
         return LibAnchorSignature.signTransaction(hash, k);
     }
 
-    function getBlockProvers(
+    function getForkChoice(
         uint256 id,
         bytes32 parentHash
-    ) public view returns (address[] memory) {
-        return state.forkChoices[id][parentHash].provers;
+    ) public view returns (TaikoData.ForkChoice memory) {
+        return state.forkChoices[id][parentHash];
     }
 
     function getUncleProofDelay(uint256 blockId) public view returns (uint64) {
@@ -293,4 +293,17 @@ contract TaikoL1 is EssentialContract, IHeaderSync, TaikoEvents {
     function getConfig() public pure virtual returns (TaikoData.Config memory) {
         return LibSharedConfig.getConfig();
     }
+
+    function isBlockVerifiable(
+        uint256 blockId,
+        bytes32 parentHash
+    ) public view returns (bool) {
+        return
+            LibVerifying.isVerifiable({
+                state: state,
+                config: getConfig(),
+                fc: state.forkChoices[blockId][parentHash],
+                blockId: blockId
+            });
+    }
 }

packages/protocol/contracts/L1/libs/LibProposing.sol

@@ -88,6 +88,7 @@ library LibProposing {
                     meta.txListHash == txList.hashTxList(),
                 "L1:txList"
             );
+
             require(
                 state.nextBlockId <
                     state.latestVerifiedId + config.maxNumBlocks,

packages/protocol/contracts/L1/libs/LibProving.sol

@@ -70,7 +70,11 @@ library LibProving {
             "L1:proof:size"
         );
 
-        {
+        IProofVerifier proofVerifier = IProofVerifier(
+            resolver.resolve("proof_verifier", false)
+        );
+
+        if (config.enableProofValidation) {
             // Check anchor tx is valid
             LibTxDecoder.Tx memory _tx = LibTxDecoder.decodeTx(
                 config.chainId,
@@ -102,38 +106,34 @@ library LibProving {
                 ),
                 "L1:anchor:calldata"
             );
-        }
-
-        IProofVerifier proofVerifier = IProofVerifier(
-            resolver.resolve("proof_verifier", false)
-        );
 
-        // Check anchor tx is the 1st tx in the block
-        require(
-            proofVerifier.verifyMKP({
-                key: LibRLPWriter.writeUint(0),
-                value: anchorTx,
-                proof: evidence.proofs[zkProofsPerBlock],
-                root: evidence.header.transactionsRoot
-            }),
-            "L1:tx:proof"
-        );
+            // Check anchor tx is the 1st tx in the block
+            require(
+                proofVerifier.verifyMKP({
+                    key: LibRLPWriter.writeUint(0),
+                    value: anchorTx,
+                    proof: evidence.proofs[zkProofsPerBlock],
+                    root: evidence.header.transactionsRoot
+                }),
+                "L1:tx:proof"
+            );
 
-        // Check anchor tx does not throw
+            // Check anchor tx does not throw
 
-        LibReceiptDecoder.Receipt memory receipt = LibReceiptDecoder
-            .decodeReceipt(anchorReceipt);
+            LibReceiptDecoder.Receipt memory receipt = LibReceiptDecoder
+                .decodeReceipt(anchorReceipt);
 
-        require(receipt.status == 1, "L1:receipt:status");
-        require(
-            proofVerifier.verifyMKP({
-                key: LibRLPWriter.writeUint(0),
-                value: anchorReceipt,
-                proof: evidence.proofs[zkProofsPerBlock + 1],
-                root: evidence.header.receiptsRoot
-            }),
-            "L1:receipt:proof"
-        );
+            require(receipt.status == 1, "L1:receipt:status");
+            require(
+                proofVerifier.verifyMKP({
+                    key: LibRLPWriter.writeUint(0),
+                    value: anchorReceipt,
+                    proof: evidence.proofs[zkProofsPerBlock + 1],
+                    root: evidence.header.receiptsRoot
+                }),
+                "L1:receipt:proof"
+            );
+        }
 
         // ZK-prove block and mark block proven to be valid.
         _proveBlock({
@@ -234,12 +234,14 @@ library LibProving {
         require(evidence.meta.id == target.id, "L1:height");
         require(evidence.prover != address(0), "L1:prover");
 
-        _checkMetadata({state: state, config: config, meta: target});
-        _validateHeaderForMetadata({
-            config: config,
-            header: evidence.header,
-            meta: evidence.meta
-        });
+        if (config.enableProofValidation) {
+            _checkMetadata({state: state, config: config, meta: target});
+            _validateHeaderForMetadata({
+                config: config,
+                header: evidence.header,
+                meta: evidence.meta
+            });
+        }
 
         bytes32 blockHash = evidence.header.hashBlockHeader();
 

packages/protocol/contracts/L1/libs/LibVerifying.sol

@@ -77,7 +77,7 @@ library LibVerifying {
 
             // Uncle proof can not take more than 2x time the first proof did.
             if (
-                !_isVerifiable({
+                !isVerifiable({
                     state: state,
                     config: config,
                     fc: fc,
@@ -234,12 +234,12 @@ library LibVerifying {
         delete fc.provers;
     }
 
-    function _isVerifiable(
+    function isVerifiable(
         TaikoData.State storage state,
         TaikoData.Config memory config,
         TaikoData.ForkChoice storage fc,
         uint256 blockId
-    ) private view returns (bool) {
+    ) public view returns (bool) {
         return
             fc.blockHash != 0 &&
             block.timestamp >

packages/protocol/contracts/libs/LibSharedConfig.sol

@@ -42,7 +42,8 @@ library LibSharedConfig {
                 bootstrapDiscountHalvingPeriod: 180 days,
                 initialUncleDelay: 60 minutes,
                 enableTokenomics: false,
-                enablePublicInputsCheck: true
+                enablePublicInputsCheck: true,
+                enableProofValidation: true
             });
     }
 }

packages/protocol/contracts/test/L1/TestTaikoL1.sol

@@ -49,6 +49,7 @@ contract TestTaikoL1 is TaikoL1, IProofVerifier {
         config.initialUncleDelay = 1 minutes;
         config.enableTokenomics = false;
         config.enablePublicInputsCheck = true;
+        config.enableProofValidation = true;
     }
 
     function verifyZKP(

packages/protocol/contracts/test/L1/TestTaikoL1EnableTokenomics.sol

@@ -18,12 +18,12 @@ contract TestTaikoL1EnableTokenomics is TaikoL1, IProofVerifier {
     {
         config.chainId = 167;
         // up to 2048 pending blocks
-        config.maxNumBlocks = 2048;
-        config.blockHashHistory = 3;
+        config.maxNumBlocks = 6;
+        config.blockHashHistory = 10;
         // This number is calculated from maxNumBlocks to make
         // the 'the maximum value of the multiplier' close to 20.0
         config.zkProofsPerBlock = 1;
-        config.maxVerificationsPerTx = 2;
+        config.maxVerificationsPerTx = 0; // dont verify blocks automatically
         config.commitConfirmations = 1;
         config.maxProofsPerForkChoice = 5;
         config.blockMaxGasLimit = 30000000; // TODO
@@ -49,6 +49,7 @@ contract TestTaikoL1EnableTokenomics is TaikoL1, IProofVerifier {
         config.initialUncleDelay = 1 seconds;
         config.enableTokenomics = true;
         config.enablePublicInputsCheck = false;
+        config.enableProofValidation = false;
     }
 
     function verifyZKP(

packages/protocol/contracts/test/L1/TestTaikoL2.sol

@@ -50,5 +50,6 @@ contract TestTaikoL2 is TaikoL2 {
         config.initialUncleDelay = 1 minutes;
         config.enableTokenomics = true;
         config.enablePublicInputsCheck = false;
+        config.enableProofValidation = false;
     }
 }

packages/protocol/contracts/test/L1/TestTaikoL2EnablePublicInputsCheck.sol

@@ -50,5 +50,6 @@ contract TestTaikoL2EnablePublicInputsCheck is TaikoL2 {
         config.initialUncleDelay = 1 minutes;
         config.enableTokenomics = true;
         config.enablePublicInputsCheck = true;
+        config.enableProofValidation = true;
     }
 }

packages/protocol/test/L1/TaikoL1.test.ts

@@ -36,17 +36,6 @@ describe("TaikoL1", function () {
         });
     });
 
-    describe("getBlockProvers()", async function () {
-        it("should return empty list when there is no proof for that block", async function () {
-            const provers = await taikoL1.getBlockProvers(
-                Math.ceil(Math.random() * 1024),
-                randomBytes32()
-            );
-
-            expect(provers).to.be.empty;
-        });
-    });
-
     describe("halt()", async function () {
         it("should revert called by nonOwner", async function () {
             const initiallyHalted = await taikoL1.isHalted();