viem 0.0.0-main.20240306T090432 → 0.0.0-main.20240306T211153

package/_cjs/chains/opStack/actions/buildProveWithdrawal.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildProveWithdrawal = void 0;
+exports.maybeAddProofNode = exports.buildProveWithdrawal = void 0;
 const getBlock_js_1 = require("../../../actions/public/getBlock.js");
 const getProof_js_1 = require("../../../actions/public/getProof.js");
+const fromRlp_js_1 = require("../../../utils/encoding/fromRlp.js");
+const toRlp_js_1 = require("../../../utils/encoding/toRlp.js");
+const keccak256_js_1 = require("../../../utils/hash/keccak256.js");
 const contracts_js_1 = require("../contracts.js");
 const getWithdrawalHashStorageSlot_js_1 = require("../utils/getWithdrawalHashStorageSlot.js");
 const outputRootProofVersion = '0x0000000000000000000000000000000000000000000000000000000000000000';
@@ -31,9 +34,26 @@ async function buildProveWithdrawal(client, args) {
             version: outputRootProofVersion,
         },
         targetChain: chain,
-        withdrawalProof: proof.storageProof[0].proof,
+        withdrawalProof: maybeAddProofNode((0, keccak256_js_1.keccak256)(slot), proof.storageProof[0].proof),
         withdrawal,
     };
 }
 exports.buildProveWithdrawal = buildProveWithdrawal;
+function maybeAddProofNode(key, proof) {
+    const lastProofRlp = proof[proof.length - 1];
+    const lastProof = (0, fromRlp_js_1.fromRlp)(lastProofRlp);
+    if (lastProof.length !== 17)
+        return proof;
+    const modifiedProof = [...proof];
+    for (const item of lastProof) {
+        if (!Array.isArray(item))
+            continue;
+        const suffix = item[0].slice(3);
+        if (typeof suffix !== 'string' || !key.endsWith(suffix))
+            continue;
+        modifiedProof.push((0, toRlp_js_1.toRlp)(item));
+    }
+    return modifiedProof;
+}
+exports.maybeAddProofNode = maybeAddProofNode;
 //# sourceMappingURL=buildProveWithdrawal.js.map

