Add CustomDA proof validation interface and reference implementation

deploy/OneStepProverHostIoCreator.js

@@ -5,7 +5,7 @@ module.exports = async hre => {
 
   await deploy('OneStepProverHostIo', {
     from: deployer,
-    args: [],
+    args: [ethers.constants.AddressZero],
   })
 }
 

foundry.toml

@@ -65,4 +65,7 @@ sort_imports = false
 [fuzz]
 runs = 1000
 
+[lint]
+lint_on_build = false
+
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config

scripts/config.example.ts

@@ -6,7 +6,7 @@ import {
 
 type PartialRollupParams = Pick<
   RollupCreator.RollupDeploymentParamsStruct,
-  'config' | 'validators' | 'batchPosterManager' | 'batchPosters'
+  'config' | 'validators' | 'batchPosterManager' | 'batchPosters' | 'customOsp'
 >
 
 // 90% of Geth's 128KB tx size limit, leaving ~13KB for proving
@@ -68,6 +68,7 @@ export const config: PartialRollupParams = {
   ],
   batchPosterManager: '0x1234123412341234123412341234123412341234',
   batchPosters: ['0x1234123412341234123412341234123412341234'],
+  customOsp: ethers.constants.AddressZero,
 }
 
 // These value should be defined in the env

scripts/createERC20Rollup.ts

@@ -43,6 +43,11 @@ async function main() {
     feeTokenPricer = ethers.constants.AddressZero
   }
 
+  let customOsp = process.env.CUSTOM_OSP_ADDRESS as string
+  if (!customOsp) {
+    customOsp = ethers.constants.AddressZero
+  }
+
   console.log(
     'Creating new rollup with',
     customFeeTokenAddress,
@@ -56,7 +61,8 @@ async function main() {
     rollupCreatorAddress,
     customFeeTokenAddress,
     feeTokenPricer,
-    stakeTokenAddress
+    stakeTokenAddress,
+    customOsp
   )
 }
 

scripts/createEthRollup.ts

@@ -15,6 +15,11 @@ async function main() {
     throw new Error('STAKE_TOKEN_ADDRESS not set')
   }
 
+  let customOsp = process.env.CUSTOM_OSP_ADDRESS as string
+  if (!customOsp) {
+    customOsp = ethers.constants.AddressZero
+  }
+
   const [signer] = await ethers.getSigners()
 
   await createRollup(
@@ -23,7 +28,8 @@ async function main() {
     rollupCreatorAddress,
     feeToken,
     feeTokenPricer,
-    stakeTokenAddress
+    stakeTokenAddress,
+    customOsp
   )
 }
 

scripts/deploymentUtils.ts

