viem 0.3.24 → 0.3.27
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/waitForTransactionReceipt.js +14 -7
- package/dist/cjs/actions/public/waitForTransactionReceipt.js.map +1 -1
- package/dist/cjs/errors/abi.js +0 -2
- package/dist/cjs/errors/abi.js.map +1 -1
- package/dist/cjs/errors/data.js +2 -2
- package/dist/cjs/errors/data.js.map +1 -1
- package/dist/cjs/errors/version.js +1 -1
- package/dist/cjs/utils/abi/decodeAbiParameters.js +22 -14
- package/dist/cjs/utils/abi/decodeAbiParameters.js.map +1 -1
- package/dist/cjs/utils/abi/decodeEventLog.js +5 -5
- package/dist/cjs/utils/abi/decodeEventLog.js.map +1 -1
- package/dist/cjs/utils/data/isHex.js +2 -2
- package/dist/cjs/utils/data/isHex.js.map +1 -1
- package/dist/cjs/utils/data/size.js +1 -1
- package/dist/cjs/utils/data/size.js.map +1 -1
- package/dist/cjs/utils/data/slice.js +36 -12
- package/dist/cjs/utils/data/slice.js.map +1 -1
- package/dist/cjs/utils/hash/keccak256.js +1 -1
- package/dist/cjs/utils/hash/keccak256.js.map +1 -1
- package/dist/cjs/utils/promise/createBatchScheduler.js.map +1 -1
- package/dist/cjs/utils/rpc.js +49 -40
- package/dist/cjs/utils/rpc.js.map +1 -1
- package/dist/esm/actions/public/waitForTransactionReceipt.js +14 -7
- package/dist/esm/actions/public/waitForTransactionReceipt.js.map +1 -1
- package/dist/esm/errors/abi.js +0 -2
- package/dist/esm/errors/abi.js.map +1 -1
- package/dist/esm/errors/data.js +2 -2
- package/dist/esm/errors/data.js.map +1 -1
- package/dist/esm/errors/version.js +1 -1
- package/dist/esm/utils/abi/decodeAbiParameters.js +23 -15
- package/dist/esm/utils/abi/decodeAbiParameters.js.map +1 -1
- package/dist/esm/utils/abi/decodeEventLog.js +5 -5
- package/dist/esm/utils/abi/decodeEventLog.js.map +1 -1
- package/dist/esm/utils/data/isHex.js +2 -2
- package/dist/esm/utils/data/isHex.js.map +1 -1
- package/dist/esm/utils/data/size.js +1 -1
- package/dist/esm/utils/data/size.js.map +1 -1
- package/dist/esm/utils/data/slice.js +36 -12
- package/dist/esm/utils/data/slice.js.map +1 -1
- package/dist/esm/utils/hash/keccak256.js +1 -1
- package/dist/esm/utils/hash/keccak256.js.map +1 -1
- package/dist/esm/utils/promise/createBatchScheduler.js.map +1 -1
- package/dist/esm/utils/rpc.js +49 -40
- package/dist/esm/utils/rpc.js.map +1 -1
- package/dist/types/actions/public/getTransactionReceipt.d.ts +1 -1
- package/dist/types/actions/public/waitForTransactionReceipt.d.ts.map +1 -1
- package/dist/types/errors/abi.d.ts.map +1 -1
- package/dist/types/errors/data.d.ts +2 -1
- package/dist/types/errors/data.d.ts.map +1 -1
- package/dist/types/errors/version.d.ts +1 -1
- package/dist/types/types/contract.d.ts +7 -33
- package/dist/types/types/contract.d.ts.map +1 -1
- package/dist/types/types/log.d.ts +0 -2
- package/dist/types/types/log.d.ts.map +1 -1
- package/dist/types/utils/abi/decodeAbiParameters.d.ts.map +1 -1
- package/dist/types/utils/data/isHex.d.ts +3 -1
- package/dist/types/utils/data/isHex.d.ts.map +1 -1
- package/dist/types/utils/data/slice.d.ts +9 -3
- package/dist/types/utils/data/slice.d.ts.map +1 -1
- package/dist/types/utils/hash/keccak256.d.ts.map +1 -1
- package/dist/types/utils/promise/createBatchScheduler.d.ts +6 -4
- package/dist/types/utils/promise/createBatchScheduler.d.ts.map +1 -1
- package/dist/types/utils/rpc.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/actions/public/getTransactionReceipt.ts +1 -1
- package/src/actions/public/waitForTransactionReceipt.ts +24 -6
- package/src/errors/abi.ts +0 -2
- package/src/errors/data.ts +8 -2
- package/src/errors/version.ts +1 -1
- package/src/types/contract.ts +11 -87
- package/src/types/log.ts +2 -2
- package/src/utils/abi/decodeAbiParameters.ts +36 -15
- package/src/utils/abi/decodeEventLog.ts +5 -5
- package/src/utils/data/isHex.ts +5 -2
- package/src/utils/data/size.ts +1 -1
- package/src/utils/data/slice.ts +43 -11
- package/src/utils/hash/keccak256.ts +3 -1
- package/src/utils/promise/createBatchScheduler.ts +24 -7
- package/src/utils/rpc.ts +59 -49
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.waitForTransactionReceipt = void 0;
|
4
4
|
const transaction_js_1 = require("../../errors/transaction.js");
|
5
5
|
const observe_js_1 = require("../../utils/observe.js");
|
6
|
+
const withRetry_js_1 = require("../../utils/promise/withRetry.js");
|
6
7
|
const getBlock_js_1 = require("./getBlock.js");
|
7
8
|
const getTransaction_js_1 = require("./getTransaction.js");
|
8
9
|
const getTransactionReceipt_js_1 = require("./getTransactionReceipt.js");
|
@@ -16,7 +17,6 @@ async function waitForTransactionReceipt(client, { confirmations = 1, hash, onRe
|
|
16
17
|
let transaction;
|
17
18
|
let replacedTransaction;
|
18
19
|
let receipt;
|
19
|
-
let retries = 0;
|
20
20
|
return new Promise((resolve, reject) => {
|
21
21
|
if (timeout)
|
22
22
|
setTimeout(() => reject(new transaction_js_1.WaitForTransactionReceiptTimeoutError({ hash })), timeout);
|
@@ -26,7 +26,8 @@ async function waitForTransactionReceipt(client, { confirmations = 1, hash, onRe
|
|
26
26
|
emitOnBegin: true,
|
27
27
|
poll: true,
|
28
28
|
pollingInterval,
|
29
|
-
async onBlockNumber(
|
29
|
+
async onBlockNumber(blockNumber_) {
|
30
|
+
let blockNumber = blockNumber_;
|
30
31
|
const done = async (fn) => {
|
31
32
|
unwatch();
|
32
33
|
fn();
|
@@ -39,9 +40,17 @@ async function waitForTransactionReceipt(client, { confirmations = 1, hash, onRe
|
|
39
40
|
done(() => emit.resolve(receipt));
|
40
41
|
return;
|
41
42
|
}
|
42
|
-
|
43
|
+
await (0, withRetry_js_1.withRetry)(async () => {
|
44
|
+
transaction = await (0, getTransaction_js_1.getTransaction)(client, { hash });
|
45
|
+
if (transaction.blockNumber)
|
46
|
+
blockNumber = transaction.blockNumber;
|
47
|
+
}, {
|
48
|
+
delay: ({ count }) => ~~(1 << count) * 100,
|
49
|
+
retryCount: 3,
|
50
|
+
});
|
43
51
|
receipt = await (0, getTransactionReceipt_js_1.getTransactionReceipt)(client, { hash });
|
44
|
-
if (
|
52
|
+
if (confirmations > 0 &&
|
53
|
+
blockNumber - receipt.blockNumber + 1n < confirmations)
|
45
54
|
return;
|
46
55
|
done(() => emit.resolve(receipt));
|
47
56
|
}
|
@@ -83,9 +92,7 @@ async function waitForTransactionReceipt(client, { confirmations = 1, hash, onRe
|
|
83
92
|
});
|
84
93
|
}
|
85
94
|
else {
|
86
|
-
|
87
|
-
done(() => emit.reject(err));
|
88
|
-
retries++;
|
95
|
+
done(() => emit.reject(err));
|
89
96
|
}
|
90
97
|
}
|
91
98
|
},
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../../src/actions/public/waitForTransactionReceipt.ts"],"names":[],"mappings":";;;AAEA,gEAIoC;AAIpC,uDAAgD;
|
1
|
+
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../../src/actions/public/waitForTransactionReceipt.ts"],"names":[],"mappings":";;;AAEA,gEAIoC;AAIpC,uDAAgD;AAChD,mEAA4D;AAE5D,+CAAwC;AACxC,2DAG4B;AAC5B,yEAGmC;AACnC,+DAAwD;AA2EjD,KAAK,UAAU,yBAAyB,CAG7C,MAAuC,EACvC,EACE,aAAa,GAAG,CAAC,EACjB,IAAI,EACJ,UAAU,EACV,eAAe,GAAG,MAAM,CAAC,eAAe,EACxC,OAAO,GACqC;IAE9C,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,2BAA2B;QAC3B,MAAM,CAAC,GAAG;QACV,IAAI;KACL,CAAC,CAAA;IAEF,IAAI,WAAyD,CAAA;IAC7D,IAAI,mBAAiE,CAAA;IACrE,IAAI,OAAgD,CAAA;IAEpD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,OAAO;YACT,UAAU,CACR,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,sDAAqC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EACjE,OAAO,CACR,CAAA;QAEH,MAAM,UAAU,GAAG,IAAA,oBAAO,EACxB,UAAU,EACV,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,EAC/B,CAAC,IAAI,EAAE,EAAE;YACP,MAAM,OAAO,GAAG,IAAA,sCAAgB,EAAC,MAAM,EAAE;gBACvC,UAAU,EAAE,IAAI;gBAChB,WAAW,EAAE,IAAI;gBACjB,IAAI,EAAE,IAAI;gBACV,eAAe;gBACf,KAAK,CAAC,aAAa,CAAC,YAAY;oBAC9B,IAAI,WAAW,GAAG,YAAY,CAAA;oBAE9B,MAAM,IAAI,GAAG,KAAK,EAAE,EAAc,EAAE,EAAE;wBACpC,OAAO,EAAE,CAAA;wBACT,EAAE,EAAE,CAAA;wBACJ,UAAU,EAAE,CAAA;oBACd,CAAC,CAAA;oBAED,IAAI;wBAGF,IAAI,OAAO,EAAE;4BACX,IAAI,WAAW,GAAG,OAAO,CAAC,WAAW,GAAG,EAAE,GAAG,aAAa;gCACxD,OAAM;4BAER,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;4BACjC,OAAM;yBACP;wBAKD,MAAM,IAAA,wBAAS,EACb,KAAK,IAAI,EAAE;4BACT,WAAW,GAAG,MAAM,IAAA,kCAAc,EAAC,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;4BACpD,IAAI,WAAW,CAAC,WAAW;gCACzB,WAAW,GAAG,WAAW,CAAC,WAAW,CAAA;wBACzC,CAAC,EACD;4BAEE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,GAAG;4BAC1C,UAAU,EAAE,CAAC;yBACd,CACF,CAAA;wBAGD,OAAO,GAAG,MAAM,IAAA,gDAAqB,EAAC,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;wBAGvD,IACE,aAAa,GAAG,CAAC;4BACjB,WAAW,GAAG,OAAO,CAAC,WAAW,GAAG,EAAE,GAAG,aAAa;4BAEtD,OAAM;wBAER,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;qBAClC;oBAAC,OAAO,GAAG,EAAE;wBAGZ,IACE,WAAW;4BACX,CAAC,GAAG,YAAY,yCAAwB;gCACtC,GAAG,YAAY,gDAA+B,CAAC,EACjD;4BACA,mBAAmB,GAAG,WAAW,CAAA;4BAGjC,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAQ,EAAC,MAAM,EAAE;gCACnC,WAAW;gCACX,mBAAmB,EAAE,IAAI;6BAC1B,CAAC,CAAA;4BAEF,MAAM,sBAAsB,GAC1B,KAAK,CAAC,YACP,CAAC,IAAI,CACJ,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAClB,IAAI,KAAK,mBAAoB,CAAC,IAAI;gCAClC,KAAK,KAAK,mBAAoB,CAAC,KAAK,CACvC,CAAA;4BAGD,IAAI,CAAC,sBAAsB;gCAAE,OAAM;4BAGnC,OAAO,GAAG,MAAM,IAAA,gDAAqB,EAAC,MAAM,EAAE;gCAC5C,IAAI,EAAE,sBAAsB,CAAC,IAAI;6BAClC,CAAC,CAAA;4BAGF,IAAI,WAAW,GAAG,OAAO,CAAC,WAAW,GAAG,EAAE,GAAG,aAAa;gCACxD,OAAM;4BAER,IAAI,MAAM,GAAsB,UAAU,CAAA;4BAC1C,IACE,sBAAsB,CAAC,EAAE,KAAK,mBAAmB,CAAC,EAAE;gCACpD,sBAAsB,CAAC,KAAK,KAAK,mBAAmB,CAAC,KAAK,EAC1D;gCACA,MAAM,GAAG,UAAU,CAAA;6BACpB;iCAAM,IACL,sBAAsB,CAAC,IAAI,KAAK,sBAAsB,CAAC,EAAE;gCACzD,sBAAsB,CAAC,KAAK,KAAK,EAAE,EACnC;gCACA,MAAM,GAAG,WAAW,CAAA;6BACrB;4BAED,IAAI,CAAC,GAAG,EAAE;gCACR,IAAI,CAAC,UAAU,EAAE,CAAC;oCAChB,MAAM;oCACN,mBAAmB,EAAE,mBAAoB;oCACzC,WAAW,EAAE,sBAAsB;oCACnC,kBAAkB,EAAE,OAAO;iCAC5B,CAAC,CAAA;gCACF,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;4BACvB,CAAC,CAAC,CAAA;yBACH;6BAAM;4BACL,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;yBAC7B;qBACF;gBACH,CAAC;aACF,CAAC,CAAA;YACF,OAAO,OAAO,CAAA;QAChB,CAAC,CACF,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAzJD,8DAyJC"}
|
package/dist/cjs/errors/abi.js
CHANGED
@@ -320,8 +320,6 @@ class DecodeLogDataMismatch extends base_js_1.BaseError {
|
|
320
320
|
`Data size of ${size} bytes is too small for non-indexed event parameters.`,
|
321
321
|
].join('\n'), {
|
322
322
|
metaMessages: [
|
323
|
-
'This error is usually caused if the ABI event has too many non-indexed event parameters for the emitted log.',
|
324
|
-
'',
|
325
323
|
`Params: (${(0, formatAbiItem_js_1.formatAbiParams)(params, { includeName: true })})`,
|
326
324
|
`Data: ${data} (${size} bytes)`,
|
327
325
|
],
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"abi.js","sourceRoot":"","sources":["../../../src/errors/abi.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"abi.js","sourceRoot":"","sources":["../../../src/errors/abi.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/errors/data.js
CHANGED
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SizeExceedsPaddingSizeError = exports.SliceOffsetOutOfBoundsError = void 0;
|
4
4
|
const base_js_1 = require("./base.js");
|
5
5
|
class SliceOffsetOutOfBoundsError extends base_js_1.BaseError {
|
6
|
-
constructor({ offset, size }) {
|
7
|
-
super(`Slice starting at offset "${offset}" is out-of-bounds (size: ${size}).`);
|
6
|
+
constructor({ offset, position, size, }) {
|
7
|
+
super(`Slice ${position === 'start' ? 'starting' : 'ending'} at offset "${offset}" is out-of-bounds (size: ${size}).`);
|
8
8
|
Object.defineProperty(this, "name", {
|
9
9
|
enumerable: true,
|
10
10
|
configurable: true,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../../src/errors/data.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AAErC,MAAa,2BAA4B,SAAQ,mBAAS;IAExD,YAAY,
|
1
|
+
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../../src/errors/data.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AAErC,MAAa,2BAA4B,SAAQ,mBAAS;IAExD,YAAY,EACV,MAAM,EACN,QAAQ,EACR,IAAI,GACwD;QAC5D,KAAK,CACH,SACE,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QACtC,eAAe,MAAM,6BAA6B,IAAI,IAAI,CAC3D,CAAA;QAVM;;;;mBAAO,6BAA6B;WAAA;IAW7C,CAAC;CACF;AAbD,kEAaC;AAED,MAAa,2BAA4B,SAAQ,mBAAS;IAExD,YAAY,EACV,IAAI,EACJ,UAAU,EACV,IAAI,GAKL;QACC,KAAK,CACH,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI;aACnC,KAAK,CAAC,CAAC,CAAC;aACR,WAAW,EAAE,UAAU,IAAI,2BAA2B,UAAU,IAAI,CACxE,CAAA;QAdM;;;;mBAAO,6BAA6B;WAAA;IAe7C,CAAC;CACF;AAjBD,kEAiBC"}
|
@@ -11,8 +11,12 @@ const encodeAbiParameters_js_1 = require("./encodeAbiParameters.js");
|
|
11
11
|
function decodeAbiParameters(params, data) {
|
12
12
|
if (data === '0x' && params.length > 0)
|
13
13
|
throw new abi_js_1.AbiDecodingZeroDataError();
|
14
|
-
if ((0, size_js_1.size)(data)
|
15
|
-
throw new abi_js_1.
|
14
|
+
if ((0, size_js_1.size)(data) && (0, size_js_1.size)(data) < 32)
|
15
|
+
throw new abi_js_1.AbiDecodingDataSizeTooSmallError({
|
16
|
+
data,
|
17
|
+
params: params,
|
18
|
+
size: (0, size_js_1.size)(data),
|
19
|
+
});
|
16
20
|
return decodeParams({
|
17
21
|
data,
|
18
22
|
params: params,
|
@@ -55,7 +59,7 @@ function decodeParam({ data, param, position, }) {
|
|
55
59
|
if (param.type.startsWith('bytes')) {
|
56
60
|
return decodeBytes(data, { param, position });
|
57
61
|
}
|
58
|
-
const value = (0, slice_js_1.slice)(data, position, position + 32);
|
62
|
+
const value = (0, slice_js_1.slice)(data, position, position + 32, { strict: true });
|
59
63
|
if (param.type.startsWith('uint') || param.type.startsWith('int')) {
|
60
64
|
return decodeNumber(value, { param });
|
61
65
|
}
|
@@ -74,8 +78,8 @@ function decodeAddress(value) {
|
|
74
78
|
}
|
75
79
|
function decodeArray(data, { param, length, position, }) {
|
76
80
|
if (!length) {
|
77
|
-
const offset = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, position, position + 32));
|
78
|
-
const length = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, offset, offset + 32));
|
81
|
+
const offset = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, position, position + 32, { strict: true }));
|
82
|
+
const length = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, offset, offset + 32, { strict: true }));
|
79
83
|
let consumed = 0;
|
80
84
|
const value = [];
|
81
85
|
for (let i = 0; i < length; ++i) {
|
@@ -95,7 +99,7 @@ function decodeArray(data, { param, length, position, }) {
|
|
95
99
|
let consumed = 0;
|
96
100
|
const value = [];
|
97
101
|
for (let i = 0; i < length; ++i) {
|
98
|
-
const offset = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, position, position + 32));
|
102
|
+
const offset = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, position, position + 32, { strict: true }));
|
99
103
|
const decodedChild = decodeParam({
|
100
104
|
data: (0, slice_js_1.slice)(data, offset),
|
101
105
|
param,
|
@@ -125,14 +129,18 @@ function decodeBool(value) {
|
|
125
129
|
function decodeBytes(data, { param, position }) {
|
126
130
|
const [_, size] = param.type.split('bytes');
|
127
131
|
if (!size) {
|
128
|
-
const offset = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, position, position + 32));
|
129
|
-
const length = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, offset, offset + 32));
|
132
|
+
const offset = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, position, position + 32, { strict: true }));
|
133
|
+
const length = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, offset, offset + 32, { strict: true }));
|
130
134
|
if (length === 0)
|
131
135
|
return { consumed: 32, value: '0x' };
|
132
|
-
const value = (0, slice_js_1.slice)(data, offset + 32, offset + 32 + length
|
136
|
+
const value = (0, slice_js_1.slice)(data, offset + 32, offset + 32 + length, {
|
137
|
+
strict: true,
|
138
|
+
});
|
133
139
|
return { consumed: 32, value };
|
134
140
|
}
|
135
|
-
const value = (0, slice_js_1.slice)(data, position, position + parseInt(size)
|
141
|
+
const value = (0, slice_js_1.slice)(data, position, position + parseInt(size), {
|
142
|
+
strict: true,
|
143
|
+
});
|
136
144
|
return { consumed: 32, value };
|
137
145
|
}
|
138
146
|
function decodeNumber(value, { param }) {
|
@@ -146,11 +154,11 @@ function decodeNumber(value, { param }) {
|
|
146
154
|
};
|
147
155
|
}
|
148
156
|
function decodeString(data, { position }) {
|
149
|
-
const offset = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, position, position + 32));
|
150
|
-
const length = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, offset, offset + 32));
|
157
|
+
const offset = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, position, position + 32, { strict: true }));
|
158
|
+
const length = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, offset, offset + 32, { strict: true }));
|
151
159
|
if (length === 0)
|
152
160
|
return { consumed: 32, value: '' };
|
153
|
-
const value = (0, fromHex_js_1.hexToString)((0, trim_js_1.trim)((0, slice_js_1.slice)(data, offset + 32, offset + 32 + length)));
|
161
|
+
const value = (0, fromHex_js_1.hexToString)((0, trim_js_1.trim)((0, slice_js_1.slice)(data, offset + 32, offset + 32 + length, { strict: true })));
|
154
162
|
return { consumed: 32, value };
|
155
163
|
}
|
156
164
|
function decodeTuple(data, { param, position }) {
|
@@ -158,7 +166,7 @@ function decodeTuple(data, { param, position }) {
|
|
158
166
|
const value = hasUnnamedChild ? [] : {};
|
159
167
|
let consumed = 0;
|
160
168
|
if (hasDynamicChild(param)) {
|
161
|
-
const offset = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, position, position + 32));
|
169
|
+
const offset = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(data, position, position + 32, { strict: true }));
|
162
170
|
for (let i = 0; i < param.components.length; ++i) {
|
163
171
|
const component = param.components[i];
|
164
172
|
const decodedChild = decodeParam({
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"decodeAbiParameters.js","sourceRoot":"","sources":["../../../../src/utils/abi/decodeAbiParameters.ts"],"names":[],"mappings":";;;AAOA,
|
1
|
+
{"version":3,"file":"decodeAbiParameters.js","sourceRoot":"","sources":["../../../../src/utils/abi/decodeAbiParameters.ts"],"names":[],"mappings":"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"}
|
@@ -21,8 +21,8 @@ function decodeEventLog({ abi, data, topics, }) {
|
|
21
21
|
const { name, inputs } = abiItem;
|
22
22
|
const isUnnamed = inputs?.some((x) => !('name' in x && x.name));
|
23
23
|
let args = isUnnamed ? [] : {};
|
24
|
+
const indexedInputs = inputs.filter((x) => 'indexed' in x && x.indexed);
|
24
25
|
if (argTopics.length > 0) {
|
25
|
-
const indexedInputs = inputs.filter((x) => 'indexed' in x && x.indexed);
|
26
26
|
for (let i = 0; i < indexedInputs.length; i++) {
|
27
27
|
const param = indexedInputs[i];
|
28
28
|
const topic = argTopics[i];
|
@@ -34,16 +34,16 @@ function decodeEventLog({ abi, data, topics, }) {
|
|
34
34
|
args[param.name || i] = decodeTopic({ param, value: topic });
|
35
35
|
}
|
36
36
|
}
|
37
|
+
const nonIndexedInputs = inputs.filter((x) => !('indexed' in x && x.indexed));
|
37
38
|
if (data && data !== '0x') {
|
38
|
-
const params = inputs.filter((x) => !('indexed' in x && x.indexed));
|
39
39
|
try {
|
40
|
-
const decodedData = (0, decodeAbiParameters_js_1.decodeAbiParameters)(
|
40
|
+
const decodedData = (0, decodeAbiParameters_js_1.decodeAbiParameters)(nonIndexedInputs, data);
|
41
41
|
if (decodedData) {
|
42
42
|
if (isUnnamed)
|
43
43
|
args = [...args, ...decodedData];
|
44
44
|
else {
|
45
|
-
for (let i = 0; i <
|
46
|
-
args[
|
45
|
+
for (let i = 0; i < nonIndexedInputs.length; i++) {
|
46
|
+
args[nonIndexedInputs[i].name] = decodedData[i];
|
47
47
|
}
|
48
48
|
}
|
49
49
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"decodeEventLog.js","sourceRoot":"","sources":["../../../../src/utils/abi/decodeEventLog.ts"],"names":[],"mappings":";;;AAEA,gDAM4B;AAQ5B,qEAA8D;AAE9D,qEAA8D;AAC9D,yDAAkD;AAsClD,MAAM,QAAQ,GAAG,+BAA+B,CAAA;AAEhD,SAAgB,cAAc,CAK5B,EACA,GAAG,EACH,IAAI,EACJ,MAAM,GAMP;IACC,MAAM,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,GAAG,MAAM,CAAA;IACxC,IAAI,CAAC,SAAS;QACZ,MAAM,IAAI,0CAAiC,CAAC;YAC1C,QAAQ;SACT,CAAC,CAAA;IACJ,MAAM,OAAO,GAAI,GAAW,CAAC,IAAI,CAC/B,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,OAAO;QAClB,SAAS,KAAK,IAAA,sCAAgB,EAAC,IAAA,gCAAa,EAAC,CAAC,CAAoB,CAAC,CACtE,CAAA;IACD,IAAI,CAAC,CAAC,OAAO,IAAI,MAAM,IAAI,OAAO,CAAC;QACjC,MAAM,IAAI,uCAA8B,CAAC,SAAS,EAAE;YAClD,QAAQ;SACT,CAAC,CAAA;IAEJ,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAChC,MAAM,SAAS,GAAG,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;IAE/D,IAAI,IAAI,GAAQ,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAGnC,
|
1
|
+
{"version":3,"file":"decodeEventLog.js","sourceRoot":"","sources":["../../../../src/utils/abi/decodeEventLog.ts"],"names":[],"mappings":"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"}
|
@@ -1,12 +1,12 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.isHex = void 0;
|
4
|
-
function isHex(value) {
|
4
|
+
function isHex(value, { strict = true } = {}) {
|
5
5
|
if (!value)
|
6
6
|
return false;
|
7
7
|
if (typeof value !== 'string')
|
8
8
|
return false;
|
9
|
-
return /^0x[0-9a-fA-F]*$/.test(value);
|
9
|
+
return strict ? /^0x[0-9a-fA-F]*$/.test(value) : value.startsWith('0x');
|
10
10
|
}
|
11
11
|
exports.isHex = isHex;
|
12
12
|
//# sourceMappingURL=isHex.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"isHex.js","sourceRoot":"","sources":["../../../../src/utils/data/isHex.ts"],"names":[],"mappings":";;;AAEA,SAAgB,KAAK,
|
1
|
+
{"version":3,"file":"isHex.js","sourceRoot":"","sources":["../../../../src/utils/data/isHex.ts"],"names":[],"mappings":";;;AAEA,SAAgB,KAAK,CACnB,KAAc,EACd,EAAE,MAAM,GAAG,IAAI,KAA2B,EAAE;IAE5C,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAA;IACxB,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC3C,OAAO,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;AACzE,CAAC;AAPD,sBAOC"}
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.size = void 0;
|
4
4
|
const isHex_js_1 = require("./isHex.js");
|
5
5
|
function size(value) {
|
6
|
-
if ((0, isHex_js_1.isHex)(value))
|
6
|
+
if ((0, isHex_js_1.isHex)(value, { strict: false }))
|
7
7
|
return Math.ceil((value.length - 2) / 2);
|
8
8
|
return value.length;
|
9
9
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"size.js","sourceRoot":"","sources":["../../../../src/utils/data/size.ts"],"names":[],"mappings":";;;AAEA,yCAAkC;AAQlC,SAAgB,IAAI,CAAC,KAAsB;IACzC,IAAI,IAAA,gBAAK,EAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;
|
1
|
+
{"version":3,"file":"size.js","sourceRoot":"","sources":["../../../../src/utils/data/size.ts"],"names":[],"mappings":";;;AAEA,yCAAkC;AAQlC,SAAgB,IAAI,CAAC,KAAsB;IACzC,IAAI,IAAA,gBAAK,EAAC,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QAAE,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;IAC7E,OAAO,KAAK,CAAC,MAAM,CAAA;AACrB,CAAC;AAHD,oBAGC"}
|
@@ -4,27 +4,51 @@ exports.sliceHex = exports.sliceBytes = exports.slice = void 0;
|
|
4
4
|
const data_js_1 = require("../../errors/data.js");
|
5
5
|
const isHex_js_1 = require("./isHex.js");
|
6
6
|
const size_js_1 = require("./size.js");
|
7
|
-
function slice(value, start, end) {
|
8
|
-
if ((0, isHex_js_1.isHex)(value))
|
9
|
-
return sliceHex(value, start, end
|
10
|
-
|
7
|
+
function slice(value, start, end, { strict } = {}) {
|
8
|
+
if ((0, isHex_js_1.isHex)(value, { strict: false }))
|
9
|
+
return sliceHex(value, start, end, {
|
10
|
+
strict,
|
11
|
+
});
|
12
|
+
return sliceBytes(value, start, end, {
|
13
|
+
strict,
|
14
|
+
});
|
11
15
|
}
|
12
16
|
exports.slice = slice;
|
13
17
|
function assertStartOffset(value, start) {
|
14
18
|
if (typeof start === 'number' && start > 0 && start > (0, size_js_1.size)(value) - 1)
|
15
|
-
throw new data_js_1.SliceOffsetOutOfBoundsError({
|
19
|
+
throw new data_js_1.SliceOffsetOutOfBoundsError({
|
20
|
+
offset: start,
|
21
|
+
position: 'start',
|
22
|
+
size: (0, size_js_1.size)(value),
|
23
|
+
});
|
16
24
|
}
|
17
|
-
function
|
18
|
-
|
19
|
-
|
25
|
+
function assertEndOffset(value, start, end) {
|
26
|
+
if (typeof start === 'number' &&
|
27
|
+
typeof end === 'number' &&
|
28
|
+
(0, size_js_1.size)(value) !== end - start) {
|
29
|
+
throw new data_js_1.SliceOffsetOutOfBoundsError({
|
30
|
+
offset: end,
|
31
|
+
position: 'end',
|
32
|
+
size: (0, size_js_1.size)(value),
|
33
|
+
});
|
34
|
+
}
|
35
|
+
}
|
36
|
+
function sliceBytes(value_, start, end, { strict } = {}) {
|
37
|
+
assertStartOffset(value_, start);
|
38
|
+
const value = value_.slice(start, end);
|
39
|
+
if (strict)
|
40
|
+
assertEndOffset(value, start, end);
|
41
|
+
return value;
|
20
42
|
}
|
21
43
|
exports.sliceBytes = sliceBytes;
|
22
|
-
function sliceHex(value_, start, end) {
|
44
|
+
function sliceHex(value_, start, end, { strict } = {}) {
|
23
45
|
assertStartOffset(value_, start);
|
24
|
-
const value = value_
|
46
|
+
const value = `0x${value_
|
25
47
|
.replace('0x', '')
|
26
|
-
.slice((start ?? 0) * 2, (end ?? value_.length) * 2)
|
27
|
-
|
48
|
+
.slice((start ?? 0) * 2, (end ?? value_.length) * 2)}`;
|
49
|
+
if (strict)
|
50
|
+
assertEndOffset(value, start, end);
|
51
|
+
return value;
|
28
52
|
}
|
29
53
|
exports.sliceHex = sliceHex;
|
30
54
|
//# sourceMappingURL=slice.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"slice.js","sourceRoot":"","sources":["../../../../src/utils/data/slice.ts"],"names":[],"mappings":";;;AAAA,kDAAkE;AAGlE,yCAAkC;AAClC,uCAAgC;AAahC,SAAgB,KAAK,CACnB,KAAa,EACb,KAAc,EACd,GAAY;
|
1
|
+
{"version":3,"file":"slice.js","sourceRoot":"","sources":["../../../../src/utils/data/slice.ts"],"names":[],"mappings":";;;AAAA,kDAAkE;AAGlE,yCAAkC;AAClC,uCAAgC;AAahC,SAAgB,KAAK,CACnB,KAAa,EACb,KAAc,EACd,GAAY,EACZ,EAAE,MAAM,KAA2B,EAAE;IAErC,IAAI,IAAA,gBAAK,EAAC,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QACjC,OAAO,QAAQ,CAAC,KAAY,EAAE,KAAK,EAAE,GAAG,EAAE;YACxC,MAAM;SACP,CAA4B,CAAA;IAC/B,OAAO,UAAU,CAAC,KAAkB,EAAE,KAAK,EAAE,GAAG,EAAE;QAChD,MAAM;KACP,CAA4B,CAAA;AAC/B,CAAC;AAbD,sBAaC;AAED,SAAS,iBAAiB,CAAC,KAAsB,EAAE,KAAc;IAC/D,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,IAAA,cAAI,EAAC,KAAK,CAAC,GAAG,CAAC;QACnE,MAAM,IAAI,qCAA2B,CAAC;YACpC,MAAM,EAAE,KAAK;YACb,QAAQ,EAAE,OAAO;YACjB,IAAI,EAAE,IAAA,cAAI,EAAC,KAAK,CAAC;SAClB,CAAC,CAAA;AACN,CAAC;AAED,SAAS,eAAe,CAAC,KAAsB,EAAE,KAAc,EAAE,GAAY;IAC3E,IACE,OAAO,KAAK,KAAK,QAAQ;QACzB,OAAO,GAAG,KAAK,QAAQ;QACvB,IAAA,cAAI,EAAC,KAAK,CAAC,KAAK,GAAG,GAAG,KAAK,EAC3B;QACA,MAAM,IAAI,qCAA2B,CAAC;YACpC,MAAM,EAAE,GAAG;YACX,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,IAAA,cAAI,EAAC,KAAK,CAAC;SAClB,CAAC,CAAA;KACH;AACH,CAAC;AASD,SAAgB,UAAU,CACxB,MAAiB,EACjB,KAAc,EACd,GAAY,EACZ,EAAE,MAAM,KAA2B,EAAE;IAErC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAChC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IACtC,IAAI,MAAM;QAAE,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,CAAA;IAC9C,OAAO,KAAK,CAAA;AACd,CAAC;AAVD,gCAUC;AASD,SAAgB,QAAQ,CACtB,MAAW,EACX,KAAc,EACd,GAAY,EACZ,EAAE,MAAM,KAA2B,EAAE;IAErC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAChC,MAAM,KAAK,GAAG,KAAK,MAAM;SACtB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;SACjB,KAAK,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAW,CAAA;IACjE,IAAI,MAAM;QAAE,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,CAAA;IAC9C,OAAO,KAAK,CAAA;AACd,CAAC;AAZD,4BAYC"}
|
@@ -7,7 +7,7 @@ const toBytes_js_1 = require("../encoding/toBytes.js");
|
|
7
7
|
const toHex_js_1 = require("../encoding/toHex.js");
|
8
8
|
function keccak256(value, to_) {
|
9
9
|
const to = to_ || 'hex';
|
10
|
-
const bytes = (0, sha3_1.keccak_256)((0, isHex_js_1.isHex)(value) ? (0, toBytes_js_1.toBytes)(value) : value);
|
10
|
+
const bytes = (0, sha3_1.keccak_256)((0, isHex_js_1.isHex)(value, { strict: false }) ? (0, toBytes_js_1.toBytes)(value) : value);
|
11
11
|
if (to === 'bytes')
|
12
12
|
return bytes;
|
13
13
|
return (0, toHex_js_1.toHex)(bytes);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"keccak256.js","sourceRoot":"","sources":["../../../../src/utils/hash/keccak256.ts"],"names":[],"mappings":";;;AAAA,6CAA+C;AAG/C,+CAAwC;AACxC,uDAAgD;AAChD,mDAA4C;AAQ5C,SAAgB,SAAS,CACvB,KAAsB,EACtB,GAAS;IAET,MAAM,EAAE,GAAG,GAAG,IAAI,KAAK,CAAA;IACvB,MAAM,KAAK,GAAG,IAAA,iBAAU,
|
1
|
+
{"version":3,"file":"keccak256.js","sourceRoot":"","sources":["../../../../src/utils/hash/keccak256.ts"],"names":[],"mappings":";;;AAAA,6CAA+C;AAG/C,+CAAwC;AACxC,uDAAgD;AAChD,mDAA4C;AAQ5C,SAAgB,SAAS,CACvB,KAAsB,EACtB,GAAS;IAET,MAAM,EAAE,GAAG,GAAG,IAAI,KAAK,CAAA;IACvB,MAAM,KAAK,GAAG,IAAA,iBAAU,EACtB,IAAA,gBAAK,EAAC,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,IAAA,oBAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CACzD,CAAA;IACD,IAAI,EAAE,KAAK,OAAO;QAAE,OAAO,KAA2B,CAAA;IACtD,OAAO,IAAA,gBAAK,EAAC,KAAK,CAAuB,CAAA;AAC3C,CAAC;AAVD,8BAUC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"createBatchScheduler.js","sourceRoot":"","sources":["../../../../src/utils/promise/createBatchScheduler.ts"],"names":[],"mappings":";;;
|
1
|
+
{"version":3,"file":"createBatchScheduler.js","sourceRoot":"","sources":["../../../../src/utils/promise/createBatchScheduler.ts"],"names":[],"mappings":";;;AA+BA,MAAM,cAAc,GAAG,IAAI,GAAG,EAAoC,CAAA;AAElE,SAAgB,oBAAoB,CAGlC,EACA,EAAE,EACF,EAAE,EACF,gBAAgB,EAChB,IAAI,GAAG,CAAC,GAIT;IACC,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;QACtB,MAAM,SAAS,GAAG,YAAY,EAAE,CAAA;QAChC,KAAK,EAAE,CAAA;QAEP,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAA;QAE9C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAM;QAE7B,EAAE,CAAC,IAAqB,CAAC;aACtB,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE,CAC1C,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAC1C,CAAA;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;QACzE,CAAC,CAAC,CAAA;IACN,CAAC,CAAA;IAED,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAE7C,MAAM,cAAc,GAAG,GAAG,EAAE,CAC1B,YAAY,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAkB,CAAA;IAEzD,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,CAAA;IAEvD,MAAM,YAAY,GAAG,CAAC,IAAmB,EAAE,EAAE,CAC3C,cAAc,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC,CAAA;IAEnD,OAAO;QACL,KAAK;QACL,KAAK,CAAC,QAAQ,CAAC,IAAiB;YAC9B,MAAM,cAAc,GAAgC,EAAE,CAAA;YACtD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrE,cAAc,CAAC,OAAO,GAAG,OAAO,CAAA;gBAChC,cAAc,CAAC,MAAM,GAAG,MAAM,CAAA;YAChC,CAAC,CAAC,CAAA;YAEF,MAAM,KAAK,GAAG,gBAAgB,EAAE,CAAC,CAAC,GAAG,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC,CAAA;YAE7D,IAAI,KAAK;gBAAE,IAAI,EAAE,CAAA;YAEjB,MAAM,kBAAkB,GAAG,YAAY,EAAE,CAAC,MAAM,GAAG,CAAC,CAAA;YACpD,IAAI,kBAAkB,EAAE;gBACtB,YAAY,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAA;gBACtC,OAAO,OAAO,CAAA;aACf;YAED,YAAY,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAA;YACtC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACtB,OAAO,OAAO,CAAA;QAChB,CAAC;KACqE,CAAA;AAC1E,CAAC;AAjED,oDAiEC"}
|
package/dist/cjs/utils/rpc.js
CHANGED
@@ -2,6 +2,7 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.rpc = exports.getSocket = void 0;
|
4
4
|
const request_js_1 = require("../errors/request.js");
|
5
|
+
const createBatchScheduler_js_1 = require("./promise/createBatchScheduler.js");
|
5
6
|
const withTimeout_js_1 = require("./promise/withTimeout.js");
|
6
7
|
const stringify_js_1 = require("./stringify.js");
|
7
8
|
let id = 0;
|
@@ -67,47 +68,55 @@ async function getSocket(url_) {
|
|
67
68
|
let socket = sockets.get(urlKey);
|
68
69
|
if (socket)
|
69
70
|
return socket;
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
webSocket.
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
71
|
+
const { schedule } = (0, createBatchScheduler_js_1.createBatchScheduler)({
|
72
|
+
id: urlKey,
|
73
|
+
fn: async () => {
|
74
|
+
let WebSocket = await import('isomorphic-ws');
|
75
|
+
if (WebSocket.default
|
76
|
+
?.constructor)
|
77
|
+
WebSocket = WebSocket
|
78
|
+
.default;
|
79
|
+
else
|
80
|
+
WebSocket = WebSocket.WebSocket;
|
81
|
+
const webSocket = new WebSocket(url);
|
82
|
+
const requests = new Map();
|
83
|
+
const subscriptions = new Map();
|
84
|
+
const onMessage = ({ data }) => {
|
85
|
+
const message = JSON.parse(data);
|
86
|
+
const isSubscription = message.method === 'eth_subscription';
|
87
|
+
const id = isSubscription ? message.params.subscription : message.id;
|
88
|
+
const cache = isSubscription ? subscriptions : requests;
|
89
|
+
const callback = cache.get(id);
|
90
|
+
if (callback)
|
91
|
+
callback({ data });
|
92
|
+
if (!isSubscription)
|
93
|
+
cache.delete(id);
|
94
|
+
};
|
95
|
+
const onClose = () => {
|
96
|
+
sockets.delete(urlKey);
|
97
|
+
webSocket.removeEventListener('close', onClose);
|
98
|
+
webSocket.removeEventListener('message', onMessage);
|
99
|
+
};
|
100
|
+
webSocket.addEventListener('close', onClose);
|
101
|
+
webSocket.addEventListener('message', onMessage);
|
102
|
+
if (webSocket.readyState === WebSocket.CONNECTING) {
|
103
|
+
await new Promise((resolve, reject) => {
|
104
|
+
if (!webSocket)
|
105
|
+
return;
|
106
|
+
webSocket.onopen = resolve;
|
107
|
+
webSocket.onerror = reject;
|
108
|
+
});
|
109
|
+
}
|
110
|
+
socket = Object.assign(webSocket, {
|
111
|
+
requests,
|
112
|
+
subscriptions,
|
113
|
+
});
|
114
|
+
sockets.set(urlKey, socket);
|
115
|
+
return [socket];
|
116
|
+
},
|
108
117
|
});
|
109
|
-
|
110
|
-
return
|
118
|
+
const [_, [socket_]] = await schedule();
|
119
|
+
return socket_;
|
111
120
|
}
|
112
121
|
exports.getSocket = getSocket;
|
113
122
|
function webSocket(socket, { body, onData, onError, }) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../src/utils/rpc.ts"],"names":[],"mappings":";;;AAEA,qDAK6B;AAE7B,6DAAsD;AACtD,iDAA0C;AAE1C,IAAI,EAAE,GAAG,CAAC,CAAA;AAqDV,KAAK,UAAU,IAAI,CACjB,GAAW,EACX,EAAE,IAAI,EAAE,YAAY,GAAG,EAAE,EAAE,OAAO,GAAG,KAAM,EAAe;IAE1D,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAA;IACzD,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,IAAA,4BAAW,EAChC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACnB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAChC,GAAG,YAAY;gBACf,IAAI,EAAE,IAAA,wBAAS,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC;gBACtD,OAAO,EAAE;oBACP,GAAG,OAAO;oBACV,cAAc,EAAE,kBAAkB;iBACnC;gBACD,MAAM,EAAE,MAAM,IAAI,MAAM;gBACxB,MAAM,EAAE,OAAO,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;aACtD,CAAC,CAAA;YACF,OAAO,QAAQ,CAAA;QACjB,CAAC,EACD;YACE,aAAa,EAAE,IAAI,yBAAY,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;YAC9C,OAAO;YACP,MAAM,EAAE,IAAI;SACb,CACF,CAAA;QAED,IAAI,IAAI,CAAA;QACR,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,kBAAkB,CAAC,EAAE;YACxE,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;SAC7B;aAAM;YACL,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;SAC7B;QAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;YAChB,MAAM,IAAI,6BAAgB,CAAC;gBACzB,IAAI;gBACJ,OAAO,EAAE,IAAA,wBAAS,EAAC,IAAI,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,UAAU;gBACrD,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,GAAG;aACJ,CAAC,CAAA;SACH;QAED,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,MAAM,IAAI,4BAAe,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;SAC5D;QACD,OAAO,IAAmB,CAAA;KAC3B;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,GAAG,YAAY,6BAAgB;YAAE,MAAM,GAAG,CAAA;QAC9C,IAAI,GAAG,YAAY,4BAAe;YAAE,MAAM,GAAG,CAAA;QAC7C,IAAI,GAAG,YAAY,yBAAY;YAAE,MAAM,GAAG,CAAA;QAC1C,MAAM,IAAI,6BAAgB,CAAC;YACzB,IAAI;YACJ,OAAO,EAAG,GAAa,CAAC,OAAO;YAC/B,GAAG;SACJ,CAAC,CAAA;KACH;AACH,CAAC;AAcD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAA;AAElC,KAAK,UAAU,SAAS,CAAC,IAAY;IAC1C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAA;IACzB,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAA;IAE7B,IAAI,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAGhC,IAAI,MAAM;QAAE,OAAO,MAAM,CAAA;IAEzB,IAAI,SAAS,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,CAAA;
|
1
|
+
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../src/utils/rpc.ts"],"names":[],"mappings":"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"}
|