package/_cjs/chains/opStack/actions/buildProveWithdrawal.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildProveWithdrawal.js","sourceRoot":"","sources":["../../../../chains/opStack/actions/buildProveWithdrawal.ts"],"names":[],"mappings":";;;AACA,qEAG4C;AAC5C,qEAG4C;AAe5C,kDAA2C;AAE3C,8FAGiD;AAIjD,MAAM,sBAAsB,GAC1B,oEAA6E,CAAA;AAiExE,KAAK,UAAU,oBAAoB,CAMxC,MAAyC,EACzC,IAKC;IAID,MAAM,EAAE,OAAO,EAAE,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;IAClE,MAAM,EAAE,cAAc,EAAE,GAAG,UAAU,CAAA;IACrC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CAAA;IAEhC,MAAM,IAAI,GAAG,IAAA,8DAA4B,EAAC,EAAE,cAAc,EAAE,CAAC,CAAA;IAC7D,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACvC,IAAA,sBAAQ,EAAC,MAAM,EAAE;YACf,OAAO,EAAE,wBAAS,CAAC,mBAAmB,CAAC,OAAO;YAC9C,WAAW,EAAE,CAAC,IAAI,CAAC;YACnB,WAAW,EAAE,aAAa;SAC3B,CAAC;QACF,IAAA,sBAAQ,EAAC,MAAM,EAAE;YACf,WAAW,EAAE,aAAa;SAC3B,CAAC;KACH,CAAC,CAAA;IAEF,OAAO;QACL,OAAO;QACP,aAAa,EAAE,MAAM,CAAC,WAAW;QACjC,eAAe,EAAE;YACf,eAAe,EAAE,KAAK,CAAC,IAAI;YAC3B,wBAAwB,EAAE,KAAK,CAAC,WAAW;YAC3C,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,OAAO,EAAE,sBAAsB;SAChC;QACD,WAAW,EAAE,KAAK;QAClB,eAAe,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK;QAC5C,UAAU;KAMX,CAAA;AACH,CAAC;AAlDD,oDAkDC"}
+{"version":3,"file":"buildProveWithdrawal.js","sourceRoot":"","sources":["../../../../chains/opStack/actions/buildProveWithdrawal.ts"],"names":[],"mappings":";;;AACA,qEAG4C;AAC5C,qEAG4C;AAgB5C,mEAA4D;AAC5D,+DAAwD;AACxD,mEAA4D;AAC5D,kDAA2C;AAE3C,8FAGiD;AAIjD,MAAM,sBAAsB,GAC1B,oEAA6E,CAAA;AAiExE,KAAK,UAAU,oBAAoB,CAMxC,MAAyC,EACzC,IAKC;IAID,MAAM,EAAE,OAAO,EAAE,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;IAClE,MAAM,EAAE,cAAc,EAAE,GAAG,UAAU,CAAA;IACrC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CAAA;IAEhC,MAAM,IAAI,GAAG,IAAA,8DAA4B,EAAC,EAAE,cAAc,EAAE,CAAC,CAAA;IAC7D,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACvC,IAAA,sBAAQ,EAAC,MAAM,EAAE;YACf,OAAO,EAAE,wBAAS,CAAC,mBAAmB,CAAC,OAAO;YAC9C,WAAW,EAAE,CAAC,IAAI,CAAC;YACnB,WAAW,EAAE,aAAa;SAC3B,CAAC;QACF,IAAA,sBAAQ,EAAC,MAAM,EAAE;YACf,WAAW,EAAE,aAAa;SAC3B,CAAC;KACH,CAAC,CAAA;IAEF,OAAO;QACL,OAAO;QACP,aAAa,EAAE,MAAM,CAAC,WAAW;QACjC,eAAe,EAAE;YACf,eAAe,EAAE,KAAK,CAAC,IAAI;YAC3B,wBAAwB,EAAE,KAAK,CAAC,WAAW;YAC3C,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,OAAO,EAAE,sBAAsB;SAChC;QACD,WAAW,EAAE,KAAK;QAClB,eAAe,EAAE,iBAAiB,CAChC,IAAA,wBAAS,EAAC,IAAI,CAAC,EACf,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAC5B;QACD,UAAU;KAMX,CAAA;AACH,CAAC;AArDD,oDAqDC;AAED,SAAgB,iBAAiB,CAAC,GAAW,EAAE,KAAqB;IAClE,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAC5C,MAAM,SAAS,GAAG,IAAA,oBAAO,EAAC,YAAY,CAAC,CAAA;IACvC,IAAI,SAAS,CAAC,MAAM,KAAK,EAAE;QAAE,OAAO,KAAK,CAAA;IAEzC,MAAM,aAAa,GAAG,CAAC,GAAG,KAAK,CAAC,CAAA;IAChC,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAE7B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YAAE,SAAQ;QAQlC,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC/B,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,SAAQ;QACjE,aAAa,CAAC,IAAI,CAAC,IAAA,gBAAK,EAAC,IAAI,CAAC,CAAC,CAAA;IACjC,CAAC;IACD,OAAO,aAAa,CAAA;AACtB,CAAC;AArBD,8CAqBC"}

package/_cjs/errors/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-exports.version = '0.0.0-main.20240306T090432';
+exports.version = '0.0.0-main.20240306T211153';
 //# sourceMappingURL=version.js.map

package/_esm/chains/opStack/actions/buildProveWithdrawal.js

@@ -1,5 +1,9 @@
 import { getBlock, } from '../../../actions/public/getBlock.js';
 import { getProof, } from '../../../actions/public/getProof.js';
+import {} from '../../../types/misc.js';
+import { fromRlp } from '../../../utils/encoding/fromRlp.js';
+import { toRlp } from '../../../utils/encoding/toRlp.js';
+import { keccak256 } from '../../../utils/hash/keccak256.js';
 import { contracts } from '../contracts.js';
 import { getWithdrawalHashStorageSlot, } from '../utils/getWithdrawalHashStorageSlot.js';
 const outputRootProofVersion = '0x0000000000000000000000000000000000000000000000000000000000000000';
@@ -52,8 +56,32 @@ export async function buildProveWithdrawal(client, args) {
             version: outputRootProofVersion,
         },
         targetChain: chain,
