viem 0.3.14 → 0.3.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/actions/public/call.js +2 -2
- package/dist/cjs/actions/public/call.js.map +1 -1
- package/dist/cjs/actions/public/multicall.js +1 -1
- package/dist/cjs/actions/public/multicall.js.map +1 -1
- package/dist/cjs/errors/version.js +1 -1
- package/dist/cjs/utils/ccip.js +29 -8
- package/dist/cjs/utils/ccip.js.map +1 -1
- package/dist/esm/actions/public/call.js +2 -2
- package/dist/esm/actions/public/call.js.map +1 -1
- package/dist/esm/actions/public/multicall.js +1 -1
- package/dist/esm/actions/public/multicall.js.map +1 -1
- package/dist/esm/errors/version.js +1 -1
- package/dist/esm/utils/ccip.js +28 -7
- package/dist/esm/utils/ccip.js.map +1 -1
- package/dist/types/actions/public/call.d.ts.map +1 -1
- package/dist/types/errors/version.d.ts +1 -1
- package/dist/types/utils/ccip.d.ts +7 -7
- package/dist/types/utils/ccip.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/actions/public/call.ts +3 -2
- package/src/actions/public/multicall.ts +1 -1
- package/src/errors/version.ts +1 -1
- package/src/utils/ccip.ts +33 -9
|
@@ -51,8 +51,8 @@ async function call(client, args) {
|
|
|
51
51
|
}
|
|
52
52
|
catch (err) {
|
|
53
53
|
const data = getRevertErrorData(err);
|
|
54
|
-
|
|
55
|
-
|
|
54
|
+
const { offchainLookup, offchainLookupSignature } = await import('../../utils/ccip.js');
|
|
55
|
+
if (data?.slice(0, 10) === offchainLookupSignature && to) {
|
|
56
56
|
return { data: await offchainLookup(client, { data, to }) };
|
|
57
57
|
}
|
|
58
58
|
throw (0, index_js_3.getCallError)(err, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"call.js","sourceRoot":"","sources":["../../../../src/actions/public/call.ts"],"names":[],"mappings":";;;AACA,uDAA6E;AAC7E,oDAK8B;AAe9B,
|
|
1
|
+
{"version":3,"file":"call.js","sourceRoot":"","sources":["../../../../src/actions/public/call.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,7 +76,7 @@ async function multicall(client, args) {
|
|
|
76
76
|
blockTag,
|
|
77
77
|
functionName: 'aggregate3',
|
|
78
78
|
})));
|
|
79
|
-
return results.flat().
|
|
79
|
+
return results.flat().map(({ returnData, success }, i) => {
|
|
80
80
|
const calls = chunkedCalls.flat();
|
|
81
81
|
const { callData } = calls[i];
|
|
82
82
|
const { abi, address, functionName, args } = contracts[i];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multicall.js","sourceRoot":"","sources":["../../../../src/actions/public/multicall.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"multicall.js","sourceRoot":"","sources":["../../../../src/actions/public/multicall.ts"],"names":[],"mappings":";;;AAEA,uDAAwD;AAExD,oDAG8B;AAS9B,mDAK6B;AAG7B,uDAAgD;AAyDzC,KAAK,UAAU,SAAS,CAK7B,MAAuC,EACvC,IAAoD;IAEpD,MAAM,EACJ,YAAY,GAAG,IAAI,EACnB,SAAS,EAAE,UAAU,EACrB,WAAW,EACX,QAAQ,EACR,SAAS,EAAE,UAAU,EACrB,gBAAgB,EAAE,iBAAiB,GACpC,GAAG,IAAI,CAAA;IAER,MAAM,SAAS,GACb,UAAU;QACV,CAAC,CAAC,OAAO,MAAM,CAAC,KAAK,EAAE,SAAS,KAAK,QAAQ;YAC3C,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC;YACjC,IAAK,CAAC,CAAA;IAGV,MAAM,SAAS,GAAG,UAA0D,CAAA;IAE5E,IAAI,gBAAgB,GAAG,iBAAiB,CAAA;IACxC,IAAI,CAAC,gBAAgB,EAAE;QACrB,IAAI,CAAC,MAAM,CAAC,KAAK;YACf,MAAM,IAAI,KAAK,CACb,4DAA4D,CAC7D,CAAA;QAEH,gBAAgB,GAAG,IAAA,kCAAuB,EAAC;YACzC,WAAW;YACX,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,QAAQ,EAAE,YAAY;SACvB,CAAC,CAAA;KACH;IAQD,MAAM,YAAY,GAAsB,CAAC,EAAE,CAAC,CAAA;IAC5C,IAAI,YAAY,GAAG,CAAC,CAAA;IACpB,IAAI,gBAAgB,GAAG,CAAC,CAAA;IACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QACzD,IAAI;YACF,MAAM,QAAQ,GAAG,IAAA,6BAAkB,EAAC;gBAClC,GAAG;gBACH,IAAI;gBACJ,YAAY;aAC8B,CAAC,CAAA;YAE7C,gBAAgB,IAAI,QAAQ,CAAC,MAAM,CAAA;YACnC,IAAI,SAAS,GAAG,CAAC,IAAI,gBAAgB,GAAG,SAAS,EAAE;gBACjD,YAAY,EAAE,CAAA;gBACd,gBAAgB,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAA;gBAC5C,YAAY,CAAC,YAAY,CAAC,GAAG,EAAE,CAAA;aAChC;YAED,YAAY,CAAC,YAAY,CAAC,GAAG;gBAC3B,GAAG,YAAY,CAAC,YAAY,CAAC;gBAC7B;oBACE,YAAY,EAAE,IAAI;oBAClB,QAAQ;oBACR,MAAM,EAAE,OAAO;iBAChB;aACF,CAAA;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,KAAK,GAAG,IAAA,2BAAgB,EAAC,GAAgB,EAAE;gBAC/C,GAAG;gBACH,OAAO;gBACP,IAAI;gBACJ,QAAQ,EAAE,0BAA0B;gBACpC,YAAY;aACb,CAAC,CAAA;YACF,IAAI,CAAC,YAAY;gBAAE,MAAM,KAAK,CAAA;YAC9B,YAAY,CAAC,YAAY,CAAC,GAAG;gBAC3B,GAAG,YAAY,CAAC,YAAY,CAAC;gBAC7B;oBACE,YAAY,EAAE,IAAI;oBAClB,QAAQ,EAAE,IAAW;oBACrB,MAAM,EAAE,OAAO;iBAChB;aACF,CAAA;SACF;KACF;IAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACzB,IAAA,8BAAY,EAAC,MAAM,EAAE;QACnB,GAAG,EAAE,wBAAa;QAClB,OAAO,EAAE,gBAAiB;QAC1B,IAAI,EAAE,CAAC,KAAK,CAAC;QACb,WAAW;QACX,QAAQ;QACR,YAAY,EAAE,YAAY;KAC3B,CAAC,CACH,CACF,CAAA;IAED,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;QACvD,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,EAAE,CAAA;QACjC,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QAC7B,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QACzD,IAAI;YACF,IAAI,QAAQ,KAAK,IAAI;gBAAE,MAAM,IAAI,mCAAwB,EAAE,CAAA;YAC3D,IAAI,CAAC,OAAO;gBAAE,MAAM,IAAI,2BAAgB,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAA;YAC9D,MAAM,MAAM,GAAG,IAAA,+BAAoB,EAAC;gBAClC,GAAG;gBACH,IAAI,EAAE,UAAU;gBAChB,YAAY,EAAE,YAAY;aAC3B,CAAC,CAAA;YACF,OAAO,YAAY,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,MAAM,CAAA;SAC7D;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,KAAK,GAAG,IAAA,2BAAgB,EAAC,GAAgB,EAAE;gBAC/C,GAAG;gBACH,OAAO;gBACP,IAAI;gBACJ,QAAQ,EAAE,0BAA0B;gBACpC,YAAY;aACb,CAAC,CAAA;YACF,IAAI,CAAC,YAAY;gBAAE,MAAM,KAAK,CAAA;YAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,CAAA;SACvD;IACH,CAAC,CAAgD,CAAA;AACnD,CAAC;AAnID,8BAmIC"}
|
package/dist/cjs/utils/ccip.js
CHANGED
|
@@ -1,15 +1,39 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ccipFetch = exports.offchainLookup = exports.offchainLookupAbiItem = exports.offchainLookupSignature = void 0;
|
|
4
|
-
const abitype_1 = require("abitype");
|
|
5
4
|
const index_js_1 = require("../errors/index.js");
|
|
6
|
-
const
|
|
5
|
+
const call_js_1 = require("../actions/public/call.js");
|
|
7
6
|
const index_js_2 = require("./abi/index.js");
|
|
8
7
|
const index_js_3 = require("./address/index.js");
|
|
9
8
|
const index_js_4 = require("./data/index.js");
|
|
10
9
|
const stringify_js_1 = require("./stringify.js");
|
|
11
10
|
exports.offchainLookupSignature = '0x556f1830';
|
|
12
|
-
exports.offchainLookupAbiItem =
|
|
11
|
+
exports.offchainLookupAbiItem = {
|
|
12
|
+
name: 'OffchainLookup',
|
|
13
|
+
type: 'error',
|
|
14
|
+
inputs: [
|
|
15
|
+
{
|
|
16
|
+
name: 'sender',
|
|
17
|
+
type: 'address',
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
name: 'urls',
|
|
21
|
+
type: 'string[]',
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
name: 'callData',
|
|
25
|
+
type: 'bytes',
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
name: 'callbackFunction',
|
|
29
|
+
type: 'bytes4',
|
|
30
|
+
},
|
|
31
|
+
{
|
|
32
|
+
name: 'extraData',
|
|
33
|
+
type: 'bytes',
|
|
34
|
+
},
|
|
35
|
+
],
|
|
36
|
+
};
|
|
13
37
|
async function offchainLookup(client, { blockNumber, blockTag, data, to, }) {
|
|
14
38
|
const { args } = (0, index_js_2.decodeErrorResult)({
|
|
15
39
|
data,
|
|
@@ -20,15 +44,12 @@ async function offchainLookup(client, { blockNumber, blockTag, data, to, }) {
|
|
|
20
44
|
if (!(0, index_js_3.isAddressEqual)(to, sender))
|
|
21
45
|
throw new index_js_1.OffchainLookupSenderMismatchError({ sender, to });
|
|
22
46
|
const result = await ccipFetch({ data: callData, sender, urls });
|
|
23
|
-
const { data: data_ } = await (0,
|
|
47
|
+
const { data: data_ } = await (0, call_js_1.call)(client, {
|
|
24
48
|
blockNumber,
|
|
25
49
|
blockTag,
|
|
26
50
|
data: (0, index_js_4.concat)([
|
|
27
51
|
callbackSelector,
|
|
28
|
-
(0, index_js_2.encodeAbiParameters)(
|
|
29
|
-
result,
|
|
30
|
-
extraData,
|
|
31
|
-
]),
|
|
52
|
+
(0, index_js_2.encodeAbiParameters)([{ type: 'bytes' }, { type: 'bytes' }], [result, extraData]),
|
|
32
53
|
]),
|
|
33
54
|
to,
|
|
34
55
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ccip.js","sourceRoot":"","sources":["../../../src/utils/ccip.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ccip.js","sourceRoot":"","sources":["../../../src/utils/ccip.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { aggregate3Signature, multicall3Abi } from '../../constants/index.js';
|
|
2
2
|
import { BaseError, ChainDoesNotSupportContract, ClientChainNotConfiguredError, RawContractError, } from '../../errors/index.js';
|
|
3
|
-
import { assertRequest, decodeFunctionResult, encodeFunctionData, extract, format, formatTransactionRequest, getCallError, getChainContractAddress, numberToHex,
|
|
3
|
+
import { assertRequest, decodeFunctionResult, encodeFunctionData, extract, format, formatTransactionRequest, getCallError, getChainContractAddress, numberToHex, parseAccount, } from '../../utils/index.js';
|
|
4
4
|
import { createBatchScheduler } from '../../utils/promise/createBatchScheduler.js';
|
|
5
5
|
export async function call(client, args) {
|
|
6
6
|
const { account: account_, batch = Boolean(client.batch?.multicall), blockNumber, blockTag = 'latest', accessList, data, gas, gasPrice, maxFeePerGas, maxPriorityFeePerGas, nonce, to, value, ...rest } = args;
|
|
@@ -48,8 +48,8 @@ export async function call(client, args) {
|
|
|
48
48
|
}
|
|
49
49
|
catch (err) {
|
|
50
50
|
const data = getRevertErrorData(err);
|
|
51
|
+
const { offchainLookup, offchainLookupSignature } = await import('../../utils/ccip.js');
|
|
51
52
|
if (data?.slice(0, 10) === offchainLookupSignature && to) {
|
|
52
|
-
const { offchainLookup } = await import('../../utils/ccip.js');
|
|
53
53
|
return { data: await offchainLookup(client, { data, to }) };
|
|
54
54
|
}
|
|
55
55
|
throw getCallError(err, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"call.js","sourceRoot":"","sources":["../../../../src/actions/public/call.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAC7E,OAAO,EACL,SAAS,EACT,2BAA2B,EAC3B,6BAA6B,EAC7B,gBAAgB,GACjB,MAAM,uBAAuB,CAAA;AAe9B,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,kBAAkB,EAClB,OAAO,EACP,MAAM,EACN,wBAAwB,EACxB,YAAY,EACZ,uBAAuB,EACvB,WAAW,EACX,
|
|
1
|
+
{"version":3,"file":"call.js","sourceRoot":"","sources":["../../../../src/actions/public/call.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,7 +73,7 @@ export async function multicall(client, args) {
|
|
|
73
73
|
blockTag,
|
|
74
74
|
functionName: 'aggregate3',
|
|
75
75
|
})));
|
|
76
|
-
return results.flat().
|
|
76
|
+
return results.flat().map(({ returnData, success }, i) => {
|
|
77
77
|
const calls = chunkedCalls.flat();
|
|
78
78
|
const { callData } = calls[i];
|
|
79
79
|
const { abi, address, functionName, args } = contracts[i];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multicall.js","sourceRoot":"","sources":["../../../../src/actions/public/multicall.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"multicall.js","sourceRoot":"","sources":["../../../../src/actions/public/multicall.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = '0.3.
|
|
1
|
+
export const version = '0.3.15';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
package/dist/esm/utils/ccip.js
CHANGED
|
@@ -1,12 +1,36 @@
|
|
|
1
|
-
import { parseAbiItem, parseAbiParameters } from 'abitype';
|
|
2
1
|
import { BaseError, HttpRequestError, OffchainLookupError, OffchainLookupResponseMalformedError, OffchainLookupSenderMismatchError, } from '../errors/index.js';
|
|
3
|
-
import { call } from '../public.js';
|
|
2
|
+
import { call } from '../actions/public/call.js';
|
|
4
3
|
import { decodeErrorResult, encodeAbiParameters } from './abi/index.js';
|
|
5
4
|
import { isAddressEqual } from './address/index.js';
|
|
6
5
|
import { concat, isHex } from './data/index.js';
|
|
7
6
|
import { stringify } from './stringify.js';
|
|
8
7
|
export const offchainLookupSignature = '0x556f1830';
|
|
9
|
-
export const offchainLookupAbiItem =
|
|
8
|
+
export const offchainLookupAbiItem = {
|
|
9
|
+
name: 'OffchainLookup',
|
|
10
|
+
type: 'error',
|
|
11
|
+
inputs: [
|
|
12
|
+
{
|
|
13
|
+
name: 'sender',
|
|
14
|
+
type: 'address',
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
name: 'urls',
|
|
18
|
+
type: 'string[]',
|
|
19
|
+
},
|
|
20
|
+
{
|
|
21
|
+
name: 'callData',
|
|
22
|
+
type: 'bytes',
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
name: 'callbackFunction',
|
|
26
|
+
type: 'bytes4',
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
name: 'extraData',
|
|
30
|
+
type: 'bytes',
|
|
31
|
+
},
|
|
32
|
+
],
|
|
33
|
+
};
|
|
10
34
|
export async function offchainLookup(client, { blockNumber, blockTag, data, to, }) {
|
|
11
35
|
const { args } = decodeErrorResult({
|
|
12
36
|
data,
|
|
@@ -22,10 +46,7 @@ export async function offchainLookup(client, { blockNumber, blockTag, data, to,
|
|
|
22
46
|
blockTag,
|
|
23
47
|
data: concat([
|
|
24
48
|
callbackSelector,
|
|
25
|
-
encodeAbiParameters(
|
|
26
|
-
result,
|
|
27
|
-
extraData,
|
|
28
|
-
]),
|
|
49
|
+
encodeAbiParameters([{ type: 'bytes' }, { type: 'bytes' }], [result, extraData]),
|
|
29
50
|
]),
|
|
30
51
|
to,
|
|
31
52
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ccip.js","sourceRoot":"","sources":["../../../src/utils/ccip.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ccip.js","sourceRoot":"","sources":["../../../src/utils/ccip.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"call.d.ts","sourceRoot":"","sources":["../../../../src/actions/public/call.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAQrE,OAAO,KAAK,EACV,OAAO,EACP,OAAO,EACP,QAAQ,EACR,KAAK,EACL,SAAS,EACT,GAAG,EACH,2BAA2B,EAC3B,kBAAkB,EACnB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EACV,SAAS,EACT,2BAA2B,EAC5B,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"call.d.ts","sourceRoot":"","sources":["../../../../src/actions/public/call.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAQrE,OAAO,KAAK,EACV,OAAO,EACP,OAAO,EACP,QAAQ,EACR,KAAK,EACL,SAAS,EACT,GAAG,EACH,2BAA2B,EAC3B,kBAAkB,EACnB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EACV,SAAS,EACT,2BAA2B,EAC5B,MAAM,sBAAsB,CAAA;AAe7B,MAAM,MAAM,aAAa,CACvB,UAAU,SAAS,SAAS,GAAG,SAAS,GAAG,SAAS,IAClD,2BAA2B,CAC7B,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,kBAAkB,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,EAC7D,kBAAkB,CACnB,CAAA;AAED,MAAM,MAAM,cAAc,CACxB,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,IAClD,aAAa,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC,GAAG;IACvD,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAA;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,GAAG,CACE;IACE,oDAAoD;IACpD,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,KAAK,CAAA;CACjB,GACD;IACE,WAAW,CAAC,EAAE,KAAK,CAAA;IACnB;;;OAGG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAA;CACpB,CACJ,CAAA;AAEH,MAAM,MAAM,cAAc,GAAG;IAAE,IAAI,EAAE,GAAG,GAAG,SAAS,CAAA;CAAE,CAAA;AAEtD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAsB,IAAI,CAAC,MAAM,SAAS,KAAK,GAAG,SAAS,EACzD,MAAM,EAAE,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,EACvC,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,GAC3B,OAAO,CAAC,cAAc,CAAC,CAgFzB;AA4GD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,6BAG9C"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "0.3.
|
|
1
|
+
export declare const version = "0.3.15";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1,26 +1,26 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { Address } from 'abitype';
|
|
2
2
|
import type { PublicClient, Transport } from '../clients/index.js';
|
|
3
|
-
import {
|
|
3
|
+
import type { CallParameters } from '../actions/public/index.js';
|
|
4
4
|
import type { Chain, Hex } from '../types/index.js';
|
|
5
5
|
export declare const offchainLookupSignature = "0x556f1830";
|
|
6
6
|
export declare const offchainLookupAbiItem: {
|
|
7
7
|
readonly name: "OffchainLookup";
|
|
8
8
|
readonly type: "error";
|
|
9
9
|
readonly inputs: readonly [{
|
|
10
|
-
readonly type: "address";
|
|
11
10
|
readonly name: "sender";
|
|
11
|
+
readonly type: "address";
|
|
12
12
|
}, {
|
|
13
|
-
readonly type: "string[]";
|
|
14
13
|
readonly name: "urls";
|
|
14
|
+
readonly type: "string[]";
|
|
15
15
|
}, {
|
|
16
|
-
readonly type: "bytes";
|
|
17
16
|
readonly name: "callData";
|
|
17
|
+
readonly type: "bytes";
|
|
18
18
|
}, {
|
|
19
|
-
readonly type: "bytes4";
|
|
20
19
|
readonly name: "callbackFunction";
|
|
20
|
+
readonly type: "bytes4";
|
|
21
21
|
}, {
|
|
22
|
-
readonly type: "bytes";
|
|
23
22
|
readonly name: "extraData";
|
|
23
|
+
readonly type: "bytes";
|
|
24
24
|
}];
|
|
25
25
|
};
|
|
26
26
|
export declare function offchainLookup<TChain extends Chain | undefined>(client: PublicClient<Transport, TChain>, { blockNumber, blockTag, data, to, }: Pick<CallParameters, 'blockNumber' | 'blockTag'> & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ccip.d.ts","sourceRoot":"","sources":["../../../src/utils/ccip.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"ccip.d.ts","sourceRoot":"","sources":["../../../src/utils/ccip.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAO,OAAO,EAAE,MAAM,SAAS,CAAA;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAQlE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAEhE,OAAO,KAAK,EAAE,KAAK,EAAgB,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAMjE,eAAO,MAAM,uBAAuB,eAAe,CAAA;AACnD,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;CAyBF,CAAA;AAEhC,wBAAsB,cAAc,CAAC,MAAM,SAAS,KAAK,GAAG,SAAS,EACnE,MAAM,EAAE,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,EACvC,EACE,WAAW,EACX,QAAQ,EACR,IAAI,EACJ,EAAE,GACH,EAAE,IAAI,CAAC,cAAc,EAAE,aAAa,GAAG,UAAU,CAAC,GAAG;IACpD,IAAI,EAAE,GAAG,CAAA;IACT,EAAE,EAAE,OAAO,CAAA;CACZ,GACA,OAAO,CAAC,GAAG,CAAC,CAwCd;AAED,wBAAsB,SAAS,CAAC,EAC9B,IAAI,EACJ,MAAM,EACN,IAAI,GACL,EAAE;IAAE,IAAI,EAAE,GAAG,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,0BAyDzD"}
|
package/package.json
CHANGED
|
@@ -30,7 +30,6 @@ import {
|
|
|
30
30
|
getCallError,
|
|
31
31
|
getChainContractAddress,
|
|
32
32
|
numberToHex,
|
|
33
|
-
offchainLookupSignature,
|
|
34
33
|
parseAccount,
|
|
35
34
|
} from '../../utils/index.js'
|
|
36
35
|
import { createBatchScheduler } from '../../utils/promise/createBatchScheduler.js'
|
|
@@ -161,8 +160,10 @@ export async function call<TChain extends Chain | undefined>(
|
|
|
161
160
|
return { data: response }
|
|
162
161
|
} catch (err) {
|
|
163
162
|
const data = getRevertErrorData(err)
|
|
163
|
+
const { offchainLookup, offchainLookupSignature } = await import(
|
|
164
|
+
'../../utils/ccip.js'
|
|
165
|
+
)
|
|
164
166
|
if (data?.slice(0, 10) === offchainLookupSignature && to) {
|
|
165
|
-
const { offchainLookup } = await import('../../utils/ccip.js')
|
|
166
167
|
return { data: await offchainLookup(client, { data, to }) }
|
|
167
168
|
}
|
|
168
169
|
throw getCallError(err as BaseError, {
|
|
@@ -185,7 +185,7 @@ export async function multicall<
|
|
|
185
185
|
),
|
|
186
186
|
)
|
|
187
187
|
|
|
188
|
-
return results.flat().
|
|
188
|
+
return results.flat().map(({ returnData, success }, i) => {
|
|
189
189
|
const calls = chunkedCalls.flat()
|
|
190
190
|
const { callData } = calls[i]
|
|
191
191
|
const { abi, address, functionName, args } = contracts[i]
|
package/src/errors/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = '0.3.
|
|
1
|
+
export const version = '0.3.15'
|
package/src/utils/ccip.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { Abi, Address } from 'abitype'
|
|
2
2
|
import type { PublicClient, Transport } from '../clients/index.js'
|
|
3
3
|
import {
|
|
4
4
|
BaseError,
|
|
@@ -7,7 +7,8 @@ import {
|
|
|
7
7
|
OffchainLookupResponseMalformedError,
|
|
8
8
|
OffchainLookupSenderMismatchError,
|
|
9
9
|
} from '../errors/index.js'
|
|
10
|
-
import {
|
|
10
|
+
import type { CallParameters } from '../actions/public/index.js'
|
|
11
|
+
import { call } from '../actions/public/call.js'
|
|
11
12
|
import type { Chain, GetErrorArgs, Hex } from '../types/index.js'
|
|
12
13
|
import { decodeErrorResult, encodeAbiParameters } from './abi/index.js'
|
|
13
14
|
import { isAddressEqual } from './address/index.js'
|
|
@@ -15,9 +16,32 @@ import { concat, isHex } from './data/index.js'
|
|
|
15
16
|
import { stringify } from './stringify.js'
|
|
16
17
|
|
|
17
18
|
export const offchainLookupSignature = '0x556f1830'
|
|
18
|
-
export const offchainLookupAbiItem =
|
|
19
|
-
'
|
|
20
|
-
|
|
19
|
+
export const offchainLookupAbiItem = {
|
|
20
|
+
name: 'OffchainLookup',
|
|
21
|
+
type: 'error',
|
|
22
|
+
inputs: [
|
|
23
|
+
{
|
|
24
|
+
name: 'sender',
|
|
25
|
+
type: 'address',
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
name: 'urls',
|
|
29
|
+
type: 'string[]',
|
|
30
|
+
},
|
|
31
|
+
{
|
|
32
|
+
name: 'callData',
|
|
33
|
+
type: 'bytes',
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
name: 'callbackFunction',
|
|
37
|
+
type: 'bytes4',
|
|
38
|
+
},
|
|
39
|
+
{
|
|
40
|
+
name: 'extraData',
|
|
41
|
+
type: 'bytes',
|
|
42
|
+
},
|
|
43
|
+
],
|
|
44
|
+
} as const satisfies Abi[number]
|
|
21
45
|
|
|
22
46
|
export async function offchainLookup<TChain extends Chain | undefined>(
|
|
23
47
|
client: PublicClient<Transport, TChain>,
|
|
@@ -51,10 +75,10 @@ export async function offchainLookup<TChain extends Chain | undefined>(
|
|
|
51
75
|
blockTag,
|
|
52
76
|
data: concat([
|
|
53
77
|
callbackSelector,
|
|
54
|
-
encodeAbiParameters(
|
|
55
|
-
|
|
56
|
-
extraData,
|
|
57
|
-
|
|
78
|
+
encodeAbiParameters(
|
|
79
|
+
[{ type: 'bytes' }, { type: 'bytes' }],
|
|
80
|
+
[result, extraData],
|
|
81
|
+
),
|
|
58
82
|
]),
|
|
59
83
|
to,
|
|
60
84
|
} as CallParameters)
|