@subql/frontier-evm-processor 0.0.3-0 → 0.0.3-3

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.
Files changed (12) hide show
  1. package/dist/.tsbuildinfo +1 -1
  2. package/dist/bundle.js +39 -0
  3. package/dist/frontierEthProvider.d.ts +4 -3
  4. package/dist/frontierEthProvider.js +0 -1
  5. package/dist/frontierEthProvider.js.map +1 -1
  6. package/dist/index.d.ts +7 -2
  7. package/dist/index.js +28 -9
  8. package/dist/index.js.map +1 -1
  9. package/package.json +9 -6
  10. package/src/frontierEthProvider.ts +6 -5
  11. package/src/index.spec.ts +54 -22
  12. package/src/index.ts +34 -11
package/dist/frontierEthProvider.d.ts CHANGED
@@ -1,6 +1,7 @@
1
- import { Block, BlockTag, BlockWithTransactions, EventType, Filter, Listener, Log, Provider, TransactionReceipt, TransactionRequest, TransactionResponse } from '@ethersproject/abstract-provider';
2
- import { Network } from '@ethersproject/networks';
3
- import { Deferrable } from '@ethersproject/properties';
1
+ import type { Block, BlockTag, BlockWithTransactions, EventType, Filter, Listener, Log, TransactionReceipt, TransactionRequest, TransactionResponse } from '@ethersproject/abstract-provider';
2
+ import { Provider } from '@ethersproject/abstract-provider';
3
+ import type { Network } from '@ethersproject/networks';
4
+ import type { Deferrable } from '@ethersproject/properties';
4
5
  import { BigNumber, BigNumberish } from '@ethersproject/bignumber';
5
6
  import '@subql/types/dist/global';