-        withdrawalProof: proof.storageProof[0].proof,
+        withdrawalProof: maybeAddProofNode(keccak256(slot), proof.storageProof[0].proof),
         withdrawal,
     };
 }
+export function maybeAddProofNode(key, proof) {
+    const lastProofRlp = proof[proof.length - 1];
+    const lastProof = fromRlp(lastProofRlp);
+    if (lastProof.length !== 17)
+        return proof;
+    const modifiedProof = [...proof];
+    for (const item of lastProof) {
+        // Find any nodes located inside of the branch node.
+        if (!Array.isArray(item))
+            continue;
+        // Check if the key inside the node matches the key we're looking for. We remove the first
+        // two characters (0x) and then we remove one more character (the first nibble) since this
+        // is the identifier for the type of node we're looking at. In this case we don't actually
+        // care what type of node it is because a branch node would only ever be the final proof
+        // element if (1) it includes the leaf node we're looking for or (2) it stores the value
+        // within itself. If (1) then this logic will work, if (2) then this won't find anything
+        // and we won't append any proof elements, which is exactly what we would want.
+        const suffix = item[0].slice(3);
+        if (typeof suffix !== 'string' || !key.endsWith(suffix))
+            continue;
+        modifiedProof.push(toRlp(item));
+    }
+    return modifiedProof;
+}
 //# sourceMappingURL=buildProveWithdrawal.js.map

package/_esm/chains/opStack/actions/buildProveWithdrawal.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildProveWithdrawal.js","sourceRoot":"","sources":["../../../../chains/opStack/actions/buildProveWithdrawal.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,QAAQ,GACT,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAEL,QAAQ,GACT,MAAM,qCAAqC,CAAA;AAe5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,OAAO,EAEL,4BAA4B,GAC7B,MAAM,0CAA0C,CAAA;AAIjD,MAAM,sBAAsB,GAC1B,oEAA6E,CAAA;AAyC/E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAMxC,MAAyC,EACzC,IAKC;IAID,MAAM,EAAE,OAAO,EAAE,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;IAClE,MAAM,EAAE,cAAc,EAAE,GAAG,UAAU,CAAA;IACrC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CAAA;IAEhC,MAAM,IAAI,GAAG,4BAA4B,CAAC,EAAE,cAAc,EAAE,CAAC,CAAA;IAC7D,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACvC,QAAQ,CAAC,MAAM,EAAE;YACf,OAAO,EAAE,SAAS,CAAC,mBAAmB,CAAC,OAAO;YAC9C,WAAW,EAAE,CAAC,IAAI,CAAC;YACnB,WAAW,EAAE,aAAa;SAC3B,CAAC;QACF,QAAQ,CAAC,MAAM,EAAE;YACf,WAAW,EAAE,aAAa;SAC3B,CAAC;KACH,CAAC,CAAA;IAEF,OAAO;QACL,OAAO;QACP,aAAa,EAAE,MAAM,CAAC,WAAW;QACjC,eAAe,EAAE;YACf,eAAe,EAAE,KAAK,CAAC,IAAI;YAC3B,wBAAwB,EAAE,KAAK,CAAC,WAAW;YAC3C,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,OAAO,EAAE,sBAAsB;SAChC;QACD,WAAW,EAAE,KAAK;QAClB,eAAe,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK;QAC5C,UAAU;KAMX,CAAA;AACH,CAAC"}
+{"version":3,"file":"buildProveWithdrawal.js","sourceRoot":"","sources":["../../../../chains/opStack/actions/buildProveWithdrawal.ts"],"names":[],"mappings":"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"}

package/_esm/errors/version.js

@@ -1,2 +1,2 @@
-export const version = '0.0.0-main.20240306T090432';
+export const version = '0.0.0-main.20240306T211153';
 //# sourceMappingURL=version.js.map

package/_types/chains/opStack/actions/buildProveWithdrawal.d.ts

@@ -6,6 +6,7 @@ import type { Transport } from '../../../clients/transports/createTransport.js';
 import type { ErrorType } from '../../../errors/utils.js';
 import type { Account, DeriveAccount, GetAccountParameter } from '../../../types/account.js';
 import type { Chain, DeriveChain, GetChainParameter } from '../../../types/chain.js';
