viem 0.0.0-main.20230604T221342 → 0.0.0-main.20230606T201704
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/getFilterChanges.js +5 -1
- package/dist/cjs/actions/public/getFilterChanges.js.map +1 -1
- package/dist/cjs/actions/public/getFilterLogs.js +6 -2
- package/dist/cjs/actions/public/getFilterLogs.js.map +1 -1
- package/dist/cjs/actions/public/getLogs.js +6 -2
- package/dist/cjs/actions/public/getLogs.js.map +1 -1
- package/dist/cjs/actions/public/watchContractEvent.js +3 -1
- package/dist/cjs/actions/public/watchContractEvent.js.map +1 -1
- package/dist/cjs/actions/public/watchEvent.js +3 -1
- package/dist/cjs/actions/public/watchEvent.js.map +1 -1
- package/dist/cjs/clients/decorators/public.js.map +1 -1
- package/dist/cjs/errors/version.js +1 -1
- package/dist/cjs/utils/abi/decodeEventLog.js +29 -23
- package/dist/cjs/utils/abi/decodeEventLog.js.map +1 -1
- package/dist/cjs/utils/abi/encodeEventTopics.js +11 -7
- package/dist/cjs/utils/abi/encodeEventTopics.js.map +1 -1
- package/dist/esm/actions/public/getFilterChanges.js +5 -1
- package/dist/esm/actions/public/getFilterChanges.js.map +1 -1
- package/dist/esm/actions/public/getFilterLogs.js +6 -2
- package/dist/esm/actions/public/getFilterLogs.js.map +1 -1
- package/dist/esm/actions/public/getLogs.js +6 -2
- package/dist/esm/actions/public/getLogs.js.map +1 -1
- package/dist/esm/actions/public/watchContractEvent.js +3 -1
- package/dist/esm/actions/public/watchContractEvent.js.map +1 -1
- package/dist/esm/actions/public/watchEvent.js +3 -1
- package/dist/esm/actions/public/watchEvent.js.map +1 -1
- package/dist/esm/clients/decorators/public.js.map +1 -1
- package/dist/esm/errors/version.js +1 -1
- package/dist/esm/utils/abi/decodeEventLog.js +29 -23
- package/dist/esm/utils/abi/decodeEventLog.js.map +1 -1
- package/dist/esm/utils/abi/encodeEventTopics.js +11 -7
- package/dist/esm/utils/abi/encodeEventTopics.js.map +1 -1
- package/dist/types/actions/getContract.d.ts +13 -5
- package/dist/types/actions/getContract.d.ts.map +1 -1
- package/dist/types/actions/public/createContractEventFilter.d.ts +1 -1
- package/dist/types/actions/public/createContractEventFilter.d.ts.map +1 -1
- package/dist/types/actions/public/createEventFilter.d.ts +1 -1
- package/dist/types/actions/public/createEventFilter.d.ts.map +1 -1
- package/dist/types/actions/public/getFilterChanges.d.ts +1 -1
- package/dist/types/actions/public/getFilterChanges.d.ts.map +1 -1
- package/dist/types/actions/public/getFilterLogs.d.ts +2 -2
- package/dist/types/actions/public/getFilterLogs.d.ts.map +1 -1
- package/dist/types/actions/public/getLogs.d.ts +2 -2
- package/dist/types/actions/public/getLogs.d.ts.map +1 -1
- package/dist/types/actions/public/watchContractEvent.d.ts +10 -5
- package/dist/types/actions/public/watchContractEvent.d.ts.map +1 -1
- package/dist/types/actions/public/watchEvent.d.ts +11 -5
- package/dist/types/actions/public/watchEvent.d.ts.map +1 -1
- package/dist/types/clients/decorators/public.d.ts +8 -8
- package/dist/types/clients/decorators/public.d.ts.map +1 -1
- package/dist/types/errors/version.d.ts +1 -1
- package/dist/types/types/contract.d.ts +3 -3
- package/dist/types/types/contract.d.ts.map +1 -1
- package/dist/types/types/filter.d.ts +3 -3
- package/dist/types/types/filter.d.ts.map +1 -1
- package/dist/types/types/log.d.ts +7 -8
- package/dist/types/types/log.d.ts.map +1 -1
- package/dist/types/utils/abi/decodeEventLog.d.ts +6 -5
- package/dist/types/utils/abi/decodeEventLog.d.ts.map +1 -1
- package/dist/types/utils/abi/encodeEventTopics.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/actions/getContract.ts +13 -8
- package/src/actions/public/createContractEventFilter.ts +1 -1
- package/src/actions/public/createEventFilter.ts +1 -1
- package/src/actions/public/getFilterChanges.ts +7 -2
- package/src/actions/public/getFilterLogs.ts +10 -5
- package/src/actions/public/getLogs.ts +10 -5
- package/src/actions/public/watchContractEvent.ts +16 -4
- package/src/actions/public/watchEvent.ts +17 -4
- package/src/clients/decorators/public.ts +18 -11
- package/src/errors/version.ts +1 -1
- package/src/types/contract.ts +3 -4
- package/src/types/filter.ts +3 -3
- package/src/types/log.ts +17 -16
- package/src/utils/abi/decodeEventLog.ts +42 -25
- package/src/utils/abi/encodeEventTopics.ts +16 -11
@@ -5,6 +5,7 @@ const abi_js_1 = require("../../errors/abi.js");
|
|
5
5
|
const decodeEventLog_js_1 = require("../../utils/abi/decodeEventLog.js");
|
6
6
|
const log_js_1 = require("../../utils/formatters/log.js");
|
7
7
|
async function getFilterChanges(_client, { filter, }) {
|
8
|
+
const strict = 'strict' in filter && filter.strict;
|
8
9
|
const logs = await filter.request({
|
9
10
|
method: 'eth_getFilterChanges',
|
10
11
|
params: [filter.id],
|
@@ -19,19 +20,22 @@ async function getFilterChanges(_client, { filter, }) {
|
|
19
20
|
abi: filter.abi,
|
20
21
|
data: log.data,
|
21
22
|
topics: log.topics,
|
23
|
+
strict,
|
22
24
|
})
|
23
25
|
: { eventName: undefined, args: undefined };
|
24
26
|
return (0, log_js_1.formatLog)(log, { args, eventName });
|
25
27
|
}
|
26
28
|
catch (err) {
|
27
29
|
let eventName;
|
30
|
+
let isUnnamed;
|
28
31
|
if (err instanceof abi_js_1.DecodeLogDataMismatch ||
|
29
32
|
err instanceof abi_js_1.DecodeLogTopicsMismatch) {
|
30
33
|
if ('strict' in filter && filter.strict)
|
31
34
|
return;
|
32
35
|
eventName = err.abiItem.name;
|
36
|
+
isUnnamed = err.abiItem.inputs?.some((x) => !('name' in x && x.name));
|
33
37
|
}
|
34
|
-
return (0, log_js_1.formatLog)(log, { args:
|
38
|
+
return (0, log_js_1.formatLog)(log, { args: isUnnamed ? [] : {}, eventName });
|
35
39
|
}
|
36
40
|
})
|
37
41
|
.filter(Boolean);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getFilterChanges.js","sourceRoot":"","sources":["../../../../src/actions/public/getFilterChanges.ts"],"names":[],"mappings":";;;AAIA,gDAG4B;AAK5B,yEAAkE;AAClE,0DAAyD;AA2GlD,KAAK,UAAU,gBAAgB,CAQpC,OAAyC,EACzC,EACE,MAAM,GAC6D;IAErE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,sBAAsB;QAC9B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IACF,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,GAAG,CAAA;QACvC,IAAI;YACF,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GACvB,KAAK,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG;gBAC3B,CAAC,CAAC,IAAA,kCAAc,EAAC;oBACb,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM,EAAE,GAAG,CAAC,MAAa;
|
1
|
+
{"version":3,"file":"getFilterChanges.js","sourceRoot":"","sources":["../../../../src/actions/public/getFilterChanges.ts"],"names":[],"mappings":";;;AAIA,gDAG4B;AAK5B,yEAAkE;AAClE,0DAAyD;AA2GlD,KAAK,UAAU,gBAAgB,CAQpC,OAAyC,EACzC,EACE,MAAM,GAC6D;IAErE,MAAM,MAAM,GAAG,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,CAAA;IAElD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,sBAAsB;QAC9B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IACF,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,GAAG,CAAA;QACvC,IAAI;YACF,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GACvB,KAAK,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG;gBAC3B,CAAC,CAAC,IAAA,kCAAc,EAAC;oBACb,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM,EAAE,GAAG,CAAC,MAAa;oBACzB,MAAM;iBACP,CAAC;gBACJ,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAA;YAC/C,OAAO,IAAA,kBAAS,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;SAC3C;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,SAAS,CAAA;YACb,IAAI,SAAS,CAAA;YACb,IACE,GAAG,YAAY,8BAAqB;gBACpC,GAAG,YAAY,gCAAuB,EACtC;gBAEA,IAAI,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM;oBAAE,OAAM;gBAC/C,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAA;gBAC5B,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;aACtE;YAGD,OAAO,IAAA,kBAAS,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;SAChE;IACH,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAKhB,CAAA;AACH,CAAC;AAxDD,4CAwDC"}
|
@@ -5,6 +5,7 @@ const abi_js_1 = require("../../errors/abi.js");
|
|
5
5
|
const decodeEventLog_js_1 = require("../../utils/abi/decodeEventLog.js");
|
6
6
|
const log_js_1 = require("../../utils/formatters/log.js");
|
7
7
|
async function getFilterLogs(_client, { filter }) {
|
8
|
+
const strict = filter.strict ?? false;
|
8
9
|
const logs = await filter.request({
|
9
10
|
method: 'eth_getFilterLogs',
|
10
11
|
params: [filter.id],
|
@@ -17,19 +18,22 @@ async function getFilterLogs(_client, { filter }) {
|
|
17
18
|
abi: filter.abi,
|
18
19
|
data: log.data,
|
19
20
|
topics: log.topics,
|
21
|
+
strict,
|
20
22
|
})
|
21
23
|
: { eventName: undefined, args: undefined };
|
22
24
|
return (0, log_js_1.formatLog)(log, { args, eventName });
|
23
25
|
}
|
24
26
|
catch (err) {
|
25
27
|
let eventName;
|
28
|
+
let isUnnamed;
|
26
29
|
if (err instanceof abi_js_1.DecodeLogDataMismatch ||
|
27
30
|
err instanceof abi_js_1.DecodeLogTopicsMismatch) {
|
28
|
-
if (filter.strict)
|
31
|
+
if ('strict' in filter && filter.strict)
|
29
32
|
return;
|
30
33
|
eventName = err.abiItem.name;
|
34
|
+
isUnnamed = err.abiItem.inputs?.some((x) => !('name' in x && x.name));
|
31
35
|
}
|
32
|
-
return (0, log_js_1.formatLog)(log, { args:
|
36
|
+
return (0, log_js_1.formatLog)(log, { args: isUnnamed ? [] : {}, eventName });
|
33
37
|
}
|
34
38
|
})
|
35
39
|
.filter(Boolean);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getFilterLogs.js","sourceRoot":"","sources":["../../../../src/actions/public/getFilterLogs.ts"],"names":[],"mappings":";;;AAIA,gDAG4B;AAI5B,yEAAkE;AAClE,0DAAyD;AA+ClD,KAAK,UAAU,aAAa,CAMjC,OAAwC,EACxC,EAAE,MAAM,EAAsD;IAE9D,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,mBAAmB;QAC3B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IACF,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,IAAI;YACF,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GACvB,KAAK,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG;gBAC3B,CAAC,CAAC,IAAA,kCAAc,EAAC;oBACb,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM,EAAE,GAAG,CAAC,MAAa;
|
1
|
+
{"version":3,"file":"getFilterLogs.js","sourceRoot":"","sources":["../../../../src/actions/public/getFilterLogs.ts"],"names":[],"mappings":";;;AAIA,gDAG4B;AAI5B,yEAAkE;AAClE,0DAAyD;AA+ClD,KAAK,UAAU,aAAa,CAMjC,OAAwC,EACxC,EAAE,MAAM,EAAsD;IAE9D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,KAAK,CAAA;IAErC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,mBAAmB;QAC3B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IACF,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,IAAI;YACF,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GACvB,KAAK,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG;gBAC3B,CAAC,CAAC,IAAA,kCAAc,EAAC;oBACb,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM,EAAE,GAAG,CAAC,MAAa;oBACzB,MAAM;iBACP,CAAC;gBACJ,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAA;YAC/C,OAAO,IAAA,kBAAS,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;SAC3C;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,SAAS,CAAA;YACb,IAAI,SAAS,CAAA;YACb,IACE,GAAG,YAAY,8BAAqB;gBACpC,GAAG,YAAY,gCAAuB,EACtC;gBAEA,IAAI,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM;oBAAE,OAAM;gBAC/C,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAA;gBAC5B,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;aACtE;YAGD,OAAO,IAAA,kBAAS,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;SAChE;IACH,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAIhB,CAAA;AACH,CAAC;AAlDD,sCAkDC"}
|
@@ -6,7 +6,8 @@ const decodeEventLog_js_1 = require("../../utils/abi/decodeEventLog.js");
|
|
6
6
|
const encodeEventTopics_js_1 = require("../../utils/abi/encodeEventTopics.js");
|
7
7
|
const toHex_js_1 = require("../../utils/encoding/toHex.js");
|
8
8
|
const log_js_1 = require("../../utils/formatters/log.js");
|
9
|
-
async function getLogs(client, { address, blockHash, fromBlock, toBlock, event, args, strict, } = {}) {
|
9
|
+
async function getLogs(client, { address, blockHash, fromBlock, toBlock, event, args, strict: strict_, } = {}) {
|
10
|
+
const strict = strict_ ?? false;
|
10
11
|
let topics = [];
|
11
12
|
if (event)
|
12
13
|
topics = (0, encodeEventTopics_js_1.encodeEventTopics)({
|
@@ -42,19 +43,22 @@ async function getLogs(client, { address, blockHash, fromBlock, toBlock, event,
|
|
42
43
|
abi: [event],
|
43
44
|
data: log.data,
|
44
45
|
topics: log.topics,
|
46
|
+
strict,
|
45
47
|
})
|
46
48
|
: { eventName: undefined, args: undefined };
|
47
49
|
return (0, log_js_1.formatLog)(log, { args, eventName });
|
48
50
|
}
|
49
51
|
catch (err) {
|
50
52
|
let eventName;
|
53
|
+
let isUnnamed;
|
51
54
|
if (err instanceof abi_js_1.DecodeLogDataMismatch ||
|
52
55
|
err instanceof abi_js_1.DecodeLogTopicsMismatch) {
|
53
56
|
if (strict)
|
54
57
|
return;
|
55
58
|
eventName = err.abiItem.name;
|
59
|
+
isUnnamed = err.abiItem.inputs?.some((x) => !('name' in x && x.name));
|
56
60
|
}
|
57
|
-
return (0, log_js_1.formatLog)(log, { args:
|
61
|
+
return (0, log_js_1.formatLog)(log, { args: isUnnamed ? [] : {}, eventName });
|
58
62
|
}
|
59
63
|
})
|
60
64
|
.filter(Boolean);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getLogs.js","sourceRoot":"","sources":["../../../../src/actions/public/getLogs.ts"],"names":[],"mappings":";;;AAIA,gDAG4B;AAU5B,yEAAkE;AAClE,+EAG6C;AAC7C,4DAA2D;AAC3D,0DAAyD;AAqElD,KAAK,UAAU,OAAO,CAK3B,MAAuC,EACvC,EACE,OAAO,EACP,SAAS,EACT,SAAS,EACT,OAAO,EACP,KAAK,EACL,IAAI,EACJ,MAAM,
|
1
|
+
{"version":3,"file":"getLogs.js","sourceRoot":"","sources":["../../../../src/actions/public/getLogs.ts"],"names":[],"mappings":";;;AAIA,gDAG4B;AAU5B,yEAAkE;AAClE,+EAG6C;AAC7C,4DAA2D;AAC3D,0DAAyD;AAqElD,KAAK,UAAU,OAAO,CAK3B,MAAuC,EACvC,EACE,OAAO,EACP,SAAS,EACT,SAAS,EACT,OAAO,EACP,KAAK,EACL,IAAI,EACJ,MAAM,EAAE,OAAO,MAC0B,EAAE;IAE7C,MAAM,MAAM,GAAG,OAAO,IAAI,KAAK,CAAA;IAE/B,IAAI,MAAM,GAAe,EAAE,CAAA;IAC3B,IAAI,KAAK;QACP,MAAM,GAAG,IAAA,wCAAiB,EAAC;YACzB,GAAG,EAAE,CAAC,KAAK,CAAC;YACZ,SAAS,EAAG,KAAkB,CAAC,IAAI;YACnC,IAAI;SAC0B,CAAC,CAAA;IAEnC,IAAI,IAAc,CAAA;IAClB,IAAI,SAAS,EAAE;QACb,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAC1B,MAAM,EAAE,aAAa;YACrB,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;SACzC,CAAC,CAAA;KACH;SAAM;QACL,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAC1B,MAAM,EAAE,aAAa;YACrB,MAAM,EAAE;gBACN;oBACE,OAAO;oBACP,MAAM;oBACN,SAAS,EACP,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,sBAAW,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;oBACpE,OAAO,EAAE,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,sBAAW,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO;iBACtE;aACF;SACF,CAAC,CAAA;KACH;IAED,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,IAAI;YACF,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,KAAK;gBAC/B,CAAC,CAAC,IAAA,kCAAc,EAAC;oBACb,GAAG,EAAE,CAAC,KAAK,CAAe;oBAC1B,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM,EAAE,GAAG,CAAC,MAAa;oBACzB,MAAM;iBACP,CAAC;gBACJ,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAA;YAC7C,OAAO,IAAA,kBAAS,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;SAC3C;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,SAAS,CAAA;YACb,IAAI,SAAS,CAAA;YACb,IACE,GAAG,YAAY,8BAAqB;gBACpC,GAAG,YAAY,gCAAuB,EACtC;gBAEA,IAAI,MAAM;oBAAE,OAAM;gBAClB,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAA;gBAC5B,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;aACtE;YAGD,OAAO,IAAA,kBAAS,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;SAChE;IACH,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAqD,CAAA;AACxE,CAAC;AA7ED,0BA6EC"}
|
@@ -10,7 +10,7 @@ const getBlockNumber_js_1 = require("./getBlockNumber.js");
|
|
10
10
|
const getFilterChanges_js_1 = require("./getFilterChanges.js");
|
11
11
|
const getLogs_js_1 = require("./getLogs.js");
|
12
12
|
const uninstallFilter_js_1 = require("./uninstallFilter.js");
|
13
|
-
function watchContractEvent(client, { abi, address, args, batch = true, eventName, onError, onLogs, pollingInterval = client.pollingInterval, }) {
|
13
|
+
function watchContractEvent(client, { abi, address, args, batch = true, eventName, onError, onLogs, pollingInterval = client.pollingInterval, strict: strict_, }) {
|
14
14
|
const observerId = (0, stringify_js_1.stringify)([
|
15
15
|
'watchContractEvent',
|
16
16
|
address,
|
@@ -20,6 +20,7 @@ function watchContractEvent(client, { abi, address, args, batch = true, eventNam
|
|
20
20
|
eventName,
|
21
21
|
pollingInterval,
|
22
22
|
]);
|
23
|
+
const strict = strict_ ?? false;
|
23
24
|
return (0, observe_js_1.observe)(observerId, { onLogs, onError }, (emit) => {
|
24
25
|
let previousBlockNumber;
|
25
26
|
let filter;
|
@@ -32,6 +33,7 @@ function watchContractEvent(client, { abi, address, args, batch = true, eventNam
|
|
32
33
|
address,
|
33
34
|
args,
|
34
35
|
eventName,
|
36
|
+
strict,
|
35
37
|
}));
|
36
38
|
}
|
37
39
|
catch { }
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"watchContractEvent.js","sourceRoot":"","sources":["../../../../src/actions/public/watchContractEvent.ts"],"names":[],"mappings":";;;AAQA,iEAGsC;AACtC,uDAAgD;AAChD,iDAA0C;AAC1C,2DAAoD;AAEpD,iFAGuC;AACvC,2DAAoD;AACpD,+DAAwD;AACxD,6CAA8D;AAC9D,6DAAsD;
|
1
|
+
{"version":3,"file":"watchContractEvent.js","sourceRoot":"","sources":["../../../../src/actions/public/watchContractEvent.ts"],"names":[],"mappings":"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"}
|
@@ -9,7 +9,7 @@ const getBlockNumber_js_1 = require("./getBlockNumber.js");
|
|
9
9
|
const getFilterChanges_js_1 = require("./getFilterChanges.js");
|
10
10
|
const getLogs_js_1 = require("./getLogs.js");
|
11
11
|
const uninstallFilter_js_1 = require("./uninstallFilter.js");
|
12
|
-
function watchEvent(client, { address, args, batch = true, event, onError, onLogs, pollingInterval = client.pollingInterval, }) {
|
12
|
+
function watchEvent(client, { address, args, batch = true, event, onError, onLogs, pollingInterval = client.pollingInterval, strict: strict_, }) {
|
13
13
|
const observerId = (0, stringify_js_1.stringify)([
|
14
14
|
'watchEvent',
|
15
15
|
address,
|
@@ -19,6 +19,7 @@ function watchEvent(client, { address, args, batch = true, event, onError, onLog
|
|
19
19
|
event,
|
20
20
|
pollingInterval,
|
21
21
|
]);
|
22
|
+
const strict = strict_ ?? false;
|
22
23
|
return (0, observe_js_1.observe)(observerId, { onLogs, onError }, (emit) => {
|
23
24
|
let previousBlockNumber;
|
24
25
|
let filter;
|
@@ -30,6 +31,7 @@ function watchEvent(client, { address, args, batch = true, event, onError, onLog
|
|
30
31
|
address,
|
31
32
|
args,
|
32
33
|
event: event,
|
34
|
+
strict,
|
33
35
|
}));
|
34
36
|
}
|
35
37
|
catch { }
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"watchEvent.js","sourceRoot":"","sources":["../../../../src/actions/public/watchEvent.ts"],"names":[],"mappings":";;;AAWA,uDAAgD;AAChD,iDAA0C;AAC1C,2DAAoD;AAEpD,iEAG+B;AAC/B,2DAAoD;AACpD,+DAAwD;AACxD,6CAAsC;AACtC,6DAAsD;
|
1
|
+
{"version":3,"file":"watchEvent.js","sourceRoot":"","sources":["../../../../src/actions/public/watchEvent.ts"],"names":[],"mappings":";;;AAWA,uDAAgD;AAChD,iDAA0C;AAC1C,2DAAoD;AAEpD,iEAG+B;AAC/B,2DAAoD;AACpD,+DAAwD;AACxD,6CAAsC;AACtC,6DAAsD;AAkFtD,SAAgB,UAAU,CAMxB,MAAuC,EACvC,EACE,OAAO,EACP,IAAI,EACJ,KAAK,GAAG,IAAI,EACZ,KAAK,EACL,OAAO,EACP,MAAM,EACN,eAAe,GAAG,MAAM,CAAC,eAAe,EACxC,MAAM,EAAE,OAAO,GAC0B;IAE3C,MAAM,UAAU,GAAG,IAAA,wBAAS,EAAC;QAC3B,YAAY;QACZ,OAAO;QACP,IAAI;QACJ,KAAK;QACL,MAAM,CAAC,GAAG;QACV,KAAK;QACL,eAAe;KAChB,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,OAAO,IAAI,KAAK,CAAA;IAE/B,OAAO,IAAA,oBAAO,EAAC,UAAU,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;QACvD,IAAI,mBAA2B,CAAA;QAC/B,IAAI,MAAqD,CAAA;QACzD,IAAI,WAAW,GAAG,KAAK,CAAA;QAEvB,MAAM,OAAO,GAAG,IAAA,cAAI,EAClB,KAAK,IAAI,EAAE;YACT,IAAI,CAAC,WAAW,EAAE;gBAChB,IAAI;oBACF,MAAM,GAAG,CAAC,MAAM,IAAA,wCAAiB,EAAC,MAAM,EAAE;wBACxC,OAAO;wBACP,IAAI;wBACJ,KAAK,EAAE,KAAM;wBACb,MAAM;qBACmC,CAAC,CAI3C,CAAA;iBACF;gBAAC,MAAM,GAAE;gBACV,WAAW,GAAG,IAAI,CAAA;gBAClB,OAAM;aACP;YAED,IAAI;gBACF,IAAI,IAAW,CAAA;gBACf,IAAI,MAAM,EAAE;oBACV,IAAI,GAAG,MAAM,IAAA,sCAAgB,EAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;iBAClD;qBAAM;oBAKL,MAAM,WAAW,GAAG,MAAM,IAAA,kCAAc,EAAC,MAAM,CAAC,CAAA;oBAKhD,IAAI,mBAAmB,IAAI,mBAAmB,KAAK,WAAW,EAAE;wBAC9D,IAAI,GAAG,MAAM,IAAA,oBAAO,EAAC,MAAM,EAAE;4BAC3B,OAAO;4BACP,IAAI;4BACJ,SAAS,EAAE,mBAAmB,GAAG,EAAE;4BACnC,OAAO,EAAE,WAAW;4BACpB,KAAK,EAAE,KAAM;yBACd,CAAC,CAAA;qBACH;yBAAM;wBACL,IAAI,GAAG,EAAE,CAAA;qBACV;oBACD,mBAAmB,GAAG,WAAW,CAAA;iBAClC;gBAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;oBAAE,OAAM;gBAC7B,IAAI,KAAK;oBAAE,IAAI,CAAC,MAAM,CAAC,IAAW,CAAC,CAAA;;oBAC9B,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAQ,CAAC,CAAC,CAAA;aACtD;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAC,OAAO,EAAE,CAAC,GAAY,CAAC,CAAA;aAC7B;QACH,CAAC,EACD;YACE,WAAW,EAAE,IAAI;YACjB,QAAQ,EAAE,eAAe;SAC1B,CACF,CAAA;QAED,OAAO,KAAK,IAAI,EAAE;YAChB,IAAI,MAAM;gBAAE,MAAM,IAAA,oCAAe,EAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;YACrD,OAAO,EAAE,CAAA;QACX,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAnGD,gCAmGC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"public.js","sourceRoot":"","sources":["../../../../src/clients/decorators/public.ts"],"names":[],"mappings":";;;AAEA,yEAI2C;AAC3C,uEAI0C;AAC1C,mEAIwC;AACxC,2EAI4C;AAC5C,mEAIwC;AACxC,0DAIqC;AACrC,oFAGkD;AAClD,oGAI0D;AAC1D,oFAIkD;AAClD,8GAG+D;AAC/D,wFAIoD;AACpD,wEAI4C;AAC5C,sEAI2C;AAC3C,kEAIyC;AACzC,8EAI+C;AAC/C,kGAIyD;AACzD,wEAI4C;AAC5C,sEAG2C;AAC3C,4EAI8C;AAC9C,kFAIiD;AACjD,4EAI8C;AAC9C,wEAG4C;AAC5C,gEAIwC;AACxC,0EAI6C;AAC7C,8EAI+C;AAC/C,wGAI4D;AAC5D,wFAIoD;AACpD,4FAIsD;AACtD,oEAI0C;AAC1C,0EAI6C;AAC7C,kFAIiD;AACjD,gFAIgD;AAChD,4EAI8C;AAC9C,gFAIgD;AAChD,oGAI0D;AAC1D,kFAIiD;AACjD,wEAI4C;AAC5C,sFAImD;AACnD,sEAI2C;AAC3C,kGAIyD;
|
1
|
+
{"version":3,"file":"public.js","sourceRoot":"","sources":["../../../../src/clients/decorators/public.ts"],"names":[],"mappings":"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"}
|
@@ -6,7 +6,8 @@ const getEventSelector_js_1 = require("../hash/getEventSelector.js");
|
|
6
6
|
const decodeAbiParameters_js_1 = require("./decodeAbiParameters.js");
|
7
7
|
const formatAbiItem_js_1 = require("./formatAbiItem.js");
|
8
8
|
const docsPath = '/docs/contract/decodeEventLog';
|
9
|
-
function decodeEventLog({ abi, data, topics, }) {
|
9
|
+
function decodeEventLog({ abi, data, strict: strict_, topics, }) {
|
10
|
+
const strict = strict_ ?? true;
|
10
11
|
const [signature, ...argTopics] = topics;
|
11
12
|
if (!signature)
|
12
13
|
throw new abi_js_1.AbiEventSignatureEmptyTopicsError({
|
@@ -36,34 +37,39 @@ function decodeEventLog({ abi, data, topics, }) {
|
|
36
37
|
}
|
37
38
|
const nonIndexedInputs = inputs.filter((x) => !('indexed' in x && x.indexed));
|
38
39
|
if (nonIndexedInputs.length > 0) {
|
39
|
-
if (
|
40
|
+
if (data && data !== '0x') {
|
41
|
+
try {
|
42
|
+
const decodedData = (0, decodeAbiParameters_js_1.decodeAbiParameters)(nonIndexedInputs, data);
|
43
|
+
if (decodedData) {
|
44
|
+
if (isUnnamed)
|
45
|
+
args = [...args, ...decodedData];
|
46
|
+
else {
|
47
|
+
for (let i = 0; i < nonIndexedInputs.length; i++) {
|
48
|
+
args[nonIndexedInputs[i].name] = decodedData[i];
|
49
|
+
}
|
50
|
+
}
|
51
|
+
}
|
52
|
+
}
|
53
|
+
catch (err) {
|
54
|
+
if (strict) {
|
55
|
+
if (err instanceof abi_js_1.AbiDecodingDataSizeTooSmallError)
|
56
|
+
throw new abi_js_1.DecodeLogDataMismatch({
|
57
|
+
abiItem,
|
58
|
+
data: err.data,
|
59
|
+
params: err.params,
|
60
|
+
size: err.size,
|
61
|
+
});
|
62
|
+
throw err;
|
63
|
+
}
|
64
|
+
}
|
65
|
+
}
|
66
|
+
else if (strict) {
|
40
67
|
throw new abi_js_1.DecodeLogDataMismatch({
|
41
68
|
abiItem,
|
42
69
|
data: '0x',
|
43
70
|
params: nonIndexedInputs,
|
44
71
|
size: 0,
|
45
72
|
});
|
46
|
-
try {
|
47
|
-
const decodedData = (0, decodeAbiParameters_js_1.decodeAbiParameters)(nonIndexedInputs, data);
|
48
|
-
if (decodedData) {
|
49
|
-
if (isUnnamed)
|
50
|
-
args = [...args, ...decodedData];
|
51
|
-
else {
|
52
|
-
for (let i = 0; i < nonIndexedInputs.length; i++) {
|
53
|
-
args[nonIndexedInputs[i].name] = decodedData[i];
|
54
|
-
}
|
55
|
-
}
|
56
|
-
}
|
57
|
-
}
|
58
|
-
catch (err) {
|
59
|
-
if (err instanceof abi_js_1.AbiDecodingDataSizeTooSmallError)
|
60
|
-
throw new abi_js_1.DecodeLogDataMismatch({
|
61
|
-
abiItem,
|
62
|
-
data: err.data,
|
63
|
-
params: err.params,
|
64
|
-
size: err.size,
|
65
|
-
});
|
66
|
-
throw err;
|
67
73
|
}
|
68
74
|
}
|
69
75
|
return {
|
@@ -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;
|
1
|
+
{"version":3,"file":"decodeEventLog.js","sourceRoot":"","sources":["../../../../src/utils/abi/decodeEventLog.ts"],"names":[],"mappings":"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"}
|
@@ -33,13 +33,17 @@ function encodeEventTopics({ abi, eventName, args }) {
|
|
33
33
|
const indexedInputs = abiItem.inputs?.filter((param) => 'indexed' in param && param.indexed);
|
34
34
|
const args_ = Array.isArray(args)
|
35
35
|
? args
|
36
|
-
:
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
36
|
+
: Object.values(args).length > 0
|
37
|
+
? indexedInputs?.map((x) => args[x.name]) ?? []
|
38
|
+
: [];
|
39
|
+
if (args_.length > 0) {
|
40
|
+
topics =
|
41
|
+
indexedInputs?.map((param, i) => Array.isArray(args_[i])
|
42
|
+
? args_[i].map((_, j) => encodeArg({ param, value: args_[i][j] }))
|
43
|
+
: args_[i]
|
44
|
+
? encodeArg({ param, value: args_[i] })
|
45
|
+
: null) ?? [];
|
46
|
+
}
|
43
47
|
}
|
44
48
|
return [signature, ...topics];
|
45
49
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"encodeEventTopics.js","sourceRoot":"","sources":["../../../../src/utils/abi/encodeEventTopics.ts"],"names":[],"mappings":";;;AAOA,gDAA2D;AAC3D,gDAAiE;AAQjE,uDAAgD;AAChD,qEAA8D;AAC9D,uDAAgD;AAEhD,qEAA8D;AAC9D,yDAAkD;AAClD,mDAAuE;AAcvE,SAAgB,iBAAiB,CAG/B,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAiD;IACvE,IAAI,OAAO,GAAG,GAAG,CAAC,CAAC,CAAY,CAAA;IAC/B,IAAI,SAAS,EAAE;QACb,OAAO,GAAG,IAAA,0BAAU,EAAC;YACnB,GAAG;YACH,IAAI;YACJ,IAAI,EAAE,SAAS;SACQ,CAAC,CAAA;QAC1B,IAAI,CAAC,OAAO;YACV,MAAM,IAAI,8BAAqB,CAAC,SAAS,EAAE;gBACzC,QAAQ,EAAE,kCAAkC;aAC7C,CAAC,CAAA;KACL;IAED,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO;QAC1B,MAAM,IAAI,8BAAqB,CAAC,SAAS,EAAE;YACzC,QAAQ,EAAE,kCAAkC;SAC7C,CAAC,CAAA;IAEJ,MAAM,UAAU,GAAG,IAAA,gCAAa,EAAC,OAAO,CAAC,CAAA;IACzC,MAAM,SAAS,GAAG,IAAA,sCAAgB,EAAC,UAA6B,CAAC,CAAA;IAEjE,IAAI,MAAM,GAAU,EAAE,CAAA;IACtB,IAAI,IAAI,IAAI,QAAQ,IAAI,OAAO,EAAE;QAC/B,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,MAAM,CAC1C,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,CAC/C,CAAA;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YAC/B,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAE,IAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;
|
1
|
+
{"version":3,"file":"encodeEventTopics.js","sourceRoot":"","sources":["../../../../src/utils/abi/encodeEventTopics.ts"],"names":[],"mappings":";;;AAOA,gDAA2D;AAC3D,gDAAiE;AAQjE,uDAAgD;AAChD,qEAA8D;AAC9D,uDAAgD;AAEhD,qEAA8D;AAC9D,yDAAkD;AAClD,mDAAuE;AAcvE,SAAgB,iBAAiB,CAG/B,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAiD;IACvE,IAAI,OAAO,GAAG,GAAG,CAAC,CAAC,CAAY,CAAA;IAC/B,IAAI,SAAS,EAAE;QACb,OAAO,GAAG,IAAA,0BAAU,EAAC;YACnB,GAAG;YACH,IAAI;YACJ,IAAI,EAAE,SAAS;SACQ,CAAC,CAAA;QAC1B,IAAI,CAAC,OAAO;YACV,MAAM,IAAI,8BAAqB,CAAC,SAAS,EAAE;gBACzC,QAAQ,EAAE,kCAAkC;aAC7C,CAAC,CAAA;KACL;IAED,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO;QAC1B,MAAM,IAAI,8BAAqB,CAAC,SAAS,EAAE;YACzC,QAAQ,EAAE,kCAAkC;SAC7C,CAAC,CAAA;IAEJ,MAAM,UAAU,GAAG,IAAA,gCAAa,EAAC,OAAO,CAAC,CAAA;IACzC,MAAM,SAAS,GAAG,IAAA,sCAAgB,EAAC,UAA6B,CAAC,CAAA;IAEjE,IAAI,MAAM,GAAU,EAAE,CAAA;IACtB,IAAI,IAAI,IAAI,QAAQ,IAAI,OAAO,EAAE;QAC/B,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,MAAM,CAC1C,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,CAC/C,CAAA;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YAC/B,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC;gBAChC,CAAC,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAE,IAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE;gBAC7D,CAAC,CAAC,EAAE,CAAA;QAEN,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,MAAM;gBACJ,aAAa,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAC9B,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACrB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,CAAS,EAAE,EAAE,CACjC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CACzC;oBACH,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;wBACV,CAAC,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;wBACvC,CAAC,CAAC,IAAI,CACT,IAAI,EAAE,CAAA;SACV;KACF;IACD,OAAO,CAAC,SAAS,EAAE,GAAG,MAAM,CAAC,CAAA;AAC/B,CAAC;AAlDD,8CAkDC;AAED,SAAS,SAAS,CAAC,EACjB,KAAK,EACL,KAAK,GACqE;IAC1E,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;QACnD,OAAO,IAAA,wBAAS,EAAC,IAAA,oBAAO,EAAC,KAAe,CAAC,CAAC,CAAA;IAC5C,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC;QAChE,MAAM,IAAI,oCAA2B,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACnD,OAAO,IAAA,4CAAmB,EAAC,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;AAC9C,CAAC"}
|
@@ -2,6 +2,7 @@ import { DecodeLogDataMismatch, DecodeLogTopicsMismatch, } from '../../errors/ab
|
|
2
2
|
import { decodeEventLog } from '../../utils/abi/decodeEventLog.js';
|
3
3
|
import { formatLog } from '../../utils/formatters/log.js';
|
4
4
|
export async function getFilterChanges(_client, { filter, }) {
|
5
|
+
const strict = 'strict' in filter && filter.strict;
|
5
6
|
const logs = await filter.request({
|
6
7
|
method: 'eth_getFilterChanges',
|
7
8
|
params: [filter.id],
|
@@ -16,19 +17,22 @@ export async function getFilterChanges(_client, { filter, }) {
|
|
16
17
|
abi: filter.abi,
|
17
18
|
data: log.data,
|
18
19
|
topics: log.topics,
|
20
|
+
strict,
|
19
21
|
})
|
20
22
|
: { eventName: undefined, args: undefined };
|
21
23
|
return formatLog(log, { args, eventName });
|
22
24
|
}
|
23
25
|
catch (err) {
|
24
26
|
let eventName;
|
27
|
+
let isUnnamed;
|
25
28
|
if (err instanceof DecodeLogDataMismatch ||
|
26
29
|
err instanceof DecodeLogTopicsMismatch) {
|
27
30
|
if ('strict' in filter && filter.strict)
|
28
31
|
return;
|
29
32
|
eventName = err.abiItem.name;
|
33
|
+
isUnnamed = err.abiItem.inputs?.some((x) => !('name' in x && x.name));
|
30
34
|
}
|
31
|
-
return formatLog(log, { args:
|
35
|
+
return formatLog(log, { args: isUnnamed ? [] : {}, eventName });
|
32
36
|
}
|
33
37
|
})
|
34
38
|
.filter(Boolean);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getFilterChanges.js","sourceRoot":"","sources":["../../../../src/actions/public/getFilterChanges.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,qBAAqB,CAAA;AAK5B,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AA2GzD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAQpC,OAAyC,EACzC,EACE,MAAM,GAC6D;IAErE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,sBAAsB;QAC9B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IACF,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,GAAG,CAAA;QACvC,IAAI;YACF,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GACvB,KAAK,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG;gBAC3B,CAAC,CAAC,cAAc,CAAC;oBACb,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM,EAAE,GAAG,CAAC,MAAa;
|
1
|
+
{"version":3,"file":"getFilterChanges.js","sourceRoot":"","sources":["../../../../src/actions/public/getFilterChanges.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,qBAAqB,CAAA;AAK5B,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AA2GzD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAQpC,OAAyC,EACzC,EACE,MAAM,GAC6D;IAErE,MAAM,MAAM,GAAG,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,CAAA;IAElD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,sBAAsB;QAC9B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IACF,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,GAAG,CAAA;QACvC,IAAI;YACF,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GACvB,KAAK,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG;gBAC3B,CAAC,CAAC,cAAc,CAAC;oBACb,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM,EAAE,GAAG,CAAC,MAAa;oBACzB,MAAM;iBACP,CAAC;gBACJ,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAA;YAC/C,OAAO,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;SAC3C;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,SAAS,CAAA;YACb,IAAI,SAAS,CAAA;YACb,IACE,GAAG,YAAY,qBAAqB;gBACpC,GAAG,YAAY,uBAAuB,EACtC;gBAEA,IAAI,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM;oBAAE,OAAM;gBAC/C,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAA;gBAC5B,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;aACtE;YAGD,OAAO,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;SAChE;IACH,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAKhB,CAAA;AACH,CAAC"}
|
@@ -2,6 +2,7 @@ import { DecodeLogDataMismatch, DecodeLogTopicsMismatch, } from '../../errors/ab
|
|
2
2
|
import { decodeEventLog } from '../../utils/abi/decodeEventLog.js';
|
3
3
|
import { formatLog } from '../../utils/formatters/log.js';
|
4
4
|
export async function getFilterLogs(_client, { filter }) {
|
5
|
+
const strict = filter.strict ?? false;
|
5
6
|
const logs = await filter.request({
|
6
7
|
method: 'eth_getFilterLogs',
|
7
8
|
params: [filter.id],
|
@@ -14,19 +15,22 @@ export async function getFilterLogs(_client, { filter }) {
|
|
14
15
|
abi: filter.abi,
|
15
16
|
data: log.data,
|
16
17
|
topics: log.topics,
|
18
|
+
strict,
|
17
19
|
})
|
18
20
|
: { eventName: undefined, args: undefined };
|
19
21
|
return formatLog(log, { args, eventName });
|
20
22
|
}
|
21
23
|
catch (err) {
|
22
24
|
let eventName;
|
25
|
+
let isUnnamed;
|
23
26
|
if (err instanceof DecodeLogDataMismatch ||
|
24
27
|
err instanceof DecodeLogTopicsMismatch) {
|
25
|
-
if (filter.strict)
|
28
|
+
if ('strict' in filter && filter.strict)
|
26
29
|
return;
|
27
30
|
eventName = err.abiItem.name;
|
31
|
+
isUnnamed = err.abiItem.inputs?.some((x) => !('name' in x && x.name));
|
28
32
|
}
|
29
|
-
return formatLog(log, { args:
|
33
|
+
return formatLog(log, { args: isUnnamed ? [] : {}, eventName });
|
30
34
|
}
|
31
35
|
})
|
32
36
|
.filter(Boolean);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getFilterLogs.js","sourceRoot":"","sources":["../../../../src/actions/public/getFilterLogs.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,qBAAqB,CAAA;AAI5B,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AA+CzD,MAAM,CAAC,KAAK,UAAU,aAAa,CAMjC,OAAwC,EACxC,EAAE,MAAM,EAAsD;IAE9D,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,mBAAmB;QAC3B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IACF,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,IAAI;YACF,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GACvB,KAAK,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG;gBAC3B,CAAC,CAAC,cAAc,CAAC;oBACb,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM,EAAE,GAAG,CAAC,MAAa;
|
1
|
+
{"version":3,"file":"getFilterLogs.js","sourceRoot":"","sources":["../../../../src/actions/public/getFilterLogs.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,qBAAqB,CAAA;AAI5B,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AA+CzD,MAAM,CAAC,KAAK,UAAU,aAAa,CAMjC,OAAwC,EACxC,EAAE,MAAM,EAAsD;IAE9D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,KAAK,CAAA;IAErC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,mBAAmB;QAC3B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IACF,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,IAAI;YACF,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GACvB,KAAK,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG;gBAC3B,CAAC,CAAC,cAAc,CAAC;oBACb,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM,EAAE,GAAG,CAAC,MAAa;oBACzB,MAAM;iBACP,CAAC;gBACJ,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAA;YAC/C,OAAO,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;SAC3C;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,SAAS,CAAA;YACb,IAAI,SAAS,CAAA;YACb,IACE,GAAG,YAAY,qBAAqB;gBACpC,GAAG,YAAY,uBAAuB,EACtC;gBAEA,IAAI,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM;oBAAE,OAAM;gBAC/C,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAA;gBAC5B,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;aACtE;YAGD,OAAO,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;SAChE;IACH,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAIhB,CAAA;AACH,CAAC"}
|
@@ -3,7 +3,8 @@ import { decodeEventLog } from '../../utils/abi/decodeEventLog.js';
|
|
3
3
|
import { encodeEventTopics, } from '../../utils/abi/encodeEventTopics.js';
|
4
4
|
import { numberToHex } from '../../utils/encoding/toHex.js';
|
5
5
|
import { formatLog } from '../../utils/formatters/log.js';
|
6
|
-
export async function getLogs(client, { address, blockHash, fromBlock, toBlock, event, args, strict, } = {}) {
|
6
|
+
export async function getLogs(client, { address, blockHash, fromBlock, toBlock, event, args, strict: strict_, } = {}) {
|
7
|
+
const strict = strict_ ?? false;
|
7
8
|
let topics = [];
|
8
9
|
if (event)
|
9
10
|
topics = encodeEventTopics({
|
@@ -39,19 +40,22 @@ export async function getLogs(client, { address, blockHash, fromBlock, toBlock,
|
|
39
40
|
abi: [event],
|
40
41
|
data: log.data,
|
41
42
|
topics: log.topics,
|
43
|
+
strict,
|
42
44
|
})
|
43
45
|
: { eventName: undefined, args: undefined };
|
44
46
|
return formatLog(log, { args, eventName });
|
45
47
|
}
|
46
48
|
catch (err) {
|
47
49
|
let eventName;
|
50
|
+
let isUnnamed;
|
48
51
|
if (err instanceof DecodeLogDataMismatch ||
|
49
52
|
err instanceof DecodeLogTopicsMismatch) {
|
50
53
|
if (strict)
|
51
54
|
return;
|
52
55
|
eventName = err.abiItem.name;
|
56
|
+
isUnnamed = err.abiItem.inputs?.some((x) => !('name' in x && x.name));
|
53
57
|
}
|
54
|
-
return formatLog(log, { args:
|
58
|
+
return formatLog(log, { args: isUnnamed ? [] : {}, eventName });
|
55
59
|
}
|
56
60
|
})
|
57
61
|
.filter(Boolean);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getLogs.js","sourceRoot":"","sources":["../../../../src/actions/public/getLogs.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,qBAAqB,CAAA;AAU5B,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAClE,OAAO,EAEL,iBAAiB,GAClB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAqEzD,MAAM,CAAC,KAAK,UAAU,OAAO,CAK3B,MAAuC,EACvC,EACE,OAAO,EACP,SAAS,EACT,SAAS,EACT,OAAO,EACP,KAAK,EACL,IAAI,EACJ,MAAM,
|
1
|
+
{"version":3,"file":"getLogs.js","sourceRoot":"","sources":["../../../../src/actions/public/getLogs.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,qBAAqB,CAAA;AAU5B,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAClE,OAAO,EAEL,iBAAiB,GAClB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAqEzD,MAAM,CAAC,KAAK,UAAU,OAAO,CAK3B,MAAuC,EACvC,EACE,OAAO,EACP,SAAS,EACT,SAAS,EACT,OAAO,EACP,KAAK,EACL,IAAI,EACJ,MAAM,EAAE,OAAO,MAC0B,EAAE;IAE7C,MAAM,MAAM,GAAG,OAAO,IAAI,KAAK,CAAA;IAE/B,IAAI,MAAM,GAAe,EAAE,CAAA;IAC3B,IAAI,KAAK;QACP,MAAM,GAAG,iBAAiB,CAAC;YACzB,GAAG,EAAE,CAAC,KAAK,CAAC;YACZ,SAAS,EAAG,KAAkB,CAAC,IAAI;YACnC,IAAI;SAC0B,CAAC,CAAA;IAEnC,IAAI,IAAc,CAAA;IAClB,IAAI,SAAS,EAAE;QACb,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAC1B,MAAM,EAAE,aAAa;YACrB,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;SACzC,CAAC,CAAA;KACH;SAAM;QACL,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAC1B,MAAM,EAAE,aAAa;YACrB,MAAM,EAAE;gBACN;oBACE,OAAO;oBACP,MAAM;oBACN,SAAS,EACP,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;oBACpE,OAAO,EAAE,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO;iBACtE;aACF;SACF,CAAC,CAAA;KACH;IAED,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,IAAI;YACF,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,KAAK;gBAC/B,CAAC,CAAC,cAAc,CAAC;oBACb,GAAG,EAAE,CAAC,KAAK,CAAe;oBAC1B,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM,EAAE,GAAG,CAAC,MAAa;oBACzB,MAAM;iBACP,CAAC;gBACJ,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAA;YAC7C,OAAO,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;SAC3C;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,SAAS,CAAA;YACb,IAAI,SAAS,CAAA;YACb,IACE,GAAG,YAAY,qBAAqB;gBACpC,GAAG,YAAY,uBAAuB,EACtC;gBAEA,IAAI,MAAM;oBAAE,OAAM;gBAClB,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAA;gBAC5B,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;aACtE;YAGD,OAAO,SAAS,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;SAChE;IACH,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAqD,CAAA;AACxE,CAAC"}
|
@@ -7,7 +7,7 @@ import { getBlockNumber } from './getBlockNumber.js';
|
|
7
7
|
import { getFilterChanges } from './getFilterChanges.js';
|
8
8
|
import { getLogs } from './getLogs.js';
|
9
9
|
import { uninstallFilter } from './uninstallFilter.js';
|
10
|
-
export function watchContractEvent(client, { abi, address, args, batch = true, eventName, onError, onLogs, pollingInterval = client.pollingInterval, }) {
|
10
|
+
export function watchContractEvent(client, { abi, address, args, batch = true, eventName, onError, onLogs, pollingInterval = client.pollingInterval, strict: strict_, }) {
|
11
11
|
const observerId = stringify([
|
12
12
|
'watchContractEvent',
|
13
13
|
address,
|
@@ -17,6 +17,7 @@ export function watchContractEvent(client, { abi, address, args, batch = true, e
|
|
17
17
|
eventName,
|
18
18
|
pollingInterval,
|
19
19
|
]);
|
20
|
+
const strict = strict_ ?? false;
|
20
21
|
return observe(observerId, { onLogs, onError }, (emit) => {
|
21
22
|
let previousBlockNumber;
|
22
23
|
let filter;
|
@@ -29,6 +30,7 @@ export function watchContractEvent(client, { abi, address, args, batch = true, e
|
|
29
30
|
address,
|
30
31
|
args,
|
31
32
|
eventName,
|
33
|
+
strict,
|
32
34
|
}));
|
33
35
|
}
|
34
36
|
catch { }
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"watchContractEvent.js","sourceRoot":"","sources":["../../../../src/actions/public/watchContractEvent.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,UAAU,GACX,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAEpD,OAAO,EAEL,yBAAyB,GAC1B,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAA0B,OAAO,EAAE,MAAM,cAAc,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;
|
1
|
+
{"version":3,"file":"watchContractEvent.js","sourceRoot":"","sources":["../../../../src/actions/public/watchContractEvent.ts"],"names":[],"mappings":"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"}
|
@@ -6,7 +6,7 @@ import { getBlockNumber } from './getBlockNumber.js';
|
|
6
6
|
import { getFilterChanges } from './getFilterChanges.js';
|
7
7
|
import { getLogs } from './getLogs.js';
|
8
8
|
import { uninstallFilter } from './uninstallFilter.js';
|
9
|
-
export function watchEvent(client, { address, args, batch = true, event, onError, onLogs, pollingInterval = client.pollingInterval, }) {
|
9
|
+
export function watchEvent(client, { address, args, batch = true, event, onError, onLogs, pollingInterval = client.pollingInterval, strict: strict_, }) {
|
10
10
|
const observerId = stringify([
|
11
11
|
'watchEvent',
|
12
12
|
address,
|
@@ -16,6 +16,7 @@ export function watchEvent(client, { address, args, batch = true, event, onError
|
|
16
16
|
event,
|
17
17
|
pollingInterval,
|
18
18
|
]);
|
19
|
+
const strict = strict_ ?? false;
|
19
20
|
return observe(observerId, { onLogs, onError }, (emit) => {
|
20
21
|
let previousBlockNumber;
|
21
22
|
let filter;
|
@@ -27,6 +28,7 @@ export function watchEvent(client, { address, args, batch = true, event, onError
|
|
27
28
|
address,
|
28
29
|
args,
|
29
30
|
event: event,
|
31
|
+
strict,
|
30
32
|
}));
|
31
33
|
}
|
32
34
|
catch { }
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"watchEvent.js","sourceRoot":"","sources":["../../../../src/actions/public/watchEvent.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAEpD,OAAO,EAEL,iBAAiB,GAClB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;
|
1
|
+
{"version":3,"file":"watchEvent.js","sourceRoot":"","sources":["../../../../src/actions/public/watchEvent.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"public.js","sourceRoot":"","sources":["../../../../src/clients/decorators/public.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,aAAa,GACd,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAGL,YAAY,GACb,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAGL,UAAU,GACX,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAGL,cAAc,GACf,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAGL,UAAU,GACX,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAGL,IAAI,GACL,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAEL,iBAAiB,GAClB,MAAM,2CAA2C,CAAA;AAClD,OAAO,EAGL,yBAAyB,GAC1B,MAAM,mDAAmD,CAAA;AAC1D,OAAO,EAGL,iBAAiB,GAClB,MAAM,2CAA2C,CAAA;AAClD,OAAO,EAEL,8BAA8B,GAC/B,MAAM,wDAAwD,CAAA;AAC/D,OAAO,EAGL,mBAAmB,GACpB,MAAM,6CAA6C,CAAA;AACpD,OAAO,EAGL,WAAW,GACZ,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAGL,UAAU,GACX,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAGL,QAAQ,GACT,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAGL,cAAc,GACf,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAGL,wBAAwB,GACzB,MAAM,kDAAkD,CAAA;AACzD,OAAO,EAGL,WAAW,GACZ,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAEL,UAAU,GACX,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAGL,aAAa,GACd,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EAGL,gBAAgB,GACjB,MAAM,0CAA0C,CAAA;AACjD,OAAO,EAGL,aAAa,GACd,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EAEL,WAAW,GACZ,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAGL,OAAO,GACR,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAGL,YAAY,GACb,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAGL,cAAc,GACf,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAGL,2BAA2B,GAC5B,MAAM,qDAAqD,CAAA;AAC5D,OAAO,EAGL,mBAAmB,GACpB,MAAM,6CAA6C,CAAA;AACpD,OAAO,EAGL,qBAAqB,GACtB,MAAM,+CAA+C,CAAA;AACtD,OAAO,EAGL,SAAS,GACV,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAGL,YAAY,GACb,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAGL,gBAAgB,GACjB,MAAM,0CAA0C,CAAA;AACjD,OAAO,EAGL,eAAe,GAChB,MAAM,yCAAyC,CAAA;AAChD,OAAO,EAGL,aAAa,GACd,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EAGL,eAAe,GAChB,MAAM,yCAAyC,CAAA;AAChD,OAAO,EAGL,yBAAyB,GAC1B,MAAM,mDAAmD,CAAA;AAC1D,OAAO,EAGL,gBAAgB,GACjB,MAAM,0CAA0C,CAAA;AACjD,OAAO,EAGL,WAAW,GACZ,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAGL,kBAAkB,GACnB,MAAM,4CAA4C,CAAA;AACnD,OAAO,EAGL,UAAU,GACX,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAGL,wBAAwB,GACzB,MAAM,kDAAkD,CAAA;
|
1
|
+
{"version":3,"file":"public.js","sourceRoot":"","sources":["../../../../src/clients/decorators/public.ts"],"names":[],"mappings":"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"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
export const version = '0.0.0-main.
|
1
|
+
export const version = '0.0.0-main.20230606T201704';
|
2
2
|
//# sourceMappingURL=version.js.map
|