viem 2.48.8 → 2.49.0

package/_cjs/tempo/actions/zone.js

@@ -23,7 +23,6 @@ const readContract_js_1 = require("../../actions/public/readContract.js");
 const sendTransaction_js_1 = require("../../actions/wallet/sendTransaction.js");
 const sendTransactionSync_js_1 = require("../../actions/wallet/sendTransactionSync.js");
 const bytes_js_1 = require("../../constants/bytes.js");
-const encodeAbiParameters_js_1 = require("../../utils/abi/encodeAbiParameters.js");
 const Abis = require("../Abis.js");
 const Addresses = require("../Addresses.js");
 const utils_js_1 = require("../internal/utils.js");
@@ -114,7 +113,7 @@ async function encryptedDeposit(client, parameters) {
     if (keyIndex === 0n) {
         throw new Error('No sequencer encryption key configured.');
     }
-    const encrypted = await encryptDepositPayload({ x: publicKey[0], yParity: publicKey[1] }, recipient, parameters.memo);
+    const encrypted = await encryptDepositPayload({ x: publicKey[0], yParity: publicKey[1] }, recipient, portalAddress, keyIndex - 1n, parameters.memo);
     const args = {
         ...parameters,
         chainId,
@@ -186,7 +185,7 @@ async function encryptedDepositSync(client, parameters) {
     if (keyIndex === 0n) {
         throw new Error('No sequencer encryption key configured.');
     }
-    const encrypted = await encryptDepositPayload({ x: publicKey[0], yParity: publicKey[1] }, recipient, parameters.memo);
+    const encrypted = await encryptDepositPayload({ x: publicKey[0], yParity: publicKey[1] }, recipient, portalAddress, keyIndex - 1n, parameters.memo);
     const args = {
         ...parameters,
         chainId,
@@ -397,30 +396,30 @@ async function signAuthorizationToken(client, parameters = {}) {
     await storage.setItem(`auth:token:${chain.id}`, token);
     return { authentication, token };
 }
-async function encryptDepositPayload(publicKey, recipient, memo = bytes_js_1.zeroHash) {
+async function encryptDepositPayload(publicKey, recipient, portalAddress, keyIndex, memo = bytes_js_1.zeroHash) {
     const sequencerPublicKey = PublicKey.from({
         prefix: publicKey.yParity,
         x: Hex.toBigInt(publicKey.x),
     });
     const { privateKey: ephemeralPrivateKey, publicKey: ephemeralPublicKey } = Secp256k1.createKeyPair();
+    const compressedEphemeral = PublicKey.compress(ephemeralPublicKey);
     const sharedSecret = Secp256k1.getSharedSecret({
         privateKey: ephemeralPrivateKey,
         publicKey: sequencerPublicKey,
         as: 'Bytes',
     });
-    const hkdfKey = await globalThis.crypto.subtle.importKey('raw', sharedSecret.buffer, 'HKDF', false, ['deriveKey']);
+    const hkdfKey = await globalThis.crypto.subtle.importKey('raw', sharedSecret.slice(1), 'HKDF', false, ['deriveKey']);
     const aesKey = await globalThis.crypto.subtle.deriveKey({
         name: 'HKDF',
         hash: 'SHA-256',
-        salt: new Uint8Array(12),
-        info: new TextEncoder().encode('ecies-aes-key'),
+        salt: new TextEncoder().encode('ecies-aes-key'),
+        info: buildDepositHkdfInfo(portalAddress, keyIndex, Hex.fromNumber(compressedEphemeral.x, { size: 32 })),
     }, hkdfKey, { name: 'AES-GCM', length: 256 }, false, ['encrypt']);
     const nonce = Bytes.random(12);
-    const plaintext = (0, encodeAbiParameters_js_1.encodeAbiParameters)([{ type: 'address' }, { type: 'bytes32' }], [recipient, memo]);
+    const plaintext = buildDepositPlaintext(recipient, memo);
     const ciphertextWithTag = new Uint8Array(await globalThis.crypto.subtle.encrypt({ name: 'AES-GCM', iv: nonce, tagLength: 128 }, aesKey, Bytes.from(plaintext)));
     const ciphertext = ciphertextWithTag.slice(0, -16);
     const tag = ciphertextWithTag.slice(-16);
-    const compressedEphemeral = PublicKey.compress(ephemeralPublicKey);
     return {
         ciphertext: Hex.fromBytes(ciphertext),
         ephemeralPubkeyX: Hex.fromNumber(compressedEphemeral.x, { size: 32 }),
@@ -429,4 +428,10 @@ async function encryptDepositPayload(publicKey, recipient, memo = bytes_js_1.zer
         tag: Hex.fromBytes(tag),
     };
 }
+function buildDepositPlaintext(recipient, memo) {
+    return Bytes.concat(Bytes.from(recipient), Bytes.from(memo), new Uint8Array(12));
+}
+function buildDepositHkdfInfo(portalAddress, keyIndex, ephemeralPubkeyX) {
+    return Bytes.concat(Bytes.from(portalAddress), Bytes.fromNumber(keyIndex, { size: 32 }), Bytes.from(ephemeralPubkeyX));
+}
 //# sourceMappingURL=zone.js.map

package/_cjs/tempo/actions/zone.js.map

@@ -1 +1 @@
-{"version":3,"file":"zone.js","sourceRoot":"","sources":["../../../tempo/actions/zone.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zone.js","sourceRoot":"","sources":["../../../tempo/actions/zone.ts"],"names":[],"mappings":";;AAsEA,0BAuBC;AAsFD,kCA6BC;AAgDD,4CAwDC;AAqGD,oDA8DC;AAuCD,8DAmBC;AAuCD,4CAgCC;AAwED,4CAeC;AAiCD,kCAmBC;AAiDD,8CAoBC;AAuGD,sDA0BC;AAkDD,kEAoBC;AA6FD,0EA0BC;AA6CD,wDA6CC;AAnsCD,kCAAiC;AACjC,8BAA6B;AAC7B,0CAAyC;AACzC,0CAAyC;AACzC,oCAAiE;AAEjE,0EAAmE;AACnE,0EAAmE;AACnE,gFAGgD;AAChD,wFAAiF;AAGjF,uDAAmD;AAKnD,mCAAkC;AAClC,6CAA4C;AAM5C,mDAAiD;AACjD,yCAAwC;AAExC,6CAA4C;AAC5C,8CAAmD;AAsC5C,KAAK,UAAU,OAAO,CAI3B,MAAyC,EACzC,UAA8C;IAE9C,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,EAAE,EAAE,CAAA;IAChC,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;IAErD,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,UAAU,CAAA;IAExD,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,8BAAY,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC5D,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;IAEvD,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,IAAI,QAAQ,EAAE,OAAO,CAAA;IAC3D,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAE3D,MAAM,IAAI,GAAG,EAAE,GAAG,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,CAAA;IAClD,OAAO,IAAA,oCAAe,EAAC,MAAM,EAAE;QAC7B,GAAG,IAAI;QACP,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;KAClB,CAAU,CAAA;AACtB,CAAC;AAED,WAAiB,OAAO;IAoCtB,SAAgB,KAAK,CAAC,IAAU;QAC9B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,GAAG,mBAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;QAC3E,MAAM,aAAa,GAAG,IAAA,0BAAgB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QACvD,OAAO;YACL,IAAA,qBAAU,EAAC;gBACT,OAAO,EAAE,eAAO,CAAC,SAAS,CAAC,KAAK,CAAC;gBACjC,GAAG,EAAE,IAAI,CAAC,KAAK;gBACf,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,CAAC,aAAa,EAAE,MAAM,CAAC;aAC9B,CAAC;YACF,IAAA,qBAAU,EAAC;gBACT,OAAO,EAAE,aAAa;gBACtB,GAAG,EAAE,QAAQ,CAAC,UAAU;gBACxB,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,CAAC,eAAO,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC;aAC1D,CAAC;SACH,CAAA;IACH,CAAC;IAjBe,aAAK,QAiBpB,CAAA;AACH,CAAC,EAtDgB,OAAO,uBAAP,OAAO,QAsDvB;AA8BM,KAAK,UAAU,WAAW,CAI/B,MAAyC,EACzC,UAAkD;IAElD,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,EAAE,EAAE,CAAA;IAChC,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;IAErD,MAAM,EACJ,OAAO,GAAG,MAAM,CAAC,OAAO,EACxB,oBAAoB,GAAG,IAAI,EAC3B,GAAG,IAAI,EACR,GAAG,UAAU,CAAA;IAEd,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,8BAAY,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC5D,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;IAEvD,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,IAAI,QAAQ,EAAE,OAAO,CAAA;IAC3D,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAE3D,MAAM,IAAI,GAAG,EAAE,GAAG,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,CAAA;IAClD,MAAM,OAAO,GAAG,MAAM,IAAA,4CAAmB,EAAC,MAAM,EAAE;QAChD,GAAG,IAAI;QACP,oBAAoB;QACpB,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;KAClB,CAAC,CAAA;IACX,OAAO,EAAE,OAAO,EAAE,CAAA;AACpB,CAAC;AAgDM,KAAK,UAAU,gBAAgB,CAIpC,MAAyC,EACzC,UAAuD;IAEvD,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,EAAE,EAAE,CAAA;IAChC,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;IAErD,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,UAAU,CAAA;IAExD,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,8BAAY,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC5D,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;IAEvD,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,IAAI,QAAQ,EAAE,OAAO,CAAA;IAC3D,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAE3D,MAAM,aAAa,GAAG,IAAA,0BAAgB,EAAC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;IAElE,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,IAAA,8BAAY,EAAC,MAAM,EAAE;YACnB,OAAO,EAAE,aAAa;YACtB,GAAG,EAAE,QAAQ,CAAC,UAAU;YACxB,YAAY,EAAE,wBAAwB;SACvC,CAAC;QACF,IAAA,8BAAY,EAAC,MAAM,EAAE;YACnB,OAAO,EAAE,aAAa;YACtB,GAAG,EAAE,QAAQ,CAAC,UAAU;YACxB,YAAY,EAAE,oBAAoB;SACnC,CAAC;KACH,CAAC,CAAA;IAEF,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;IAC5D,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,qBAAqB,CAC3C,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,EAC1C,SAAS,EACT,aAAa,EACb,QAAQ,GAAG,EAAE,EACb,UAAU,CAAC,IAAI,CAChB,CAAA;IAED,MAAM,IAAI,GAAG;QACX,GAAG,UAAU;QACb,OAAO;QACP,SAAS;QACT,QAAQ,EAAE,QAAQ,GAAG,EAAE;QACvB,SAAS;KACV,CAAA;IACD,OAAO,IAAA,oCAAe,EAAC,MAAM,EAAE;QAC7B,GAAG,IAAI;QACP,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC;KAC3B,CAAU,CAAA;AACtB,CAAC;AAED,WAAiB,gBAAgB;IAwC/B,SAAgB,KAAK,CAAC,IAAU;QAC9B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;QACpE,MAAM,aAAa,GAAG,IAAA,0BAAgB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QACvD,OAAO;YACL,IAAA,qBAAU,EAAC;gBACT,OAAO,EAAE,eAAO,CAAC,SAAS,CAAC,KAAK,CAAC;gBACjC,GAAG,EAAE,IAAI,CAAC,KAAK;gBACf,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,CAAC,aAAa,EAAE,MAAM,CAAC;aAC9B,CAAC;YACF,IAAA,qBAAU,EAAC;gBACT,OAAO,EAAE,aAAa;gBACtB,GAAG,EAAE,QAAQ,CAAC,UAAU;gBACxB,YAAY,EAAE,kBAAkB;gBAChC,IAAI,EAAE;oBACJ,eAAO,CAAC,SAAS,CAAC,KAAK,CAAC;oBACxB,MAAM;oBACN,QAAQ;oBACR;wBACE,gBAAgB,EAAE,SAAS,CAAC,gBAAgB;wBAC5C,sBAAsB,EAAE,SAAS,CAAC,sBAAsB;wBACxD,UAAU,EAAE,SAAS,CAAC,UAAU;wBAChC,KAAK,EAAE,SAAS,CAAC,KAAK;wBACtB,GAAG,EAAE,SAAS,CAAC,GAAG;qBACnB;iBACF;aACF,CAAC;SACH,CAAA;IACH,CAAC;IA5Be,sBAAK,QA4BpB,CAAA;AACH,CAAC,EArEgB,gBAAgB,gCAAhB,gBAAgB,QAqEhC;AA8BM,KAAK,UAAU,oBAAoB,CAIxC,MAAyC,EACzC,UAA2D;IAE3D,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,EAAE,EAAE,CAAA;IAChC,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;IAErD,MAAM,EACJ,OAAO,GAAG,MAAM,CAAC,OAAO,EACxB,oBAAoB,GAAG,IAAI,EAC3B,GAAG,IAAI,EACR,GAAG,UAAU,CAAA;IAEd,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,8BAAY,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC5D,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;IAEvD,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,IAAI,QAAQ,EAAE,OAAO,CAAA;IAC3D,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAE3D,MAAM,aAAa,GAAG,IAAA,0BAAgB,EAAC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;IAElE,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,IAAA,8BAAY,EAAC,MAAM,EAAE;YACnB,OAAO,EAAE,aAAa;YACtB,GAAG,EAAE,QAAQ,CAAC,UAAU;YACxB,YAAY,EAAE,wBAAwB;SACvC,CAAC;QACF,IAAA,8BAAY,EAAC,MAAM,EAAE;YACnB,OAAO,EAAE,aAAa;YACtB,GAAG,EAAE,QAAQ,CAAC,UAAU;YACxB,YAAY,EAAE,oBAAoB;SACnC,CAAC;KACH,CAAC,CAAA;IAEF,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;IAC5D,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,qBAAqB,CAC3C,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,EAC1C,SAAS,EACT,aAAa,EACb,QAAQ,GAAG,EAAE,EACb,UAAU,CAAC,IAAI,CAChB,CAAA;IAED,MAAM,IAAI,GAAG;QACX,GAAG,UAAU;QACb,OAAO;QACP,SAAS;QACT,QAAQ,EAAE,QAAQ,GAAG,EAAE;QACvB,SAAS;KACV,CAAA;IACD,MAAM,OAAO,GAAG,MAAM,IAAA,4CAAmB,EAAC,MAAM,EAAE;QAChD,GAAG,IAAI;QACP,oBAAoB;QACpB,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC;KAC3B,CAAC,CAAA;IACX,OAAO,EAAE,OAAO,EAAE,CAAA;AACpB,CAAC;AAuCM,KAAK,UAAU,yBAAyB,CAI7C,MAAyC;IAEzC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAI9B;QACD,MAAM,EAAE,gCAAgC;QACxC,MAAM,EAAE,EAAE;KACX,CAAC,CAAA;IAEF,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC;KACxC,CAAA;AACH,CAAC;AAuCM,KAAK,UAAU,gBAAgB,CAIpC,MAAyC,EACzC,UAAuC;IAEvC,MAAM,EAAE,gBAAgB,EAAE,GAAG,UAAU,CAAA;IACvC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAIhC;QACD,MAAM,EAAE,uBAAuB;QAC/B,MAAM,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;KAC3C,CAAC,CAAA;IAEF,OAAO;QACL,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAC1C,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;YACpC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB,CAAC,CAAC;QACH,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,gBAAgB,EAAE,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC;QACvD,oBAAoB,EAAE,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,oBAAoB,CAAC;KAChE,CAAA;AACH,CAAC;AAwEM,KAAK,UAAU,gBAAgB,CAIpC,MAAyC,EACzC,aAA0C,EAAE;IAE5C,MAAM,EAAE,GAAG,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,UAAU,CAAA;IACxC,OAAO,IAAA,8BAAY,EAAC,MAAM,EAAE;QAC1B,GAAG,IAAI;QACP,OAAO,EAAE,SAAS,CAAC,UAAU;QAC7B,GAAG,EAAE,QAAQ,CAAC,UAAU;QACxB,YAAY,EAAE,wBAAwB;QACtC,IAAI,EAAE,CAAC,GAAG,CAAC;KACZ,CAAC,CAAA;AACJ,CAAC;AAiCM,KAAK,UAAU,WAAW,CAG/B,MAAyC;IACzC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAI9B;QACD,MAAM,EAAE,kBAAkB;QAC1B,MAAM,EAAE,EAAE;KACX,CAAC,CAAA;IAEF,OAAO;QACL,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;QACnC,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QACjC,UAAU,EAAE,IAAI,CAAC,UAAU;KAC5B,CAAA;AACH,CAAC;AAiDM,KAAK,UAAU,iBAAiB,CAIrC,MAAyC,EACzC,UAAwD;IAExD,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,UAAU,CAAA;IAExD,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,8BAAY,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC5D,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;IAEvD,MAAM,EAAE,GAAG,UAAU,CAAC,EAAE,IAAI,QAAQ,EAAE,OAAO,CAAA;IAC7C,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAE7C,MAAM,IAAI,GAAG,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE,CAAA;IAClC,OAAO,IAAA,oCAAe,EAAC,MAAM,EAAE;QAC7B,GAAG,IAAI;QACP,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC;KAC5B,CAAU,CAAA;AACtB,CAAC;AAED,WAAiB,iBAAiB;IAsChC,SAAgB,KAAK,CAAC,IAAU;QAC9B,MAAM,EACJ,MAAM,EACN,IAAI,GAAG,IAAI,EACX,iBAAiB,GAAG,IAAI,CAAC,EAAE,EAC3B,GAAG,GAAG,EAAE,EACR,IAAI,GAAG,mBAAQ,EACf,EAAE,EACF,KAAK,GACN,GAAG,IAAI,CAAA;QACR,OAAO;YACL,IAAA,qBAAU,EAAC;gBACT,OAAO,EAAE,eAAO,CAAC,SAAS,CAAC,KAAK,CAAC;gBACjC,GAAG,EAAE,IAAI,CAAC,KAAK;gBACf,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;aACrC,CAAC;YACF,IAAA,qBAAU,EAAC;gBACT,OAAO,EAAE,SAAS,CAAC,UAAU;gBAC7B,GAAG,EAAE,QAAQ,CAAC,UAAU;gBACxB,YAAY,EAAE,mBAAmB;gBACjC,IAAI,EAAE;oBACJ,eAAO,CAAC,SAAS,CAAC,KAAK,CAAC;oBACxB,EAAE;oBACF,MAAM;oBACN,IAAI;oBACJ,GAAG;oBACH,iBAAiB;oBACjB,IAAI;oBACJ,IAAI;iBACL;aACF,CAAC;SACH,CAAA;IACH,CAAC;IAjCe,uBAAK,QAiCpB,CAAA;AACH,CAAC,EAxEgB,iBAAiB,iCAAjB,iBAAiB,QAwEjC;AA6BM,KAAK,UAAU,qBAAqB,CAIzC,MAAyC,EACzC,UAA4D;IAE5D,MAAM,EACJ,OAAO,GAAG,MAAM,CAAC,OAAO,EACxB,oBAAoB,GAAG,IAAI,EAC3B,GAAG,IAAI,EACR,GAAG,UAAU,CAAA;IAEd,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,8BAAY,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC5D,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;IAEvD,MAAM,EAAE,GAAG,UAAU,CAAC,EAAE,IAAI,QAAQ,EAAE,OAAO,CAAA;IAC7C,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAE7C,MAAM,IAAI,GAAG,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE,CAAA;IAClC,MAAM,OAAO,GAAG,MAAM,IAAA,4CAAmB,EAAC,MAAM,EAAE;QAChD,GAAG,IAAI;QACP,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC;QACpC,oBAAoB;KACZ,CAAC,CAAA;IACX,OAAO,EAAE,OAAO,EAAE,CAAA;AACpB,CAAC;AAkDM,KAAK,UAAU,2BAA2B,CAI/C,MAAyC,EACzC,UAAkE;IAElE,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,UAAU,CAAA;IAExD,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,8BAAY,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC5D,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;IAEvD,MAAM,EAAE,GAAG,UAAU,CAAC,EAAE,IAAI,QAAQ,EAAE,OAAO,CAAA;IAC7C,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAE7C,MAAM,IAAI,GAAG,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE,CAAA;IAClC,OAAO,IAAA,oCAAe,EAAC,MAAM,EAAE;QAC7B,GAAG,IAAI;QACP,KAAK,EAAE,2BAA2B,CAAC,KAAK,CAAC,IAAI,CAAC;KACtC,CAAU,CAAA;AACtB,CAAC;AAED,WAAiB,2BAA2B;IA0B1C,SAAgB,KAAK,CAAC,IAAU;QAC9B,MAAM,EACJ,MAAM,EACN,IAAI,GAAG,IAAI,EACX,iBAAiB,GAAG,IAAI,CAAC,EAAE,EAC3B,GAAG,GAAG,EAAE,EACR,IAAI,GAAG,mBAAQ,EACf,QAAQ,EACR,EAAE,EACF,KAAK,GACN,GAAG,IAAI,CAAA;QACR,OAAO;YACL,IAAA,qBAAU,EAAC;gBACT,OAAO,EAAE,eAAO,CAAC,SAAS,CAAC,KAAK,CAAC;gBACjC,GAAG,EAAE,IAAI,CAAC,KAAK;gBACf,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;aACrC,CAAC;YACF,IAAA,qBAAU,EAAC;gBACT,OAAO,EAAE,SAAS,CAAC,UAAU;gBAC7B,GAAG,EAAE,QAAQ,CAAC,UAAU;gBACxB,YAAY,EAAE,mBAAmB;gBACjC,IAAI,EAAE;oBACJ,eAAO,CAAC,SAAS,CAAC,KAAK,CAAC;oBACxB,EAAE;oBACF,MAAM;oBACN,IAAI;oBACJ,GAAG;oBACH,iBAAiB;oBACjB,IAAI;oBACJ,QAAQ;iBACT;aACF,CAAC;SACH,CAAA;IACH,CAAC;IAlCe,iCAAK,QAkCpB,CAAA;AACH,CAAC,EA7DgB,2BAA2B,2CAA3B,2BAA2B,QA6D3C;AA8BM,KAAK,UAAU,+BAA+B,CAInD,MAAyC,EACzC,UAAsE;IAEtE,MAAM,EACJ,OAAO,GAAG,MAAM,CAAC,OAAO,EACxB,oBAAoB,GAAG,IAAI,EAC3B,GAAG,IAAI,EACR,GAAG,UAAU,CAAA;IAEd,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,8BAAY,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC5D,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;IAEvD,MAAM,EAAE,GAAG,UAAU,CAAC,EAAE,IAAI,QAAQ,EAAE,OAAO,CAAA;IAC7C,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAE7C,MAAM,IAAI,GAAG,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE,CAAA;IAClC,MAAM,OAAO,GAAG,MAAM,IAAA,4CAAmB,EAAC,MAAM,EAAE;QAChD,GAAG,IAAI;QACP,KAAK,EAAE,2BAA2B,CAAC,KAAK,CAAC,IAAI,CAAC;QAC9C,oBAAoB;KACZ,CAAC,CAAA;IACX,OAAO,EAAE,OAAO,EAAE,CAAA;AACpB,CAAC;AA6CM,KAAK,UAAU,sBAAsB,CAK1C,MAAyC,EACzC,aAGI,EAAS;IAEb,MAAM,EACJ,OAAO,GAAG,MAAM,CAAC,OAAO,EACxB,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,EACxC,SAAS,GAAG,QAAQ,GAAG,MAAM,EAC7B,OAAO,GAAG,OAAO,CAAC,cAAc,EAAE,GACnC,GAAG,UAAU,CAAA;IAEd,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAA;IAC9C,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;IAEzE,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,8BAAY,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC5D,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI;QAC7B,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;IAEvD,MAAM,UAAU,GAAG,QAAQ,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,KAAK,CAAC,EAAE,EAAE,CAAA;IAEvE,MAAM,cAAc,GAAG,6BAAqB,CAAC,IAAI,CAAC;QAChD,OAAO,EAAE,KAAK,CAAC,EAAE;QACjB,SAAS;QACT,QAAQ;QACR,MAAM,EAAE,cAAM,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;KACrC,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,6BAAqB,CAAC,cAAc,CAAC,cAAc,CAAC,CAAA;IACpE,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;IAExD,MAAM,KAAK,GAAG,6BAAqB,CAAC,SAAS,CAAC,cAAc,EAAE;QAC5D,SAAS;KACV,CAAC,CAAA;IAEF,MAAM,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;IACxC,MAAM,OAAO,CAAC,OAAO,CAAC,cAAc,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,CAAA;IAEtD,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,CAAA;AAClC,CAAC;AAiCD,KAAK,UAAU,qBAAqB,CAClC,SAA0C,EAC1C,SAAkB,EAClB,aAAsB,EACtB,QAAgB,EAChB,OAAgB,mBAAQ;IAExB,MAAM,kBAAkB,GAAG,SAAS,CAAC,IAAI,CAAC;QACxC,MAAM,EAAE,SAAS,CAAC,OAAO;QACzB,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;KAC7B,CAAC,CAAA;IAEF,MAAM,EAAE,UAAU,EAAE,mBAAmB,EAAE,SAAS,EAAE,kBAAkB,EAAE,GACtE,SAAS,CAAC,aAAa,EAAE,CAAA;IAC3B,MAAM,mBAAmB,GAAG,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAA;IAElE,MAAM,YAAY,GAAG,SAAS,CAAC,eAAe,CAAC;QAC7C,UAAU,EAAE,mBAAmB;QAC/B,SAAS,EAAE,kBAAkB;QAC7B,EAAE,EAAE,OAAO;KACZ,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CACtD,KAAK,EACL,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EACrB,MAAM,EACN,KAAK,EACL,CAAC,WAAW,CAAC,CACd,CAAA;IACD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CACrD;QACE,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC;QAC/C,IAAI,EAAE,oBAAoB,CACxB,aAAa,EACb,QAAQ,EACR,GAAG,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CACpC;KAClB,EACD,OAAO,EACP,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,EAChC,KAAK,EACL,CAAC,SAAS,CAAC,CACZ,CAAA;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC9B,MAAM,SAAS,GAAG,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IAExD,MAAM,iBAAiB,GAAG,IAAI,UAAU,CACtC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CACpC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,KAAqB,EAAE,SAAS,EAAE,GAAG,EAAE,EAC9D,MAAM,EACN,KAAK,CAAC,IAAI,CAAC,SAAS,CAAiB,CACtC,CACF,CAAA;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;IAClD,MAAM,GAAG,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAA;IAExC,OAAO;QACL,UAAU,EAAE,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC;QACrC,gBAAgB,EAAE,GAAG,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QACrE,sBAAsB,EAAE,mBAAmB,CAAC,MAAM;QAClD,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC;QAC3B,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC;KACxB,CAAA;AACH,CAAC;AAED,SAAS,qBAAqB,CAAC,SAAkB,EAAE,IAAa;IAC9D,OAAO,KAAK,CAAC,MAAM,CACjB,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EACrB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAChB,IAAI,UAAU,CAAC,EAAE,CAAC,CACnB,CAAA;AACH,CAAC;AAED,SAAS,oBAAoB,CAC3B,aAAsB,EACtB,QAAgB,EAChB,gBAAyB;IAEzB,OAAO,KAAK,CAAC,MAAM,CACjB,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,EACzB,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EACxC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAC7B,CAAA;AACH,CAAC"}

package/_cjs/utils/buildRequest.js

@@ -5,12 +5,13 @@ exports.shouldRetry = shouldRetry;
 const base_js_1 = require("../errors/base.js");
 const request_js_1 = require("../errors/request.js");
 const rpc_js_1 = require("../errors/rpc.js");
+const utils_js_1 = require("../errors/utils.js");
 const withDedupe_js_1 = require("./promise/withDedupe.js");
 const withRetry_js_1 = require("./promise/withRetry.js");
 const stringify_js_1 = require("./stringify.js");
 function buildRequest(request, options = {}) {
     return async (args, overrideOptions = {}) => {
-        const { dedupe = false, methods, retryDelay = 150, retryCount = 3, uid, } = {
+        const { dedupe = false, methods, retryDelay = 150, retryCount = 3, signal, uid, } = {
             ...options,
             ...overrideOptions,
         };
@@ -23,14 +24,20 @@ function buildRequest(request, options = {}) {
             throw new rpc_js_1.MethodNotSupportedRpcError(new Error('method not supported'), {
                 method,
             });
+        if (signal?.aborted)
+            throw (0, utils_js_1.getAbortError)(signal);
         const requestId = dedupe
             ? hashString(`${uid}.${(0, stringify_js_1.stringify)(args)}`)
             : undefined;
         return (0, withDedupe_js_1.withDedupe)(() => (0, withRetry_js_1.withRetry)(async () => {
             try {
-                return await request(args);
+                return await request(args, signal ? { signal } : undefined);
             }
             catch (err_) {
+                if (signal?.aborted)
+                    throw (0, utils_js_1.getAbortError)(signal);
+                if ((0, utils_js_1.isAbortError)(err_))
+                    throw err_;
                 const err = err_;
                 switch (err.code) {
                     case rpc_js_1.ParseRpcError.code:
@@ -105,11 +112,14 @@ function buildRequest(request, options = {}) {
                 return ~~(1 << count) * retryDelay;
             },
             retryCount,
+            signal,
             shouldRetry: ({ error }) => shouldRetry(error),
         }), { enabled: dedupe, id: requestId });
     };
 }
 function shouldRetry(error) {
+    if ((0, utils_js_1.isAbortError)(error))
+        return false;
     if ('code' in error && typeof error.code === 'number') {
         if (error.code === -1)
             return true;

package/_cjs/utils/buildRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildRequest.js","sourceRoot":"","sources":["../../utils/buildRequest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildRequest.js","sourceRoot":"","sources":["../../utils/buildRequest.ts"],"names":[],"mappings":"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"}

package/_cjs/utils/ccip.js

@@ -6,6 +6,7 @@ exports.ccipRequest = ccipRequest;
 const call_js_1 = require("../actions/public/call.js");
 const ccip_js_1 = require("../errors/ccip.js");
 const request_js_1 = require("../errors/request.js");
+const utils_js_1 = require("../errors/utils.js");
 const decodeErrorResult_js_1 = require("./abi/decodeErrorResult.js");
 const encodeAbiParameters_js_1 = require("./abi/encodeAbiParameters.js");
 const isAddressEqual_js_1 = require("./address/isAddressEqual.js");
@@ -40,7 +41,7 @@ exports.offchainLookupAbiItem = {
         },
     ],
 };
-async function offchainLookup(client, { blockNumber, blockTag, data, to, }) {
+async function offchainLookup(client, { blockNumber, blockTag, data, requestOptions, to, }) {
     const { args } = (0, decodeErrorResult_js_1.decodeErrorResult)({
         data,
         abi: [exports.offchainLookupAbiItem],
@@ -56,9 +57,9 @@ async function offchainLookup(client, { blockNumber, blockTag, data, to, }) {
         const result = urls.includes(localBatchGatewayRequest_js_1.localBatchGatewayUrl)
             ? await (0, localBatchGatewayRequest_js_1.localBatchGatewayRequest)({
                 data: callData,
-                ccipRequest: ccipRequest_,
+                ccipRequest: (parameters) => ccipRequest_({ ...parameters, requestOptions }),
             })
-            : await ccipRequest_({ data: callData, sender, urls });
+            : await ccipRequest_({ data: callData, requestOptions, sender, urls });
         const { data: data_ } = await (0, call_js_1.call)(client, {
             blockNumber,
             blockTag,
@@ -66,11 +67,16 @@ async function offchainLookup(client, { blockNumber, blockTag, data, to, }) {
                 callbackSelector,
                 (0, encodeAbiParameters_js_1.encodeAbiParameters)([{ type: 'bytes' }, { type: 'bytes' }], [result, extraData]),
             ]),
+            requestOptions,
             to,
         });
         return data_;
     }
     catch (err) {
+        if (requestOptions?.signal?.aborted)
+            throw (0, utils_js_1.getAbortError)(requestOptions.signal);
+        if ((0, utils_js_1.isAbortError)(err))
+            throw err;
         throw new ccip_js_1.OffchainLookupError({
             callbackSelector,
             cause: err,
@@ -81,9 +87,11 @@ async function offchainLookup(client, { blockNumber, blockTag, data, to, }) {
         });
     }
 }
-async function ccipRequest({ data, sender, urls, }) {
+async function ccipRequest({ data, requestOptions, sender, urls, }) {
     let error = new Error('An unknown error occurred.');
     for (let i = 0; i < urls.length; i++) {
+        if (requestOptions?.signal?.aborted)
+            throw (0, utils_js_1.getAbortError)(requestOptions.signal);
         const url = urls[i];
         const method = url.includes('{data}') ? 'GET' : 'POST';
         const body = method === 'POST' ? { data, sender } : undefined;
@@ -93,6 +101,7 @@ async function ccipRequest({ data, sender, urls, }) {
                 body: JSON.stringify(body),
                 headers,
                 method,
+                ...(requestOptions?.signal ? { signal: requestOptions.signal } : {}),
             });
             let result;
             if (response.headers.get('Content-Type')?.startsWith('application/json')) {
@@ -123,6 +132,10 @@ async function ccipRequest({ data, sender, urls, }) {
             return result;
         }
         catch (err) {
+            if (requestOptions?.signal?.aborted)
+                throw (0, utils_js_1.getAbortError)(requestOptions.signal);
+            if ((0, utils_js_1.isAbortError)(err))
+                throw err;
             error = new request_js_1.HttpRequestError({
                 body,
                 details: err.message,

package/_cjs/utils/ccip.js.map

@@ -1 +1 @@
-{"version":3,"file":"ccip.js","sourceRoot":"","sources":["../../utils/ccip.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ccip.js","sourceRoot":"","sources":["../../utils/ccip.ts"],"names":[],"mappings":"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"}

package/_cjs/utils/promise/withRetry.js

@@ -1,14 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withRetry = withRetry;
+const utils_js_1 = require("../../errors/utils.js");
 const wait_js_1 = require("../wait.js");
-function withRetry(fn, { delay: delay_ = 100, retryCount = 2, shouldRetry = () => true, } = {}) {
+function withRetry(fn, { delay: delay_ = 100, retryCount = 2, shouldRetry = () => true, signal, } = {}) {
     return new Promise((resolve, reject) => {
         const attemptRetry = async ({ count = 0 } = {}) => {
+            if (signal?.aborted) {
+                reject((0, utils_js_1.getAbortError)(signal));
+                return;
+            }
             const retry = async ({ error }) => {
                 const delay = typeof delay_ === 'function' ? delay_({ count, error }) : delay_;
-                if (delay)
-                    await (0, wait_js_1.wait)(delay);
+                if (delay) {
+                    try {
+                        await (0, wait_js_1.wait)(delay, { signal });
+                    }
+                    catch (err) {
+                        reject(err);
+                        return;
+                    }
+                }
                 attemptRetry({ count: count + 1 });
             };
             try {
@@ -16,6 +28,14 @@ function withRetry(fn, { delay: delay_ = 100, retryCount = 2, shouldRetry = () =
                 resolve(data);
             }
             catch (err) {
+                if (signal?.aborted) {
+                    reject((0, utils_js_1.getAbortError)(signal));
+                    return;
+                }
+                if ((0, utils_js_1.isAbortError)(err)) {
+                    reject(err);
+                    return;
+                }
                 if (count < retryCount &&
                     (await shouldRetry({ count, error: err })))
                     return retry({ error: err });

package/_cjs/utils/promise/withRetry.js.map

@@ -1 +1 @@
-{"version":3,"file":"withRetry.js","sourceRoot":"","sources":["../../../utils/promise/withRetry.ts"],"names":[],"mappings":";;AAyBA,8BA+BC;AAvDD,wCAAiC;AAwBjC,SAAgB,SAAS,CACvB,EAAuB,EACvB,EACE,KAAK,EAAE,MAAM,GAAG,GAAG,EACnB,UAAU,GAAG,CAAC,EACd,WAAW,GAAG,GAAG,EAAE,CAAC,IAAI,MACD,EAAE;IAE3B,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,YAAY,GAAG,KAAK,EAAE,EAAE,KAAK,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE;YAChD,MAAM,KAAK,GAAG,KAAK,EAAE,EAAE,KAAK,EAAoB,EAAE,EAAE;gBAClD,MAAM,KAAK,GACT,OAAO,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;gBAClE,IAAI,KAAK;oBAAE,MAAM,IAAA,cAAI,EAAC,KAAK,CAAC,CAAA;gBAC5B,YAAY,CAAC,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAA;YACpC,CAAC,CAAA;YAED,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,EAAE,EAAE,CAAA;gBACvB,OAAO,CAAC,IAAI,CAAC,CAAA;YACf,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IACE,KAAK,GAAG,UAAU;oBAClB,CAAC,MAAM,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,GAAY,EAAE,CAAC,CAAC;oBAEnD,OAAO,KAAK,CAAC,EAAE,KAAK,EAAE,GAAY,EAAE,CAAC,CAAA;gBACvC,MAAM,CAAC,GAAG,CAAC,CAAA;YACb,CAAC;QACH,CAAC,CAAA;QACD,YAAY,EAAE,CAAA;IAChB,CAAC,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"withRetry.js","sourceRoot":"","sources":["../../../utils/promise/withRetry.ts"],"names":[],"mappings":";;AA+BA,8BAoDC;AAnFD,oDAI8B;AAC9B,wCAAiC;AA0BjC,SAAgB,SAAS,CACvB,EAAuB,EACvB,EACE,KAAK,EAAE,MAAM,GAAG,GAAG,EACnB,UAAU,GAAG,CAAC,EACd,WAAW,GAAG,GAAG,EAAE,CAAC,IAAI,EACxB,MAAM,MACiB,EAAE;IAE3B,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,YAAY,GAAG,KAAK,EAAE,EAAE,KAAK,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE;YAChD,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;gBACpB,MAAM,CAAC,IAAA,wBAAa,EAAC,MAAM,CAAC,CAAC,CAAA;gBAC7B,OAAM;YACR,CAAC;YAED,MAAM,KAAK,GAAG,KAAK,EAAE,EAAE,KAAK,EAAoB,EAAE,EAAE;gBAClD,MAAM,KAAK,GACT,OAAO,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;gBAClE,IAAI,KAAK,EAAE,CAAC;oBACV,IAAI,CAAC;wBACH,MAAM,IAAA,cAAI,EAAC,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;oBAC/B,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACb,MAAM,CAAC,GAAG,CAAC,CAAA;wBACX,OAAM;oBACR,CAAC;gBACH,CAAC;gBACD,YAAY,CAAC,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAA;YACpC,CAAC,CAAA;YAED,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,EAAE,EAAE,CAAA;gBACvB,OAAO,CAAC,IAAI,CAAC,CAAA;YACf,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;oBACpB,MAAM,CAAC,IAAA,wBAAa,EAAC,MAAM,CAAC,CAAC,CAAA;oBAC7B,OAAM;gBACR,CAAC;gBACD,IAAI,IAAA,uBAAY,EAAC,GAAG,CAAC,EAAE,CAAC;oBACtB,MAAM,CAAC,GAAG,CAAC,CAAA;oBACX,OAAM;gBACR,CAAC;gBACD,IACE,KAAK,GAAG,UAAU;oBAClB,CAAC,MAAM,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,GAAY,EAAE,CAAC,CAAC;oBAEnD,OAAO,KAAK,CAAC,EAAE,KAAK,EAAE,GAAY,EAAE,CAAC,CAAA;gBACvC,MAAM,CAAC,GAAG,CAAC,CAAA;YACb,CAAC;QACH,CAAC,CAAA;QACD,YAAY,EAAE,CAAA;IAChB,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/_cjs/utils/promise/withTimeout.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withTimeout = withTimeout;
+const utils_js_1 = require("../../errors/utils.js");
 function withTimeout(fn, { errorInstance = new Error('timed out'), timeout, signal, }) {
     return new Promise((resolve, reject) => {
         ;
         (async () => {
             let timeoutId;
+            const controller = new AbortController();
             try {
-                const controller = new AbortController();
                 if (timeout > 0) {
                     timeoutId = setTimeout(() => {
                         if (signal) {
@@ -21,8 +22,10 @@ function withTimeout(fn, { errorInstance = new Error('timed out'), timeout, sign
                 resolve(await fn({ signal: controller?.signal || null }));
             }
             catch (err) {
-                if (err?.name === 'AbortError')
+                if (controller?.signal.aborted && (0, utils_js_1.isAbortError)(err)) {
                     reject(errorInstance);
+                    return;
+                }
                 reject(err);
             }
             finally {

package/_cjs/utils/promise/withTimeout.js.map

@@ -1 +1 @@
-{"version":3,"file":"withTimeout.js","sourceRoot":"","sources":["../../../utils/promise/withTimeout.ts"],"names":[],"mappings":";;AAIA,kCA0CC;AA1CD,SAAgB,WAAW,CACzB,EAImB,EACnB,EACE,aAAa,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,EACtC,OAAO,EACP,MAAM,GAQP;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,CAAC;QAAA,CAAC,KAAK,IAAI,EAAE;YACX,IAAI,SAA0B,CAAA;YAC9B,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;gBACxC,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;oBAChB,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;wBAC1B,IAAI,MAAM,EAAE,CAAC;4BACX,UAAU,CAAC,KAAK,EAAE,CAAA;wBACpB,CAAC;6BAAM,CAAC;4BACN,MAAM,CAAC,aAAa,CAAC,CAAA;wBACvB,CAAC;oBACH,CAAC,EAAE,OAAO,CAAmB,CAAA;gBAC/B,CAAC;gBACD,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC,CAAA;YAC3D,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAK,GAAa,EAAE,IAAI,KAAK,YAAY;oBAAE,MAAM,CAAC,aAAa,CAAC,CAAA;gBAChE,MAAM,CAAC,GAAG,CAAC,CAAA;YACb,CAAC;oBAAS,CAAC;gBACT,YAAY,CAAC,SAAS,CAAC,CAAA;YACzB,CAAC;QACH,CAAC,CAAC,EAAE,CAAA;IACN,CAAC,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"withTimeout.js","sourceRoot":"","sources":["../../../utils/promise/withTimeout.ts"],"names":[],"mappings":";;AAIA,kCA6CC;AAjDD,oDAAoE;AAIpE,SAAgB,WAAW,CACzB,EAImB,EACnB,EACE,aAAa,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,EACtC,OAAO,EACP,MAAM,GAQP;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,CAAC;QAAA,CAAC,KAAK,IAAI,EAAE;YACX,IAAI,SAA0B,CAAA;YAC9B,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;YACxC,IAAI,CAAC;gBACH,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;oBAChB,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;wBAC1B,IAAI,MAAM,EAAE,CAAC;4BACX,UAAU,CAAC,KAAK,EAAE,CAAA;wBACpB,CAAC;6BAAM,CAAC;4BACN,MAAM,CAAC,aAAa,CAAC,CAAA;wBACvB,CAAC;oBACH,CAAC,EAAE,OAAO,CAAmB,CAAA;gBAC/B,CAAC;gBACD,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC,CAAA;YAC3D,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,UAAU,EAAE,MAAM,CAAC,OAAO,IAAI,IAAA,uBAAY,EAAC,GAAG,CAAC,EAAE,CAAC;oBACpD,MAAM,CAAC,aAAa,CAAC,CAAA;oBACrB,OAAM;gBACR,CAAC;gBACD,MAAM,CAAC,GAAG,CAAC,CAAA;YACb,CAAC;oBAAS,CAAC;gBACT,YAAY,CAAC,SAAS,CAAC,CAAA;YACzB,CAAC;QACH,CAAC,CAAC,EAAE,CAAA;IACN,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/_cjs/utils/rpc/http.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHttpRpcClient = getHttpRpcClient;
 exports.parseUrl = parseUrl;
 const request_js_1 = require("../../errors/request.js");
+const utils_js_1 = require("../../errors/utils.js");
 const withTimeout_js_1 = require("../promise/withTimeout.js");
 const stringify_js_1 = require("../stringify.js");
 const id_js_1 = require("./id.js");
@@ -79,6 +80,10 @@ function getHttpRpcClient(url_, options = {}) {
                 return data;
             }
             catch (err) {
+                if (signal_?.aborted)
+                    throw (0, utils_js_1.getAbortError)(signal_);
+                if ((0, utils_js_1.isAbortError)(err))
+                    throw err;
                 if (err instanceof request_js_1.HttpRequestError)
                     throw err;
                 if (err instanceof request_js_1.TimeoutError)

package/_cjs/utils/rpc/http.js.map

@@ -1 +1 @@
-{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../utils/rpc/http.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../utils/rpc/http.ts"],"names":[],"mappings":"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"}

package/_cjs/utils/wait.js

@@ -1,7 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.wait = wait;
-async function wait(time) {
-    return new Promise((res) => setTimeout(res, time));
+const utils_js_1 = require("../errors/utils.js");
+async function wait(time, { signal } = {}) {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject((0, utils_js_1.getAbortError)(signal));
+            return;
+        }
+        const cleanup = () => signal?.removeEventListener('abort', onAbort);
+        const timeout = setTimeout(() => {
+            cleanup();
+            resolve();
+        }, time);
+        const onAbort = () => {
+            clearTimeout(timeout);
+            cleanup();
+            reject((0, utils_js_1.getAbortError)(signal));
+        };
+        signal?.addEventListener('abort', onAbort, { once: true });
+    });
 }
 //# sourceMappingURL=wait.js.map

package/_cjs/utils/wait.js.map

@@ -1 +1 @@
-{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../utils/wait.ts"],"names":[],"mappings":";;AAAA,oBAEC;AAFM,KAAK,UAAU,IAAI,CAAC,IAAY;IACrC,OAAO,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAA;AACpD,CAAC"}
+{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../utils/wait.ts"],"names":[],"mappings":";;AAEA,oBAsBC;AAxBD,iDAAkD;AAE3C,KAAK,UAAU,IAAI,CACxB,IAAY,EACZ,EAAE,MAAM,KAA2C,EAAE;IAErD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;YACpB,MAAM,CAAC,IAAA,wBAAa,EAAC,MAAM,CAAC,CAAC,CAAA;YAC7B,OAAM;QACR,CAAC;QAED,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QACnE,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,OAAO,EAAE,CAAA;YACT,OAAO,EAAE,CAAA;QACX,CAAC,EAAE,IAAI,CAAC,CAAA;QACR,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,YAAY,CAAC,OAAO,CAAC,CAAA;YACrB,OAAO,EAAE,CAAA;YACT,MAAM,CAAC,IAAA,wBAAa,EAAC,MAAM,CAAC,CAAC,CAAA;QAC/B,CAAC,CAAA;QACD,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;IAC5D,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/_esm/actions/public/call.js

@@ -7,6 +7,7 @@ import { deploylessCallViaBytecodeBytecode, deploylessCallViaFactoryBytecode, mu
 import { BaseError } from '../../errors/base.js';
 import { ChainDoesNotSupportContract, ClientChainNotConfiguredError, } from '../../errors/chain.js';
 import { CounterfactualDeploymentFailedError, RawContractError, } from '../../errors/contract.js';
+import { getAbortError, isAbortError, } from '../../errors/utils.js';
 import { decodeFunctionResult, } from '../../utils/abi/decodeFunctionResult.js';
 import { encodeDeployData, } from '../../utils/abi/encodeDeployData.js';
 import { encodeFunctionData, } from '../../utils/abi/encodeFunctionData.js';
@@ -44,7 +45,7 @@ import { assertRequest } from '../../utils/transaction/assertRequest.js';
  * })
  */
 export async function call(client, args) {
-    const { account: account_ = client.account, authorizationList, batch = Boolean(client.batch?.multicall), blockNumber, blockTag = client.experimental_blockTag ?? 'latest', accessList, blobs, blockOverrides, code, data: data_, factory, factoryData, gas, gasPrice, maxFeePerBlobGas, maxFeePerGas, maxPriorityFeePerGas, nonce, to, value, stateOverride, ...rest } = args;
+    const { account: account_ = client.account, authorizationList, batch = Boolean(client.batch?.multicall), blockNumber, blockTag = client.experimental_blockTag ?? 'latest', accessList, blobs, blockOverrides, code, data: data_, factory, factoryData, gas, gasPrice, maxFeePerBlobGas, maxFeePerGas, maxPriorityFeePerGas, nonce, requestOptions, to, value, stateOverride, ...rest } = args;
     const account = account_ ? parseAccount(account_) : undefined;
     if (code && (factory || factoryData))
         throw new BaseError('Cannot provide both `code` & `factory`/`factoryData` as parameters.');
@@ -106,6 +107,7 @@ export async function call(client, args) {
                     ...request,
                     blockNumber,
                     blockTag,
+                    requestOptions,
                 });
             }
             catch (err) {
@@ -130,19 +132,25 @@ export async function call(client, args) {
         const response = await client.request({
             method: 'eth_call',
             params,
-        });
+        }, requestOptions);
         if (response === '0x')
             return { data: undefined };
         return { data: response };
     }
     catch (err) {
+        if (requestOptions?.signal?.aborted)
+            throw getAbortError(requestOptions.signal);
+        if (isAbortError(err))
+            throw err;
         const data = getRevertErrorData(err);
         // Check for CCIP-Read offchain lookup signature.
         const { offchainLookup, offchainLookupSignature } = await import('../../utils/ccip.js');
         if (client.ccipRead !== false &&
             data?.slice(0, 10) === offchainLookupSignature &&
             to)
-            return { data: await offchainLookup(client, { data, to }) };
+            return {
+                data: await offchainLookup(client, { data, requestOptions, to }),
+            };
         // Check for counterfactual deployment error.
         if (deploylessCall && data?.slice(0, 10) === '0x101bb98d')
             throw new CounterfactualDeploymentFailedError({ factory });
@@ -170,9 +178,21 @@ function shouldPerformMulticall({ request }) {
         return false;
     return true;
 }
+let requestOptionsId = 0;
+const requestOptionsIds = new WeakMap();
+function getRequestOptionsId(requestOptions) {
+    if (!requestOptions)
+        return 'default';
+    const id = requestOptionsIds.get(requestOptions);
+    if (id !== undefined)
+        return id;
+    const nextId = requestOptionsId++;
+    requestOptionsIds.set(requestOptions, nextId);
+    return nextId;
+}
 async function scheduleMulticall(client, args) {
     const { batchSize = 1024, deployless = false, wait = 0, } = typeof client.batch?.multicall === 'object' ? client.batch.multicall : {};
-    const { blockNumber, blockTag = client.experimental_blockTag ?? 'latest', data, to, } = args;
+    const { blockNumber, blockTag = client.experimental_blockTag ?? 'latest', data, requestOptions, to, } = args;
     const multicallAddress = (() => {
         if (deployless)
             return null;
@@ -190,7 +210,7 @@ async function scheduleMulticall(client, args) {
     const blockNumberHex = typeof blockNumber === 'bigint' ? numberToHex(blockNumber) : undefined;
     const block = blockNumberHex || blockTag;
     const { schedule } = createBatchScheduler({
-        id: `${client.uid}.${block}`,
+        id: `${client.uid}.${block}.${getRequestOptionsId(requestOptions)}`,
         wait,
         shouldSplitBatch(args) {
             const size = args.reduce((size, { data }) => size + (data.length - 2), 0);
@@ -222,7 +242,7 @@ async function scheduleMulticall(client, args) {
                     },
                     block,
                 ],
-            });
+            }, requestOptions);
             return decodeFunctionResult({
                 abi: multicall3Abi,
                 args: [calls],