+import { type Hex } from '../../../types/misc.js';
 import type { Prettify } from '../../../types/utils.js';
 import type { Withdrawal } from '../types/withdrawal.js';
 import { type GetWithdrawalHashStorageSlotErrorType } from '../utils/getWithdrawalHashStorageSlot.js';
@@ -45,4 +46,5 @@ export type BuildProveWithdrawalErrorType = GetBlockErrorType | GetProofErrorTyp
  * })
  */
 export declare function buildProveWithdrawal<chain extends Chain | undefined, account extends Account | undefined, chainOverride extends Chain | undefined = undefined, accountOverride extends Account | Address | undefined = undefined>(client: Client<Transport, chain, account>, args: BuildProveWithdrawalParameters<chain, account, chainOverride, accountOverride>): Promise<BuildProveWithdrawalReturnType<chain, account, chainOverride, accountOverride>>;
+export declare function maybeAddProofNode(key: string, proof: readonly Hex[]): readonly `0x${string}`[];
 //# sourceMappingURL=buildProveWithdrawal.d.ts.map

package/_types/chains/opStack/actions/buildProveWithdrawal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildProveWithdrawal.d.ts","sourceRoot":"","sources":["../../../../chains/opStack/actions/buildProveWithdrawal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildProveWithdrawal.d.ts","sourceRoot":"","sources":["../../../../chains/opStack/actions/buildProveWithdrawal.ts"],"names":[],"mappings":"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"}

package/_types/errors/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "0.0.0-main.20240306T090432";
+export declare const version = "0.0.0-main.20240306T211153";
 //# sourceMappingURL=version.d.ts.map

package/chains/opStack/actions/buildProveWithdrawal.ts

@@ -20,7 +20,11 @@ import type {
   DeriveChain,
   GetChainParameter,
 } from '../../../types/chain.js'
+import { type Hex } from '../../../types/misc.js'
 import type { Prettify } from '../../../types/utils.js'
+import { fromRlp } from '../../../utils/encoding/fromRlp.js'
+import { toRlp } from '../../../utils/encoding/toRlp.js'
+import { keccak256 } from '../../../utils/hash/keccak256.js'
 import { contracts } from '../contracts.js'
 import type { Withdrawal } from '../types/withdrawal.js'
 import {
@@ -138,7 +142,10 @@ export async function buildProveWithdrawal<
       version: outputRootProofVersion,
     },
     targetChain: chain,
-    withdrawalProof: proof.storageProof[0].proof,
+    withdrawalProof: maybeAddProofNode(
+      keccak256(slot),
+      proof.storageProof[0].proof,
+    ),
     withdrawal,
   } as unknown as BuildProveWithdrawalReturnType<
     chain,
@@ -147,3 +154,26 @@ export async function buildProveWithdrawal<
     accountOverride
   >
 }
+
+export function maybeAddProofNode(key: string, proof: readonly Hex[]) {
+  const lastProofRlp = proof[proof.length - 1]
+  const lastProof = fromRlp(lastProofRlp)
+  if (lastProof.length !== 17) return proof
+
+  const modifiedProof = [...proof]
+  for (const item of lastProof) {
+    // Find any nodes located inside of the branch node.
+    if (!Array.isArray(item)) continue
+    // Check if the key inside the node matches the key we're looking for. We remove the first
+    // two characters (0x) and then we remove one more character (the first nibble) since this
+    // is the identifier for the type of node we're looking at. In this case we don't actually
+    // care what type of node it is because a branch node would only ever be the final proof
+    // element if (1) it includes the leaf node we're looking for or (2) it stores the value
+    // within itself. If (1) then this logic will work, if (2) then this won't find anything
+    // and we won't append any proof elements, which is exactly what we would want.
+    const suffix = item[0].slice(3)
+    if (typeof suffix !== 'string' || !key.endsWith(suffix)) continue
+    modifiedProof.push(toRlp(item))
+  }
+  return modifiedProof
+}

package/errors/version.ts

@@ -1 +1 @@
-export const version = '0.0.0-main.20240306T090432'
+export const version = '0.0.0-main.20240306T211153'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "0.0.0-main.20240306T090432",
+  "version": "0.0.0-main.20240306T211153",
   "type": "module",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",