@sentio/sdk 2.31.0-rc.1 → 2.31.0-rc.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.
@@ -1,5 +1,5 @@
1
1
  import { BaseContext } from './base-context.js';
2
- import { CoinID, EventLogConfig, EventLogConfig_BasicFieldType, LogLevel } from '@sentio/protos';
2
+ import { CoinID, EventLogConfig, EventLogConfig_BasicFieldType, EventLogConfig_Field, LogLevel } from '@sentio/protos';
3
3
  import { MapStateStorage } from '@sentio/runtime';
4
4
  export interface Attribute<T> {
5
5
  [key: string]: Exclude<T | number | bigint | string | boolean | LogLevel | Attribute<T> | undefined, Promise<any>>;
@@ -17,9 +17,16 @@ export declare class EventLoggerBinding {
17
17
  constructor(ctx: BaseContext);
18
18
  emit<T>(eventName: string, event: Event<T>): void;
19
19
  }
20
+ export type BasicFieldType = EventLogConfig_BasicFieldType;
21
+ export declare const BasicFieldType: typeof EventLogConfig_BasicFieldType;
22
+ export type FieldType = CoinID | BasicFieldType | Fields;
23
+ export type Fields = {
24
+ [key: string]: FieldType;
25
+ };
20
26
  export interface EventLogOptions {
21
- fields: Record<string, CoinID | EventLogConfig_BasicFieldType>;
27
+ fields: Fields;
22
28
  }
29
+ export declare function fieldsToProtos(fields: Fields): EventLogConfig_Field[];
23
30
  export declare class EventLogger {
24
31
  private readonly eventName;
25
32
  config: EventLogConfig;
@@ -1 +1 @@
1
- {"version":3,"file":"event-logger.d.ts","sourceRoot":"","sources":["../../src/core/event-logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,6BAA6B,EAAuB,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAErH,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,WAAW,SAAS,CAAC,CAAC;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;CACnH;AAED,MAAM,WAAW,KAAK,CAAC,CAAC,CAAE,SAAQ,SAAS,CAAC,CAAC,CAAC;IAI5C,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,qBAAa,gBAAiB,SAAQ,eAAe,CAAC,WAAW,CAAC;IAChE,MAAM,CAAC,QAAQ,mBAAyB;CACzC;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAa;gBAErB,GAAG,EAAE,WAAW;IAI5B,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;CAG3C;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,6BAA6B,CAAC,CAAA;CAC/D;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,MAAM,EAAE,cAAc,CAAA;IAEtB,OAAO;IAKP,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,WAAW;IAqB1E,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;CAG1C"}
1
+ {"version":3,"file":"event-logger.d.ts","sourceRoot":"","sources":["../../src/core/event-logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EACL,MAAM,EACN,cAAc,EACd,6BAA6B,EAC7B,oBAAoB,EAGpB,QAAQ,EACT,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,WAAW,SAAS,CAAC,CAAC;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;CACnH;AAED,MAAM,WAAW,KAAK,CAAC,CAAC,CAAE,SAAQ,SAAS,CAAC,CAAC,CAAC;IAI5C,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,qBAAa,gBAAiB,SAAQ,eAAe,CAAC,WAAW,CAAC;IAChE,MAAM,CAAC,QAAQ,mBAAyB;CACzC;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAa;gBAErB,GAAG,EAAE,WAAW;IAI5B,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;CAG3C;AAED,MAAM,MAAM,cAAc,GAAG,6BAA6B,CAAA;AAC1D,eAAO,MAAM,cAAc,sCAAgC,CAAA;AAE3D,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,cAAc,GAAG,MAAM,CAAA;AAExD,MAAM,MAAM,MAAM,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAA;AAEjD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAA;CACf;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,oBAAoB,EAAE,CA0BrE;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,MAAM,EAAE,cAAc,CAAA;IAEtB,OAAO;IAKP,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,WAAW;IAa1E,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;CAG1C"}
@@ -1,4 +1,4 @@
1
- import { EventLogConfig, LogLevel } from '@sentio/protos';
1
+ import { EventLogConfig, EventLogConfig_BasicFieldType, EventLogConfig_StructFieldType, LogLevel } from '@sentio/protos';
2
2
  import { normalizeAttribute } from './normalization.js';
3
3
  import { MapStateStorage } from '@sentio/runtime';
4
4
  export class EventLoggerState extends MapStateStorage {
@@ -13,6 +13,35 @@ export class EventLoggerBinding {
13
13
  emit(this.ctx, eventName, event);
14
14
  }
15
15
  }
16
+ export const BasicFieldType = EventLogConfig_BasicFieldType;
17
+ export function fieldsToProtos(fields) {
18
+ const fieldsProto = [];
19
+ for (const [key, value] of Object.entries(fields)) {
20
+ let basicType;
21
+ let coinType;
22
+ let structType;
23
+ if (typeof value === 'number') {
24
+ basicType = value;
25
+ }
26
+ else {
27
+ if (value.address || value.symbol) {
28
+ coinType = value;
29
+ }
30
+ else {
31
+ structType = EventLogConfig_StructFieldType.create({
32
+ fields: fieldsToProtos(value)
33
+ });
34
+ }
35
+ }
36
+ fieldsProto.push({
37
+ name: key,
38
+ basicType,
39
+ coinType,
40
+ structType
41
+ });
42
+ }
43
+ return fieldsProto;
44
+ }
16
45
  export class EventLogger {
17
46
  eventName;
18
47
  config;
@@ -21,20 +50,10 @@ export class EventLogger {
21
50
  this.config = EventLogConfig.fromPartial(config || {});
22
51
  }
23
52
  static register(eventName, options) {
24
- const config = EventLogConfig.create();
25
- for (const [key, value] of Object.entries(options?.fields || {})) {
26
- let basicType;
27
- let coinType;
28
- if (typeof value === 'number') {
29
- basicType = value;
30
- }
31
- else {
32
- coinType = value;
33
- }
34
- config.fields.push({
35
- name: key,
36
- basicType,
37
- coinType
53
+ let config;
54
+ if (options?.fields) {
55
+ config = EventLogConfig.create({
56
+ fields: fieldsToProtos(options.fields)
38
57
  });
39
58
  }
40
59
  const logger = new EventLogger(eventName, config);
@@ -1 +1 @@
1
- {"version":3,"file":"event-logger.js","sourceRoot":"","sources":["../../src/core/event-logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,cAAc,EAAsD,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACrH,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAejD,MAAM,OAAO,gBAAiB,SAAQ,eAA4B;IAChE,MAAM,CAAC,QAAQ,GAAG,IAAI,gBAAgB,EAAE,CAAA;;AAG1C,MAAM,OAAO,kBAAkB;IACZ,GAAG,CAAa;IAEjC,YAAY,GAAgB;QAC1B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAED,IAAI,CAAI,SAAiB,EAAE,KAAe;QACxC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;IAClC,CAAC;CACF;AAMD,MAAM,OAAO,WAAW;IACL,SAAS,CAAQ;IAClC,MAAM,CAAgB;IAEtB,YAAoB,SAAiB,EAAE,MAAuB;QAC5D,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,WAAW,CAAC,MAAM,IAAI,EAAE,CAAC,CAAA;IACxD,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,SAAiB,EAAE,OAAyB;QAC1D,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,EAAE,CAAA;QACtC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,IAAI,EAAE,CAAC,EAAE;YAChE,IAAI,SAAoD,CAAA;YACxD,IAAI,QAA4B,CAAA;YAChC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,SAAS,GAAG,KAAK,CAAA;aAClB;iBAAM;gBACL,QAAQ,GAAG,KAAK,CAAA;aACjB;YACD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,GAAG;gBACT,SAAS;gBACT,QAAQ;aACT,CAAC,CAAA;SACH;QAED,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QACjD,OAAO,gBAAgB,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;IACnE,CAAC;IAED,IAAI,CAAI,GAAgB,EAAE,KAAe;QACvC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;IAClC,CAAC;CACF;AAED,SAAS,IAAI,CAAI,GAAgB,EAAE,SAAiB,EAAE,KAAe;IACnE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,KAAK,CAAA;IAE3D,MAAM,GAAG,GAAwB;QAC/B,QAAQ,EAAE,GAAG,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC;QACxC,QAAQ,EAAE,QAAQ,IAAI,QAAQ,CAAC,IAAI;QACnC,OAAO,EAAE,OAAO,IAAI,EAAE;QACtB,gBAAgB,EAAE,UAAU,IAAI,EAAE;QAClC,UAAU,EAAE,kBAAkB,CAAC,OAAO,CAAC;QACvC,WAAW,EAAE,SAAS;QACtB,QAAQ,EAAE,IAAI;KACf,CAAA;IACD,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;AAC/B,CAAC"}
1
+ {"version":3,"file":"event-logger.js","sourceRoot":"","sources":["../../src/core/event-logger.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=event-logger.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"event-logger.test.d.ts","sourceRoot":"","sources":["../../src/core/event-logger.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"event-logger.test.js","sourceRoot":"","sources":["../../src/core/event-logger.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAE1E,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAC5B,MAAM,MAAM,GAAG;YACb,KAAK,EAAE,cAAc,CAAC,MAAM;YAC5B,MAAM,EAAE,cAAc,CAAC,MAAM;YAC7B,IAAI,EAAE,cAAc,CAAC,IAAI;SAC1B,CAAA;QAED,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;QAC1C,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;YAC1B;gBACE,IAAI,EAAE,OAAO;gBACb,SAAS,EAAE,cAAc,CAAC,MAAM;aACjC;YACD;gBACE,IAAI,EAAE,QAAQ;gBACd,SAAS,EAAE,cAAc,CAAC,MAAM;aACjC;YACD;gBACE,IAAI,EAAE,MAAM;gBACZ,SAAS,EAAE,cAAc,CAAC,IAAI;aAC/B;SACF,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;QAC9B,MAAM,MAAM,GAAG;YACb,KAAK,EAAE,cAAc,CAAC,MAAM;YAC5B,EAAE,EAAE;gBACF,GAAG,EAAE,cAAc,CAAC,IAAI;aACzB;SACF,CAAA;QAED,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;QAC1C,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;YAC1B;gBACE,IAAI,EAAE,OAAO;gBACb,SAAS,EAAE,cAAc,CAAC,MAAM;aACjC;YACD;gBACE,IAAI,EAAE,IAAI;gBACV,UAAU,EAAE;oBACV,MAAM,EAAE;wBACN;4BACE,IAAI,EAAE,KAAK;4BACX,SAAS,EAAE,cAAc,CAAC,IAAI;yBAC/B;qBACF;iBACF;aACF;SACF,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;QAC3B,MAAM,MAAM,GAAW;YACrB,IAAI,EAAE;gBACJ,MAAM,EAAE,MAAM;aACf;SACF,CAAA;QACD,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;QAC1C,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;YAC1B;gBACE,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE;oBACR,MAAM,EAAE,MAAM;iBACf;aACF;SACF,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
@@ -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,4 +1,4 @@
1
- import { formatBlock, formatLog, formatTransactionResponse, allowNull, arrayOf, formatHash, formatReceiptLog, object, formatData, } from 'ethers/providers';
1
+ import { formatBlock, formatLog, formatTransactionResponse, allowNull, arrayOf, formatHash, formatReceiptLog, object, formatData } from 'ethers/providers';
2
2
  import { Result } from 'ethers';
3
3
  import { getAddress } from 'ethers/address';
4
4
  import { getBigInt, getNumber, hexlify } from 'ethers/utils';
@@ -64,12 +64,13 @@ const _formatTransactionReceipt = object({
64
64
  //confirmations: allowNull(getNumber, null),
65
65
  cumulativeGasUsed: getBigInt,
66
66
  effectiveGasPrice: allowNull(getBigInt),
67
+ gasPrice: allowNull(getBigInt),
67
68
  status: allowNull(getNumber),
68
- type: allowNull(getNumber, 0),
69
+ type: allowNull(getNumber, 0)
69
70
  }, {
70
- effectiveGasPrice: ['gasPrice'],
71
+ // effectiveGasPrice: ['gasPrice'],
71
72
  hash: ['transactionHash'],
72
- index: ['transactionIndex'],
73
+ index: ['transactionIndex']
73
74
  });
74
75
  function formatTransactionReceipt(value) {
75
76
  return _formatTransactionReceipt(value);
@@ -88,7 +89,7 @@ export function formatEthData(data) {
88
89
  block,
89
90
  trace,
90
91
  transaction,
91
- transactionReceipt,
92
+ transactionReceipt
92
93
  };
93
94
  }
94
95
  export function formatRichBlock(block) {
@@ -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": "2.31.0-rc.1",
3
+ "version": "2.31.0-rc.3",
4
4
  "license": "Apache-2.0",
5
5
  "type": "module",
6
6
  "exports": {
@@ -73,8 +73,8 @@
73
73
  "typedoc": "^0.25.0",
74
74
  "utility-types": "^3.10.0",
75
75
  "yaml": "^2.2.1",
76
- "@sentio/protos": "2.31.0-rc.1",
77
- "@sentio/runtime": "^2.31.0-rc.1"
76
+ "@sentio/protos": "2.31.0-rc.3",
77
+ "@sentio/runtime": "^2.31.0-rc.3"
78
78
  },
79
79
  "peerDependencies": {
80
80
  "tsup": "npm:@sentio/tsup@^6.7.2"
@@ -1,5 +1,13 @@
1
1
  import { BaseContext } from './base-context.js'
2
- import { CoinID, EventLogConfig, EventLogConfig_BasicFieldType, EventTrackingResult, LogLevel } from '@sentio/protos'
2
+ import {
3
+ CoinID,
4
+ EventLogConfig,
5
+ EventLogConfig_BasicFieldType,
6
+ EventLogConfig_Field,
7
+ EventLogConfig_StructFieldType,
8
+ EventTrackingResult,
9
+ LogLevel
10
+ } from '@sentio/protos'
3
11
  import { normalizeAttribute } from './normalization.js'
4
12
  import { MapStateStorage } from '@sentio/runtime'
5
13
 
@@ -32,8 +40,43 @@ export class EventLoggerBinding {
32
40
  }
33
41
  }
34
42
 
43
+ export type BasicFieldType = EventLogConfig_BasicFieldType
44
+ export const BasicFieldType = EventLogConfig_BasicFieldType
45
+
46
+ export type FieldType = CoinID | BasicFieldType | Fields
47
+
48
+ export type Fields = { [key: string]: FieldType }
49
+
35
50
  export interface EventLogOptions {
36
- fields: Record<string, CoinID | EventLogConfig_BasicFieldType>
51
+ fields: Fields
52
+ }
53
+
54
+ export function fieldsToProtos(fields: Fields): EventLogConfig_Field[] {
55
+ const fieldsProto: EventLogConfig_Field[] = []
56
+ for (const [key, value] of Object.entries(fields)) {
57
+ let basicType: BasicFieldType | undefined
58
+ let coinType: CoinID | undefined
59
+ let structType: EventLogConfig_StructFieldType | undefined
60
+
61
+ if (typeof value === 'number') {
62
+ basicType = value
63
+ } else {
64
+ if (value.address || value.symbol) {
65
+ coinType = value
66
+ } else {
67
+ structType = EventLogConfig_StructFieldType.create({
68
+ fields: fieldsToProtos(value as Fields)
69
+ })
70
+ }
71
+ }
72
+ fieldsProto.push({
73
+ name: key,
74
+ basicType,
75
+ coinType,
76
+ structType
77
+ })
78
+ }
79
+ return fieldsProto
37
80
  }
38
81
 
39
82
  export class EventLogger {
@@ -46,19 +89,11 @@ export class EventLogger {
46
89
  }
47
90
 
48
91
  static register(eventName: string, options?: EventLogOptions): EventLogger {
49
- const config = EventLogConfig.create()
50
- for (const [key, value] of Object.entries(options?.fields || {})) {
51
- let basicType: EventLogConfig_BasicFieldType | undefined
52
- let coinType: CoinID | undefined
53
- if (typeof value === 'number') {
54
- basicType = value
55
- } else {
56
- coinType = value
57
- }
58
- config.fields.push({
59
- name: key,
60
- basicType,
61
- coinType
92
+ let config: EventLogConfig | undefined
93
+
94
+ if (options?.fields) {
95
+ config = EventLogConfig.create({
96
+ fields: fieldsToProtos(options.fields)
62
97
  })
63
98
  }
64
99
 
package/src/eth/eth.ts CHANGED
@@ -9,7 +9,7 @@ import {
9
9
  formatHash,
10
10
  formatReceiptLog,
11
11
  object,
12
- formatData,
12
+ formatData
13
13
  } from 'ethers/providers'
14
14
  import { CallExceptionError, LogDescription, Result, DeferredTopicFilter, BlockParams } from 'ethers'
15
15
  import { ContractContext } from './context.js'
@@ -109,13 +109,14 @@ const _formatTransactionReceipt = object(
109
109
  //confirmations: allowNull(getNumber, null),
110
110
  cumulativeGasUsed: getBigInt,
111
111
  effectiveGasPrice: allowNull(getBigInt),
112
+ gasPrice: allowNull(getBigInt),
112
113
  status: allowNull(getNumber),
113
- type: allowNull(getNumber, 0),
114
+ type: allowNull(getNumber, 0)
114
115
  },
115
116
  {
116
- effectiveGasPrice: ['gasPrice'],
117
+ // effectiveGasPrice: ['gasPrice'],
117
118
  hash: ['transactionHash'],
118
- index: ['transactionIndex'],
119
+ index: ['transactionIndex']
119
120
  }
120
121
  )
121
122
 
@@ -143,7 +144,7 @@ export function formatEthData(data: {
143
144
  block,
144
145
  trace,
145
146
  transaction,
146
- transactionReceipt,
147
+ transactionReceipt
147
148
  }
148
149
  }
149
150