@sentio/sdk 3.0.1-rc.1 → 3.0.2-rc.1

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.
@@ -1,4 +1,5 @@
1
1
  import { LogDescription, LogParams, ParamType, Result } from 'ethers';
2
+ import { FormattedLog } from '../eth.js';
2
3
  export interface IResult {
3
4
  array?: any[];
4
5
  keys: string[];
@@ -17,7 +18,7 @@ export interface ILogDescription {
17
18
  }
18
19
  export declare function parseLogInline(contractViewInterface: any, log: LogParams): LogDescription | null;
19
20
  export declare function parseLog({ log }: {
20
- log: LogParams;
21
+ log: FormattedLog;
21
22
  }): ILogDescription | null;
22
23
  declare const _default: {
23
24
  parseLog: typeof parseLog;
@@ -1 +1 @@
1
- {"version":3,"file":"decode-worker.d.ts","sourceRoot":"","sources":["../../../src/eth/abi-decoder/decode-worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAIhF,MAAM,WAAW,OAAO;IACtB,KAAK,CAAC,EAAE,GAAG,EAAE,CAAA;IACb,IAAI,EAAE,MAAM,EAAE,CAAA;CACf;AAED,wBAAgB,iBAAiB,CAAC,qBAAqB,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAErH;AAED,wBAAgB,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE;IAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,GAAG,IAAI,CAiB7G;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE;QACJ,KAAK,CAAC,EAAE,GAAG,EAAE,CAAA;QACb,IAAI,EAAE,MAAM,EAAE,CAAA;KACf,GAAG,IAAI,CAAA;CACT;AAED,wBAAgB,cAAc,CAAC,qBAAqB,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,GAAG,cAAc,GAAG,IAAI,CAMhG;AAED,wBAAgB,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,SAAS,CAAA;CAAE,GAAG,eAAe,GAAG,IAAI,CA+B5E;;;;;AAED,wBAGC"}
1
+ {"version":3,"file":"decode-worker.d.ts","sourceRoot":"","sources":["../../../src/eth/abi-decoder/decode-worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAGhF,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAExC,MAAM,WAAW,OAAO;IACtB,KAAK,CAAC,EAAE,GAAG,EAAE,CAAA;IACb,IAAI,EAAE,MAAM,EAAE,CAAA;CACf;AAED,wBAAgB,iBAAiB,CAAC,qBAAqB,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAErH;AAED,wBAAgB,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE;IAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,GAAG,IAAI,CAiB7G;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE;QACJ,KAAK,CAAC,EAAE,GAAG,EAAE,CAAA;QACb,IAAI,EAAE,MAAM,EAAE,CAAA;KACf,GAAG,IAAI,CAAA;CACT;AAED,wBAAgB,cAAc,CAAC,qBAAqB,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,GAAG,cAAc,GAAG,IAAI,CAOhG;AAED,wBAAgB,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,YAAY,CAAA;CAAE,GAAG,eAAe,GAAG,IAAI,CAkC/E;;;;;AAED,wBAGC"}
@@ -1,6 +1,7 @@
1
1
  import { Interface } from 'ethers';
2
2
  import { Piscina } from 'piscina';
3
3
  import { ServerError, Status } from 'nice-grpc';
4
+ import { FormattedLog } from '../eth.js';
4
5
  export function decodeTraceInline(contractViewInterface, inputs, traceData) {
5
6
  return contractViewInterface.getAbiCoder().decode(inputs, traceData, true);
6
7
  }
@@ -24,12 +25,16 @@ export function parseLogInline(contractViewInterface, log) {
24
25
  if (!log) {
25
26
  throw new ServerError(Status.INVALID_ARGUMENT, 'Log is empty');
26
27
  }
27
- const logParam = log;
28
- return contractViewInterface.parseLog(logParam);
28
+ const topics = log.topics;
29
+ const data = log.data;
30
+ return contractViewInterface.parseLog({ topics, data });
29
31
  }
30
32
  export function parseLog({ log }) {
31
33
  const fragments = Piscina['workerData'];
32
34
  const contractViewInterface = new Interface(fragments);
35
+ if (log.raw) {
36
+ log = new FormattedLog(log.raw);
37
+ }
33
38
  const result = parseLogInline(contractViewInterface, log);
34
39
  if (!result) {
35
40
  return null;
@@ -1 +1 @@
1
- {"version":3,"file":"decode-worker.js","sourceRoot":"","sources":["../../../src/eth/abi-decoder/decode-worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAgD,MAAM,QAAQ,CAAA;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAO/C,MAAM,UAAU,iBAAiB,CAAC,qBAA0B,EAAE,MAA4B,EAAE,SAAiB;IAC3G,OAAO,qBAAqB,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;AAC5E,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,EAA8C;IAC3F,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IACvC,MAAM,qBAAqB,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,CAAA;IACtD,MAAM,MAAM,GAAG,iBAAiB,CAAC,qBAAqB,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;IAE1E,MAAM,OAAO,GAAG,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IAC3C,MAAM,SAAS,GAAU,EAAE,CAAA;IAC3B,MAAM,IAAI,GAAa,EAAE,CAAA;IACzB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACd,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACvB,CAAC;IAED,OAAO;QACL,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,IAAI;KACX,CAAA;AACH,CAAC;AAUD,MAAM,UAAU,cAAc,CAAC,qBAA0B,EAAE,GAAc;IACvE,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAA;IAChE,CAAC;IACD,MAAM,QAAQ,GAAG,GAAqD,CAAA;IACtE,OAAO,qBAAqB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;AACjD,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,EAAE,GAAG,EAAsB;IAClD,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IACvC,MAAM,qBAAqB,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,CAAA;IACtD,MAAM,MAAM,GAAG,cAAc,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAA;IACzD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAA;IACb,CAAC;IAED,iEAAiE;IACjE,IAAI,MAAM,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC;QACzB,OAAO;YACL,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,MAAM,CAAC,KAAK;SACpB,CAAA;IACH,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IAC3C,MAAM,SAAS,GAAU,EAAE,CAAA;IAC3B,MAAM,IAAI,GAAa,EAAE,CAAA;IACzB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACd,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACvB,CAAC;IAED,OAAO;QACL,IAAI,EAAE;YACJ,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,IAAI;SACX;QACD,KAAK,EAAE,MAAM,CAAC,KAAK;KACpB,CAAA;AACH,CAAC;AAED,eAAe;IACb,QAAQ;IACR,WAAW;CACZ,CAAA"}
1
+ {"version":3,"file":"decode-worker.js","sourceRoot":"","sources":["../../../src/eth/abi-decoder/decode-worker.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@ import { ERC721Processor } from './builtin/erc721.js';
5
5
  import { AccountContext } from './context.js';
6
6
  import { defaultPreprocessHandler } from './base-processor.js';
7
7
  import { AccountProcessorState } from './account-processor-state.js';
8
- import { fixEmptyKey, formatEthData, validateAndNormalizeAddress } from './eth.js';
8
+ import { fixEmptyKey, formatEthData, TypedEvent, validateAndNormalizeAddress } from './eth.js';
9
9
  import { EthChainId } from '@sentio/chain';
10
10
  import { ServerError, Status } from 'nice-grpc';
11
11
  import { getHandlerName, proxyProcessor } from '../utils/metrics.js';
@@ -150,7 +150,7 @@ export class AccountProcessor {
150
150
  const logParam = log;
151
151
  const parsed = ERC20_INTERFACE.parseLog(logParam);
152
152
  if (parsed) {
153
- const event = { ...log, name: parsed.name, args: fixEmptyKey(parsed) };
153
+ const event = new TypedEvent(log, parsed.name, fixEmptyKey(parsed));
154
154
  await handler(event, ctx);
155
155
  return ctx.stopAndGetResult();
156
156
  }
@@ -166,7 +166,7 @@ export class AccountProcessor {
166
166
  const logParam = log;
167
167
  const parsed = ERC20_INTERFACE.parseLog(logParam);
168
168
  if (parsed) {
169
- const event = { ...log, name: parsed.name, args: fixEmptyKey(parsed) };
169
+ const event = new TypedEvent(log, parsed.name, fixEmptyKey(parsed));
170
170
  return preprocessHandler(event, ctx, preprocessStore);
171
171
  }
172
172
  return PreprocessResult.fromPartial({});
@@ -1 +1 @@
1
- {"version":3,"file":"account-processor.js","sourceRoot":"","sources":["../../src/eth/account-processor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"account-processor.js","sourceRoot":"","sources":["../../src/eth/account-processor.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { ContractContext, GlobalContext } from './context.js';
2
2
  import { EthFetchConfig, PreprocessResult, ProcessResult } from '@sentio/protos';
3
3
  import { ServerError, Status } from 'nice-grpc';
4
- import { fixEmptyKey, formatEthData, validateAndNormalizeAddress } from './eth.js';
4
+ import { fixEmptyKey, formatEthData, TypedEvent, validateAndNormalizeAddress } from './eth.js';
5
5
  import sha3 from 'js-sha3';
6
6
  import { ListStateStorage } from '@sentio/runtime';
7
7
  import { EthChainId } from '@sentio/chain';
@@ -352,7 +352,7 @@ export class BaseProcessor {
352
352
  throw e;
353
353
  }
354
354
  if (parsed) {
355
- const event = { ...log, name: parsed.name, args: fixEmptyKey(parsed) };
355
+ const event = new TypedEvent(log, parsed.name, fixEmptyKey(parsed));
356
356
  await handler(event, ctx);
357
357
  return ctx.stopAndGetResult();
358
358
  }
@@ -390,7 +390,7 @@ export class BaseProcessor {
390
390
  throw e;
391
391
  }
392
392
  if (parsed) {
393
- const event = { ...log, name: parsed.name, args: fixEmptyKey(parsed) };
393
+ const event = new TypedEvent(log, parsed.name, fixEmptyKey(parsed));
394
394
  return preprocessHandler(event, ctx, preprocessStore);
395
395
  }
396
396
  return PreprocessResult.fromPartial({});
@@ -411,7 +411,7 @@ export class BaseProcessor {
411
411
  return undefined;
412
412
  }
413
413
  if (parsed) {
414
- const event = { ...log, name: parsed.name, args: fixEmptyKey(parsed) };
414
+ const event = new TypedEvent(log, parsed.name, fixEmptyKey(parsed));
415
415
  return p(event);
416
416
  }
417
417
  return undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"base-processor.js","sourceRoot":"","sources":["../../src/eth/base-processor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAqB,eAAe,EAAgB,aAAa,EAAE,MAAM,cAAc,CAAA;AAC9F,OAAO,EAML,cAAc,EAGd,gBAAgB,EAChB,aAAa,EACd,MAAM,gBAAgB,CAAA;AAGvB,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAC/C,OAAO,EACL,WAAW,EACX,aAAa,EAMb,2BAA2B,EAC5B,MAAM,UAAU,CAAA;AACjB,OAAO,IAAI,MAAM,SAAS,CAAA;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACnF,OAAO,EAAE,WAAW,EAAkB,MAAM,kBAAkB,CAAA;AAC9D,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAO9D,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAG,EAAE,CAAC,CAAmB,EAAE,aAAa,EAAE,EAAE,EAAU,CAAA,CAAA;AAE9F,MAAM,OAAO,aAAa;IACxB,OAAO,CAA4B;IACnC,WAAW,CAAQ;IACnB,OAAO,CAAgD;IACvD,iBAAiB,CAA2F;IAC5G,WAAW,CAAgB;IAC3B,gBAAgB,CAAsD;CACvE;AAED,MAAM,OAAO,YAAY;IACvB,UAAU,CAAU;IACpB,WAAW,CAAQ;IACnB,OAAO,CAAkD;IACzD,iBAAiB,CAA6F;IAC9G,WAAW,CAAgB;IAC3B,gBAAgB,CAAwD;CACzE;AAED,MAAM,OAAO,YAAY;IACvB,aAAa,CAAiB;IAC9B,qBAAqB,CAAiB;IACtC,WAAW,CAAQ;IACnB,OAAO,CAAkD;IACzD,iBAAiB,CAA6F;IAC9G,WAAW,CAAgB;IAC3B,gBAAgB,CAAwD;CACzE;AAED,MAAM,OAAO,kBAAkB;IAC7B,OAAO,CAAqD;IAC5D,WAAW,CAAQ;IACnB,iBAAiB,CAAmG;IACpH,WAAW,CAAgB;IAC3B,gBAAgB,CAA2D;CAC5E;AAED,MAAM,mBAAmB;IACvB,OAAO,CAAQ;IACf,OAAO,CAAY;IACnB,IAAI,CAAQ;IACZ,KAAK,CAAa;IAClB,GAAG,CAAc;IACjB,UAAU,CAA4B;CACvC;AAED,MAAM,OAAO,oBAAqB,SAAQ,gBAAiC;IACzE,MAAM,CAAC,QAAQ,GAAG,IAAI,oBAAoB,EAAE,CAAA;;AAG9C,MAAM,OAAO,eAAe;IAC1B,MAAM,CAAqB;IAC3B,aAAa,GAAmB,aAAa,CAAC,EAAE,CAAC,CAAA;IACjD,kBAAkB,GAAyB,aAAa,CAAC,EAAE,CAAC,CAAA;IAC5D,aAAa,GAAmB,aAAa,CAAC,EAAE,CAAC,CAAA;IACjD,aAAa,GAAoB,EAAE,CAAA;IAEnC,MAAM,CAAC,IAAI,CAAC,MAAoC;QAC9C,MAAM,SAAS,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAA;QAC7C,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QACjD,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,YAAY,MAAoC;QAC9C,IAAI,CAAC,MAAM,GAAG;YACZ,OAAO,EAAE,WAAW;YACpB,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,QAAQ;YAC7B,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,UAAU,CAAC,QAAQ;YAC9C,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI;gBACrB,KAAK,EAAE,CAAC;aACT;YACD,GAAG,EAAE,MAAM,CAAC,GAAG;SAChB,CAAA;QACD,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG;gBAClB,KAAK,EAAE,MAAM,CAAC,UAAU;aACzB,CAAA;QACH,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG;gBAChB,KAAK,EAAE,MAAM,CAAC,QAAQ;aACvB,CAAA;QACH,CAAC;QAED,OAAO,cAAc,CAAC,IAAI,CAAC,CAAA;IAC7B,CAAC;IAEM,eAAe,CACpB,OAAgE,EAChE,aAAa,GAAG,GAAG,EACnB,qBAAqB,GAAG,IAAI,EAC5B,cAA0D,EAC1D,oBAMiC,wBAAwB;QAEzD,OAAO,IAAI,CAAC,UAAU,CACpB,OAAO,EACP,SAAS,EACT;YACE,cAAc,EAAE,aAAa;YAC7B,gBAAgB,EAAE,qBAAqB;SACxC,EACD,cAAc,EACd,iBAAiB,CAClB,CAAA;IACH,CAAC;IAEM,cAAc,CACnB,OAAgE,EAChE,qBAAqB,GAAG,EAAE,EAC1B,6BAA6B,GAAG,GAAG,EACnC,cAA0D,EAC1D,oBAMiC,wBAAwB;QAEzD,OAAO,IAAI,CAAC,UAAU,CACpB,OAAO,EACP,EAAE,cAAc,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,EAC1F,SAAS,EACT,cAAc,EACd,iBAAiB,CAClB,CAAA;IACH,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAA;IAC5B,CAAC;IAEM,UAAU,CACf,OAAgE,EAChE,YAAwC,EACxC,aAAyC,EACzC,cAA0D,EAC1D,oBAMiC,wBAAwB;QAEzD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QACjC,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,YAAY,CAAC,gBAAgB,GAAG,YAAY,CAAC,cAAc,EAAE,CAAC;gBAChE,YAAY,CAAC,gBAAgB,GAAG,YAAY,CAAC,cAAc,CAAA;YAC7D,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAA;QACtB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACtB,WAAW,EAAE,cAAc,EAAE;YAC7B,OAAO,EAAE,KAAK,WAAW,IAAmB;gBAC1C,MAAM,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;gBAErC,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;gBAClE,CAAC;gBAED,MAAM,GAAG,GAAG,IAAI,aAAa,CAC3B,OAAO,EACP,WAAW,EACX,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,EAChC,KAAK,EACL,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,CAAC,MAAM,CAAC,UAAU,CAC5B,CAAA;gBACD,MAAM,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;gBACzB,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;YAC/B,CAAC;YACD,iBAAiB,EAAE,KAAK,WAAW,IAAmB,EAAE,eAAqC;gBAC3F,MAAM,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;gBAErC,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;gBAClE,CAAC;gBAED,MAAM,GAAG,GAAG,IAAI,aAAa,CAC3B,OAAO,EACP,WAAW,EACX,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,EAChC,KAAK,EACL,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,CAAC,MAAM,CAAC,UAAU,CAC5B,CAAA;gBACD,OAAO,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,eAAe,CAAC,CAAA;YACvD,CAAC;YACD,qBAAqB,EAAE,YAAY;YACnC,aAAa,EAAE,aAAa;YAC5B,WAAW,EAAE,cAAc,CAAC,WAAW,CAAC,cAAc,IAAI,EAAE,CAAC;YAC7D,gBAAgB,EAAE,KAAK,EAAE,IAAmB,EAA+B,EAAE;gBAC3E,MAAM,CAAC,GAAG,cAAc,EAAE,YAAY,CAAA;gBACtC,IAAI,CAAC,CAAC;oBAAE,OAAO,SAAS,CAAA;gBACxB,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;oBAC5B,MAAM,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;oBACrC,IAAI,CAAC,KAAK;wBAAE,OAAO,SAAS,CAAA;oBAC5B,OAAO,CAAC,CAAC,KAAK,CAAC,CAAA;gBACjB,CAAC;gBACD,OAAO,CAAC,CAAA;YACV,CAAC;SACF,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,aAAa,CAClB,OAAsF,EACtF,cAA0E,EAC1E,oBAMiC,wBAAwB;QAEzD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QACjC,MAAM,SAAS,GAAG,IAAI,CAAA;QAEtB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;YAC3B,WAAW,EAAE,cAAc,EAAE;YAC7B,OAAO,EAAE,KAAK,WAAW,IAAyB;gBAChD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;gBAE7E,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,CAAA;gBACxE,CAAC;gBACD,IAAI,EAAE,GAAG,WAAW,CAAC,EAAE,CAAA;gBACvB,IAAI,EAAE,KAAK,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;oBAC9B,EAAE,GAAG,GAAG,CAAA;gBACV,CAAC;gBACD,MAAM,GAAG,GAAG,IAAI,aAAa,CAC3B,OAAO,EACP,EAAE,IAAI,GAAG,EACT,IAAI,CAAC,SAAS,EACd,KAAK,EACL,SAAS,EACT,KAAK,EACL,WAAW,EACX,kBAAkB,EAClB,SAAS,CAAC,MAAM,CAAC,UAAU,CAC5B,CAAA;gBACD,MAAM,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAA;gBAC/B,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;YAC/B,CAAC;YACD,iBAAiB,EAAE,KAAK,WAAW,IAAyB,EAAE,eAAqC;gBACjG,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;gBAE7E,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,CAAA;gBACxE,CAAC;gBACD,IAAI,EAAE,GAAG,WAAW,CAAC,EAAE,CAAA;gBACvB,IAAI,EAAE,KAAK,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;oBAC9B,EAAE,GAAG,GAAG,CAAA;gBACV,CAAC;gBACD,MAAM,GAAG,GAAG,IAAI,aAAa,CAC3B,OAAO,EACP,EAAE,IAAI,GAAG,EACT,IAAI,CAAC,SAAS,EACd,KAAK,EACL,SAAS,EACT,KAAK,EACL,WAAW,EACX,kBAAkB,EAClB,SAAS,CAAC,MAAM,CAAC,UAAU,CAC5B,CAAA;gBACD,OAAO,iBAAiB,CAAC,WAAW,EAAE,GAAG,EAAE,eAAe,CAAC,CAAA;YAC7D,CAAC;YACD,WAAW,EAAE,cAAc,CAAC,WAAW,CAAC,cAAc,IAAI,EAAE,CAAC;YAC7D,gBAAgB,EAAE,KAAK,EAAE,IAAyB,EAA+B,EAAE;gBACjF,MAAM,CAAC,GAAG,cAAc,EAAE,YAAY,CAAA;gBACtC,IAAI,CAAC,CAAC;oBAAE,OAAO,SAAS,CAAA;gBACxB,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;oBAC5B,MAAM,EAAE,WAAW,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;oBAC3C,OAAO,CAAC,CAAC,WAAW,CAAC,CAAA;gBACvB,CAAC;gBACD,OAAO,CAAC,CAAA;YACV,CAAC;SACF,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,OAAO,CACZ,OAAiE,EACjE,MAA8D,EAC9D,cAA2D;QAE3D,IAAI,QAAQ,GAA+B,EAAE,CAAA;QAE7C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,QAAQ,GAAG,MAAM,CAAA;QACnB,CAAC;aAAM,IAAI,MAAM,EAAE,CAAC;YAClB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACvB,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QAEjC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACtB,OAAO,EAAE,QAAQ;YACjB,WAAW,EAAE,cAAc,CAAC,WAAW,CAAC,cAAc,IAAI,EAAE,CAAC;YAC7D,WAAW,EAAE,cAAc,EAAE;YAC7B,OAAO,EAAE,KAAK,WAAW,IAAI;gBAC3B,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;gBAC3E,IAAI,CAAC,GAAG,EAAE,CAAC;oBACT,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAA;gBAChE,CAAC;gBACD,MAAM,GAAG,GAAG,IAAI,aAAa,CAC3B,OAAO,EACP,WAAW,EAAE,EAAE,IAAI,GAAG,EACtB,IAAI,CAAC,SAAS,EACd,KAAK,EACL,GAAG,EACH,SAAS,EACT,WAAW,EACX,kBAAkB,CACnB,CAAA;gBAED,MAAM,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;gBACvB,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;YAC/B,CAAC;SACF,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,OAAO,CACZ,UAA6B,EAC7B,OAA4D,EAC5D,cAAsD,EACtD,oBAMiC,wBAAwB;QAEzD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QACjC,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACnC,UAAU,GAAG,CAAC,UAAU,CAAC,CAAA;QAC3B,CAAC;QACD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;YACjE,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAA;QAEtB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACtB,UAAU;YACV,WAAW,EAAE,cAAc,CAAC,WAAW,CAAC,cAAc,IAAI,EAAE,CAAC;YAC7D,WAAW,EAAE,cAAc,EAAE;YAC7B,OAAO,EAAE,KAAK,WAAW,IAAmB;gBAC1C,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;gBAE7E,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAA;gBACjE,CAAC;gBACD,MAAM,GAAG,GAAG,IAAI,aAAa,CAC3B,OAAO,EACP,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,EACtB,IAAI,CAAC,SAAS,EACd,KAAK,EACL,SAAS,EACT,KAAK,EACL,WAAW,EACX,kBAAkB,EAClB,SAAS,CAAC,MAAM,CAAC,UAAU,CAC5B,CAAA;gBACD,MAAM,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;gBACzB,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;YAC/B,CAAC;YACD,iBAAiB,EAAE,KAAK,WAAW,IAAmB,EAAE,eAAqC;gBAC3F,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;gBAE7E,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAA;gBACjE,CAAC;gBACD,MAAM,GAAG,GAAG,IAAI,aAAa,CAC3B,OAAO,EACP,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,EACtB,IAAI,CAAC,SAAS,EACd,KAAK,EACL,SAAS,EACT,KAAK,EACL,WAAW,EACX,kBAAkB,EAClB,SAAS,CAAC,MAAM,CAAC,UAAU,CAC5B,CAAA;gBACD,OAAO,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,eAAe,CAAC,CAAA;YACvD,CAAC;YACD,gBAAgB,EAAE,KAAK,EAAE,IAAmB,EAA+B,EAAE;gBAC3E,MAAM,CAAC,GAAG,cAAc,EAAE,YAAY,CAAA;gBACtC,IAAI,CAAC,CAAC;oBAAE,OAAO,SAAS,CAAA;gBACxB,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;oBAC5B,MAAM,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;oBACrC,IAAI,CAAC,KAAK;wBAAE,OAAO,SAAS,CAAA;oBAC5B,OAAO,CAAC,CAAC,KAAK,CAAC,CAAA;gBACjB,CAAC;gBACD,OAAO,CAAC,CAAA;YACV,CAAC;SACF,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAED,MAAM,OAAgB,aAAa;IAIjC,aAAa,GAAmB,aAAa,CAAC,EAAE,CAAC,CAAA;IACjD,aAAa,GAAoB,aAAa,CAAC,EAAE,CAAC,CAAA;IAClD,aAAa,GAAmB,aAAa,CAAC,EAAE,CAAC,CAAA;IAEjD,MAAM,CAAqB;IAE3B,YAAY,MAAmB;QAC7B,IAAI,CAAC,MAAM,GAAG;YACZ,OAAO,EAAE,2BAA2B,CAAC,MAAM,CAAC,OAAO,CAAC;YACpD,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE;YACvB,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,UAAU,CAAC,QAAQ;YAC9C,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI;gBACrB,KAAK,EAAE,CAAC;aACT;YACD,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,UAAU,EAAE,MAAM,CAAC,UAAU;SAC9B,CAAA;QACD,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG;gBAClB,KAAK,EAAE,MAAM,CAAC,UAAU;aACzB,CAAA;QACH,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG;gBAChB,KAAK,EAAE,MAAM,CAAC,QAAQ;aACvB,CAAA;QACH,CAAC;QAED,OAAO,cAAc,CAAC,IAAI,CAAC,CAAA;IAC7B,CAAC;IAIM,UAAU;QACf,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAA;IAC5B,CAAC;IAEM,OAAO,CACZ,OAAkG,EAClG,cAA2D,EAC3D,oBAIiC,wBAAwB;QAEzD,MAAM,QAAQ,GAA0B,EAAE,CAAA;QAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAA;QAElD,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;YACnE,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC9B,MAAM,MAAM,GAAG,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;gBACjE,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;YACzB,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAA;IAC9E,CAAC;IAES,UAAU,CAClB,OAA6G,EAC7G,MAAmD,EACnD,cAA2D,EAC3D,oBAIiC,wBAAwB,EACzD,WAAW,GAAG,cAAc,EAAE;QAE9B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QACjC,IAAI,QAAQ,GAA0B,EAAE,CAAA;QAExC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,QAAQ,GAAG,MAAM,CAAA;QACnB,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACvB,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;QACrC,MAAM,SAAS,GAAG,IAAI,CAAA;QACtB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACtB,OAAO,EAAE,QAAQ;YACjB,WAAW,EAAE,cAAc,CAAC,WAAW,CAAC,cAAc,IAAI,EAAE,CAAC;YAC7D,WAAW;YACX,OAAO,EAAE,KAAK,WAAW,IAAiB,EAAE,YAA2B;gBACrE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;gBAC3E,IAAI,CAAC,GAAG,EAAE,CAAC;oBACT,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAA;gBAChE,CAAC;gBACD,IAAI,YAAY,CAAA;gBAChB,IAAI,CAAC;oBACH,YAAY,GAAG,SAAS,CAAC,uBAAuB,EAAE,CAAA;gBACpD,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,CAAC,CAAA;oBACP,iBAAiB;gBACnB,CAAC;gBACD,IAAI,SAAS,CAAC,MAAM,CAAC,OAAO,KAAK,GAAG,EAAE,CAAC;oBACrC,YAAY,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;gBACpC,CAAC;gBACD,MAAM,GAAG,GAAG,IAAI,eAAe,CAC7B,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,IAAI,CAAC,SAAS,EACd,KAAK,EACL,GAAG,EACH,SAAS,EACT,WAAW,EACX,kBAAkB,EAClB,SAAS,CAAC,MAAM,CAAC,UAAU,EAC3B,YAAY,CACb,CAAA;gBACD,IAAI,cAAc,EAAE,YAAY,EAAE,CAAC;oBACjC,MAAM,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;oBACvB,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;gBAC/B,CAAC;gBACD,IAAI,MAAM,GAA0B,IAAI,CAAA;gBACxC,IAAI,CAAC;oBACH,MAAM,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;gBACzD,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,gCAAgC;oBAChC,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;wBACvB,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;4BAC7C,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,iEAAiE,EAAE,CAAC,CAAC,CAAA;4BACxG,OAAO,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;wBACtC,CAAC;oBACH,CAAC;oBACD,MAAM,CAAC,CAAA;gBACT,CAAC;gBACD,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,KAAK,GAAe,EAAE,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,CAAA;oBAClF,MAAM,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;oBACzB,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;gBAC/B,CAAC;gBACD,OAAO,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;YACtC,CAAC;YACD,iBAAiB,EAAE,KAAK,WACtB,IAAiB,EACjB,eAAqC;gBAErC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;gBAC3E,IAAI,CAAC,GAAG,EAAE,CAAC;oBACT,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAA;gBAChE,CAAC;gBACD,IAAI,YAAY,CAAA;gBAChB,IAAI,CAAC;oBACH,YAAY,GAAG,SAAS,CAAC,uBAAuB,EAAE,CAAA;gBACpD,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,CAAC,CAAA;oBACP,iBAAiB;gBACnB,CAAC;gBACD,IAAI,SAAS,CAAC,MAAM,CAAC,OAAO,KAAK,GAAG,EAAE,CAAC;oBACrC,YAAY,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;gBACpC,CAAC;gBAED,MAAM,GAAG,GAAG,IAAI,eAAe,CAC7B,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,IAAI,CAAC,SAAS,EACd,KAAK,EACL,GAAG,EACH,SAAS,EACT,WAAW,EACX,kBAAkB,EAClB,SAAS,CAAC,MAAM,CAAC,UAAU,CAC5B,CAAA;gBAED,IAAI,MAAM,GAA0B,IAAI,CAAA;gBACxC,IAAI,CAAC;oBACH,MAAM,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;gBACzD,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,gCAAgC;oBAChC,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;wBACvB,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;4BAC7C,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,iEAAiE,EAAE,CAAC,CAAC,CAAA;4BACxG,OAAO,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;wBACzC,CAAC;oBACH,CAAC;oBACD,MAAM,CAAC,CAAA;gBACT,CAAC;gBACD,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,KAAK,GAAe,EAAE,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,CAAA;oBAClF,OAAO,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,eAAe,CAAC,CAAA;gBACvD,CAAC;gBACD,OAAO,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;YACzC,CAAC;YACD,gBAAgB,EAAE,KAAK,EAAE,IAAiB,EAA+B,EAAE;gBACzE,MAAM,CAAC,GAAG,cAAc,EAAE,YAAY,CAAA;gBACtC,IAAI,CAAC,CAAC;oBAAE,OAAO,SAAS,CAAA;gBACxB,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;oBAC5B,MAAM,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;oBACnC,IAAI,CAAC,GAAG;wBAAE,OAAO,SAAS,CAAA;oBAC1B,IAAI,MAAM,GAA0B,IAAI,CAAA;oBACxC,IAAI,CAAC;wBACH,MAAM,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;oBACzD,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,OAAO,SAAS,CAAA;oBAClB,CAAC;oBACD,IAAI,MAAM,EAAE,CAAC;wBACX,MAAM,KAAK,GAAe,EAAE,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,CAAA;wBAClF,OAAO,CAAC,CAAC,KAAK,CAAC,CAAA;oBACjB,CAAC;oBACD,OAAO,SAAS,CAAA;gBAClB,CAAC;gBACD,OAAO,CAAC,CAAA;YACV,CAAC;SACF,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,eAAe,CACpB,OAAiG,EACjG,aAAa,GAAG,GAAG,EACnB,qBAAqB,GAAG,IAAI,EAC5B,cAA0D,EAC1D,oBAIiC,wBAAwB;QAEzD,OAAO,IAAI,CAAC,UAAU,CACpB,OAAO,EACP,SAAS,EACT;YACE,cAAc,EAAE,aAAa;YAC7B,gBAAgB,EAAE,qBAAqB;SACxC,EACD,cAAc,EACd,iBAAiB,CAClB,CAAA;IACH,CAAC;IAEM,cAAc,CACnB,OAAiG,EACjG,qBAAqB,GAAG,EAAE,EAC1B,6BAA6B,GAAG,GAAG,EACnC,cAA0D,EAC1D,oBAIiC,wBAAwB;QAEzD,OAAO,IAAI,CAAC,UAAU,CACpB,OAAO,EACP,EAAE,cAAc,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,EAC1F,SAAS,EACT,cAAc,EACd,iBAAiB,CAClB,CAAA;IACH,CAAC;IAEM,UAAU,CACf,OAAiG,EACjG,YAAwC,EACxC,aAAyC,EACzC,cAA0D,EAC1D,oBAIiC,wBAAwB,EACzD,WAAW,GAAG,cAAc,EAAE;QAE9B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QACjC,MAAM,SAAS,GAAG,IAAI,CAAA;QACtB,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;QAErC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACtB,WAAW;YACX,OAAO,EAAE,KAAK,WAAW,IAAmB,EAAE,YAA2B;gBACvE,MAAM,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;gBAErC,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;gBAClE,CAAC;gBAED,MAAM,YAAY,GAAG,SAAS,CAAC,uBAAuB,EAAE,CAAA;gBAExD,MAAM,GAAG,GAAG,IAAI,eAAe,CAC7B,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,EAChC,KAAK,EACL,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,CAAC,MAAM,CAAC,UAAU,EAC3B,YAAY,CACb,CAAA;gBACD,MAAM,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;gBACzB,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;YAC/B,CAAC;YACD,iBAAiB,EAAE,KAAK,WAAW,IAAmB,EAAE,eAAqC;gBAC3F,MAAM,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;gBAErC,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;gBAClE,CAAC;gBAED,MAAM,YAAY,GAAG,SAAS,CAAC,uBAAuB,EAAE,CAAA;gBAExD,MAAM,GAAG,GAAG,IAAI,eAAe,CAC7B,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,EAChC,KAAK,EACL,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,CAAC,MAAM,CAAC,UAAU,CAC5B,CAAA;gBACD,OAAO,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,eAAe,CAAC,CAAA;YACvD,CAAC;YACD,qBAAqB,EAAE,YAAY;YACnC,aAAa,EAAE,aAAa;YAC5B,WAAW,EAAE,cAAc,CAAC,WAAW,CAAC,cAAc,IAAI,EAAE,CAAC;YAC7D,gBAAgB,EAAE,KAAK,EAAE,IAAmB,EAA+B,EAAE;gBAC3E,MAAM,CAAC,GAAG,cAAc,EAAE,YAAY,CAAA;gBACtC,IAAI,CAAC,CAAC;oBAAE,OAAO,SAAS,CAAA;gBACxB,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;oBAC5B,MAAM,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;oBACrC,IAAI,CAAC,KAAK;wBAAE,OAAO,SAAS,CAAA;oBAC5B,OAAO,CAAC,CAAC,KAAK,CAAC,CAAA;gBACjB,CAAC;gBACD,OAAO,CAAC,CAAA;YACV,CAAC;SACF,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAES,UAAU,CAClB,UAA6B,EAC7B,OAAsG,EACtG,cAA+D,EAC/D,oBAIiC,wBAAwB,EACzD,WAAW,GAAG,cAAc,EAAE;QAE9B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QACjC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;QACrC,MAAM,SAAS,GAAG,IAAI,CAAA;QACtB,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACnC,UAAU,GAAG,CAAC,UAAU,CAAC,CAAA;QAC3B,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACtB,UAAU;YACV,WAAW,EAAE,cAAc,CAAC,WAAW,CAAC,cAAc,IAAI,EAAE,CAAC;YAC7D,WAAW;YACX,OAAO,EAAE,KAAK,WAAW,IAAmB,EAAE,YAA2B;gBACvE,MAAM,YAAY,GAAG,SAAS,CAAC,uBAAuB,EAAE,CAAA;gBACxD,MAAM,iBAAiB,GAAG,YAAY,CAAC,WAAW,CAAC,SAAS,CAAA;gBAC5D,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;gBAC7E,MAAM,OAAO,GAAG,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;gBACjD,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,CAAA;gBACxE,CAAC;gBACD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;gBAEvD,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACxB,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAA;gBACjE,CAAC;gBACD,MAAM,UAAU,GAAG,KAAuB,CAAA;gBAC1C,UAAU,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAA;gBAC/B,UAAU,CAAC,iBAAiB,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAA;gBAChD,oCAAoC;gBACpC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;oBACzB,OAAO,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;gBACtC,CAAC;gBACD,MAAM,SAAS,GAAG,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;gBACrD,IAAI,CAAC;oBACH,UAAU,CAAC,IAAI,GAAG,MAAM,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;oBAC1E,6FAA6F;gBAC/F,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;wBACjB,MAAM,CAAC,CAAA;oBACT,CAAC;oBACD,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAA;gBACvD,CAAC;gBACD,MAAM,GAAG,GAAG,IAAI,eAAe,CAC7B,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,IAAI,CAAC,SAAS,EACd,KAAK,EACL,SAAS,EACT,KAAK,EACL,WAAW,EACX,kBAAkB,EAClB,SAAS,CAAC,MAAM,CAAC,UAAU,EAC3B,YAAY,CACb,CAAA;gBACD,MAAM,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;gBAC9B,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;YAC/B,CAAC;YACD,iBAAiB,EAAE,KAAK,WAAW,IAAmB,EAAE,eAAqC;gBAC3F,MAAM,YAAY,GAAG,SAAS,CAAC,uBAAuB,EAAE,CAAA;gBACxD,MAAM,iBAAiB,GAAG,YAAY,CAAC,WAAW,CAAC,SAAS,CAAA;gBAC5D,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;gBAC7E,MAAM,OAAO,GAAG,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;gBACjD,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,CAAA;gBACxE,CAAC;gBACD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;gBAEvD,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACxB,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAA;gBACjE,CAAC;gBACD,MAAM,UAAU,GAAG,KAAuB,CAAA;gBAC1C,UAAU,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAA;gBAC/B,UAAU,CAAC,iBAAiB,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAA;gBAChD,oCAAoC;gBACpC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;oBACzB,OAAO,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;gBACzC,CAAC;gBACD,MAAM,SAAS,GAAG,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;gBACrD,IAAI,CAAC;oBACH,UAAU,CAAC,IAAI,GAAG,MAAM,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;gBAC5E,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;wBACjB,MAAM,CAAC,CAAA;oBACT,CAAC;oBACD,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAA;gBACvD,CAAC;gBACD,MAAM,GAAG,GAAG,IAAI,eAAe,CAC7B,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,IAAI,CAAC,SAAS,EACd,KAAK,EACL,SAAS,EACT,KAAK,EACL,WAAW,EACX,kBAAkB,EAClB,SAAS,CAAC,MAAM,CAAC,UAAU,CAC5B,CAAA;gBACD,OAAO,iBAAiB,CAAC,UAAU,EAAE,GAAG,EAAE,eAAe,CAAC,CAAA;YAC5D,CAAC;YACD,gBAAgB,EAAE,KAAK,EAAE,IAAmB,EAA+B,EAAE;gBAC3E,MAAM,CAAC,GAAG,cAAc,EAAE,YAAY,CAAA;gBACtC,IAAI,CAAC,CAAC;oBAAE,OAAO,SAAS,CAAA;gBACxB,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;oBAC5B,MAAM,YAAY,GAAG,SAAS,CAAC,uBAAuB,EAAE,CAAA;oBACxD,MAAM,iBAAiB,GAAG,YAAY,CAAC,WAAW,CAAC,SAAS,CAAA;oBAC5D,MAAM,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;oBACrC,IAAI,CAAC,KAAK;wBAAE,OAAO,SAAS,CAAA;oBAC5B,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;oBAChD,IAAI,CAAC,OAAO;wBAAE,OAAO,SAAS,CAAA;oBAC9B,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;oBACvD,IAAI,CAAC,QAAQ;wBAAE,OAAO,SAAS,CAAA;oBAC/B,MAAM,UAAU,GAAG,KAAuB,CAAA;oBAC1C,UAAU,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAA;oBAC/B,UAAU,CAAC,iBAAiB,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAA;oBAChD,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;wBACvB,MAAM,SAAS,GAAG,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;wBACrD,IAAI,CAAC;4BACH,UAAU,CAAC,IAAI,GAAG,MAAM,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;wBAC5E,CAAC;wBAAC,OAAO,CAAC,EAAE,CAAC;4BACX,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;gCACjB,MAAM,CAAC,CAAA;4BACT,CAAC;wBACH,CAAC;oBACH,CAAC;oBACD,OAAO,CAAC,CAAC,UAAU,CAAC,CAAA;gBACtB,CAAC;gBACD,OAAO,CAAC,CAAA;YACV,CAAC;SACF,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,OAAO,CACZ,OAAsG,EACtG,cAA+D,EAC/D,oBAIiC,wBAAwB;QAEzD,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAA;QAClD,MAAM,SAAS,GAAG,EAAE,CAAA;QAEpB,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;YACnE,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBACjC,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAA;gBACnC,MAAM,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;gBAChD,MAAM,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBAC5D,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACzB,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAA;IAC/E,CAAC;CACF;AAED,kDAAkD;AAClD,KAAK,UAAU,kBAAkB,CAAC,IAAS,EAAE,SAAc,EAAE,GAAQ;IACnE,uDAAuD;IACvD,IAAK,IAAY,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAC5C,OAAQ,IAAY,CAAC,WAAW,CAAA;IAClC,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,CAE5C;QAAC,IAAY,CAAC,WAAW,GAAG,MAAM,CAAA;QACnC,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,0CAA0C;QAC1C,CAAC;QAAC,IAAY,CAAC,WAAW,GAAG,IAAI,CAAA;QACjC,MAAM,CAAC,CAAA;IACT,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"base-processor.js","sourceRoot":"","sources":["../../src/eth/base-processor.ts"],"names":[],"mappings":"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"}
package/lib/eth/eth.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { LogParams, TransactionReceiptParams } from 'ethers/providers';
2
- import { LogDescription, Result, DeferredTopicFilter, BlockParams, Interface, Contract, Addressable, InterfaceAbi, ContractRunner } from 'ethers';
2
+ import { Addressable, BlockParams, Contract, ContractRunner, DeferredTopicFilter, Interface, InterfaceAbi, LogDescription, Result } from 'ethers';
3
3
  import { ContractContext } from './context.js';
4
4
  import { EthCallContext, EthCallParam } from '@sentio/protos';
5
5
  export interface IResult {
@@ -12,10 +12,6 @@ export interface IResult {
12
12
  */
13
13
  toObject(): Record<string, any>;
14
14
  }
15
- export interface TypedEvent<TArgsArray extends Array<any> = any, TArgsObject = any> extends LogParams {
16
- args: TArgsObject & IResult;
17
- name: string;
18
- }
19
15
  export type RawEvent = Record<string, any>;
20
16
  export type TypedEventFilter<_TEvent extends TypedEvent> = DeferredTopicFilter;
21
17
  export interface RichBlock extends BlockParams {
@@ -29,6 +25,26 @@ export declare class SimpleEthersError extends Error {
29
25
  }
30
26
  export declare function transformEtherError(e: Error, ctx: ContractContext<any, any> | undefined, stack?: string): Error;
31
27
  export declare function fixEmptyKey(result: LogDescription): Result;
28
+ export declare class FormattedLog implements LogParams {
29
+ readonly raw: any;
30
+ constructor(raw: any);
31
+ get transactionHash(): string;
32
+ get blockHash(): string;
33
+ get blockNumber(): number;
34
+ get removed(): boolean;
35
+ _address: string;
36
+ get address(): string;
37
+ get topics(): readonly string[];
38
+ get transactionIndex(): number;
39
+ get index(): number;
40
+ get data(): string;
41
+ }
42
+ export declare class TypedEvent<TArgsArray extends Array<any> = any, TArgsObject = any> extends FormattedLog {
43
+ readonly log: FormattedLog;
44
+ readonly name: string;
45
+ readonly args: TArgsObject & IResult;
46
+ constructor(log: FormattedLog, name: string, args: TArgsObject & IResult);
47
+ }
32
48
  export declare function formatEthData(data: {
33
49
  log?: any;
34
50
  block?: any;
@@ -1 +1 @@
1
- {"version":3,"file":"eth.d.ts","sourceRoot":"","sources":["../../src/eth/eth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"eth.d.ts","sourceRoot":"","sources":["../../src/eth/eth.ts"],"names":[],"mappings":"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"}
package/lib/eth/eth.js CHANGED
@@ -1,7 +1,7 @@
1
- import { formatBlock, formatLog, formatTransactionResponse, allowNull, arrayOf, formatHash, formatReceiptLog, object, formatData } from 'ethers/providers';
2
- import { Result, Interface, Contract } from 'ethers';
1
+ import { arrayOf, formatBlock, formatTransactionResponse } from 'ethers/providers';
2
+ import { Contract, Interface, Result } from 'ethers';
3
3
  import { getAddress } from 'ethers/address';
4
- import { getBigInt, getNumber, hexlify } from 'ethers/utils';
4
+ import { getBigInt } from 'ethers/utils';
5
5
  import { ALL_ADDRESS } from '../core/index.js';
6
6
  export class SimpleEthersError extends Error {
7
7
  e;
@@ -49,33 +49,178 @@ export function fixEmptyKey(result) {
49
49
  }
50
50
  return Result.fromItems(Array.from(result.args.values()), keys);
51
51
  }
52
- const _formatTransactionReceipt = object({
53
- to: allowNull(getAddress, null),
54
- from: allowNull(getAddress, null),
55
- contractAddress: allowNull(getAddress, null),
56
- // should be allowNull(hash), but broken-EIP-658 support is handled in receipt
57
- index: getNumber,
58
- root: allowNull(hexlify),
59
- gasUsed: getBigInt,
60
- logsBloom: allowNull(formatData),
61
- blockHash: formatHash,
62
- hash: formatHash,
63
- logs: allowNull(arrayOf(formatReceiptLog)), // Only thing that different
64
- blockNumber: getNumber,
65
- //confirmations: allowNull(getNumber, null),
66
- cumulativeGasUsed: getBigInt,
67
- effectiveGasPrice: allowNull(getBigInt),
68
- gasPrice: allowNull(getBigInt),
69
- l1Fee: allowNull(getBigInt),
70
- status: allowNull(getNumber),
71
- type: allowNull(getNumber, 0)
72
- }, {
73
- // effectiveGasPrice: ['gasPrice'],
74
- hash: ['transactionHash'],
75
- index: ['transactionIndex']
76
- });
77
52
  function formatTransactionReceipt(value) {
78
- return _formatTransactionReceipt(value);
53
+ return new TransactionReceipt(value);
54
+ }
55
+ class TransactionReceipt {
56
+ data;
57
+ constructor(data) {
58
+ this.data = data;
59
+ }
60
+ toChecksumAddress(originData, converted) {
61
+ if (converted) {
62
+ return converted;
63
+ }
64
+ if (originData === null) {
65
+ return null;
66
+ }
67
+ return getAddress(originData);
68
+ }
69
+ _to;
70
+ get to() {
71
+ this._to = this.toChecksumAddress(this.data.to, this._to);
72
+ return this._to;
73
+ }
74
+ _from;
75
+ get from() {
76
+ this._from = this.toChecksumAddress(this.data.from, this._from);
77
+ return this._from;
78
+ }
79
+ _contractAddress;
80
+ get contractAddress() {
81
+ this._contractAddress = this.toChecksumAddress(this.data.contractAddress, this._contractAddress);
82
+ return this._contractAddress;
83
+ }
84
+ get hash() {
85
+ return this.data.transactionHash;
86
+ }
87
+ get index() {
88
+ return this.data.transactionIndex;
89
+ }
90
+ get blockHash() {
91
+ return this.data.blockHash;
92
+ }
93
+ get blockNumber() {
94
+ return this.data.blockNumber;
95
+ }
96
+ get logsBloom() {
97
+ return this.data.logsBloom;
98
+ }
99
+ _logs;
100
+ get logs() {
101
+ if (this._logs) {
102
+ return this._logs;
103
+ }
104
+ this._logs = arrayOf(formatLog)(this.data.logs);
105
+ return this._logs;
106
+ }
107
+ _gasUsed;
108
+ get gasUsed() {
109
+ if (this._gasUsed != null) {
110
+ return this._gasUsed;
111
+ }
112
+ this._gasUsed = getBigInt(this.data.gasUsed);
113
+ return this._gasUsed;
114
+ }
115
+ _blobGasUsed;
116
+ get blobGasUsed() {
117
+ if (this._blobGasUsed !== undefined) {
118
+ return this._blobGasUsed;
119
+ }
120
+ this._blobGasUsed = getBigInt(this.data.blobGasUsed);
121
+ return this._blobGasUsed;
122
+ }
123
+ _cumulativeGasUsed;
124
+ get cumulativeGasUsed() {
125
+ if (this._cumulativeGasUsed != null) {
126
+ return this._cumulativeGasUsed;
127
+ }
128
+ this._cumulativeGasUsed = getBigInt(this.data.cumulativeGasUsed);
129
+ return this._cumulativeGasUsed;
130
+ }
131
+ _gasPrice;
132
+ get gasPrice() {
133
+ if (this._gasPrice !== undefined) {
134
+ return this._gasPrice;
135
+ }
136
+ this._gasPrice = getBigInt(this.data.gasPrice);
137
+ return this._gasPrice;
138
+ }
139
+ _blobGasPrice;
140
+ get blobGasPrice() {
141
+ if (this._blobGasPrice !== undefined) {
142
+ return this._blobGasPrice;
143
+ }
144
+ this._blobGasPrice = getBigInt(this.data.blobGasPrice);
145
+ return this._blobGasPrice;
146
+ }
147
+ _effectiveGasPrice;
148
+ get effectiveGasPrice() {
149
+ if (this._effectiveGasPrice !== undefined) {
150
+ return this._effectiveGasPrice;
151
+ }
152
+ this._effectiveGasPrice = getBigInt(this.data.effectiveGasPrice);
153
+ return this._effectiveGasPrice;
154
+ }
155
+ _l1Fee;
156
+ get l1Fee() {
157
+ if (this._l1Fee !== undefined) {
158
+ return this._l1Fee;
159
+ }
160
+ this._l1Fee = getBigInt(this.data.l1Fee);
161
+ return this._l1Fee;
162
+ }
163
+ get type() {
164
+ return this.data.type;
165
+ }
166
+ get status() {
167
+ return this.data.status;
168
+ }
169
+ get root() {
170
+ return this.data.root;
171
+ }
172
+ }
173
+ export class FormattedLog {
174
+ raw;
175
+ constructor(raw) {
176
+ this.raw = raw;
177
+ }
178
+ get transactionHash() {
179
+ return this.raw.transactionHash;
180
+ }
181
+ get blockHash() {
182
+ return this.raw.blockHash;
183
+ }
184
+ get blockNumber() {
185
+ return this.raw.blockNumber;
186
+ }
187
+ get removed() {
188
+ return this.raw.removed;
189
+ }
190
+ _address;
191
+ get address() {
192
+ if (this._address) {
193
+ return this._address;
194
+ }
195
+ this._address = getAddress(this.raw.address);
196
+ return this._address;
197
+ }
198
+ get topics() {
199
+ return this.raw.topics;
200
+ }
201
+ get transactionIndex() {
202
+ return this.raw.transactionIndex;
203
+ }
204
+ get index() {
205
+ return this.raw.logIndex;
206
+ }
207
+ get data() {
208
+ return this.raw.data;
209
+ }
210
+ }
211
+ export class TypedEvent extends FormattedLog {
212
+ log;
213
+ name;
214
+ args;
215
+ constructor(log, name, args) {
216
+ super(log.raw);
217
+ this.log = log;
218
+ this.name = name;
219
+ this.args = args;
220
+ }
221
+ }
222
+ function formatLog(log) {
223
+ return new FormattedLog(log);
79
224
  }
80
225
  export function formatEthData(data) {
81
226
  // Return cached result if it exists
@@ -1 +1 @@
1
- {"version":3,"file":"eth.js","sourceRoot":"","sources":["../../src/eth/eth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"eth.js","sourceRoot":"","sources":["../../src/eth/eth.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sentio/sdk",
3
- "version": "3.0.1-rc.1",
3
+ "version": "3.0.2-rc.1",
4
4
  "license": "Apache-2.0",
5
5
  "type": "module",
6
6
  "exports": {
@@ -97,8 +97,8 @@
97
97
  "typechain": "^8.3.2",
98
98
  "utility-types": "^3.11.0",
99
99
  "yaml": "^2.3.4",
100
- "@sentio/protos": "3.0.1-rc.1",
101
- "@sentio/runtime": "^3.0.1-rc.1"
100
+ "@sentio/protos": "3.0.2-rc.1",
101
+ "@sentio/runtime": "^3.0.2-rc.1"
102
102
  },
103
103
  "peerDependencies": {
104
104
  "@sentio/tsup": "^8.3.5-rc.1"
@@ -1,6 +1,7 @@
1
1
  import { Interface, LogDescription, LogParams, ParamType, Result } from 'ethers'
2
2
  import { Piscina } from 'piscina'
3
3
  import { ServerError, Status } from 'nice-grpc'
4
+ import { FormattedLog } from '../eth.js'
4
5
 
5
6
  export interface IResult {
6
7
  array?: any[]
@@ -42,13 +43,17 @@ export function parseLogInline(contractViewInterface: any, log: LogParams): LogD
42
43
  if (!log) {
43
44
  throw new ServerError(Status.INVALID_ARGUMENT, 'Log is empty')
44
45
  }
45
- const logParam = log as any as { topics: Array<string>; data: string }
46
- return contractViewInterface.parseLog(logParam)
46
+ const topics = log.topics
47
+ const data = log.data
48
+ return contractViewInterface.parseLog({ topics, data })
47
49
  }
48
50
 
49
- export function parseLog({ log }: { log: LogParams }): ILogDescription | null {
51
+ export function parseLog({ log }: { log: FormattedLog }): ILogDescription | null {
50
52
  const fragments = Piscina['workerData']
51
53
  const contractViewInterface = new Interface(fragments)
54
+ if (log.raw) {
55
+ log = new FormattedLog(log.raw)
56
+ }
52
57
  const result = parseLogInline(contractViewInterface, log)
53
58
  if (!result) {
54
59
  return null
@@ -317,7 +317,7 @@ export class AccountProcessor {
317
317
  const logParam = log as any as { topics: Array<string>; data: string }
318
318
  const parsed = ERC20_INTERFACE.parseLog(logParam)
319
319
  if (parsed) {
320
- const event: TypedEvent = { ...log, name: parsed.name, args: fixEmptyKey(parsed) }
320
+ const event: TypedEvent = new TypedEvent(log, parsed.name, fixEmptyKey(parsed))
321
321
  await handler(event, ctx)
322
322
  return ctx.stopAndGetResult()
323
323
  }
@@ -343,7 +343,7 @@ export class AccountProcessor {
343
343
  const logParam = log as any as { topics: Array<string>; data: string }
344
344
  const parsed = ERC20_INTERFACE.parseLog(logParam)
345
345
  if (parsed) {
346
- const event: TypedEvent = { ...log, name: parsed.name, args: fixEmptyKey(parsed) }
346
+ const event: TypedEvent = new TypedEvent(log, parsed.name, fixEmptyKey(parsed))
347
347
  return preprocessHandler(event, ctx, preprocessStore)
348
348
  }
349
349
  return PreprocessResult.fromPartial({})
@@ -592,7 +592,7 @@ export abstract class BaseProcessor<
592
592
  throw e
593
593
  }
594
594
  if (parsed) {
595
- const event: TypedEvent = { ...log, name: parsed.name, args: fixEmptyKey(parsed) }
595
+ const event: TypedEvent = new TypedEvent(log, parsed.name, fixEmptyKey(parsed))
596
596
  await handler(event, ctx)
597
597
  return ctx.stopAndGetResult()
598
598
  }
@@ -644,7 +644,7 @@ export abstract class BaseProcessor<
644
644
  throw e
645
645
  }
646
646
  if (parsed) {
647
- const event: TypedEvent = { ...log, name: parsed.name, args: fixEmptyKey(parsed) }
647
+ const event: TypedEvent = new TypedEvent(log, parsed.name, fixEmptyKey(parsed))
648
648
  return preprocessHandler(event, ctx, preprocessStore)
649
649
  }
650
650
  return PreprocessResult.fromPartial({})
@@ -662,7 +662,7 @@ export abstract class BaseProcessor<
662
662
  return undefined
663
663
  }
664
664
  if (parsed) {
665
- const event: TypedEvent = { ...log, name: parsed.name, args: fixEmptyKey(parsed) }
665
+ const event: TypedEvent = new TypedEvent(log, parsed.name, fixEmptyKey(parsed))
666
666
  return p(event)
667
667
  }
668
668
  return undefined
package/src/eth/eth.ts CHANGED
@@ -1,31 +1,19 @@
1
+ import { arrayOf, formatBlock, formatTransactionResponse, LogParams, TransactionReceiptParams } from 'ethers/providers'
1
2
  import {
2
- LogParams,
3
- formatBlock,
4
- formatLog,
5
- TransactionReceiptParams,
6
- formatTransactionResponse,
7
- allowNull,
8
- arrayOf,
9
- formatHash,
10
- formatReceiptLog,
11
- object,
12
- formatData
13
- } from 'ethers/providers'
14
- import {
3
+ Addressable,
4
+ BlockParams,
15
5
  CallExceptionError,
16
- LogDescription,
17
- Result,
6
+ Contract,
7
+ ContractRunner,
18
8
  DeferredTopicFilter,
19
- BlockParams,
20
9
  Interface,
21
- Contract,
22
- Addressable,
23
10
  InterfaceAbi,
24
- ContractRunner
11
+ LogDescription,
12
+ Result
25
13
  } from 'ethers'
26
14
  import { ContractContext } from './context.js'
27
15
  import { getAddress } from 'ethers/address'
28
- import { getBigInt, getNumber, hexlify } from 'ethers/utils'
16
+ import { getBigInt } from 'ethers/utils'
29
17
  import { EthCallContext, EthCallParam } from '@sentio/protos'
30
18
  import { ALL_ADDRESS } from '../core/index.js'
31
19
 
@@ -40,11 +28,6 @@ export interface IResult {
40
28
  toObject(): Record<string, any>
41
29
  }
42
30
 
43
- export interface TypedEvent<TArgsArray extends Array<any> = any, TArgsObject = any> extends LogParams {
44
- args: TArgsObject & IResult
45
- name: string
46
- }
47
-
48
31
  export type RawEvent = Record<string, any>
49
32
 
50
33
  export type TypedEventFilter<_TEvent extends TypedEvent> = DeferredTopicFilter
@@ -106,37 +89,184 @@ export function fixEmptyKey(result: LogDescription): Result {
106
89
  return Result.fromItems(Array.from(result.args.values()), keys)
107
90
  }
108
91
 
109
- const _formatTransactionReceipt = object(
110
- {
111
- to: allowNull(getAddress, null),
112
- from: allowNull(getAddress, null),
113
- contractAddress: allowNull(getAddress, null),
114
- // should be allowNull(hash), but broken-EIP-658 support is handled in receipt
115
- index: getNumber,
116
- root: allowNull(hexlify),
117
- gasUsed: getBigInt,
118
- logsBloom: allowNull(formatData),
119
- blockHash: formatHash,
120
- hash: formatHash,
121
- logs: allowNull(arrayOf(formatReceiptLog)), // Only thing that different
122
- blockNumber: getNumber,
123
- //confirmations: allowNull(getNumber, null),
124
- cumulativeGasUsed: getBigInt,
125
- effectiveGasPrice: allowNull(getBigInt),
126
- gasPrice: allowNull(getBigInt),
127
- l1Fee: allowNull(getBigInt),
128
- status: allowNull(getNumber),
129
- type: allowNull(getNumber, 0)
130
- },
131
- {
132
- // effectiveGasPrice: ['gasPrice'],
133
- hash: ['transactionHash'],
134
- index: ['transactionIndex']
135
- }
136
- )
137
-
138
92
  function formatTransactionReceipt(value: any): TransactionReceiptParams {
139
- return _formatTransactionReceipt(value)
93
+ return new TransactionReceipt(value)
94
+ }
95
+
96
+ class TransactionReceipt implements TransactionReceiptParams {
97
+ constructor(readonly data: any) {}
98
+
99
+ private toChecksumAddress<T>(originData: string | null, converted: T): T {
100
+ if (converted) {
101
+ return converted
102
+ }
103
+ if (originData === null) {
104
+ return null as T
105
+ }
106
+ return getAddress(originData) as T
107
+ }
108
+
109
+ _to: string | null
110
+ get to(): string | null {
111
+ this._to = this.toChecksumAddress(this.data.to, this._to)
112
+ return this._to
113
+ }
114
+ _from: string
115
+ get from() {
116
+ this._from = this.toChecksumAddress(this.data.from, this._from)
117
+ return this._from
118
+ }
119
+ _contractAddress: string | null
120
+ get contractAddress(): string | null {
121
+ this._contractAddress = this.toChecksumAddress(this.data.contractAddress, this._contractAddress)
122
+ return this._contractAddress
123
+ }
124
+
125
+ get hash(): string {
126
+ return this.data.transactionHash
127
+ }
128
+ get index(): number {
129
+ return this.data.transactionIndex
130
+ }
131
+
132
+ get blockHash(): string {
133
+ return this.data.blockHash
134
+ }
135
+ get blockNumber(): number {
136
+ return this.data.blockNumber
137
+ }
138
+ get logsBloom(): string {
139
+ return this.data.logsBloom
140
+ }
141
+ _logs: LogParams[]
142
+ get logs(): readonly LogParams[] {
143
+ if (this._logs) {
144
+ return this._logs
145
+ }
146
+ this._logs = arrayOf(formatLog)(this.data.logs)
147
+ return this._logs
148
+ }
149
+ _gasUsed: bigint
150
+ get gasUsed(): bigint {
151
+ if (this._gasUsed != null) {
152
+ return this._gasUsed
153
+ }
154
+ this._gasUsed = getBigInt(this.data.gasUsed)
155
+ return this._gasUsed
156
+ }
157
+
158
+ _blobGasUsed?: bigint | null | undefined
159
+ get blobGasUsed(): bigint | null | undefined {
160
+ if (this._blobGasUsed !== undefined) {
161
+ return this._blobGasUsed
162
+ }
163
+ this._blobGasUsed = getBigInt(this.data.blobGasUsed)
164
+ return this._blobGasUsed
165
+ }
166
+ _cumulativeGasUsed: bigint
167
+ get cumulativeGasUsed(): bigint {
168
+ if (this._cumulativeGasUsed != null) {
169
+ return this._cumulativeGasUsed
170
+ }
171
+ this._cumulativeGasUsed = getBigInt(this.data.cumulativeGasUsed)
172
+ return this._cumulativeGasUsed
173
+ }
174
+ _gasPrice?: bigint | null | undefined
175
+ get gasPrice(): bigint | null | undefined {
176
+ if (this._gasPrice !== undefined) {
177
+ return this._gasPrice
178
+ }
179
+ this._gasPrice = getBigInt(this.data.gasPrice)
180
+ return this._gasPrice
181
+ }
182
+ _blobGasPrice?: bigint | null | undefined
183
+ get blobGasPrice(): bigint | null | undefined {
184
+ if (this._blobGasPrice !== undefined) {
185
+ return this._blobGasPrice
186
+ }
187
+ this._blobGasPrice = getBigInt(this.data.blobGasPrice)
188
+ return this._blobGasPrice
189
+ }
190
+ _effectiveGasPrice?: bigint | null | undefined
191
+ get effectiveGasPrice(): bigint | null | undefined {
192
+ if (this._effectiveGasPrice !== undefined) {
193
+ return this._effectiveGasPrice
194
+ }
195
+ this._effectiveGasPrice = getBigInt(this.data.effectiveGasPrice)
196
+ return this._effectiveGasPrice
197
+ }
198
+ _l1Fee?: bigint | null | undefined
199
+ get l1Fee(): bigint | null | undefined {
200
+ if (this._l1Fee !== undefined) {
201
+ return this._l1Fee
202
+ }
203
+ this._l1Fee = getBigInt(this.data.l1Fee)
204
+ return this._l1Fee
205
+ }
206
+ get type(): number {
207
+ return this.data.type
208
+ }
209
+ get status(): number | null {
210
+ return this.data.status
211
+ }
212
+ get root(): string | null {
213
+ return this.data.root
214
+ }
215
+ }
216
+
217
+ export class FormattedLog implements LogParams {
218
+ constructor(readonly raw: any) {}
219
+ get transactionHash(): string {
220
+ return this.raw.transactionHash
221
+ }
222
+ get blockHash(): string {
223
+ return this.raw.blockHash
224
+ }
225
+ get blockNumber(): number {
226
+ return this.raw.blockNumber
227
+ }
228
+ get removed(): boolean {
229
+ return this.raw.removed
230
+ }
231
+
232
+ _address: string
233
+ get address(): string {
234
+ if (this._address) {
235
+ return this._address
236
+ }
237
+ this._address = getAddress(this.raw.address)
238
+ return this._address
239
+ }
240
+
241
+ get topics(): readonly string[] {
242
+ return this.raw.topics
243
+ }
244
+
245
+ get transactionIndex(): number {
246
+ return this.raw.transactionIndex
247
+ }
248
+
249
+ get index(): number {
250
+ return this.raw.logIndex
251
+ }
252
+
253
+ get data(): string {
254
+ return this.raw.data
255
+ }
256
+ }
257
+
258
+ export class TypedEvent<TArgsArray extends Array<any> = any, TArgsObject = any> extends FormattedLog {
259
+ constructor(
260
+ readonly log: FormattedLog,
261
+ readonly name: string,
262
+ readonly args: TArgsObject & IResult
263
+ ) {
264
+ super(log.raw)
265
+ }
266
+ }
267
+
268
+ function formatLog(log: any): LogParams {
269
+ return new FormattedLog(log)
140
270
  }
141
271
 
142
272
  export function formatEthData(data: {