@@ -310,7 +310,7 @@ export async function deployAllContracts(
   const proverHostIo = await deployContract(
     'OneStepProverHostIo',
     signer,
-    [],
+    [ethers.constants.AddressZero],
     verify,
     true
   )

scripts/local-deployment/deployCreatorAndCreateRollup.ts

@@ -60,6 +60,11 @@ async function main() {
     console.log('WETH deployed at', stakeToken)
   }
 
+  let customOsp = process.env.CUSTOM_OSP_ADDRESS as string
+  if (!customOsp) {
+    customOsp = ethers.constants.AddressZero
+  }
+
   const factoryCode = await deployerWallet.provider.getCode(
     '0x4e59b44847b379578588920ca78fbf26c0b4956c'
   )
@@ -116,7 +121,8 @@ async function main() {
     contracts.rollupCreator.address,
     feeToken,
     feeTokenPricer,
-    stakeToken
+    stakeToken,
+    customOsp
   )
 
   if (!result) {

scripts/rollupCreation.ts

@@ -67,7 +67,8 @@ export async function createRollup(
   rollupCreatorAddress: string,
   feeToken: string,
   feeTokenPricer: string,
-  stakeToken: string
+  stakeToken: string,
+  customOsp: string
 ): Promise<{
   rollupCreationResult: RollupCreationResult
   chainInfo: ChainInfo
@@ -112,7 +113,8 @@ export async function createRollup(
             feeToken,
             feeTokenPricer,
             validatorWalletCreator,
-            stakeToken
+            stakeToken,
+            customOsp
           )
         : {
             config: config.config,
@@ -124,9 +126,12 @@ export async function createRollup(
             batchPosters: config.batchPosters,
             batchPosterManager: config.batchPosterManager,
             feeTokenPricer: feeTokenPricer,
+            customOsp: config.customOsp,
           }
 
-    const createRollupTx = await rollupCreator.createRollup(deployParams, {
+    const createRollupTx = await rollupCreator.functions[
+      'createRollup(((uint64,address,uint256,bytes32,address,address,uint256,string,uint256,uint64,uint256[],(uint256,uint256,uint256,uint256),uint256,uint256,uint256,((bytes32[2],uint64[2]),uint8,bytes32),uint256,address,uint8,uint64,(uint64,uint64,uint64)),address[],uint256,address,bool,uint256,address[],address,address,address))'
+    ](deployParams, {
       value: feeCost,
     })
     const createRollupReceipt = await createRollupTx.wait()
@@ -235,7 +240,8 @@ async function _getDevRollupConfig(
   feeToken: string,
   feeTokenPricer: string,
   validatorWalletCreator: string,
-  stakeToken: string
+  stakeToken: string,
+  customOsp: string
 ): Promise<RollupCreator.RollupDeploymentParamsStruct> {
   // set up owner address
   const ownerAddress =
@@ -357,6 +363,7 @@ async function _getDevRollupConfig(
     batchPosters: batchPosters,
     batchPosterManager: batchPosterManager,
     feeTokenPricer: feeTokenPricer,
+    customOsp: customOsp,
   }
 
   function _createValidatorAddress(

scripts/upgrade/deploy4844.ts

@@ -59,7 +59,7 @@ async function main() {
   const proverHostIo = await deployContract(
     'OneStepProverHostIo',
     signer,
-    [],
+    [ethers.constants.AddressZero],
     false,
     true,
     overrides
@@ -96,7 +96,9 @@ async function main() {
   await verifyContract('OneStepProver0', prover0.address, [])
   await verifyContract('OneStepProverMemory', proverMem.address, [])
   await verifyContract('OneStepProverMath', proverMath.address, [])
-  await verifyContract('OneStepProverHostIo', proverHostIo.address, [])
+  await verifyContract('OneStepProverHostIo', proverHostIo.address, [
+    ethers.constants.AddressZero,
+  ])
   await verifyContract('OneStepProofEntry', osp.address, [
     prover0.address,
     proverMem.address,

src/bridge/ISequencerInbox.sol

@@ -116,6 +116,11 @@ interface ISequencerInbox is IDelayedMessageProvider {
     // solhint-disable-next-line func-name-mixedcase
     function ZERO_HEAVY_MESSAGE_HEADER_FLAG() external view returns (bytes1);
 
+    /// @dev If the first data byte after the header has this set,
+    ///      then the batch data comes from a custom data availability provider
+    // solhint-disable-next-line func-name-mixedcase
+    function CUSTOM_DA_MESSAGE_HEADER_FLAG() external view returns (bytes1);
+
     function rollup() external view returns (IOwnable);
 
     function isBatchPoster(

src/bridge/SequencerInbox.sol

@@ -89,6 +89,9 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
     /// @inheritdoc ISequencerInbox
     bytes1 public constant ZERO_HEAVY_MESSAGE_HEADER_FLAG = 0x20;
 
+    /// @inheritdoc ISequencerInbox
+    bytes1 public constant CUSTOM_DA_MESSAGE_HEADER_FLAG = 0x01;
+
     // GAS_PER_BLOB from EIP-4844
     uint256 internal constant GAS_PER_BLOB = 1 << 17;
 
@@ -599,7 +602,8 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
     ) internal pure returns (bool) {
         return headerByte == BROTLI_MESSAGE_HEADER_FLAG || headerByte == DAS_MESSAGE_HEADER_FLAG
             || (headerByte == (DAS_MESSAGE_HEADER_FLAG | TREE_DAS_MESSAGE_HEADER_FLAG))
-            || headerByte == ZERO_HEAVY_MESSAGE_HEADER_FLAG;
+            || headerByte == ZERO_HEAVY_MESSAGE_HEADER_FLAG
+            || headerByte == CUSTOM_DA_MESSAGE_HEADER_FLAG;
     }
 
     /// @dev    Form a hash of the data taken from the calldata

src/osp/ICustomDAProofValidator.sol

@@ -0,0 +1,43 @@
+// Copyright 2021-2024, Offchain Labs, Inc.
+// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE
+// SPDX-License-Identifier: BUSL-1.1
+
+pragma solidity ^0.8.0;
+
+/**
+ * @title ICustomDAProofValidator
+ * @notice Interface for custom data availability proof validators
+ */
+interface ICustomDAProofValidator {
+    /**
+     * @notice Validates a custom DA proof and returns the preimage chunk
+     * @param certHash The keccak256 hash of the certificate (from machine's proven state)
+     * @param offset The offset into the preimage to read from (from machine's proven state)
+     * @param proof The proof data starting with [certSize(8), certificate, customData...]
+     * @return preimageChunk The 32-byte chunk of preimage data at the specified offset
+     */
+    function validateReadPreimage(
+        bytes32 certHash,
+        uint256 offset,
+        bytes calldata proof
+    ) external view returns (bytes memory preimageChunk);
+
+    /**
+     * @notice Validates whether a certificate is well-formed and legitimate
+     * @dev This function MUST NOT revert. It should return false for malformed or invalid certificates.
+     *      The security model requires that the prover's validity claim matches what this function returns.
+     *      If they disagree (e.g., prover claims valid but this returns false), the OSP will revert.
+     *
+     *      The proof format is: [certSize(8), certificate, claimedValid(1), validityProof...]
+     *      The validityProof section can contain additional verification data such as:
+     *      - Cryptographic signatures
+     *      - Merkle proofs
+     *      - Timestamped attestations
+     *      - Or other authentication mechanisms
+     * @param proof The proof data starting with [certSize(8), certificate, validityProof...]
+     * @return isValid True if the certificate is valid, false otherwise
+     */
+    function validateCertificate(
+        bytes calldata proof
+    ) external view returns (bool isValid);
+}

src/osp/OneStepProofEntry.sol

@@ -184,7 +184,8 @@ contract OneStepProofEntry is IOneStepProofEntry {
             (
                 opcode >= Instructions.GET_GLOBAL_STATE_BYTES32
                     && opcode <= Instructions.SET_GLOBAL_STATE_U64
-            ) || (opcode >= Instructions.READ_PRE_IMAGE && opcode <= Instructions.UNLINK_MODULE)
+            )
+                || (opcode >= Instructions.VALIDATE_CERTIFICATE && opcode <= Instructions.UNLINK_MODULE)
                 || (opcode >= Instructions.NEW_COTHREAD && opcode <= Instructions.SWITCH_COTHREAD)
         ) {
             prover = proverHostIo;