contract with DA

Author: Ho

.gitignore

@@ -1,5 +1,5 @@
 node_modules
-
+package-lock.json
 #Hardhat files
 cache
 artifacts

contracts/FluiDex.sol

@@ -149,18 +149,122 @@ contract FluiDexDemo is AccessControl, IFluiDex, Ownable, ReentrancyGuard {
         return block_states[_block_id];
     }
 
+    /**
+     * @notice to verify the validity of a sole block
+     * @param _public_inputs the public inputs of this block
+     * @param _serialized_proof the serialized proof of this block
+     * @param _public_data the serialized tx data inside this block (data availability)
+     * @return true if the block was accepted
+     */
+    function verifyBlock(
+        uint256[] memory _public_inputs,
+        uint256[] memory _serialized_proof,
+        bytes memory _public_data
+    ) public view returns (bool) {
+        // _public_inputs[2]/[3] is the low/high 128bit of sha256 hash of _public_data respectively
+        require(_public_inputs.length >= 4);
+
+        bytes32 h = sha256(_public_data);
+
+        console.logBytes(_public_data);
+        console.logBytes32(h);
+
+        uint256 h_lo = 0;
+        for(uint i=0;i<16;i++){
+            uint tmp = uint(uint8(h[i+16]))<<(120-8*i);
+            h_lo = h_lo + tmp;
+
+        }
+        uint256 h_hi = 0;
+        for(uint i=0;i<16;i++){
+            uint tmp = uint(uint8(h[i]))<<(120-8*i);
+            h_hi = h_hi + tmp;
+        }
+
+        assert(_public_inputs[2] == h_hi);
+        assert(_public_inputs[3] == h_lo);
+
+        return verifier.verify_serialized_proof(
+            _public_inputs,
+            _serialized_proof
+        );           
+    }
+
+    /**
+     * @notice to test a block can be submitted or not, this require the block itself
+     *         is valid, and be consistent with state root list
+     * @param _public_inputs the public inputs of this block
+     * @param _serialized_proof the serialized proof of this block
+     * @param _public_data the serialized tx data inside this block (data availability)
+     * @return true if the block can be submitted
+     */
+    function verifySubmitting(
+        uint256 _block_id,
+        uint256[] memory _public_inputs,
+        uint256[] memory _serialized_proof,
+        bytes memory _public_data
+    ) public view returns (bool) {
+        // _public_inputs[0] is previous_state_root
+        // _public_inputs[1] is new_state_root
+        require(_public_inputs.length >= 2);
+        if (_block_id == 0) {
+            assert(_public_inputs[0] == GENESIS_ROOT);
+        } else {
+            assert(_public_inputs[0] == state_roots[_block_id - 1]);
+        }
+
+        return verifyBlock(
+            _public_inputs,
+            _serialized_proof,
+            _public_data            
+        );
+    }
+
+    /**
+     * @notice request to submit a new l2 block, same parameters with verifySubmitting
+     * @return true if the block was accepted
+     */
+    function submitBlock(
+        uint256 _block_id,
+        uint256[] memory _public_inputs,
+        uint256[] memory _serialized_proof,
+        bytes memory _public_data
+    ) external override returns (bool) {
+
+        require(block_states[_block_id] != BlockState.Verified, "Block must not be submitted twice");
+        if (_block_id > 0) {
+            require(block_states[_block_id - 1] == BlockState.Verified, "Previous block must be verified");
+        }
+
+        bool ret = verifySubmitting(
+            _block_id,
+            _public_inputs,
+            _serialized_proof,
+            _public_data
+            );
+        
+        if (!ret){
+            return ret;
+        }
+
+        state_roots[_block_id] = _public_inputs[1];
+        block_states[_block_id] = BlockState.Verified;
+
+        return true;
+    }
+
     /**
      * @notice request to submit a new l2 block
      * @param _block_id the l2 block id
      * @param _public_inputs the public inputs of this block
      * @param _serialized_proof the serialized proof of this block
      * @return true if the block was accepted
      */
-    function submitBlock(
+    function submitBlockLegacy(
         uint256 _block_id,
         uint256[] memory _public_inputs,
         uint256[] memory _serialized_proof
-    ) external override returns (bool) {
+    ) external returns (bool) {
         // _public_inputs[0] is previous_state_root
         // _public_inputs[1] is new_state_root
         require(_public_inputs.length >= 2);

contracts/FluiDexDelegate.sol

@@ -104,9 +104,10 @@ contract FluiDexDelegate is
     function submitBlock(
         uint256 _block_id,
         uint256[] memory _public_inputs,
-        uint256[] memory _serialized_proof
+        uint256[] memory _serialized_proof,
+        bytes memory _public_data
     ) external override returns (bool) {
-        return target.submitBlock(_block_id, _public_inputs, _serialized_proof);
+        return target.submitBlock(_block_id, _public_inputs, _serialized_proof, _public_data);
     }
 
     /**

contracts/IFluiDex.sol

@@ -44,12 +44,14 @@ interface IFluiDex {
      * @param _block_id the l2 block id
      * @param _public_inputs the public inputs of this block
      * @param _serialized_proof the serialized proof of this block
+     * @param _public_data the serialized tx data inside this block (data availability)
      * @return true if the block was accepted
      */
     function submitBlock(
         uint256 _block_id,
         uint256[] memory _public_inputs,
-        uint256[] memory _serialized_proof
+        uint256[] memory _serialized_proof,
+        bytes memory _public_data
     ) external returns (bool);
 
     /**

contracts/IFluiDexDelegate.sol

@@ -32,11 +32,13 @@ interface IFluiDexDelegate {
      * @param _block_id the l2 block id
      * @param _public_inputs the public inputs of this block
      * @param _serialized_proof the serialized proof of this block
+     * @param _public_data the serialized tx data inside this block (data availability)
      * @return true if the block was accepted
      */
     function submitBlock(
         uint256 _block_id,
         uint256[] memory _public_inputs,
-        uint256[] memory _serialized_proof
+        uint256[] memory _serialized_proof,
+        bytes memory _public_data
     ) external returns (bool);
 }