prividium 0.18.1 → 0.19.0

package/dist/sdk/selective-disclosure/disclosure-result.d.ts

@@ -28,6 +28,8 @@ export type AccountStorageProofs = {
  */
 export type EthCallDisclosureResult = {
     result: Hex;
+    from: Address;
+    to: Address;
     callData: Hex;
     batchNumber: number;
     stateCommitmentPreimage: StateCommitmentPreimage;

package/dist/sdk/selective-disclosure/verify-disclosure.js

@@ -5,6 +5,32 @@ import { calculateStateMerkleRoot } from './verifiy-proofs.js';
 export const DIAMOND_ABI = [
     parseAbiItem('function storedBatchHash(uint256 _batchNumber) external view returns (bytes32)')
 ];
+const tracerStr = `{
+    prevTop: null,
+    state: {
+        reads: {},success: null, value: null
+    },
+    step: function (log, _db) {
+        if (log.op.toString() === 'SLOAD') {
+            const addr = log.contract.getAddress();
+            const slot = this.prevTop;
+            if (!this.state.reads[addr]) this.state.reads[addr] = [];
+            if (this.state.reads[addr].indexOf(slot) === -1) this.state.reads[addr].push(slot);
+        }
+        
+        if (log.stack.length() > 0) {
+            this.prevTop = log.stack.peek(0).toString(16);
+        } else {
+            this.prevTop = null;
+        }
+    },
+    fault: (_log, _db) => {},
+    result: function (ctx, _db) {
+        this.state.success = ctx.error === null;
+        this.state.value = ctx.output.toString('hex');
+        return this.state;
+    }
+}`;
 /**
  * Verifies an ethCall disclosure response end-to-end.
  *
@@ -60,31 +86,51 @@ export async function verifyEthCallDisclosure(disclosure, l1Client, l2Client, di
     if (batchInfoHash !== storedBatchHash) {
         return false;
     }
-    // Step 5: Replay the call on L2 with state overrides to verify the proven
-    // storage values produce the expected result.
-    const contractAddress = disclosure.proofs[0].address;
-    const stateOverride = disclosure.proofs.map((proof) => {
+    const contractAddress = disclosure.to;
+    const stateOverride = {};
+    for (const proof of disclosure.proofs) {
         const address = proof.address.toLowerCase();
         const code = contractBytecodes[address];
         if (!code) {
             throw new Error(`Missing bytecode for contract ${address}`);
         }
-        return {
-            address,
+        const state = {};
+        for (const sp of proof.storageProofs) {
+            state[sp.key] = sp.proof.type === 'existing' ? sp.proof.value : pad('0x0');
+        }
+        stateOverride[address] = {
             code,
-            state: proof.storageProofs.map((sp) => ({
-                slot: sp.key,
-                value: sp.proof.type === 'existing' ? sp.proof.value : pad('0x0')
-            }))
+            state: state
         };
+    }
+    const debugResult = await l2Client.request({
+        method: 'debug_traceCall',
+        params: [
+            {
+                from: disclosure.from,
+                to: contractAddress,
+                data: disclosure.callData
+            },
+            'latest',
+            {
+                tracer: tracerStr,
+                stateOverrides: stateOverride
+            }
+        ]
     });
-    const callResult = await l2Client.call({
-        to: contractAddress,
-        data: disclosure.callData,
-        stateOverride
-    });
-    if (!callResult.data) {
+    if (!debugResult.success) {
         return false;
     }
-    return BigInt(callResult.data) === BigInt(disclosure.result);
+    for (const address in debugResult.reads) {
+        for (const slot of debugResult.reads[address]) {
+            const realSlot = `0x${slot}`;
+            const exists = disclosure.proofs.find((p) => p.address.toLowerCase() === address.toLowerCase() &&
+                p.storageProofs.some((sp) => BigInt(sp.key) === BigInt(realSlot)));
+            if (!exists) {
+                return false;
+            }
+        }
+    }
+    const callResult = debugResult.value;
+    return BigInt(callResult) === BigInt(disclosure.result);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prividium",
-  "version": "0.18.1",
+  "version": "0.19.0",
   "type": "module",
   "bin": {
     "prividium": "bin/cli.js"