6
7
  export default class FrontierEthProvider extends Provider {
package/dist/frontierEthProvider.js CHANGED
@@ -1,6 +1,5 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- /* eslint-disable @typescript-eslint/no-unused-vars */
4
3
  const abstract_provider_1 = require("@ethersproject/abstract-provider");
5
4
  const properties_1 = require("@ethersproject/properties");
6
5
  const bignumber_1 = require("@ethersproject/bignumber");
package/dist/frontierEthProvider.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"frontierEthProvider.js","sourceRoot":"","sources":["../src/frontierEthProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"frontierEthProvider.js","sourceRoot":"","sources":["../src/frontierEthProvider.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import '@polkadot/api-augment';
2
2
  import { Result } from '@ethersproject/abi';
3
3
  import { Log, TransactionResponse } from '@ethersproject/abstract-provider';
4
+ import { TransactionV2, EthTransaction, EvmLog } from '@polkadot/types/interfaces';
4
5
  import { SubstrateDatasourceProcessor, SubstrateCustomDatasource, SubstrateHandlerKind, SubstrateNetworkFilter, SubstrateCustomHandler, SubstrateMapping, SecondLayerHandlerProcessor_1_0_0 } from '@subql/types';
5
6
  import FrontierEthProvider from './frontierEthProvider';
6
7
  export { FrontierEthProvider };
@@ -26,8 +27,12 @@ export declare class FrontierEvmProcessorOptions {
26
27
  abi?: string;
27
28
  address?: string;
28
29
  }
29
- declare const EventProcessor: SecondLayerHandlerProcessor_1_0_0<SubstrateHandlerKind.Event, FrontierEvmEventFilter, FrontierEvmEvent, FrontierEvmDatasource>;
30
- declare const CallProcessor: SecondLayerHandlerProcessor_1_0_0<SubstrateHandlerKind.Call, FrontierEvmCallFilter, FrontierEvmCall, FrontierEvmDatasource>;
30
+ declare const EventProcessor: SecondLayerHandlerProcessor_1_0_0<SubstrateHandlerKind.Event, FrontierEvmEventFilter, FrontierEvmEvent, [
31
+ EvmLog
32
+ ], FrontierEvmDatasource>;
33
+ declare const CallProcessor: SecondLayerHandlerProcessor_1_0_0<SubstrateHandlerKind.Call, FrontierEvmCallFilter, FrontierEvmCall, [
34
+ TransactionV2 | EthTransaction
35
+ ], FrontierEvmDatasource>;
31
36
  export declare const FrontierEvmDatasourcePlugin: SubstrateDatasourceProcessor<"substrate/FrontierEvm", SubstrateNetworkFilter, FrontierEvmDatasource, {
32
37
  'substrate/FrontierEvmEvent': typeof EventProcessor;
33
38
  'substrate/FrontierEvmCall': typeof CallProcessor;
package/dist/index.js CHANGED
@@ -75,7 +75,7 @@ function getExecutionEvent(extrinsic) {
75
75
  from: from.toHex(),
76
76
  to: to.toHex(),
77
77
  hash: hash.toHex(),
78
- status: status,
78
+ status,
79
79
  };
80
80
  }
81
81
  async function getEtheruemBlockHash(api, blockNumber) {
@@ -210,6 +210,7 @@ const CallProcessor = {
210
210
  baseFilter: [{ module: 'ethereum', method: 'transact' }],
211
211
  baseHandlerKind: types_1.SubstrateHandlerKind.Call,
212
212
  async transformer({ api, assets, ds, input: original }) {
213
+ var _a;
213
214
  const [tx] = original.extrinsic.method.args;
214
215
  const rawTx = tx.isEip1559
215
216
  ? tx.asEip1559
@@ -235,7 +236,6 @@ const CallProcessor = {
235
236
  from,
236
237
  to,
237
238
  nonce: rawTx.nonce.toNumber(),
238
- gasLimit: bignumber_1.BigNumber.from(rawTx.gasLimit.toBigInt()),
239
239
  data: rawTx.input.toHex(),
240
240
  value: bignumber_1.BigNumber.from(rawTx.value.toBigInt()),
241
241
  // Transaction response properties
@@ -247,16 +247,35 @@ const CallProcessor = {
247
247
  };
248
248
  if (tx.isEip1559) {
249
249
  const eip1559tx = tx.asEip1559;
250
- call = Object.assign(Object.assign({}, baseCall), { chainId: eip1559tx.chainId.toNumber(), maxFeePerGas: bignumber_1.BigNumber.from(eip1559tx.maxFeePerGas.toBigInt()), maxPriorityFeePerGas: bignumber_1.BigNumber.from(eip1559tx.maxPriorityFeePerGas.toBigInt()), s: eip1559tx.s.toHex(), r: eip1559tx.r.toHex(), type: 2 });
250
+ call = Object.assign(Object.assign({}, baseCall), { chainId: eip1559tx.chainId.toNumber(), gasLimit: bignumber_1.BigNumber.from(eip1559tx.gasLimit.toBigInt()), maxFeePerGas: bignumber_1.BigNumber.from(eip1559tx.maxFeePerGas.toBigInt()), maxPriorityFeePerGas: bignumber_1.BigNumber.from(eip1559tx.maxPriorityFeePerGas.toBigInt()), s: eip1559tx.s.toHex(), r: eip1559tx.r.toHex(), type: 2 });
251
251
  }
252
252
  else if (tx.isEip2930) {
253
253
  const eip2930tx = tx.asEip2930;
254
254
  call = Object.assign(Object.assign({}, baseCall), { chainId: eip2930tx.chainId.toNumber(), gasPrice: bignumber_1.BigNumber.from(eip2930tx.gasPrice.toBigInt()), gasLimit: bignumber_1.BigNumber.from(eip2930tx.gasLimit.toBigInt()), s: eip2930tx.s.toHex(), r: eip2930tx.r.toHex(), type: 1 });
255
- }
255
+ } /*if (((tx as TransactionV2).isLegacy))*/
256
256
  else {
257
- const legacyTx = tx.isLegacy ? tx.asLegacy : tx;
258
- call = Object.assign(Object.assign({}, baseCall), { gasPrice: bignumber_1.BigNumber.from(legacyTx.gasPrice.toBigInt()), chainId: -1, r: legacyTx.signature.r.toHex(), s: legacyTx.signature.s.toHex(), v: legacyTx.signature.v.toNumber(), type: 0 });
259
- }
257
+ const legacyTx = (_a = tx.asLegacy) !== null && _a !== void 0 ? _a : tx;
258
+ call = Object.assign(Object.assign({}, baseCall), { gasLimit: bignumber_1.BigNumber.from(legacyTx.gasLimit.toBigInt()), gasPrice: bignumber_1.BigNumber.from(legacyTx.gasPrice.toBigInt()), chainId: -1, r: legacyTx.signature.r.toHex(), s: legacyTx.signature.s.toHex(), v: legacyTx.signature.v.toNumber(), type: 0 });
259
+ } /* else {
260
+ const ethTx = tx as EthTransaction;
261
+ console.log(`XXXXXX ${(tx as any).asLegacy}`)
262
+
263
+ call = {
264
+ ...baseCall,
265
+
266
+ maxFeePerGas: BigNumber.from(ethTx.maxFeePerGas.unwrap().toBigInt()),
267
+ maxPriorityFeePerGas: BigNumber.from(ethTx.maxPriorityFeePerGas.unwrap().toBigInt()),
268
+
269
+ gasLimit: BigNumber.from(0),
270
+ gasPrice: BigNumber.from(ethTx.gasPrice.unwrap().toBigInt()),
271
+ chainId: ethTx.chainId.unwrap().toNumber(),
272
+
273
+ r: ethTx.r.toHex(),
274
+ s: ethTx.s.toHex(),
275
+ v: ethTx.v.toNumber(),
276
+ type: 0,
277
+ };
278
+ }*/
260
279
  try {
261
280
  const iface = buildInterface(ds, assets);
262
281
  call.args = iface === null || iface === void 0 ? void 0 : iface.decodeFunctionData(iface.getFunction((0, bytes_1.hexDataSlice)(call.data, 0, 4)), call.data);
@@ -268,7 +287,7 @@ const CallProcessor = {
268
287
  return [call];
269
288
  },
270
289
  filterProcessor({ ds, filter, input }) {
271
- var _a, _b, _c, _d;
290
+ var _a, _b, _c, _d, _e;
272
291
  try {
273
292
  const { from, to } = getExecutionEvent(input);
274
293
  if ((filter === null || filter === void 0 ? void 0 : filter.from) && !(0, utils_1.stringNormalizedEq)(filter.from, from)) {
@@ -284,7 +303,7 @@ const CallProcessor = {
284
303
  : tx;
285
304
  // if `to` is null then we handle contract creation
286
305
  if ((((_b = (_a = ds.processor) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.address) && !(0, utils_1.stringNormalizedEq)(ds.processor.options.address, to)) ||
287
- (((_d = (_c = ds.processor) === null || _c === void 0 ? void 0 : _c.options) === null || _d === void 0 ? void 0 : _d.address) === null && !rawTx.action.isCreate)) {
306
+ (((_d = (_c = ds.processor) === null || _c === void 0 ? void 0 : _c.options) === null || _d === void 0 ? void 0 : _d.address) === null && !((_e = rawTx.action) === null || _e === void 0 ? void 0 : _e.isCreate))) {
288
307
  return false;
289
308
  }
290
309
  if ((filter === null || filter === void 0 ? void 0 : filter.function) && rawTx.input.toHex().indexOf((0, utils_1.functionToSighash)(filter.function)) !== 0) {
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;;;;;;;;;;;AAGtC,iCAA+B;AAC/B,4CAAqD;AAErD,wDAAmD;AACnD,gDAAkD;AAGlD,wCAUsB;AACtB,yDAA+C;AAC/C,qDAQyB;AACzB,mCAAyF;AACzF,gFAAwD;AAEhD,8BAFD,6BAAmB,CAEC;AA+B3B,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IACxB,QAAQ,CAAC,KAAkB;QACzB,IAAI;YACF,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;SAC9E;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAED,cAAc;QACZ,OAAO,kEAAkE,CAAC;IAC5E,CAAC;CACF,CAAA;AAZK,oBAAoB;IADzB,IAAA,qCAAmB,EAAC,EAAC,IAAI,EAAE,sBAAsB,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC;GAC5D,oBAAoB,CAYzB;AAED,MAAa,2BAA2B;CAOvC;AAJC;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;wDACE;AAGb;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,mCAAiB,GAAE;4DACH;AANnB,kEAOC;AAED,MAAM,0BAA0B;CAI/B;AADC;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,EAAC,oBAAoB,EAAE,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;0DACiB;AAGhE,MAAM,yBAAyB;CAO9B;AAJC;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,mCAAiB,GAAE;uDACN;AAGd;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;2DACO;AAgBpB,SAAS,iBAAiB,CAAC,SAA6B;IACtD,MAAM,cAAc,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAC1C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,UAAU,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,UAAU,CAC7E,CAAC;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;IAED,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC;IAE3D,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE;QAClB,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE;QACd,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE;QAClB,MAAM,EAAE,MAAoB;KAC7B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,GAAe,EAAE,WAAmB;IACtE,OAAO,SAAS,CAAC;IAEjB,+FAA+F;IAC/F,2CAA2C;IAC3C,iEAAiE;IACjE,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAErE,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;AAC1C,CAAC;AAED,MAAM,kBAAkB,GAA8B,EAAE,CAAC;AAEzD,SAAS,cAAc,CAAC,EAAyB,EAAE,MAA+B;;IAChF,MAAM,GAAG,GAAG,MAAA,MAAA,EAAE,CAAC,SAAS,0CAAE,OAAO,0CAAE,GAAG,CAAC;IACvC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE;QACnB,OAAO;KACR;IAED,IAAI,CAAC,CAAA,MAAA,EAAE,CAAC,MAAM,0CAAE,GAAG,CAAC,GAAG,CAAC,CAAA,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,cAAc,GAAG,4BAA4B,CAAC,CAAC;KAChE;IAED,uFAAuF;IACvF,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE;QAC5B,+CAA+C;QAC/C,IAAI;YACF,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YAErC;;;eAGG;YACH,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE;gBACxC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC;aACrB;YAED,kBAAkB,CAAC,GAAG,CAAC,GAAG,IAAI,eAAS,CAAC,MAAM,CAAC,CAAC;SACjD;QAAC,OAAO,CAAC,EAAE;YACT,MAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC;YACvD,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;SACnC;KACF;IAED,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,cAAc,GAKhB;IACF,WAAW,EAAE,OAAO;IACpB,UAAU,EAAE,CAAC,EAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAC,CAAC;IAC5C,eAAe,EAAE,4BAAoB,CAAC,KAAK;IAC3C,KAAK,CAAC,WAAW,CAAC,EAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAC;;QAClD,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;QAExC,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC;YACzD,CAAC,CAAC,cAAc,CAAC,UAAU;YAC3B,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAChC,MAAM,SAAS,GACb,MAAA,MAAA,QAAQ,CAAC,SAAS,0CAAE,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CACxC,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CACvG,mCAAI,EAAE,CAAC;QAEV;;;WAGG;QACH,MAAM,EAAC,IAAI,EAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAC,IAAI,EAAE,SAAS,EAAC,CAAC;QAE9F,MAAM,GAAG,mCACH,SAAS,CAAC,MAAM,EAA0B,KAC9C,WAAW,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAC1D,SAAS,EAAE,MAAM,oBAAoB,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EACzF,cAAc,EAAE,QAAQ,CAAC,KAAK,CAAC,SAAS,EACxC,gBAAgB,EAAE,MAAA,MAAA,QAAQ,CAAC,SAAS,0CAAE,GAAG,mCAAI,CAAC,CAAC,EAC/C,eAAe,EAAE,IAAI,EACrB,OAAO,EAAE,KAAK,EACd,QAAQ,EAAE,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,GACtC,CAAC;QAEF,IAAI;YACF,MAAM,KAAK,GAAG,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAEzC,GAAG,CAAC,IAAI,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;SACtC;QAAC,OAAO,CAAC,EAAE;YACV,wCAAwC;YACvC,MAAc,CAAC,MAAM,CAAC,IAAI,CACzB,+DAAgE,CAAW,CAAC,OAAO,EAAE,CACtF,CAAC;SACH;QAED,OAAO,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IACD,eAAe,CAAC,EAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAC;;QACjC,MAAM,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;QACrC,MAAM,QAAQ,GAAG,SAAmB,CAAC;QAErC,IACE,CAAA,MAAA,MAAA,EAAE,CAAC,SAAS,0CAAE,OAAO,0CAAE,OAAO;YAC9B,CAAC,IAAA,0BAAkB,EAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,EAC9E;YACA,OAAO,KAAK,CAAC;SACd;QAED,mFAAmF;QACnF,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE;YAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,CAAC,KAAK,EAAE;oBACV,SAAS;iBACV;gBAED,IAAI,CAAC,IAAA,mBAAW,EAAC,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE;oBACjE,OAAO,KAAK,CAAC;iBACd;aACF;SACF;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IACD,eAAe,CAAC,MAA+B;QAC7C,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,MAAM,SAAS,GAAG,IAAA,gCAAY,EAAC,0BAA0B,EAAE,MAAM,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,IAAA,8BAAY,EAAC,SAAS,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAC,CAAC,CAAC;QAEtF,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE;YAClB,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,mCAAmC,SAAS,EAAE,CAAC,CAAC;SACjE;IACH,CAAC;IACD,eAAe,CAAC,MAA8B,EAAE,EAAyB;;QACvE,MAAM,UAAU,GAAyB;YACvC,MAAM,EAAE,SAAS;YACjB,UAAU,EAAE,EAAE;SACf,CAAC;QACF,IAAI,MAAA,MAAA,EAAE,CAAC,SAAS,0CAAE,OAAO,0CAAE,OAAO,EAAE;YAClC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC;gBACzB,KAAK,EAAE,SAAS;gBAChB,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE;aAClD,CAAC,CAAC;SACJ;aAAM;YACL,OAAO;SACR;QAED,mFAAmF;QACnF,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE;YAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,CAAC,KAAK,EAAE;oBACV,SAAS;iBACV;gBACD,MAAM,KAAK,GAAG,SAAS,CAAC,EAAE,CAAC;gBAC3B,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,KAAK,EAAE,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAC,CAAC,CAAC;aACjE;SACF;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF,CAAC;AAEF,MAAM,aAAa,GAKf;IACF,WAAW,EAAE,OAAO;IACpB,UAAU,EAAE,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAC,CAAC;IACtD,eAAe,EAAE,4BAAoB,CAAC,IAAI;IAC1C,KAAK,CAAC,WAAW,CAAC,EAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAC;QAClD,MAAM,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,IAAwC,CAAC;QAEhF,MAAM,KAAK,GAAI,EAAoB,CAAC,SAAS;YAC3C,CAAC,CAAE,EAAoB,CAAC,SAAS;YACjC,CAAC,CAAE,EAAoB,CAAC,SAAS;gBACjC,CAAC,CAAE,EAAoB,CAAC,SAAS;gBACjC,CAAC,CAAE,EAAoB,CAAC,QAAQ;oBAChC,CAAC,CAAE,EAAoB,CAAC,QAAQ;oBAChC,CAAC,CAAE,EAAqB,CAAC;QAE3B,IAAI,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC;QAC5B,IAAI;YACF,MAAM,cAAc,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACnD,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC;YAC3B,EAAE,GAAG,cAAc,CAAC,EAAE,CAAC;YACvB,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC;YAC3B,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC;SAC3C;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,GAAG,KAAK,CAAC;YAEhB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;SACjE;QAED,IAAI,IAAqB,CAAC;QAE1B,MAAM,QAAQ,CAAC,2BAA2B,GAAG;YAC3C,IAAI;YACJ,EAAE;YACF,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE;YAC7B,QAAQ,EAAE,qBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACnD,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE;YACzB,KAAK,EAAE,qBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YAE7C,kCAAkC;YAClC,IAAI;YACJ,WAAW,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC1D,SAAS,EAAE,MAAM,oBAAoB,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACzF,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;YAChE,OAAO;SACR,CAAC;QAEF,IAAK,EAAoB,CAAC,SAAS,EAAE;YACnC,MAAM,SAAS,GAAI,EAAoB,CAAC,SAAS,CAAC;YAElD,IAAI,mCACC,QAAQ,KACX,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,EACrC,YAAY,EAAE,qBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,EAC/D,oBAAoB,EAAE,qBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC,EAE/E,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,EACtB,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,EACtB,IAAI,EAAE,CAAC,GACR,CAAC;SACH;aAAM,IAAK,EAAoB,CAAC,SAAS,EAAE;YAC1C,MAAM,SAAS,GAAI,EAAoB,CAAC,SAAS,CAAC;YAElD,IAAI,mCACC,QAAQ,KACX,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,EACrC,QAAQ,EAAE,qBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,EACvD,QAAQ,EAAE,qBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,EACvD,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,EACtB,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,EACtB,IAAI,EAAE,CAAC,GACR,CAAC;SACH;aAAM;YACL,MAAM,QAAQ,GAAI,EAAoB,CAAC,QAAQ,CAAC,CAAC,CAAE,EAAoB,CAAC,QAAQ,CAAC,CAAC,CAAE,EAAqB,CAAC;YAE1G,IAAI,mCACC,QAAQ,KAEX,QAAQ,EAAE,qBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,EACtD,OAAO,EAAE,CAAC,CAAC,EAEX,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,EAC/B,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,EAC/B,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,EAClC,IAAI,EAAE,CAAC,GACR,CAAC;SACH;QAED,IAAI;YACF,MAAM,KAAK,GAAG,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAEzC,IAAI,CAAC,IAAI,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,kBAAkB,CAAC,KAAK,CAAC,WAAW,CAAC,IAAA,oBAAY,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;SACpG;QAAC,OAAO,CAAC,EAAE;YACV,wCAAwC;YACvC,MAAc,CAAC,MAAM,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;SAC5F;QAED,OAAO,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IACD,eAAe,CAAC,EAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAC;;QACjC,IAAI;YACF,MAAM,EAAC,IAAI,EAAE,EAAE,EAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAE5C,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,CAAC,IAAA,0BAAkB,EAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;gBAC1D,OAAO,KAAK,CAAC;aACd;YAED,MAAM,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,IAAwC,CAAC;YAE7E,MAAM,KAAK,GAAI,EAAoB,CAAC,SAAS;gBAC3C,CAAC,CAAE,EAAoB,CAAC,SAAS;gBACjC,CAAC,CAAE,EAAoB,CAAC,SAAS;oBACjC,CAAC,CAAE,EAAoB,CAAC,SAAS;oBACjC,CAAC,CAAE,EAAoB,CAAC,QAAQ;wBAChC,CAAC,CAAE,EAAoB,CAAC,QAAQ;wBAChC,CAAC,CAAE,EAAqB,CAAC;YAC3B,mDAAmD;YACnD,IACE,CAAC,CAAA,MAAA,MAAA,EAAE,CAAC,SAAS,0CAAE,OAAO,0CAAE,OAAO,KAAI,CAAC,IAAA,0BAAkB,EAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBACzF,CAAC,CAAA,MAAA,MAAA,EAAE,CAAC,SAAS,0CAAE,OAAO,0CAAE,OAAO,MAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,EACnE;gBACA,OAAO,KAAK,CAAC;aACd;YAED,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,KAAI,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,IAAA,yBAAiB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,EAAE;gBAC7F,OAAO,KAAK,CAAC;aACd;YAED,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,CAAC,EAAE;YACT,MAAc,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YAC/D,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IACD,eAAe,CAAC,MAA8B;QAC5C,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,MAAM,SAAS,GAAG,IAAA,gCAAY,EAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;QAClE,MAAM,MAAM,GAAG,IAAA,8BAAY,EAAC,SAAS,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAC,CAAC,CAAC;QAEtF,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE;YAClB,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,sCAAsC,SAAS,EAAE,CAAC,CAAC;SACpE;IACH,CAAC;IACD,eAAe,CAAC,MAA6B,EAAE,EAAyB;;QACtE,MAAM,UAAU,GAAyB;YACvC,MAAM,EAAE,iBAAiB;YACzB,UAAU,EAAE,EAAE;SACf,CAAC;QACF,IAAI,MAAA,MAAA,EAAE,CAAC,SAAS,0CAAE,OAAO,0CAAE,OAAO,EAAE;YAClC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,EAAC,CAAC,CAAC;SAC9F;QACD,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,EAAE;YAChB,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,EAAC,CAAC,CAAC;SAC/E;QAED,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE;YACpB,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAA,yBAAiB,EAAC,MAAM,CAAC,QAAQ,CAAC,EAAC,CAAC,CAAC;SACxF;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF,CAAC;AAEW,QAAA,2BAA2B,GAUvC;IACC,IAAI,EAAE,uBAAuB;IAC7B,QAAQ,CAAC,EAAyB,EAAE,MAA8B;QAChE,IAAI,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE;YACxB,MAAM,IAAI,GAAG,IAAA,gCAAY,EAAC,2BAA2B,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAC7E,MAAM,MAAM,GAAG,IAAA,8BAAY,EAAC,IAAI,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAC,CAAC,CAAC;YACjF,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE;gBAClB,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC7D,MAAM,IAAI,KAAK,CAAC,sCAAsC,SAAS,EAAE,CAAC,CAAC;aACpE;SACF;QAED,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,oCAAoC;QAEhE,OAAO;IACT,CAAC;IACD,iBAAiB,CAAC,EAAyB;QACzC,OAAO,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC;IAC/B,CAAC;IACD,iBAAiB,EAAE;QACjB,4BAA4B,EAAE,cAAc;QAC5C,2BAA2B,EAAE,aAAa;KAC3C;CACF,CAAC;AAEF,kBAAe,mCAA2B,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,27 +1,30 @@
1
1
  {
2
2
  "name": "@subql/frontier-evm-processor",
3
- "version": "0.0.3-0",
3
+ "version": "0.0.3-3",
4
4
  "description": "SubQuery datasource processor for Frontier EVM",
5
5
  "main": "dist/index.js",
6
6
  "author": "Subquery Pte Limited",
7
7
  "license": "Apache-2.0",
8
8
  "scripts": {
9
- "build": "tsc -b"
9
+ "build:ts": "tsc -b",
10
+ "build:bundle": "esbuild src/index.ts --platform=node --bundle --format=cjs --minify --outfile=dist/bundle.js",
11
+ "build": "yarn build:ts && yarn build:bundle"
10
12
  },
11
13
  "dependencies": {
12
14
  "@subql/types": "latest",
13
15
  "class-transformer": "^0.5.1",
14
16
  "class-validator": "^0.13.2",
15
- "ethers": "^5.6.5",
17
+ "ethers": "^5.7.0",
16
18
  "pino": "^7.11.0"
17
19
  },
18
20
  "devDependencies": {
19
- "@subql/utils": "^1.0.0",
21
+ "@subql/utils": "latest",
22
+ "esbuild": "^0.15.5",
20
23
  "moonbeam-types-bundle": "^2.0.4",
21
24
  "typescript": "^4.6.4"
22
25
  },
23
26
  "peerDependencies": {
24
- "@polkadot/api": "^8"
27
+ "@polkadot/api": "^9"
25
28
  },
26
- "stableVersion": "0.0.2"
29
+ "stableVersion": "0.0.3-2"
27
30
  }
package/src/frontierEthProvider.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /* eslint-disable @typescript-eslint/no-unused-vars */
2
- import {
2
+ import type {
3
3
  Block,
4
4
  BlockTag,
5
5
  BlockWithTransactions,
@@ -7,15 +7,16 @@ import {
7
7
  Filter,
8
8
  Listener,
9
9
  Log,
10
- Provider,
11
10
  TransactionReceipt,
12
11
  TransactionRequest,
13
12
  TransactionResponse,
14
13
  } from '@ethersproject/abstract-provider';
15
- import {Network} from '@ethersproject/networks';
16
- import {Deferrable, resolveProperties} from '@ethersproject/properties';
14
+ import {Provider} from '@ethersproject/abstract-provider';
15
+ import type {Network} from '@ethersproject/networks';
16
+ import type {Deferrable} from '@ethersproject/properties';
17
+ import {resolveProperties} from '@ethersproject/properties';
17
18
  import {BigNumber, BigNumberish} from '@ethersproject/bignumber';
18
- import {EthLog, EthRichBlock, EthTransaction} from '@polkadot/types/interfaces';
19
+ import type {EthLog, EthRichBlock, EthTransaction} from '@polkadot/types/interfaces';
19
20
 
20
21
  // Gets logger and api
21
22
  import '@subql/types/dist/global';
package/src/index.spec.ts CHANGED
@@ -5,6 +5,7 @@ import {ApiPromise, WsProvider} from '@polkadot/api';
5
5
  import {Logger} from '@subql/utils';
6
6
  import {SubstrateEvent, SubstrateExtrinsic} from '@subql/types';
7
7
  import {typesBundleDeprecated} from 'moonbeam-types-bundle';
8
+ import {TransactionV2, EthTransaction, EvmLog} from '@polkadot/types/interfaces';
8
9
  import FrontierEvmDatasourcePlugin, {FrontierEvmCall, FrontierEvmDatasource, FrontierEvmEvent} from '.';
9
10
 
10
11
  import {fetchBlock} from '../../../test/helpers';
@@ -144,6 +145,7 @@ describe('FrontierDS', () => {
144
145
  api = await ApiPromise.create({
145
146
  provider: new WsProvider('wss://moonriver.api.onfinality.io/public-ws'),
146
147
  typesBundle: typesBundleDeprecated as any,
148
+ noInitWarn: true,
147
149
  });
148
150
  });
149
151
 
@@ -204,12 +206,12 @@ describe('FrontierDS', () => {
204
206
  describe('FilterProcessor', () => {
205
207
  describe('FrontierEvmEvent', () => {
206
208
  const processor = FrontierEvmDatasourcePlugin.handlerProcessors['substrate/FrontierEvmEvent'];
207
- let log: SubstrateEvent;
209
+ let log: SubstrateEvent<[EvmLog]>;
208
210
 
209
211
  beforeAll(async () => {
210
212
  const {events} = await fetchBlock(api, 752073);
211
213
 
212
- log = events[4];
214
+ log = events[4] as SubstrateEvent<[EvmLog]>;
213
215
  });
214
216
 
215
217
  it('filters just a matching address', () => {
@@ -346,12 +348,12 @@ describe('FrontierDS', () => {
346
348
  describe('FrontierEvmCall', () => {
347
349
  const processor = FrontierEvmDatasourcePlugin.handlerProcessors['substrate/FrontierEvmCall'];
348
350
 
349
- let transaction: SubstrateExtrinsic;
351
+ let transaction: SubstrateExtrinsic<[TransactionV2 | EthTransaction]>;
350
352
 
351
353
  beforeAll(async () => {
352
354
  const {extrinsics} = await fetchBlock(api, 763971);
353
355
 
354
- transaction = extrinsics[3];
356
+ transaction = extrinsics[3] as SubstrateExtrinsic<[TransactionV2 | EthTransaction]>;
355
357
  });
356
358
 
357
359
  it('can filter from', () => {
@@ -396,7 +398,7 @@ describe('FrontierDS', () => {
396
398
  const blockNumber = 442090;
397
399
  const {extrinsics} = await fetchBlock(api, blockNumber);
398
400
 
399
- const contractTx = extrinsics[4];
401
+ const contractTx = extrinsics[4] as SubstrateExtrinsic<[TransactionV2 | EthTransaction]>;
400
402
  expect(
401
403
  processor.filterProcessor({
402
404
  filter: {},
@@ -457,7 +459,7 @@ describe('FrontierDS', () => {
457
459
  });
458
460
  const {extrinsics} = await fetchBlock(moonbeamApi, 459730);
459
461
 
460
- transaction = extrinsics[3];
462
+ transaction = extrinsics[3] as SubstrateExtrinsic<[TransactionV2 | EthTransaction]>;
461
463
 
462
464
  expect(
463
465
  processor.filterProcessor({
@@ -504,7 +506,7 @@ describe('FrontierDS', () => {
504
506
  const {events} = await fetchBlock(api, blockNumber);
505
507
 
506
508
  const [event] = (await processor.transformer({
507
- input: events[4],
509
+ input: events[4] as SubstrateEvent<[EvmLog]>,
508
510
  ds: baseDS,
509
511
  api,
510
512
  assets: {erc20: erc20MiniAbi},
@@ -524,7 +526,11 @@ describe('FrontierDS', () => {
524
526
  expect(event.args?.to).toBe('0xf884c8774b09b3302f98e38C944eB352264024F8');
525
527
  expect(event.args?.value.toString()).toBe('255185643564356435');
526
528
 
527
- const [event2] = (await processor.transformer({input: events[6], ds: baseDS, api})) as [FrontierEvmEvent];
529
+ const [event2] = (await processor.transformer({
530
+ input: events[6] as SubstrateEvent<[EvmLog]>,
531
+ ds: baseDS,
532
+ api,
533
+ })) as [FrontierEvmEvent];
528
534
 
529
535
  expect(event2.logIndex).toBe(2);
530
536
  });
@@ -539,7 +545,11 @@ describe('FrontierDS', () => {
539
545
  const blockNumber = 717200;
540
546
  const {extrinsics} = await fetchBlock(api, blockNumber);
541
547
 
542
- const [call] = (await processor.transformer({input: extrinsics[3], ds: baseDS, api})) as [FrontierEvmCall];
548
+ const [call] = (await processor.transformer({
549
+ input: extrinsics[3] as SubstrateExtrinsic<[TransactionV2 | EthTransaction]>,
550
+ ds: baseDS,
551
+ api,
552
+ })) as [FrontierEvmCall];
543
553
 
544
554
  expect(call.from).toBe('0x6d15eff7c4d740c4683a23abeb432f0a1b255a12');
545
555
  expect(call.to).toBe('0xf03b75831397d4695a6b9dddeea0e578faa30907');
@@ -568,7 +578,11 @@ describe('FrontierDS', () => {
568
578
  const blockNumber = 829319;
569
579
  const {extrinsics} = await fetchBlock(api, blockNumber);
570
580
 
571
- const [call] = (await processor.transformer({input: extrinsics[3], ds: baseDS, api})) as [FrontierEvmCall];
581
+ const [call] = (await processor.transformer({
582
+ input: extrinsics[3] as SubstrateExtrinsic<[TransactionV2 | EthTransaction]>,
583
+ ds: baseDS,
584
+ api,
585
+ })) as [FrontierEvmCall];
572
586
 
573
587
  expect(call.from).toBe('0x5aec27384dbe84d46c29a20dfeff09493711cd15');
574
588
  expect(call.to).toBe('0x2ddcfdb16c370f116e12db9863901b6e224af15a');
@@ -594,7 +608,11 @@ describe('FrontierDS', () => {
594
608
  const blockNumber = 442090;
595
609
  const {extrinsics} = await fetchBlock(api, blockNumber);
596
610
 
597
- const [call] = (await processor.transformer({input: extrinsics[4], ds: baseDS, api})) as [FrontierEvmCall];
611
+ const [call] = (await processor.transformer({
612
+ input: extrinsics[4] as SubstrateExtrinsic<[TransactionV2 | EthTransaction]>,
613
+ ds: baseDS,
614
+ api,
615
+ })) as [FrontierEvmCall];
598
616
 
599
617
  expect(call.from).toBe('0x9b9fc58a24f296d04d03921550c7ffc441af34ba');
600
618
  expect(call.to).toBe('0x8bd5180ccdd7ae4af832c8c03e21ce8484a128d4'); // Newly created contract address
@@ -621,7 +639,11 @@ describe('FrontierDS', () => {
621
639
  const blockNumber = 829253;
622
640
  const {extrinsics} = await fetchBlock(api, blockNumber);
623
641
 
624
- const [call] = (await processor.transformer({input: extrinsics[3], ds: baseDS, api})) as [FrontierEvmCall];
642
+ const [call] = (await processor.transformer({
643
+ input: extrinsics[3] as SubstrateExtrinsic<[TransactionV2 | EthTransaction]>,
644
+ ds: baseDS,
645
+ api,
646
+ })) as [FrontierEvmCall];
625
647
 
626
648
  expect(call.from).toBe('0xd3de1f8aa8e9cf7133bb65f4555f8f09cfcb7473');
627
649
  expect(call.to).toBe('0x6c8894f4582af73df96b5e802bbbabd74a7285d2');
@@ -654,9 +676,11 @@ describe('FrontierDS', () => {
654
676
  const blockNumber = 131451;
655
677
  const {extrinsics} = await fetchBlock(moonbeamAlphaApi, blockNumber);
656
678
 
657
- const [call] = (await processor.transformer({input: extrinsics[3], ds: baseDS, api: moonbeamAlphaApi})) as [
658
- FrontierEvmCall
659
- ];
679
+ const [call] = (await processor.transformer({
680
+ input: extrinsics[3] as SubstrateExtrinsic<[TransactionV2 | EthTransaction]>,
681
+ ds: baseDS,
682
+ api: moonbeamAlphaApi,
683
+ })) as [FrontierEvmCall];
660
684
 
661
685
  expect(call.nonce).toBe(18);
662
686
  expect(call.data).toBe(
@@ -689,9 +713,11 @@ describe('FrontierDS', () => {
689
713
  const {extrinsics} = await fetchBlock(moonbeamApi, blockNumber);
690
714
 
691
715
  // https://moonbeam.subscan.io/tx/0xe2df11371c71a1372f34736ca4eefe6e6783f15592c0c7054c682020abad75c3
692
- const [call] = (await processor.transformer({input: extrinsics[5], ds: baseDS, api: moonbeamApi})) as [
693
- FrontierEvmCall
694
- ];
716
+ const [call] = (await processor.transformer({
717
+ input: extrinsics[5] as SubstrateExtrinsic<[TransactionV2 | EthTransaction]>,
718
+ ds: baseDS,
719
+ api: moonbeamApi,
720
+ })) as [FrontierEvmCall];
695
721
 
696
722
  expect(call.hash).toBe('0xe2df11371c71a1372f34736ca4eefe6e6783f15592c0c7054c682020abad75c3');
697
723
  expect(call.from).toBe('0xad54f68c34df2a9a311806b84349a06786816fd2');
@@ -726,9 +752,11 @@ describe('FrontierDS', () => {
726
752
 
727
753
  // https://blockscout.moonbeam.network/tx/0x31152aa4291cd46a6e2df23e9218f70c92031f6d77d6854cd2868fe5b88578ee/token-transfers
728
754
  // https://moonbeam.subscan.io/tx/0x31152aa4291cd46a6e2df23e9218f70c92031f6d77d6854cd2868fe5b88578ee
729
- const [call] = (await processor.transformer({input: extrinsics[3], ds: baseDS, api: moonbeamApi})) as [
730
- FrontierEvmCall
731
- ];
755
+ const [call] = (await processor.transformer({
756
+ input: extrinsics[3] as SubstrateExtrinsic<[TransactionV2 | EthTransaction]>,
757
+ ds: baseDS,
758
+ api: moonbeamApi,
759
+ })) as [FrontierEvmCall];
732
760
 
733
761
  expect(call.hash).toBe('0x31152aa4291cd46a6e2df23e9218f70c92031f6d77d6854cd2868fe5b88578ee');
734
762
  expect(call.from).toBe('0x9c71226863d3db3a7de3402e3743fea8026dc9e0');
@@ -759,7 +787,11 @@ describe('FrontierDS', () => {
759
787
 
760
788
  //https://moonriver.subscan.io/tx/0x7a4c3eb237f49c53363e5ee77b3b4855c7a816b9d8545296bf75495d97394548
761
789
 
762
- const [call] = (await processor.transformer({input: extrinsics[5], ds: baseDS, api})) as [FrontierEvmCall];
790
+ const [call] = (await processor.transformer({
791
+ input: extrinsics[5] as SubstrateExtrinsic<[TransactionV2 | EthTransaction]>,
792
+ ds: baseDS,
793
+ api,
794
+ })) as [FrontierEvmCall];
763
795
 
764
796
  expect(call.hash).toBe('0x7a4c3eb237f49c53363e5ee77b3b4855c7a816b9d8545296bf75495d97394548');
765
797
  expect(call.from).toBe('0x63c41b22f7812f5149e474746564d5010c7e839d');
package/src/index.ts CHANGED
@@ -1,14 +1,13 @@
1
1
  // Copyright 2020-2022 OnFinality Limited authors & contributors
2
2
  // SPDX-License-Identifier: Apache-2.0
3
3
 
4
- import assert from 'assert';
5
4
  import '@polkadot/api-augment';
6
5
  import {Interface, Result} from '@ethersproject/abi';
7
6
  import {Log, TransactionResponse} from '@ethersproject/abstract-provider';
8
7
  import {BigNumber} from '@ethersproject/bignumber';
9
8
  import {hexDataSlice} from '@ethersproject/bytes';
10
9
  import {ApiPromise} from '@polkadot/api';
11
- import {TransactionV2, EthTransaction, EvmLog, ExitReason} from '@polkadot/types/interfaces';
10
+ import {EIP1559Transaction, TransactionV2, EthTransaction, EvmLog, ExitReason} from '@polkadot/types/interfaces';
12
11
  import {
13
12
  SubstrateDatasourceProcessor,
14
13
  SubstrateCustomDatasource,
@@ -19,6 +18,7 @@ import {
19
18
  SubstrateMapping,
20
19
  DictionaryQueryEntry,
21
20
  SecondLayerHandlerProcessor_1_0_0,
21
+ TypedEventRecord,
22
22
  } from '@subql/types';
23
23
  import {plainToClass} from 'class-transformer';
24
24
  import {
@@ -32,6 +32,7 @@ import {
32
32
  } from 'class-validator';
33
33
  import {eventToTopic, functionToSighash, hexStringEq, stringNormalizedEq} from './utils';
34
34
  import FrontierEthProvider from './frontierEthProvider';
35
+ import {Codec} from '@polkadot/types/types';
35
36
 
36
37
  export {FrontierEthProvider};
37
38
 
@@ -124,13 +125,13 @@ function getExecutionEvent(extrinsic: SubstrateExtrinsic): ExecutionEvent {
124
125
  throw new Error('eth execution failed');
125
126
  }
126
127
 
127
- const [from, to, hash, status] = executionEvent.event.data;
128
+ const [from, to, hash, status] = executionEvent.event.data as unknown as [Codec, Codec, Codec, ExitReason];
128
129
 
129
130
  return {
130
131
  from: from.toHex(),
131
132
  to: to.toHex(),
132
133
  hash: hash.toHex(),
133
- status: status as ExitReason,
134
+ status,
134
135
  };
135
136
  }
136
137
 
@@ -185,6 +186,7 @@ const EventProcessor: SecondLayerHandlerProcessor_1_0_0<
185
186
  SubstrateHandlerKind.Event,
186
187
  FrontierEvmEventFilter,
187
188
  FrontierEvmEvent,
189
+ [EvmLog],
188
190
  FrontierEvmDatasource
189
191
  > = {
190
192
  specVersion: '1.0.0',
@@ -199,7 +201,7 @@ const EventProcessor: SecondLayerHandlerProcessor_1_0_0<
199
201
  const evmEvents =
200
202
  original.extrinsic?.events.filter((evt) =>
201
203
  baseFilter.find((filter) => filter.module === evt.event.section && filter.method === evt.event.method)
202
- ) ?? [];
204
+ ) ?? ([] as TypedEventRecord<EvmLog[]>[]);
203
205
 
204
206
  /*
205
207
  * Example with no extrinsic https://rata.uncoverexplorer.com/block/3450156
@@ -301,13 +303,14 @@ const CallProcessor: SecondLayerHandlerProcessor_1_0_0<
301
303
  SubstrateHandlerKind.Call,
302
304
  FrontierEvmCallFilter,
303
305
  FrontierEvmCall,
306
+ [TransactionV2 | EthTransaction],
304
307
  FrontierEvmDatasource
305
308
  > = {
306
309
  specVersion: '1.0.0',
307
310
  baseFilter: [{module: 'ethereum', method: 'transact'}],
308
311
  baseHandlerKind: SubstrateHandlerKind.Call,
309
312
  async transformer({api, assets, ds, input: original}): Promise<[FrontierEvmCall]> {
310
- const [tx] = original.extrinsic.method.args as [TransactionV2 | EthTransaction];
313
+ const [tx] = original.extrinsic.method.args;
311
314
 
312
315
  const rawTx = (tx as TransactionV2).isEip1559
313
316
  ? (tx as TransactionV2).asEip1559
@@ -336,7 +339,6 @@ const CallProcessor: SecondLayerHandlerProcessor_1_0_0<
336
339
  from,
337
340
  to, // when contract creation
338
341
  nonce: rawTx.nonce.toNumber(),
339
- gasLimit: BigNumber.from(rawTx.gasLimit.toBigInt()),
340
342
  data: rawTx.input.toHex(),
341
343
  value: BigNumber.from(rawTx.value.toBigInt()),
342
344
 
@@ -354,6 +356,7 @@ const CallProcessor: SecondLayerHandlerProcessor_1_0_0<
354
356
  call = {
355
357
  ...baseCall,
356
358
  chainId: eip1559tx.chainId.toNumber(),
359
+ gasLimit: BigNumber.from(eip1559tx.gasLimit.toBigInt()),
357
360
  maxFeePerGas: BigNumber.from(eip1559tx.maxFeePerGas.toBigInt()),
358
361
  maxPriorityFeePerGas: BigNumber.from(eip1559tx.maxPriorityFeePerGas.toBigInt()),
359
362
 
@@ -373,12 +376,13 @@ const CallProcessor: SecondLayerHandlerProcessor_1_0_0<
373
376
  r: eip2930tx.r.toHex(),
374
377
  type: 1,
375
378
  };
376
- } else {
377
- const legacyTx = (tx as TransactionV2).isLegacy ? (tx as TransactionV2).asLegacy : (tx as EthTransaction);
379
+ } /*if (((tx as TransactionV2).isLegacy))*/ else {
380
+ const legacyTx = (tx as TransactionV2).asLegacy ?? tx;
378
381
 
379
382
  call = {
380
383
  ...baseCall,
381
384
 
385
+ gasLimit: BigNumber.from(legacyTx.gasLimit.toBigInt()),
382
386
  gasPrice: BigNumber.from(legacyTx.gasPrice.toBigInt()),
383
387
  chainId: -1, // Unkonwn
384
388
 
@@ -387,7 +391,26 @@ const CallProcessor: SecondLayerHandlerProcessor_1_0_0<
387
391
  v: legacyTx.signature.v.toNumber(),
388
392
  type: 0,
389
393
  };
390
- }
394
+ } /* else {
395
+ const ethTx = tx as EthTransaction;
396
+ console.log(`XXXXXX ${(tx as any).asLegacy}`)
397
+
398
+ call = {
399
+ ...baseCall,
400
+
401
+ maxFeePerGas: BigNumber.from(ethTx.maxFeePerGas.unwrap().toBigInt()),
402
+ maxPriorityFeePerGas: BigNumber.from(ethTx.maxPriorityFeePerGas.unwrap().toBigInt()),
403
+
404
+ gasLimit: BigNumber.from(0),
405
+ gasPrice: BigNumber.from(ethTx.gasPrice.unwrap().toBigInt()),
406
+ chainId: ethTx.chainId.unwrap().toNumber(),
407
+
408
+ r: ethTx.r.toHex(),
409
+ s: ethTx.s.toHex(),
410
+ v: ethTx.v.toNumber(),
411
+ type: 0,
412
+ };
413
+ }*/
391
414
 
392
415
  try {
393
416
  const iface = buildInterface(ds, assets);
@@ -420,7 +443,7 @@ const CallProcessor: SecondLayerHandlerProcessor_1_0_0<
420
443
  // if `to` is null then we handle contract creation
421
444
  if (
422
445
  (ds.processor?.options?.address && !stringNormalizedEq(ds.processor.options.address, to)) ||
423
- (ds.processor?.options?.address === null && !rawTx.action.isCreate)
446
+ (ds.processor?.options?.address === null && !(rawTx as EIP1559Transaction).action?.isCreate)
424
447
  ) {
425
448
  return false;
426
449
  }