viem 2.9.12 → 2.9.13
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/CHANGELOG.md +8 -0
- package/_cjs/actions/public/watchContractEvent.js +8 -2
- package/_cjs/actions/public/watchContractEvent.js.map +1 -1
- package/_cjs/actions/public/watchEvent.js +8 -2
- package/_cjs/actions/public/watchEvent.js.map +1 -1
- package/_cjs/errors/version.js +1 -1
- package/_cjs/utils/abi/decodeEventLog.js +1 -1
- package/_cjs/utils/abi/decodeEventLog.js.map +1 -1
- package/_esm/actions/public/watchContractEvent.js +8 -2
- package/_esm/actions/public/watchContractEvent.js.map +1 -1
- package/_esm/actions/public/watchEvent.js +8 -2
- package/_esm/actions/public/watchEvent.js.map +1 -1
- package/_esm/errors/version.js +1 -1
- package/_esm/utils/abi/decodeEventLog.js +1 -1
- package/_esm/utils/abi/decodeEventLog.js.map +1 -1
- package/_types/actions/public/watchContractEvent.d.ts +3 -0
- package/_types/actions/public/watchContractEvent.d.ts.map +1 -1
- package/_types/actions/public/watchEvent.d.ts +4 -1
- package/_types/actions/public/watchEvent.d.ts.map +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/actions/public/watchContractEvent.ts +10 -1
- package/actions/public/watchEvent.ts +10 -1
- package/errors/version.ts +1 -1
- package/package.json +1 -1
- package/utils/abi/decodeEventLog.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# viem
|
|
2
2
|
|
|
3
|
+
## 2.9.13
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#2092](https://github.com/wevm/viem/pull/2092) [`25cd1a2d97f83de2a3a8a1eaa34e772cff13e2b6`](https://github.com/wevm/viem/commit/25cd1a2d97f83de2a3a8a1eaa34e772cff13e2b6) Thanks [@ITZSHOAIB](https://github.com/ITZSHOAIB)! - Fixed decoding of event logs when an event argument was missing a name.
|
|
8
|
+
|
|
9
|
+
- [#2082](https://github.com/wevm/viem/pull/2082) [`39ccad8988b54f7cc25ad68a3170d03ec5a0fd3e`](https://github.com/wevm/viem/commit/39ccad8988b54f7cc25ad68a3170d03ec5a0fd3e) Thanks [@maxencerb](https://github.com/maxencerb)! - Added `fromBlock` parameter to `watchEvent` and `watchContractEvent`.
|
|
10
|
+
|
|
3
11
|
## 2.9.12
|
|
4
12
|
|
|
5
13
|
### Patch Changes
|
|
@@ -16,8 +16,10 @@ const getContractEvents_js_1 = require("./getContractEvents.js");
|
|
|
16
16
|
const getFilterChanges_js_1 = require("./getFilterChanges.js");
|
|
17
17
|
const uninstallFilter_js_1 = require("./uninstallFilter.js");
|
|
18
18
|
function watchContractEvent(client, parameters) {
|
|
19
|
-
const { abi, address, args, batch = true, eventName, onError, onLogs, poll: poll_, pollingInterval = client.pollingInterval, strict: strict_, } = parameters;
|
|
20
|
-
const enablePolling = typeof poll_ !== 'undefined'
|
|
19
|
+
const { abi, address, args, batch = true, eventName, fromBlock, onError, onLogs, poll: poll_, pollingInterval = client.pollingInterval, strict: strict_, } = parameters;
|
|
20
|
+
const enablePolling = typeof poll_ !== 'undefined'
|
|
21
|
+
? poll_
|
|
22
|
+
: client.transport.type !== 'webSocket' || typeof fromBlock === 'number';
|
|
21
23
|
const pollContractEvent = () => {
|
|
22
24
|
const strict = strict_ ?? false;
|
|
23
25
|
const observerId = (0, stringify_js_1.stringify)([
|
|
@@ -29,9 +31,12 @@ function watchContractEvent(client, parameters) {
|
|
|
29
31
|
eventName,
|
|
30
32
|
pollingInterval,
|
|
31
33
|
strict,
|
|
34
|
+
fromBlock,
|
|
32
35
|
]);
|
|
33
36
|
return (0, observe_js_1.observe)(observerId, { onLogs, onError }, (emit) => {
|
|
34
37
|
let previousBlockNumber;
|
|
38
|
+
if (fromBlock !== undefined)
|
|
39
|
+
previousBlockNumber = fromBlock - 1n;
|
|
35
40
|
let filter;
|
|
36
41
|
let initialized = false;
|
|
37
42
|
const unwatch = (0, poll_js_1.poll)(async () => {
|
|
@@ -43,6 +48,7 @@ function watchContractEvent(client, parameters) {
|
|
|
43
48
|
args: args,
|
|
44
49
|
eventName: eventName,
|
|
45
50
|
strict: strict,
|
|
51
|
+
fromBlock,
|
|
46
52
|
}));
|
|
47
53
|
}
|
|
48
54
|
catch { }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchContractEvent.js","sourceRoot":"","sources":["../../../actions/public/watchContractEvent.ts"],"names":[],"mappings":";;;AAQA,gDAG4B;AAC5B,gDAA0D;
|
|
1
|
+
{"version":3,"file":"watchContractEvent.js","sourceRoot":"","sources":["../../../actions/public/watchContractEvent.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,10 @@ const getBlockNumber_js_1 = require("./getBlockNumber.js");
|
|
|
13
13
|
const getFilterChanges_js_1 = require("./getFilterChanges.js");
|
|
14
14
|
const getLogs_js_1 = require("./getLogs.js");
|
|
15
15
|
const uninstallFilter_js_1 = require("./uninstallFilter.js");
|
|
16
|
-
function watchEvent(client, { address, args, batch = true, event, events, onError, onLogs, poll: poll_, pollingInterval = client.pollingInterval, strict: strict_, }) {
|
|
17
|
-
const enablePolling = typeof poll_ !== 'undefined'
|
|
16
|
+
function watchEvent(client, { address, args, batch = true, event, events, fromBlock, onError, onLogs, poll: poll_, pollingInterval = client.pollingInterval, strict: strict_, }) {
|
|
17
|
+
const enablePolling = typeof poll_ !== 'undefined'
|
|
18
|
+
? poll_
|
|
19
|
+
: client.transport.type !== 'webSocket' || typeof fromBlock === 'bigint';
|
|
18
20
|
const strict = strict_ ?? false;
|
|
19
21
|
const pollEvent = () => {
|
|
20
22
|
const observerId = (0, stringify_js_1.stringify)([
|
|
@@ -25,9 +27,12 @@ function watchEvent(client, { address, args, batch = true, event, events, onErro
|
|
|
25
27
|
client.uid,
|
|
26
28
|
event,
|
|
27
29
|
pollingInterval,
|
|
30
|
+
fromBlock,
|
|
28
31
|
]);
|
|
29
32
|
return (0, observe_js_1.observe)(observerId, { onLogs, onError }, (emit) => {
|
|
30
33
|
let previousBlockNumber;
|
|
34
|
+
if (fromBlock !== undefined)
|
|
35
|
+
previousBlockNumber = fromBlock - 1n;
|
|
31
36
|
let filter;
|
|
32
37
|
let initialized = false;
|
|
33
38
|
const unwatch = (0, poll_js_1.poll)(async () => {
|
|
@@ -39,6 +44,7 @@ function watchEvent(client, { address, args, batch = true, event, events, onErro
|
|
|
39
44
|
event: event,
|
|
40
45
|
events,
|
|
41
46
|
strict,
|
|
47
|
+
fromBlock,
|
|
42
48
|
}));
|
|
43
49
|
}
|
|
44
50
|
catch { }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchEvent.js","sourceRoot":"","sources":["../../../actions/public/watchEvent.ts"],"names":[],"mappings":";;;AAcA,uDAAuE;AACvE,iDAA0C;AAC1C,2DAA6E;AAE7E,gDAG4B;AAC5B,gDAA0D;
|
|
1
|
+
{"version":3,"file":"watchEvent.js","sourceRoot":"","sources":["../../../actions/public/watchEvent.ts"],"names":[],"mappings":";;;AAcA,uDAAuE;AACvE,iDAA0C;AAC1C,2DAA6E;AAE7E,gDAG4B;AAC5B,gDAA0D;AAG1D,2DAAoD;AACpD,mDAI6B;AAC7B,iEAG+B;AAC/B,2DAAoD;AACpD,+DAAwD;AACxD,6CAA8D;AAC9D,6DAAsD;AA8GtD,SAAgB,UAAU,CAWxB,MAAkC,EAClC,EACE,OAAO,EACP,IAAI,EACJ,KAAK,GAAG,IAAI,EACZ,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,MAAM,EACN,IAAI,EAAE,KAAK,EACX,eAAe,GAAG,MAAM,CAAC,eAAe,EACxC,MAAM,EAAE,OAAO,GACkD;IAEnE,MAAM,aAAa,GACjB,OAAO,KAAK,KAAK,WAAW;QAC1B,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,WAAW,IAAI,OAAO,SAAS,KAAK,QAAQ,CAAA;IAC5E,MAAM,MAAM,GAAG,OAAO,IAAI,KAAK,CAAA;IAE/B,MAAM,SAAS,GAAG,GAAG,EAAE;QACrB,MAAM,UAAU,GAAG,IAAA,wBAAS,EAAC;YAC3B,YAAY;YACZ,OAAO;YACP,IAAI;YACJ,KAAK;YACL,MAAM,CAAC,GAAG;YACV,KAAK;YACL,eAAe;YACf,SAAS;SACV,CAAC,CAAA;QAEF,OAAO,IAAA,oBAAO,EAAC,UAAU,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;YACvD,IAAI,mBAA2B,CAAA;YAC/B,IAAI,SAAS,KAAK,SAAS;gBAAE,mBAAmB,GAAG,SAAS,GAAG,EAAE,CAAA;YACjE,IAAI,MAAoD,CAAA;YACxD,IAAI,WAAW,GAAG,KAAK,CAAA;YAEvB,MAAM,OAAO,GAAG,IAAA,cAAI,EAClB,KAAK,IAAI,EAAE;gBACT,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,IAAI,CAAC;wBACH,MAAM,GAAG,CAAC,MAAM,IAAA,wBAAS,EACvB,MAAM,EACN,wCAAwB,EACxB,mBAAmB,CACpB,CAAC;4BACA,OAAO;4BACP,IAAI;4BACJ,KAAK,EAAE,KAAM;4BACb,MAAM;4BACN,MAAM;4BACN,SAAS;yBACgC,CAAC,CAI3C,CAAA;oBACH,CAAC;oBAAC,MAAM,CAAC,CAAA,CAAC;oBACV,WAAW,GAAG,IAAI,CAAA;oBAClB,OAAM;gBACR,CAAC;gBAED,IAAI,CAAC;oBACH,IAAI,IAAW,CAAA;oBACf,IAAI,MAAM,EAAE,CAAC;wBACX,IAAI,GAAG,MAAM,IAAA,wBAAS,EACpB,MAAM,EACN,sCAAgB,EAChB,kBAAkB,CACnB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;oBACf,CAAC;yBAAM,CAAC;wBAKN,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAS,EACjC,MAAM,EACN,kCAAc,EACd,gBAAgB,CACjB,CAAC,EAAE,CAAC,CAAA;wBAKL,IAAI,mBAAmB,IAAI,mBAAmB,KAAK,WAAW,EAAE,CAAC;4BAC/D,IAAI,GAAG,MAAM,IAAA,wBAAS,EACpB,MAAM,EACN,oBAAO,EACP,SAAS,CACV,CAAC;gCACA,OAAO;gCACP,IAAI;gCACJ,KAAK,EAAE,KAAM;gCACb,MAAM;gCACN,SAAS,EAAE,mBAAmB,GAAG,EAAE;gCACnC,OAAO,EAAE,WAAW;6BACW,CAAC,CAAA;wBACpC,CAAC;6BAAM,CAAC;4BACN,IAAI,GAAG,EAAE,CAAA;wBACX,CAAC;wBACD,mBAAmB,GAAG,WAAW,CAAA;oBACnC,CAAC;oBAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;wBAAE,OAAM;oBAC7B,IAAI,KAAK;wBAAE,IAAI,CAAC,MAAM,CAAC,IAAW,CAAC,CAAA;;wBAC9B,KAAK,MAAM,GAAG,IAAI,IAAI;4BAAE,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAQ,CAAC,CAAA;gBACxD,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBAGb,IAAI,MAAM,IAAI,GAAG,YAAY,6BAAoB;wBAC/C,WAAW,GAAG,KAAK,CAAA;oBACrB,IAAI,CAAC,OAAO,EAAE,CAAC,GAAY,CAAC,CAAA;gBAC9B,CAAC;YACH,CAAC,EACD;gBACE,WAAW,EAAE,IAAI;gBACjB,QAAQ,EAAE,eAAe;aAC1B,CACF,CAAA;YAED,OAAO,KAAK,IAAI,EAAE;gBAChB,IAAI,MAAM;oBACR,MAAM,IAAA,wBAAS,EACb,MAAM,EACN,oCAAe,EACf,iBAAiB,CAClB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;gBACf,OAAO,EAAE,CAAA;YACX,CAAC,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,GAAG,EAAE;QAC1B,IAAI,MAAM,GAAG,IAAI,CAAA;QACjB,IAAI,WAAW,GAAG,GAAG,EAAE,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC,CACvC;QAAA,CAAC,KAAK,IAAI,EAAE;YACX,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;gBACvD,IAAI,MAAM,GAAe,EAAE,CAAA;gBAC3B,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,GAAG;wBACN,OAAsB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CACxC,IAAA,4BAAiB,EAAC;4BAChB,GAAG,EAAE,CAAC,KAAK,CAAC;4BACZ,SAAS,EAAG,KAAkB,CAAC,IAAI;4BACnC,IAAI;yBAC0B,CAAC,CAClC;qBACF,CAAA;oBACD,IAAI,KAAK;wBAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAe,CAAA;gBAC7C,CAAC;gBAED,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC;oBACrE,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;oBACrC,MAAM,CAAC,IAAS;wBACd,IAAI,CAAC,MAAM;4BAAE,OAAM;wBACnB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAA;wBACvB,IAAI,CAAC;4BACH,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAA,yBAAc,EAAC;gCACzC,GAAG,EAAE,OAAO,IAAI,EAAE;gCAClB,IAAI,EAAE,GAAG,CAAC,IAAI;gCACd,MAAM,EAAE,GAAG,CAAC,MAAM;gCAClB,MAAM;6BACP,CAAC,CAAA;4BACF,MAAM,SAAS,GAAG,IAAA,oBAAS,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;4BACrD,MAAM,CAAC,CAAC,SAAS,CAAQ,CAAC,CAAA;wBAC5B,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BACb,IAAI,SAA6B,CAAA;4BACjC,IAAI,SAA8B,CAAA;4BAClC,IACE,GAAG,YAAY,8BAAqB;gCACpC,GAAG,YAAY,gCAAuB,EACtC,CAAC;gCAED,IAAI,OAAO;oCAAE,OAAM;gCACnB,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAA;gCAC5B,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAClC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAChC,CAAA;4BACH,CAAC;4BAGD,MAAM,SAAS,GAAG,IAAA,oBAAS,EAAC,GAAG,EAAE;gCAC/B,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;gCACzB,SAAS;6BACV,CAAC,CAAA;4BACF,MAAM,CAAC,CAAC,SAAS,CAAQ,CAAC,CAAA;wBAC5B,CAAC;oBACH,CAAC;oBACD,OAAO,CAAC,KAAY;wBAClB,OAAO,EAAE,CAAC,KAAK,CAAC,CAAA;oBAClB,CAAC;iBACF,CAAC,CAAA;gBACF,WAAW,GAAG,YAAY,CAAA;gBAC1B,IAAI,CAAC,MAAM;oBAAE,WAAW,EAAE,CAAA;YAC5B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,EAAE,CAAC,GAAY,CAAC,CAAA;YACzB,CAAC;QACH,CAAC,CAAC,EAAE,CAAA;QACJ,OAAO,GAAG,EAAE,CAAC,WAAW,EAAE,CAAA;IAC5B,CAAC,CAAA;IAED,OAAO,aAAa,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,cAAc,EAAE,CAAA;AACvD,CAAC;AAxND,gCAwNC"}
|
package/_cjs/errors/version.js
CHANGED
|
@@ -30,7 +30,7 @@ function decodeEventLog(parameters) {
|
|
|
30
30
|
abiItem,
|
|
31
31
|
param: param,
|
|
32
32
|
});
|
|
33
|
-
args[param.name || i] = decodeTopic({ param, value: topic });
|
|
33
|
+
args[isUnnamed ? i : param.name || i] = decodeTopic({ param, value: topic });
|
|
34
34
|
}
|
|
35
35
|
const nonIndexedInputs = inputs.filter((x) => !('indexed' in x && x.indexed));
|
|
36
36
|
if (nonIndexedInputs.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decodeEventLog.js","sourceRoot":"","sources":["../../../utils/abi/decodeEventLog.ts"],"names":[],"mappings":";;;AAEA,gDAW4B;AAa5B,6CAAsC;AACtC,mEAGmC;AAEnC,sDAAiE;AACjE,qEAGiC;AACjC,yDAA+E;AA2D/E,MAAM,QAAQ,GAAG,+BAA+B,CAAA;AAEhD,SAAgB,cAAc,CAO5B,UAA0E;IAE1E,MAAM,EACJ,GAAG,EACH,IAAI,EACJ,MAAM,EAAE,OAAO,EACf,MAAM,GACP,GAAG,UAAsC,CAAA;IAE1C,MAAM,MAAM,GAAG,OAAO,IAAI,IAAI,CAAA;IAC9B,MAAM,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,GAAG,MAAM,CAAA;IACxC,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,0CAAiC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAA;IAEzE,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CACtB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,OAAO;QAClB,SAAS,KAAK,IAAA,oCAAe,EAAC,IAAA,gCAAa,EAAC,CAAC,CAAoB,CAAC,CACrE,CAAA;IACD,IAAI,CAAC,CAAC,OAAO,IAAI,MAAM,IAAI,OAAO,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO;QAC7D,MAAM,IAAI,uCAA8B,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;IAEnE,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,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAA;IACvE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;QAC9B,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QAC1B,IAAI,CAAC,KAAK;YACR,MAAM,IAAI,gCAAuB,CAAC;gBAChC,OAAO;gBACP,KAAK,EAAE,KAA4C;aACpD,CAAC,CAAA;QACJ,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"decodeEventLog.js","sourceRoot":"","sources":["../../../utils/abi/decodeEventLog.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,8 +43,10 @@ import { uninstallFilter } from './uninstallFilter.js';
|
|
|
43
43
|
* })
|
|
44
44
|
*/
|
|
45
45
|
export function watchContractEvent(client, parameters) {
|
|
46
|
-
const { abi, address, args, batch = true, eventName, onError, onLogs, poll: poll_, pollingInterval = client.pollingInterval, strict: strict_, } = parameters;
|
|
47
|
-
const enablePolling = typeof poll_ !== 'undefined'
|
|
46
|
+
const { abi, address, args, batch = true, eventName, fromBlock, onError, onLogs, poll: poll_, pollingInterval = client.pollingInterval, strict: strict_, } = parameters;
|
|
47
|
+
const enablePolling = typeof poll_ !== 'undefined'
|
|
48
|
+
? poll_
|
|
49
|
+
: client.transport.type !== 'webSocket' || typeof fromBlock === 'number';
|
|
48
50
|
const pollContractEvent = () => {
|
|
49
51
|
const strict = strict_ ?? false;
|
|
50
52
|
const observerId = stringify([
|
|
@@ -56,9 +58,12 @@ export function watchContractEvent(client, parameters) {
|
|
|
56
58
|
eventName,
|
|
57
59
|
pollingInterval,
|
|
58
60
|
strict,
|
|
61
|
+
fromBlock,
|
|
59
62
|
]);
|
|
60
63
|
return observe(observerId, { onLogs, onError }, (emit) => {
|
|
61
64
|
let previousBlockNumber;
|
|
65
|
+
if (fromBlock !== undefined)
|
|
66
|
+
previousBlockNumber = fromBlock - 1n;
|
|
62
67
|
let filter;
|
|
63
68
|
let initialized = false;
|
|
64
69
|
const unwatch = poll(async () => {
|
|
@@ -70,6 +75,7 @@ export function watchContractEvent(client, parameters) {
|
|
|
70
75
|
args: args,
|
|
71
76
|
eventName: eventName,
|
|
72
77
|
strict: strict,
|
|
78
|
+
fromBlock,
|
|
73
79
|
}));
|
|
74
80
|
}
|
|
75
81
|
catch { }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchContractEvent.js","sourceRoot":"","sources":["../../../actions/public/watchContractEvent.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"watchContractEvent.js","sourceRoot":"","sources":["../../../actions/public/watchContractEvent.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,8 +42,10 @@ import { uninstallFilter } from './uninstallFilter.js';
|
|
|
42
42
|
* onLogs: (logs) => console.log(logs),
|
|
43
43
|
* })
|
|
44
44
|
*/
|
|
45
|
-
export function watchEvent(client, { address, args, batch = true, event, events, onError, onLogs, poll: poll_, pollingInterval = client.pollingInterval, strict: strict_, }) {
|
|
46
|
-
const enablePolling = typeof poll_ !== 'undefined'
|
|
45
|
+
export function watchEvent(client, { address, args, batch = true, event, events, fromBlock, onError, onLogs, poll: poll_, pollingInterval = client.pollingInterval, strict: strict_, }) {
|
|
46
|
+
const enablePolling = typeof poll_ !== 'undefined'
|
|
47
|
+
? poll_
|
|
48
|
+
: client.transport.type !== 'webSocket' || typeof fromBlock === 'bigint';
|
|
47
49
|
const strict = strict_ ?? false;
|
|
48
50
|
const pollEvent = () => {
|
|
49
51
|
const observerId = stringify([
|
|
@@ -54,9 +56,12 @@ export function watchEvent(client, { address, args, batch = true, event, events,
|
|
|
54
56
|
client.uid,
|
|
55
57
|
event,
|
|
56
58
|
pollingInterval,
|
|
59
|
+
fromBlock,
|
|
57
60
|
]);
|
|
58
61
|
return observe(observerId, { onLogs, onError }, (emit) => {
|
|
59
62
|
let previousBlockNumber;
|
|
63
|
+
if (fromBlock !== undefined)
|
|
64
|
+
previousBlockNumber = fromBlock - 1n;
|
|
60
65
|
let filter;
|
|
61
66
|
let initialized = false;
|
|
62
67
|
const unwatch = poll(async () => {
|
|
@@ -68,6 +73,7 @@ export function watchEvent(client, { address, args, batch = true, event, events,
|
|
|
68
73
|
event: event,
|
|
69
74
|
events,
|
|
70
75
|
strict,
|
|
76
|
+
fromBlock,
|
|
71
77
|
}));
|
|
72
78
|
}
|
|
73
79
|
catch { }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchEvent.js","sourceRoot":"","sources":["../../../actions/public/watchEvent.ts"],"names":[],"mappings":"AAcA,OAAO,EAAyB,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACvE,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC1C,OAAO,EAA2B,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAE7E,OAAO,EACL,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"watchEvent.js","sourceRoot":"","sources":["../../../actions/public/watchEvent.ts"],"names":[],"mappings":"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"}
|
package/_esm/errors/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = '2.9.
|
|
1
|
+
export const version = '2.9.13';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -28,7 +28,7 @@ export function decodeEventLog(parameters) {
|
|
|
28
28
|
abiItem,
|
|
29
29
|
param: param,
|
|
30
30
|
});
|
|
31
|
-
args[param.name || i] = decodeTopic({ param, value: topic });
|
|
31
|
+
args[isUnnamed ? i : param.name || i] = decodeTopic({ param, value: topic });
|
|
32
32
|
}
|
|
33
33
|
// Decode data (non-indexed args).
|
|
34
34
|
const nonIndexedInputs = inputs.filter((x) => !('indexed' in x && x.indexed));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decodeEventLog.js","sourceRoot":"","sources":["../../../utils/abi/decodeEventLog.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gCAAgC,EAEhC,iCAAiC,EAEjC,8BAA8B,EAE9B,qBAAqB,EAErB,uBAAuB,GAExB,MAAM,qBAAqB,CAAA;AAa5B,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAEL,eAAe,GAChB,MAAM,4BAA4B,CAAA;AAEnC,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AACjE,OAAO,EAEL,mBAAmB,GACpB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAA+B,aAAa,EAAE,MAAM,oBAAoB,CAAA;AA2D/E,MAAM,QAAQ,GAAG,+BAA+B,CAAA;AAEhD,MAAM,UAAU,cAAc,CAO5B,UAA0E;IAE1E,MAAM,EACJ,GAAG,EACH,IAAI,EACJ,MAAM,EAAE,OAAO,EACf,MAAM,GACP,GAAG,UAAsC,CAAA;IAE1C,MAAM,MAAM,GAAG,OAAO,IAAI,IAAI,CAAA;IAC9B,MAAM,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,GAAG,MAAM,CAAA;IACxC,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,iCAAiC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAA;IAEzE,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CACtB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,OAAO;QAClB,SAAS,KAAK,eAAe,CAAC,aAAa,CAAC,CAAC,CAAoB,CAAC,CACrE,CAAA;IACD,IAAI,CAAC,CAAC,OAAO,IAAI,MAAM,IAAI,OAAO,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO;QAC7D,MAAM,IAAI,8BAA8B,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;IAEnE,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;IAEnC,gCAAgC;IAChC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAA;IACvE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;QAC9B,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QAC1B,IAAI,CAAC,KAAK;YACR,MAAM,IAAI,uBAAuB,CAAC;gBAChC,OAAO;gBACP,KAAK,EAAE,KAA4C;aACpD,CAAC,CAAA;QACJ,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"decodeEventLog.js","sourceRoot":"","sources":["../../../utils/abi/decodeEventLog.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import type { Transport } from '../../clients/transports/createTransport.js';
|
|
|
4
4
|
import type { Chain } from '../../types/chain.js';
|
|
5
5
|
import type { Log } from '../../types/log.js';
|
|
6
6
|
import type { ErrorType } from '../../errors/utils.js';
|
|
7
|
+
import type { BlockNumber } from '../../types/block.js';
|
|
7
8
|
import type { ContractEventArgs, ContractEventName } from '../../types/contract.js';
|
|
8
9
|
import type { GetPollOptions } from '../../types/transport.js';
|
|
9
10
|
import { type ObserveErrorType } from '../../utils/observe.js';
|
|
@@ -18,6 +19,8 @@ export type WatchContractEventParameters<abi extends Abi | readonly unknown[] =
|
|
|
18
19
|
args?: ContractEventArgs<abi, eventName extends ContractEventName<abi> ? eventName : ContractEventName<abi>> | undefined;
|
|
19
20
|
/** Contract event. */
|
|
20
21
|
eventName?: eventName | ContractEventName<abi> | undefined;
|
|
22
|
+
/** Block to start listening from. */
|
|
23
|
+
fromBlock?: BlockNumber<bigint> | undefined;
|
|
21
24
|
/** The callback to call when an error occurred when trying to get for a new block. */
|
|
22
25
|
onError?: ((error: Error) => void) | undefined;
|
|
23
26
|
/** The callback to call when new event logs are received. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchContractEvent.d.ts","sourceRoot":"","sources":["../../../actions/public/watchContractEvent.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"watchContractEvent.d.ts","sourceRoot":"","sources":["../../../actions/public/watchContractEvent.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,11 +8,14 @@ import type { GetPollOptions } from '../../types/transport.js';
|
|
|
8
8
|
import { type ObserveErrorType } from '../../utils/observe.js';
|
|
9
9
|
import { type StringifyErrorType } from '../../utils/stringify.js';
|
|
10
10
|
import type { ErrorType } from '../../errors/utils.js';
|
|
11
|
+
import type { BlockNumber } from '../../types/block.js';
|
|
11
12
|
export type WatchEventOnLogsParameter<TAbiEvent extends AbiEvent | undefined = undefined, TAbiEvents extends readonly AbiEvent[] | readonly unknown[] | undefined = TAbiEvent extends AbiEvent ? [TAbiEvent] : undefined, TStrict extends boolean | undefined = undefined, TEventName extends string | undefined = MaybeAbiEventName<TAbiEvent>> = Log<bigint, number, false, TAbiEvent, TStrict, TAbiEvents, TEventName>[];
|
|
12
13
|
export type WatchEventOnLogsFn<TAbiEvent extends AbiEvent | undefined = undefined, TAbiEvents extends readonly AbiEvent[] | readonly unknown[] | undefined = TAbiEvent extends AbiEvent ? [TAbiEvent] : undefined, TStrict extends boolean | undefined = undefined, _EventName extends string | undefined = MaybeAbiEventName<TAbiEvent>> = (logs: WatchEventOnLogsParameter<TAbiEvent, TAbiEvents, TStrict, _EventName>) => void;
|
|
13
14
|
export type WatchEventParameters<TAbiEvent extends AbiEvent | undefined = undefined, TAbiEvents extends readonly AbiEvent[] | readonly unknown[] | undefined = TAbiEvent extends AbiEvent ? [TAbiEvent] : undefined, TStrict extends boolean | undefined = undefined, TTransport extends Transport = Transport, _EventName extends string | undefined = MaybeAbiEventName<TAbiEvent>> = {
|
|
14
15
|
/** The address of the contract. */
|
|
15
16
|
address?: Address | Address[] | undefined;
|
|
17
|
+
/** Block to start listening from. */
|
|
18
|
+
fromBlock?: BlockNumber<bigint> | undefined;
|
|
16
19
|
/** The callback to call when an error occurred when trying to get for a new block. */
|
|
17
20
|
onError?: ((error: Error) => void) | undefined;
|
|
18
21
|
/** The callback to call when new event logs are received. */
|
|
@@ -75,5 +78,5 @@ export type WatchEventErrorType = StringifyErrorType | ObserveErrorType | ErrorT
|
|
|
75
78
|
* onLogs: (logs) => console.log(logs),
|
|
76
79
|
* })
|
|
77
80
|
*/
|
|
78
|
-
export declare function watchEvent<TChain extends Chain | undefined, const TAbiEvent extends AbiEvent | undefined = undefined, const TAbiEvents extends readonly AbiEvent[] | readonly unknown[] | undefined = TAbiEvent extends AbiEvent ? [TAbiEvent] : undefined, TStrict extends boolean | undefined = undefined, TTransport extends Transport = Transport, _EventName extends string | undefined = undefined>(client: Client<TTransport, TChain>, { address, args, batch, event, events, onError, onLogs, poll: poll_, pollingInterval, strict: strict_, }: WatchEventParameters<TAbiEvent, TAbiEvents, TStrict, TTransport>): WatchEventReturnType;
|
|
81
|
+
export declare function watchEvent<TChain extends Chain | undefined, const TAbiEvent extends AbiEvent | undefined = undefined, const TAbiEvents extends readonly AbiEvent[] | readonly unknown[] | undefined = TAbiEvent extends AbiEvent ? [TAbiEvent] : undefined, TStrict extends boolean | undefined = undefined, TTransport extends Transport = Transport, _EventName extends string | undefined = undefined>(client: Client<TTransport, TChain>, { address, args, batch, event, events, fromBlock, onError, onLogs, poll: poll_, pollingInterval, strict: strict_, }: WatchEventParameters<TAbiEvent, TAbiEvents, TStrict, TTransport>): WatchEventReturnType;
|
|
79
82
|
//# sourceMappingURL=watchEvent.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchEvent.d.ts","sourceRoot":"","sources":["../../../actions/public/watchEvent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAA;AAC5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,EACV,iBAAiB,EACjB,4BAA4B,EAC7B,MAAM,yBAAyB,CAAA;AAEhC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAA;AAE7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAE9D,OAAO,EAAE,KAAK,gBAAgB,EAAW,MAAM,wBAAwB,CAAA;AAEvE,OAAO,EAAE,KAAK,kBAAkB,EAAa,MAAM,0BAA0B,CAAA;AAO7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"watchEvent.d.ts","sourceRoot":"","sources":["../../../actions/public/watchEvent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "2.9.
|
|
1
|
+
export declare const version = "2.9.13";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -12,6 +12,7 @@ import {
|
|
|
12
12
|
} from '../../errors/abi.js'
|
|
13
13
|
import { InvalidInputRpcError } from '../../errors/rpc.js'
|
|
14
14
|
import type { ErrorType } from '../../errors/utils.js'
|
|
15
|
+
import type { BlockNumber } from '../../types/block.js'
|
|
15
16
|
import type {
|
|
16
17
|
ContractEventArgs,
|
|
17
18
|
ContractEventName,
|
|
@@ -73,6 +74,8 @@ export type WatchContractEventParameters<
|
|
|
73
74
|
| undefined
|
|
74
75
|
/** Contract event. */
|
|
75
76
|
eventName?: eventName | ContractEventName<abi> | undefined
|
|
77
|
+
/** Block to start listening from. */
|
|
78
|
+
fromBlock?: BlockNumber<bigint> | undefined
|
|
76
79
|
/** The callback to call when an error occurred when trying to get for a new block. */
|
|
77
80
|
onError?: ((error: Error) => void) | undefined
|
|
78
81
|
/** The callback to call when new event logs are received. */
|
|
@@ -143,6 +146,7 @@ export function watchContractEvent<
|
|
|
143
146
|
args,
|
|
144
147
|
batch = true,
|
|
145
148
|
eventName,
|
|
149
|
+
fromBlock,
|
|
146
150
|
onError,
|
|
147
151
|
onLogs,
|
|
148
152
|
poll: poll_,
|
|
@@ -151,7 +155,9 @@ export function watchContractEvent<
|
|
|
151
155
|
} = parameters
|
|
152
156
|
|
|
153
157
|
const enablePolling =
|
|
154
|
-
typeof poll_ !== 'undefined'
|
|
158
|
+
typeof poll_ !== 'undefined'
|
|
159
|
+
? poll_
|
|
160
|
+
: client.transport.type !== 'webSocket' || typeof fromBlock === 'number'
|
|
155
161
|
|
|
156
162
|
const pollContractEvent = () => {
|
|
157
163
|
const strict = strict_ ?? false
|
|
@@ -164,10 +170,12 @@ export function watchContractEvent<
|
|
|
164
170
|
eventName,
|
|
165
171
|
pollingInterval,
|
|
166
172
|
strict,
|
|
173
|
+
fromBlock,
|
|
167
174
|
])
|
|
168
175
|
|
|
169
176
|
return observe(observerId, { onLogs, onError }, (emit) => {
|
|
170
177
|
let previousBlockNumber: bigint
|
|
178
|
+
if (fromBlock !== undefined) previousBlockNumber = fromBlock - 1n
|
|
171
179
|
let filter: Filter<'event', abi, eventName> | undefined
|
|
172
180
|
let initialized = false
|
|
173
181
|
|
|
@@ -185,6 +193,7 @@ export function watchContractEvent<
|
|
|
185
193
|
args: args as any,
|
|
186
194
|
eventName: eventName as any,
|
|
187
195
|
strict: strict as any,
|
|
196
|
+
fromBlock,
|
|
188
197
|
})) as Filter<'event', abi, eventName>
|
|
189
198
|
} catch {}
|
|
190
199
|
initialized = true
|
|
@@ -22,6 +22,7 @@ import {
|
|
|
22
22
|
} from '../../errors/abi.js'
|
|
23
23
|
import { InvalidInputRpcError } from '../../errors/rpc.js'
|
|
24
24
|
import type { ErrorType } from '../../errors/utils.js'
|
|
25
|
+
import type { BlockNumber } from '../../types/block.js'
|
|
25
26
|
import { getAction } from '../../utils/getAction.js'
|
|
26
27
|
import {
|
|
27
28
|
decodeEventLog,
|
|
@@ -70,6 +71,8 @@ export type WatchEventParameters<
|
|
|
70
71
|
> = {
|
|
71
72
|
/** The address of the contract. */
|
|
72
73
|
address?: Address | Address[] | undefined
|
|
74
|
+
/** Block to start listening from. */
|
|
75
|
+
fromBlock?: BlockNumber<bigint> | undefined
|
|
73
76
|
/** The callback to call when an error occurred when trying to get for a new block. */
|
|
74
77
|
onError?: ((error: Error) => void) | undefined
|
|
75
78
|
/** The callback to call when new event logs are received. */
|
|
@@ -161,6 +164,7 @@ export function watchEvent<
|
|
|
161
164
|
batch = true,
|
|
162
165
|
event,
|
|
163
166
|
events,
|
|
167
|
+
fromBlock,
|
|
164
168
|
onError,
|
|
165
169
|
onLogs,
|
|
166
170
|
poll: poll_,
|
|
@@ -169,7 +173,9 @@ export function watchEvent<
|
|
|
169
173
|
}: WatchEventParameters<TAbiEvent, TAbiEvents, TStrict, TTransport>,
|
|
170
174
|
): WatchEventReturnType {
|
|
171
175
|
const enablePolling =
|
|
172
|
-
typeof poll_ !== 'undefined'
|
|
176
|
+
typeof poll_ !== 'undefined'
|
|
177
|
+
? poll_
|
|
178
|
+
: client.transport.type !== 'webSocket' || typeof fromBlock === 'bigint'
|
|
173
179
|
const strict = strict_ ?? false
|
|
174
180
|
|
|
175
181
|
const pollEvent = () => {
|
|
@@ -181,10 +187,12 @@ export function watchEvent<
|
|
|
181
187
|
client.uid,
|
|
182
188
|
event,
|
|
183
189
|
pollingInterval,
|
|
190
|
+
fromBlock,
|
|
184
191
|
])
|
|
185
192
|
|
|
186
193
|
return observe(observerId, { onLogs, onError }, (emit) => {
|
|
187
194
|
let previousBlockNumber: bigint
|
|
195
|
+
if (fromBlock !== undefined) previousBlockNumber = fromBlock - 1n
|
|
188
196
|
let filter: Filter<'event', TAbiEvents, _EventName, any>
|
|
189
197
|
let initialized = false
|
|
190
198
|
|
|
@@ -202,6 +210,7 @@ export function watchEvent<
|
|
|
202
210
|
event: event!,
|
|
203
211
|
events,
|
|
204
212
|
strict,
|
|
213
|
+
fromBlock,
|
|
205
214
|
} as unknown as CreateEventFilterParameters)) as unknown as Filter<
|
|
206
215
|
'event',
|
|
207
216
|
TAbiEvents,
|
package/errors/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = '2.9.
|
|
1
|
+
export const version = '2.9.13'
|
package/package.json
CHANGED
|
@@ -139,7 +139,7 @@ export function decodeEventLog<
|
|
|
139
139
|
abiItem,
|
|
140
140
|
param: param as AbiParameter & { indexed: boolean },
|
|
141
141
|
})
|
|
142
|
-
args[param.name || i] = decodeTopic({ param, value: topic })
|
|
142
|
+
args[isUnnamed ? i : param.name || i] = decodeTopic({ param, value: topic })
|
|
143
143
|
}
|
|
144
144
|
|
|
145
145
|
// Decode data (non-indexed args).
|