@rosen-bridge/evm-address-tx-extractor 1.0.6 → 1.0.8

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 CHANGED
@@ -1,5 +1,23 @@
1
1
  # @rosen-bridge/evm-address-tx-extractor
2
2
 
3
+ ## 1.0.8
4
+
5
+ ### Patch Changes
6
+
7
+ - Improve extraction speed by applying the checks on response and transform only the desired transactions
8
+ - Updated dependencies
9
+ - @rosen-bridge/abstract-extractor@1.0.2
10
+
11
+ ## 1.0.7
12
+
13
+ ### Patch Changes
14
+
15
+ - Update node version to 20
16
+ - Update logger package
17
+ - Updated dependencies
18
+ - @rosen-bridge/abstract-extractor@1.0.1
19
+ - @rosen-bridge/scanner@5.0.2
20
+
3
21
  ## 1.0.6
4
22
 
5
23
  ### Patch Changes
@@ -1 +1 @@
1
- {"version":3,"file":"EvmTxExtractor.d.ts","sourceRoot":"","sources":["../../lib/extractors/EvmTxExtractor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAgC,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAe,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAE5E,qBAAa,cAAe,SAAQ,iBAAiB,CAAC,mBAAmB,CAAC;IACxE,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC1B,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAS;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC;;OAEG;gBAED,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,cAAkC;IAS5C;;OAEG;IACH,KAAK,eAAiB;IAEtB;;;;OAIG;IACH,mBAAmB,QACZ,MAAM,mBAAmB,CAAC,SACxB,KAAK,KACX,QAAQ,OAAO,CAAC,CAmCjB;IAEF;;;OAGG;IACH,SAAS,SAAgB,MAAM,KAAG,QAAQ,IAAI,CAAC,CAE7C;IAEF;;OAEG;IACH,eAAe,sBAEb;CACH"}
1
+ {"version":3,"file":"EvmTxExtractor.d.ts","sourceRoot":"","sources":["../../lib/extractors/EvmTxExtractor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAgC,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAe,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAE5E,qBAAa,cAAe,SAAQ,iBAAiB,CAAC,mBAAmB,CAAC;IACxE,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC1B,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAS;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC;;OAEG;gBAED,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,cAAkC;IAS5C;;OAEG;IACH,KAAK,eAAiB;IAEtB;;;;OAIG;IACH,mBAAmB,QACZ,MAAM,mBAAmB,CAAC,SACxB,KAAK,KACX,QAAQ,OAAO,CAAC,CAkCjB;IAEF;;;OAGG;IACH,SAAS,SAAgB,MAAM,KAAG,QAAQ,IAAI,CAAC,CAE7C;IAEF;;OAEG;IACH,eAAe,sBAEb;CACH"}
@@ -29,8 +29,7 @@ export class EvmTxExtractor extends AbstractExtractor {
29
29
  */
30
30
  processTransactions = async (txs, block) => {
31
31
  const extractedTxs = [];
32
- for (const txRes of txs) {
33
- const tx = Transaction.from(txRes);
32
+ for (const tx of txs) {
34
33
  if (tx.from === null) {
35
34
  throw Error('ImpossibleBehavior: RPC transactions must have `from`.');
36
35
  }
@@ -40,11 +39,11 @@ export class EvmTxExtractor extends AbstractExtractor {
40
39
  if (tx.from.toLowerCase() === this.address) {
41
40
  let status;
42
41
  try {
43
- const result = await txRes.wait(0);
42
+ const result = await tx.wait(0);
44
43
  if (result)
45
44
  status = EvmTxStatus.succeed;
46
45
  else
47
- throw Error(`Impossible behavior: Evm Tx [${txRes.hash}] is included in block [${block.hash}] but waiting resulted in null or undefined`);
46
+ throw Error(`Impossible behavior: Evm Tx [${tx.hash}] is included in block [${block.hash}] but waiting resulted in null or undefined`);
48
47
  }
49
48
  catch (e) {
50
49
  if (isCallException(e))
@@ -53,7 +52,7 @@ export class EvmTxExtractor extends AbstractExtractor {
53
52
  throw e;
54
53
  }
55
54
  extractedTxs.push({
56
- unsignedHash: tx.unsignedHash,
55
+ unsignedHash: Transaction.from(tx).unsignedHash,
57
56
  signedHash: tx.hash,
58
57
  nonce: tx.nonce,
59
58
  address: tx.from.toLowerCase(),
@@ -79,4 +78,4 @@ export class EvmTxExtractor extends AbstractExtractor {
79
78
  return;
80
79
  };
81
80
  }
82
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXZtVHhFeHRyYWN0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvZXh0cmFjdG9ycy9Fdm1UeEV4dHJhY3Rvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxlQUFlLEVBQUUsV0FBVyxFQUF1QixNQUFNLFFBQVEsQ0FBQztBQUMzRSxPQUFPLEVBQWtCLFdBQVcsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzVFLE9BQU8sRUFBRSxXQUFXLEVBQWUsTUFBTSxxQkFBcUIsQ0FBQztBQUMvRCxPQUFPLEVBQUUsaUJBQWlCLEVBQVMsTUFBTSxrQ0FBa0MsQ0FBQztBQUU1RSxNQUFNLE9BQU8sY0FBZSxTQUFRLGlCQUFzQztJQUMvRCxNQUFNLENBQWlCO0lBQ3ZCLE1BQU0sQ0FBVztJQUNULEVBQUUsQ0FBUztJQUNYLE9BQU8sQ0FBUztJQUVqQzs7T0FFRztJQUNILFlBQ0UsVUFBc0IsRUFDdEIsRUFBVSxFQUNWLE9BQWUsRUFDZixTQUF5QixJQUFJLFdBQVcsRUFBRTtRQUUxQyxLQUFLLEVBQUUsQ0FBQztRQUNSLElBQUksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO1FBQ2IsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDdkIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLFFBQVEsQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3RELENBQUM7SUFFRDs7T0FFRztJQUNILEtBQUssR0FBRyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO0lBRXRCOzs7O09BSUc7SUFDSCxtQkFBbUIsR0FBRyxLQUFLLEVBQ3pCLEdBQStCLEVBQy9CLEtBQVksRUFDTSxFQUFFO1FBQ3BCLE1BQU0sWUFBWSxHQUF1QixFQUFFLENBQUM7UUFDNUMsS0FBSyxNQUFNLEtBQUssSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUN4QixNQUFNLEVBQUUsR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ25DLElBQUksRUFBRSxDQUFDLElBQUksS0FBSyxJQUFJLEVBQUUsQ0FBQztnQkFDckIsTUFBTSxLQUFLLENBQUMsd0RBQXdELENBQUMsQ0FBQztZQUN4RSxDQUFDO1lBQ0QsSUFBSSxFQUFFLENBQUMsSUFBSSxLQUFLLElBQUksRUFBRSxDQUFDO2dCQUNyQixNQUFNLEtBQUssQ0FBQyx3REFBd0QsQ0FBQyxDQUFDO1lBQ3hFLENBQUM7WUFDRCxJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLEtBQUssSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO2dCQUMzQyxJQUFJLE1BQW1CLENBQUM7Z0JBQ3hCLElBQUksQ0FBQztvQkFDSCxNQUFNLE1BQU0sR0FBRyxNQUFNLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ25DLElBQUksTUFBTTt3QkFBRSxNQUFNLEdBQUcsV0FBVyxDQUFDLE9BQU8sQ0FBQzs7d0JBRXZDLE1BQU0sS0FBSyxDQUNULGdDQUFnQyxLQUFLLENBQUMsSUFBSSwyQkFBMkIsS0FBSyxDQUFDLElBQUksNkNBQTZDLENBQzdILENBQUM7Z0JBQ04sQ0FBQztnQkFBQyxPQUFPLENBQUMsRUFBRSxDQUFDO29CQUNYLElBQUksZUFBZSxDQUFDLENBQUMsQ0FBQzt3QkFBRSxNQUFNLEdBQUcsV0FBVyxDQUFDLE1BQU0sQ0FBQzs7d0JBQy9DLE1BQU0sQ0FBQyxDQUFDO2dCQUNmLENBQUM7Z0JBQ0QsWUFBWSxDQUFDLElBQUksQ0FBQztvQkFDaEIsWUFBWSxFQUFFLEVBQUUsQ0FBQyxZQUFZO29CQUM3QixVQUFVLEVBQUUsRUFBRSxDQUFDLElBQUk7b0JBQ25CLEtBQUssRUFBRSxFQUFFLENBQUMsS0FBSztvQkFDZixPQUFPLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUU7b0JBQzlCLE1BQU0sRUFBRSxNQUFNO2lCQUNmLENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDO1FBQ0QsSUFBSSxZQUFZLENBQUMsTUFBTSxHQUFHLENBQUM7WUFDekIsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxZQUFZLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO1FBQ2hFLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQyxDQUFDO0lBRUY7OztPQUdHO0lBQ0gsU0FBUyxHQUFHLEtBQUssRUFBRSxJQUFZLEVBQWlCLEVBQUU7UUFDaEQsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7SUFDdkQsQ0FBQyxDQUFDO0lBRUY7O09BRUc7SUFDSCxlQUFlLEdBQUcsS0FBSyxJQUFJLEVBQUU7UUFDM0IsT0FBTztJQUNULENBQUMsQ0FBQztDQUNIIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRGF0YVNvdXJjZSB9IGZyb20gJ3R5cGVvcm0nO1xuaW1wb3J0IHsgVHhBY3Rpb24gfSBmcm9tICcuLi9hY3Rpb25zL2RiJztcbmltcG9ydCB7IGlzQ2FsbEV4Y2VwdGlvbiwgVHJhbnNhY3Rpb24sIFRyYW5zYWN0aW9uUmVzcG9uc2UgfSBmcm9tICdldGhlcnMnO1xuaW1wb3J0IHsgQWJzdHJhY3RMb2dnZXIsIER1bW15TG9nZ2VyIH0gZnJvbSAnQHJvc2VuLWJyaWRnZS9hYnN0cmFjdC1sb2dnZXInO1xuaW1wb3J0IHsgRXZtVHhTdGF0dXMsIEV4dHJhY3RlZFR4IH0gZnJvbSAnLi4vaW50ZXJmYWNlcy90eXBlcyc7XG5pbXBvcnQgeyBBYnN0cmFjdEV4dHJhY3RvciwgQmxvY2sgfSBmcm9tICdAcm9zZW4tYnJpZGdlL2Fic3RyYWN0LWV4dHJhY3Rvcic7XG5cbmV4cG9ydCBjbGFzcyBFdm1UeEV4dHJhY3RvciBleHRlbmRzIEFic3RyYWN0RXh0cmFjdG9yPFRyYW5zYWN0aW9uUmVzcG9uc2U+IHtcbiAgcmVhZG9ubHkgbG9nZ2VyOiBBYnN0cmFjdExvZ2dlcjtcbiAgcmVhZG9ubHkgYWN0aW9uOiBUeEFjdGlvbjtcbiAgcHJpdmF0ZSByZWFkb25seSBpZDogc3RyaW5nO1xuICBwcml2YXRlIHJlYWRvbmx5IGFkZHJlc3M6IHN0cmluZztcblxuICAvKipcbiAgICogYWRkcmVzcyBzaG91bGQgYmUgbG93ZXIgY2FzZSAod2l0aG91dCBjaGVja3N1bSlcbiAgICovXG4gIGNvbnN0cnVjdG9yKFxuICAgIGRhdGFTb3VyY2U6IERhdGFTb3VyY2UsXG4gICAgaWQ6IHN0cmluZyxcbiAgICBhZGRyZXNzOiBzdHJpbmcsXG4gICAgbG9nZ2VyOiBBYnN0cmFjdExvZ2dlciA9IG5ldyBEdW1teUxvZ2dlcigpXG4gICkge1xuICAgIHN1cGVyKCk7XG4gICAgdGhpcy5pZCA9IGlkO1xuICAgIHRoaXMuYWRkcmVzcyA9IGFkZHJlc3M7XG4gICAgdGhpcy5sb2dnZXIgPSBsb2dnZXI7XG4gICAgdGhpcy5hY3Rpb24gPSBuZXcgVHhBY3Rpb24oZGF0YVNvdXJjZSwgdGhpcy5sb2dnZXIpO1xuICB9XG5cbiAgLyoqXG4gICAqIGdldCBJZCBmb3IgY3VycmVudCBleHRyYWN0b3JcbiAgICovXG4gIGdldElkID0gKCkgPT4gdGhpcy5pZDtcblxuICAvKipcbiAgICogZ2V0cyBibG9jayBpZCBhbmQgdHJhbnNhY3Rpb25zIGNvcnJlc3BvbmRpbmcgdG8gdGhlIGJsb2NrIGFuZCBzYXZlcyBhbGwgdHJhbnNhY3Rpb24gaWRzIGluIGRhdGFiYXNlXG4gICAqIEBwYXJhbSB0eHNcbiAgICogQHBhcmFtIGJsb2NrXG4gICAqL1xuICBwcm9jZXNzVHJhbnNhY3Rpb25zID0gYXN5bmMgKFxuICAgIHR4czogQXJyYXk8VHJhbnNhY3Rpb25SZXNwb25zZT4sXG4gICAgYmxvY2s6IEJsb2NrXG4gICk6IFByb21pc2U8Ym9vbGVhbj4gPT4ge1xuICAgIGNvbnN0IGV4dHJhY3RlZFR4czogQXJyYXk8RXh0cmFjdGVkVHg+ID0gW107XG4gICAgZm9yIChjb25zdCB0eFJlcyBvZiB0eHMpIHtcbiAgICAgIGNvbnN0IHR4ID0gVHJhbnNhY3Rpb24uZnJvbSh0eFJlcyk7XG4gICAgICBpZiAodHguZnJvbSA9PT0gbnVsbCkge1xuICAgICAgICB0aHJvdyBFcnJvcignSW1wb3NzaWJsZUJlaGF2aW9yOiBSUEMgdHJhbnNhY3Rpb25zIG11c3QgaGF2ZSBgZnJvbWAuJyk7XG4gICAgICB9XG4gICAgICBpZiAodHguaGFzaCA9PT0gbnVsbCkge1xuICAgICAgICB0aHJvdyBFcnJvcignSW1wb3NzaWJsZUJlaGF2aW9yOiBSUEMgdHJhbnNhY3Rpb25zIG11c3QgaGF2ZSBgaGFzaGAuJyk7XG4gICAgICB9XG4gICAgICBpZiAodHguZnJvbS50b0xvd2VyQ2FzZSgpID09PSB0aGlzLmFkZHJlc3MpIHtcbiAgICAgICAgbGV0IHN0YXR1czogRXZtVHhTdGF0dXM7XG4gICAgICAgIHRyeSB7XG4gICAgICAgICAgY29uc3QgcmVzdWx0ID0gYXdhaXQgdHhSZXMud2FpdCgwKTtcbiAgICAgICAgICBpZiAocmVzdWx0KSBzdGF0dXMgPSBFdm1UeFN0YXR1cy5zdWNjZWVkO1xuICAgICAgICAgIGVsc2VcbiAgICAgICAgICAgIHRocm93IEVycm9yKFxuICAgICAgICAgICAgICBgSW1wb3NzaWJsZSBiZWhhdmlvcjogRXZtIFR4IFske3R4UmVzLmhhc2h9XSBpcyBpbmNsdWRlZCBpbiBibG9jayBbJHtibG9jay5oYXNofV0gYnV0IHdhaXRpbmcgcmVzdWx0ZWQgaW4gbnVsbCBvciB1bmRlZmluZWRgXG4gICAgICAgICAgICApO1xuICAgICAgICB9IGNhdGNoIChlKSB7XG4gICAgICAgICAgaWYgKGlzQ2FsbEV4Y2VwdGlvbihlKSkgc3RhdHVzID0gRXZtVHhTdGF0dXMuZmFpbGVkO1xuICAgICAgICAgIGVsc2UgdGhyb3cgZTtcbiAgICAgICAgfVxuICAgICAgICBleHRyYWN0ZWRUeHMucHVzaCh7XG4gICAgICAgICAgdW5zaWduZWRIYXNoOiB0eC51bnNpZ25lZEhhc2gsXG4gICAgICAgICAgc2lnbmVkSGFzaDogdHguaGFzaCxcbiAgICAgICAgICBub25jZTogdHgubm9uY2UsXG4gICAgICAgICAgYWRkcmVzczogdHguZnJvbS50b0xvd2VyQ2FzZSgpLFxuICAgICAgICAgIHN0YXR1czogc3RhdHVzLFxuICAgICAgICB9KTtcbiAgICAgIH1cbiAgICB9XG4gICAgaWYgKGV4dHJhY3RlZFR4cy5sZW5ndGggPiAwKVxuICAgICAgYXdhaXQgdGhpcy5hY3Rpb24uc3RvcmVUeHMoZXh0cmFjdGVkVHhzLCBibG9jaywgdGhpcy5nZXRJZCgpKTtcbiAgICByZXR1cm4gdHJ1ZTtcbiAgfTtcblxuICAvKipcbiAgICogZm9yayBvbmUgYmxvY2sgYW5kIHJlbW92ZSBhbGwgc3RvcmVkIHR4SWQgZm9yIHRoaXMgYmxvY2tcbiAgICogQHBhcmFtIGhhc2g6IGJsb2NrIGhhc2hcbiAgICovXG4gIGZvcmtCbG9jayA9IGFzeW5jIChoYXNoOiBzdHJpbmcpOiBQcm9taXNlPHZvaWQ+ID0+IHtcbiAgICBhd2FpdCB0aGlzLmFjdGlvbi5kZWxldGVCbG9ja1R4cyhoYXNoLCB0aGlzLmdldElkKCkpO1xuICB9O1xuXG4gIC8qKlxuICAgKiBJbml0aWFsaXplcyB0aGUgZGF0YWJhc2Ugd2l0aCBvbGRlciBib3hlcyByZWxhdGVkIHRvIHRoZSBhZGRyZXNzXG4gICAqL1xuICBpbml0aWFsaXplQm94ZXMgPSBhc3luYyAoKSA9PiB7XG4gICAgcmV0dXJuO1xuICB9O1xufVxuIl19
81
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXZtVHhFeHRyYWN0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvZXh0cmFjdG9ycy9Fdm1UeEV4dHJhY3Rvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxlQUFlLEVBQUUsV0FBVyxFQUF1QixNQUFNLFFBQVEsQ0FBQztBQUMzRSxPQUFPLEVBQWtCLFdBQVcsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzVFLE9BQU8sRUFBRSxXQUFXLEVBQWUsTUFBTSxxQkFBcUIsQ0FBQztBQUMvRCxPQUFPLEVBQUUsaUJBQWlCLEVBQVMsTUFBTSxrQ0FBa0MsQ0FBQztBQUU1RSxNQUFNLE9BQU8sY0FBZSxTQUFRLGlCQUFzQztJQUMvRCxNQUFNLENBQWlCO0lBQ3ZCLE1BQU0sQ0FBVztJQUNULEVBQUUsQ0FBUztJQUNYLE9BQU8sQ0FBUztJQUVqQzs7T0FFRztJQUNILFlBQ0UsVUFBc0IsRUFDdEIsRUFBVSxFQUNWLE9BQWUsRUFDZixTQUF5QixJQUFJLFdBQVcsRUFBRTtRQUUxQyxLQUFLLEVBQUUsQ0FBQztRQUNSLElBQUksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO1FBQ2IsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDdkIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLFFBQVEsQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3RELENBQUM7SUFFRDs7T0FFRztJQUNILEtBQUssR0FBRyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO0lBRXRCOzs7O09BSUc7SUFDSCxtQkFBbUIsR0FBRyxLQUFLLEVBQ3pCLEdBQStCLEVBQy9CLEtBQVksRUFDTSxFQUFFO1FBQ3BCLE1BQU0sWUFBWSxHQUF1QixFQUFFLENBQUM7UUFDNUMsS0FBSyxNQUFNLEVBQUUsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNyQixJQUFJLEVBQUUsQ0FBQyxJQUFJLEtBQUssSUFBSSxFQUFFLENBQUM7Z0JBQ3JCLE1BQU0sS0FBSyxDQUFDLHdEQUF3RCxDQUFDLENBQUM7WUFDeEUsQ0FBQztZQUNELElBQUksRUFBRSxDQUFDLElBQUksS0FBSyxJQUFJLEVBQUUsQ0FBQztnQkFDckIsTUFBTSxLQUFLLENBQUMsd0RBQXdELENBQUMsQ0FBQztZQUN4RSxDQUFDO1lBQ0QsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxLQUFLLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztnQkFDM0MsSUFBSSxNQUFtQixDQUFDO2dCQUN4QixJQUFJLENBQUM7b0JBQ0gsTUFBTSxNQUFNLEdBQUcsTUFBTSxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUNoQyxJQUFJLE1BQU07d0JBQUUsTUFBTSxHQUFHLFdBQVcsQ0FBQyxPQUFPLENBQUM7O3dCQUV2QyxNQUFNLEtBQUssQ0FDVCxnQ0FBZ0MsRUFBRSxDQUFDLElBQUksMkJBQTJCLEtBQUssQ0FBQyxJQUFJLDZDQUE2QyxDQUMxSCxDQUFDO2dCQUNOLENBQUM7Z0JBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztvQkFDWCxJQUFJLGVBQWUsQ0FBQyxDQUFDLENBQUM7d0JBQUUsTUFBTSxHQUFHLFdBQVcsQ0FBQyxNQUFNLENBQUM7O3dCQUMvQyxNQUFNLENBQUMsQ0FBQztnQkFDZixDQUFDO2dCQUNELFlBQVksQ0FBQyxJQUFJLENBQUM7b0JBQ2hCLFlBQVksRUFBRSxXQUFXLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFlBQVk7b0JBQy9DLFVBQVUsRUFBRSxFQUFFLENBQUMsSUFBSTtvQkFDbkIsS0FBSyxFQUFFLEVBQUUsQ0FBQyxLQUFLO29CQUNmLE9BQU8sRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRTtvQkFDOUIsTUFBTSxFQUFFLE1BQU07aUJBQ2YsQ0FBQyxDQUFDO1lBQ0wsQ0FBQztRQUNILENBQUM7UUFDRCxJQUFJLFlBQVksQ0FBQyxNQUFNLEdBQUcsQ0FBQztZQUN6QixNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFlBQVksRUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7UUFDaEUsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDLENBQUM7SUFFRjs7O09BR0c7SUFDSCxTQUFTLEdBQUcsS0FBSyxFQUFFLElBQVksRUFBaUIsRUFBRTtRQUNoRCxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQztJQUN2RCxDQUFDLENBQUM7SUFFRjs7T0FFRztJQUNILGVBQWUsR0FBRyxLQUFLLElBQUksRUFBRTtRQUMzQixPQUFPO0lBQ1QsQ0FBQyxDQUFDO0NBQ0giLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBEYXRhU291cmNlIH0gZnJvbSAndHlwZW9ybSc7XG5pbXBvcnQgeyBUeEFjdGlvbiB9IGZyb20gJy4uL2FjdGlvbnMvZGInO1xuaW1wb3J0IHsgaXNDYWxsRXhjZXB0aW9uLCBUcmFuc2FjdGlvbiwgVHJhbnNhY3Rpb25SZXNwb25zZSB9IGZyb20gJ2V0aGVycyc7XG5pbXBvcnQgeyBBYnN0cmFjdExvZ2dlciwgRHVtbXlMb2dnZXIgfSBmcm9tICdAcm9zZW4tYnJpZGdlL2Fic3RyYWN0LWxvZ2dlcic7XG5pbXBvcnQgeyBFdm1UeFN0YXR1cywgRXh0cmFjdGVkVHggfSBmcm9tICcuLi9pbnRlcmZhY2VzL3R5cGVzJztcbmltcG9ydCB7IEFic3RyYWN0RXh0cmFjdG9yLCBCbG9jayB9IGZyb20gJ0Byb3Nlbi1icmlkZ2UvYWJzdHJhY3QtZXh0cmFjdG9yJztcblxuZXhwb3J0IGNsYXNzIEV2bVR4RXh0cmFjdG9yIGV4dGVuZHMgQWJzdHJhY3RFeHRyYWN0b3I8VHJhbnNhY3Rpb25SZXNwb25zZT4ge1xuICByZWFkb25seSBsb2dnZXI6IEFic3RyYWN0TG9nZ2VyO1xuICByZWFkb25seSBhY3Rpb246IFR4QWN0aW9uO1xuICBwcml2YXRlIHJlYWRvbmx5IGlkOiBzdHJpbmc7XG4gIHByaXZhdGUgcmVhZG9ubHkgYWRkcmVzczogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBhZGRyZXNzIHNob3VsZCBiZSBsb3dlciBjYXNlICh3aXRob3V0IGNoZWNrc3VtKVxuICAgKi9cbiAgY29uc3RydWN0b3IoXG4gICAgZGF0YVNvdXJjZTogRGF0YVNvdXJjZSxcbiAgICBpZDogc3RyaW5nLFxuICAgIGFkZHJlc3M6IHN0cmluZyxcbiAgICBsb2dnZXI6IEFic3RyYWN0TG9nZ2VyID0gbmV3IER1bW15TG9nZ2VyKClcbiAgKSB7XG4gICAgc3VwZXIoKTtcbiAgICB0aGlzLmlkID0gaWQ7XG4gICAgdGhpcy5hZGRyZXNzID0gYWRkcmVzcztcbiAgICB0aGlzLmxvZ2dlciA9IGxvZ2dlcjtcbiAgICB0aGlzLmFjdGlvbiA9IG5ldyBUeEFjdGlvbihkYXRhU291cmNlLCB0aGlzLmxvZ2dlcik7XG4gIH1cblxuICAvKipcbiAgICogZ2V0IElkIGZvciBjdXJyZW50IGV4dHJhY3RvclxuICAgKi9cbiAgZ2V0SWQgPSAoKSA9PiB0aGlzLmlkO1xuXG4gIC8qKlxuICAgKiBnZXRzIGJsb2NrIGlkIGFuZCB0cmFuc2FjdGlvbnMgY29ycmVzcG9uZGluZyB0byB0aGUgYmxvY2sgYW5kIHNhdmVzIGFsbCB0cmFuc2FjdGlvbiBpZHMgaW4gZGF0YWJhc2VcbiAgICogQHBhcmFtIHR4c1xuICAgKiBAcGFyYW0gYmxvY2tcbiAgICovXG4gIHByb2Nlc3NUcmFuc2FjdGlvbnMgPSBhc3luYyAoXG4gICAgdHhzOiBBcnJheTxUcmFuc2FjdGlvblJlc3BvbnNlPixcbiAgICBibG9jazogQmxvY2tcbiAgKTogUHJvbWlzZTxib29sZWFuPiA9PiB7XG4gICAgY29uc3QgZXh0cmFjdGVkVHhzOiBBcnJheTxFeHRyYWN0ZWRUeD4gPSBbXTtcbiAgICBmb3IgKGNvbnN0IHR4IG9mIHR4cykge1xuICAgICAgaWYgKHR4LmZyb20gPT09IG51bGwpIHtcbiAgICAgICAgdGhyb3cgRXJyb3IoJ0ltcG9zc2libGVCZWhhdmlvcjogUlBDIHRyYW5zYWN0aW9ucyBtdXN0IGhhdmUgYGZyb21gLicpO1xuICAgICAgfVxuICAgICAgaWYgKHR4Lmhhc2ggPT09IG51bGwpIHtcbiAgICAgICAgdGhyb3cgRXJyb3IoJ0ltcG9zc2libGVCZWhhdmlvcjogUlBDIHRyYW5zYWN0aW9ucyBtdXN0IGhhdmUgYGhhc2hgLicpO1xuICAgICAgfVxuICAgICAgaWYgKHR4LmZyb20udG9Mb3dlckNhc2UoKSA9PT0gdGhpcy5hZGRyZXNzKSB7XG4gICAgICAgIGxldCBzdGF0dXM6IEV2bVR4U3RhdHVzO1xuICAgICAgICB0cnkge1xuICAgICAgICAgIGNvbnN0IHJlc3VsdCA9IGF3YWl0IHR4LndhaXQoMCk7XG4gICAgICAgICAgaWYgKHJlc3VsdCkgc3RhdHVzID0gRXZtVHhTdGF0dXMuc3VjY2VlZDtcbiAgICAgICAgICBlbHNlXG4gICAgICAgICAgICB0aHJvdyBFcnJvcihcbiAgICAgICAgICAgICAgYEltcG9zc2libGUgYmVoYXZpb3I6IEV2bSBUeCBbJHt0eC5oYXNofV0gaXMgaW5jbHVkZWQgaW4gYmxvY2sgWyR7YmxvY2suaGFzaH1dIGJ1dCB3YWl0aW5nIHJlc3VsdGVkIGluIG51bGwgb3IgdW5kZWZpbmVkYFxuICAgICAgICAgICAgKTtcbiAgICAgICAgfSBjYXRjaCAoZSkge1xuICAgICAgICAgIGlmIChpc0NhbGxFeGNlcHRpb24oZSkpIHN0YXR1cyA9IEV2bVR4U3RhdHVzLmZhaWxlZDtcbiAgICAgICAgICBlbHNlIHRocm93IGU7XG4gICAgICAgIH1cbiAgICAgICAgZXh0cmFjdGVkVHhzLnB1c2goe1xuICAgICAgICAgIHVuc2lnbmVkSGFzaDogVHJhbnNhY3Rpb24uZnJvbSh0eCkudW5zaWduZWRIYXNoLFxuICAgICAgICAgIHNpZ25lZEhhc2g6IHR4Lmhhc2gsXG4gICAgICAgICAgbm9uY2U6IHR4Lm5vbmNlLFxuICAgICAgICAgIGFkZHJlc3M6IHR4LmZyb20udG9Mb3dlckNhc2UoKSxcbiAgICAgICAgICBzdGF0dXM6IHN0YXR1cyxcbiAgICAgICAgfSk7XG4gICAgICB9XG4gICAgfVxuICAgIGlmIChleHRyYWN0ZWRUeHMubGVuZ3RoID4gMClcbiAgICAgIGF3YWl0IHRoaXMuYWN0aW9uLnN0b3JlVHhzKGV4dHJhY3RlZFR4cywgYmxvY2ssIHRoaXMuZ2V0SWQoKSk7XG4gICAgcmV0dXJuIHRydWU7XG4gIH07XG5cbiAgLyoqXG4gICAqIGZvcmsgb25lIGJsb2NrIGFuZCByZW1vdmUgYWxsIHN0b3JlZCB0eElkIGZvciB0aGlzIGJsb2NrXG4gICAqIEBwYXJhbSBoYXNoOiBibG9jayBoYXNoXG4gICAqL1xuICBmb3JrQmxvY2sgPSBhc3luYyAoaGFzaDogc3RyaW5nKTogUHJvbWlzZTx2b2lkPiA9PiB7XG4gICAgYXdhaXQgdGhpcy5hY3Rpb24uZGVsZXRlQmxvY2tUeHMoaGFzaCwgdGhpcy5nZXRJZCgpKTtcbiAgfTtcblxuICAvKipcbiAgICogSW5pdGlhbGl6ZXMgdGhlIGRhdGFiYXNlIHdpdGggb2xkZXIgYm94ZXMgcmVsYXRlZCB0byB0aGUgYWRkcmVzc1xuICAgKi9cbiAgaW5pdGlhbGl6ZUJveGVzID0gYXN5bmMgKCkgPT4ge1xuICAgIHJldHVybjtcbiAgfTtcbn1cbiJdfQ==
@@ -42,8 +42,7 @@ export class EvmTxExtractor extends AbstractExtractor<TransactionResponse> {
42
42
  block: Block
43
43
  ): Promise<boolean> => {
44
44
  const extractedTxs: Array<ExtractedTx> = [];
45
- for (const txRes of txs) {
46
- const tx = Transaction.from(txRes);
45
+ for (const tx of txs) {
47
46
  if (tx.from === null) {
48
47
  throw Error('ImpossibleBehavior: RPC transactions must have `from`.');
49
48
  }
@@ -53,18 +52,18 @@ export class EvmTxExtractor extends AbstractExtractor<TransactionResponse> {
53
52
  if (tx.from.toLowerCase() === this.address) {
54
53
  let status: EvmTxStatus;
55
54
  try {
56
- const result = await txRes.wait(0);
55
+ const result = await tx.wait(0);
57
56
  if (result) status = EvmTxStatus.succeed;
58
57
  else
59
58
  throw Error(
60
- `Impossible behavior: Evm Tx [${txRes.hash}] is included in block [${block.hash}] but waiting resulted in null or undefined`
59
+ `Impossible behavior: Evm Tx [${tx.hash}] is included in block [${block.hash}] but waiting resulted in null or undefined`
61
60
  );
62
61
  } catch (e) {
63
62
  if (isCallException(e)) status = EvmTxStatus.failed;
64
63
  else throw e;
65
64
  }
66
65
  extractedTxs.push({
67
- unsignedHash: tx.unsignedHash,
66
+ unsignedHash: Transaction.from(tx).unsignedHash,
68
67
  signedHash: tx.hash,
69
68
  nonce: tx.nonce,
70
69
  address: tx.from.toLowerCase(),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rosen-bridge/evm-address-tx-extractor",
3
- "version": "1.0.6",
3
+ "version": "1.0.8",
4
4
  "description": "Extract and store EVM chain notable data of transactions for an address",
5
5
  "repository": "",
6
6
  "license": "GPL-3.0",
@@ -33,9 +33,8 @@
33
33
  "node": ">=20.11.0"
34
34
  },
35
35
  "dependencies": {
36
- "@rosen-bridge/abstract-logger": "^1.0.0",
37
- "@rosen-bridge/abstract-extractor": "^1.0.0",
38
- "@rosen-bridge/scanner": "^5.0.1",
36
+ "@rosen-bridge/abstract-extractor": "^1.0.2",
37
+ "@rosen-bridge/abstract-logger": "^2.0.1",
39
38
  "ethers": "^6.11.0",
40
39
  "typeorm": "^0.3.20"
41
40
  }