@sentio/sdk 1.36.4 → 1.37.0-rc.2

package/lib/core/meter.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Meter = exports.GaugeBinding = exports.Gauge = exports.CounterBinding = exports.Counter = exports.MetricState = exports.Metric = exports.CounterOptions = exports.MetricOptions = exports.normalizeLabels = exports.normalizeValue = exports.normalizeKey = exports.normalizeName = void 0;
 const numberish_1 = require("./numberish");
 const metadata_1 = require("./metadata");
-const gen_1 = require("../gen");
-const state_storage_1 = require("../state/state-storage");
+const protos_1 = require("@sentio/protos");
+const base_1 = require("@sentio/base");
 function normalizeName(name) {
     const regex = new RegExp('![_.a-zA-Z0-9]');
     return name.slice(0, 100).replace(regex, '_');
@@ -50,20 +50,20 @@ class Metric extends metadata_1.NamedResultDescriptor {
     config;
     constructor(type, name, option) {
         super(name);
-        this.config = gen_1.MetricConfig.fromPartial({ name: this.name, type: type, ...option });
+        this.config = protos_1.MetricConfig.fromPartial({ name: this.name, type: type, ...option });
         const aggregationConfig = this.config.aggregationConfig;
         if (aggregationConfig && aggregationConfig.intervalInMinutes.length) {
             if (aggregationConfig.intervalInMinutes.length > 1) {
                 console.error('current only support one intervalInMinutes, only first interval will be used for', name);
             }
             if (aggregationConfig.intervalInMinutes[0] > 0 && aggregationConfig.types.length === 0) {
-                aggregationConfig.types = [gen_1.AggregationType.SUM, gen_1.AggregationType.COUNT];
+                aggregationConfig.types = [protos_1.AggregationType.SUM, protos_1.AggregationType.COUNT];
             }
         }
     }
 }
 exports.Metric = Metric;
-class MetricState extends state_storage_1.MapStateStorage {
+class MetricState extends base_1.MapStateStorage {
     static INSTANCE = new MetricState();
     getOrRegisterMetric(type, name, option) {
         const metricMap = this.getOrRegister();
@@ -72,7 +72,7 @@ class MetricState extends state_storage_1.MapStateStorage {
             throw Error(`redefine ${name} of metric type ${type} that is previously ${metric.config.type}`);
         }
         if (!metric) {
-            if (type === gen_1.MetricType.COUNTER) {
+            if (type === protos_1.MetricType.COUNTER) {
                 metric = new Counter(name, option);
             }
             else {
@@ -86,10 +86,10 @@ class MetricState extends state_storage_1.MapStateStorage {
 exports.MetricState = MetricState;
 class Counter extends Metric {
     static register(name, option) {
-        return MetricState.INSTANCE.getOrRegisterMetric(gen_1.MetricType.COUNTER, name, option);
+        return MetricState.INSTANCE.getOrRegisterMetric(protos_1.MetricType.COUNTER, name, option);
     }
     constructor(name, option) {
-        super(gen_1.MetricType.COUNTER, name, option);
+        super(protos_1.MetricType.COUNTER, name, option);
     }
     add(ctx, value, labels = {}) {
         this.record(ctx, value, labels, true);
@@ -124,10 +124,10 @@ class CounterBinding {
 exports.CounterBinding = CounterBinding;
 class Gauge extends Metric {
     static register(name, option) {
-        return MetricState.INSTANCE.getOrRegisterMetric(gen_1.MetricType.GAUGE, name, option);
+        return MetricState.INSTANCE.getOrRegisterMetric(protos_1.MetricType.GAUGE, name, option);
     }
     constructor(name, option) {
-        super(gen_1.MetricType.GAUGE, name, option);
+        super(protos_1.MetricType.GAUGE, name, option);
     }
     record(ctx, value, labels = {}) {
         ctx.res.gauges.push({

package/lib/core/meter.js.map

@@ -1 +1 @@
-{"version":3,"file":"meter.js","sourceRoot":"","sources":["../../src/core/meter.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseContext } from './base-context'\nimport { Numberish, toMetricValue } from './numberish'\nimport { Labels, NamedResultDescriptor } from './metadata'\nimport { AggregationConfig, AggregationType, MetricConfig, MetricType } from '../gen'\nimport { MapStateStorage } from '../state/state-storage'\n\nexport function normalizeName(name: string): string {\n  const regex = new RegExp('![_.a-zA-Z0-9]')\n  return name.slice(0, 100).replace(regex, '_')\n}\n\nexport function normalizeKey(name: string): string {\n  if (name === 'labels') {\n    return 'labels_'\n  }\n  return normalizeName(name)\n}\n\nexport function normalizeValue(name: string): string {\n  return name.slice(0, 100)\n}\n\nexport function normalizeLabels(labels: Labels): Labels {\n  const normLabels: Labels = {}\n  for (const key in labels) {\n    normLabels[normalizeKey(key)] = normalizeValue(labels[key])\n  }\n  return normLabels\n}\n\nexport class MetricOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n  aggregationConfig?: Partial<AggregationConfig>\n}\n\nexport class CounterOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n}\n\n// enum MetricType {\n//   Counter = 0,\n//   Gauge = 1,\n// }\n\nexport class Metric extends NamedResultDescriptor {\n  config: MetricConfig\n  constructor(type: MetricType, name: string, option?: MetricOptions) {\n    super(name)\n    this.config = MetricConfig.fromPartial({ name: this.name, type: type, ...option })\n    const aggregationConfig = this.config.aggregationConfig\n    if (aggregationConfig && aggregationConfig.intervalInMinutes.length) {\n      if (aggregationConfig.intervalInMinutes.length > 1) {\n        console.error('current only support one intervalInMinutes, only first interval will be used for', name)\n      }\n      if (aggregationConfig.intervalInMinutes[0] > 0 && aggregationConfig.types.length === 0) {\n        aggregationConfig.types = [AggregationType.SUM, AggregationType.COUNT]\n      }\n    }\n  }\n}\n\nexport class MetricState extends MapStateStorage<Metric> {\n  static INSTANCE = new MetricState()\n\n  getOrRegisterMetric(type: MetricType, name: string, option?: CounterOptions | MetricOptions): Metric {\n    const metricMap = this.getOrRegister()\n    let metric = metricMap.get(name)\n    if (metric && metric.config.type !== type) {\n      throw Error(`redefine ${name} of metric type ${type} that is previously ${metric.config.type}`)\n    }\n\n    if (!metric) {\n      if (type === MetricType.COUNTER) {\n        metric = new Counter(name, option)\n      } else {\n        metric = new Gauge(name, option)\n      }\n    }\n    metricMap.set(name, metric)\n    return metric\n  }\n}\n\nexport class Counter extends Metric {\n  static register(name: string, option?: CounterOptions): Counter {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.COUNTER, name, option) as Counter\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.COUNTER, name, option)\n  }\n\n  add(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, true)\n  }\n\n  sub(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, false)\n  }\n\n  private record(ctx: BaseContext, value: Numberish, labels: Labels, add: boolean) {\n    ctx.res.counters.push({\n      metadata: ctx.getMetaData(this.name, labels),\n      metricValue: toMetricValue(value),\n      add: add,\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class CounterBinding {\n  private readonly ctx: BaseContext\n  private readonly counter: Counter\n\n  constructor(name: string, ctx: BaseContext) {\n    this.counter = new Counter(name)\n    this.ctx = ctx\n  }\n\n  add(value: Numberish, labels: Labels = {}) {\n    this.counter.add(this.ctx, value, labels)\n  }\n\n  sub(value: Numberish, labels: Labels = {}) {\n    this.counter.sub(this.ctx, value, labels)\n  }\n}\n\nexport class Gauge extends Metric {\n  static register(name: string, option?: MetricOptions): Gauge {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.GAUGE, name, option) as Gauge\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.GAUGE, name, option)\n  }\n\n  record(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    ctx.res.gauges.push({\n      metadata: ctx.getMetaData(this.config.name, labels),\n      metricValue: toMetricValue(value),\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class GaugeBinding {\n  private readonly gauge: Gauge\n  private readonly ctx: BaseContext\n\n  constructor(name: string, ctx: BaseContext) {\n    this.gauge = new Gauge(name)\n    this.ctx = ctx\n  }\n\n  record(value: Numberish, labels: Labels = {}) {\n    this.gauge.record(this.ctx, value, labels)\n  }\n}\n\nexport class Meter {\n  private readonly ctx: BaseContext\n\n  constructor(ctx: BaseContext) {\n    this.ctx = ctx\n  }\n\n  Counter(name: string): CounterBinding {\n    return new CounterBinding(name, this.ctx)\n  }\n\n  Gauge(name: string): GaugeBinding {\n    return new GaugeBinding(name, this.ctx)\n  }\n}\n"]}
+{"version":3,"file":"meter.js","sourceRoot":"","sources":["../../src/core/meter.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseContext } from './base-context'\nimport { Numberish, toMetricValue } from './numberish'\nimport { Labels, NamedResultDescriptor } from './metadata'\nimport { AggregationConfig, AggregationType, MetricConfig, MetricType } from '@sentio/protos'\nimport { MapStateStorage } from '@sentio/base'\n\nexport function normalizeName(name: string): string {\n  const regex = new RegExp('![_.a-zA-Z0-9]')\n  return name.slice(0, 100).replace(regex, '_')\n}\n\nexport function normalizeKey(name: string): string {\n  if (name === 'labels') {\n    return 'labels_'\n  }\n  return normalizeName(name)\n}\n\nexport function normalizeValue(name: string): string {\n  return name.slice(0, 100)\n}\n\nexport function normalizeLabels(labels: Labels): Labels {\n  const normLabels: Labels = {}\n  for (const key in labels) {\n    normLabels[normalizeKey(key)] = normalizeValue(labels[key])\n  }\n  return normLabels\n}\n\nexport class MetricOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n  aggregationConfig?: Partial<AggregationConfig>\n}\n\nexport class CounterOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n}\n\n// enum MetricType {\n//   Counter = 0,\n//   Gauge = 1,\n// }\n\nexport class Metric extends NamedResultDescriptor {\n  config: MetricConfig\n  constructor(type: MetricType, name: string, option?: MetricOptions) {\n    super(name)\n    this.config = MetricConfig.fromPartial({ name: this.name, type: type, ...option })\n    const aggregationConfig = this.config.aggregationConfig\n    if (aggregationConfig && aggregationConfig.intervalInMinutes.length) {\n      if (aggregationConfig.intervalInMinutes.length > 1) {\n        console.error('current only support one intervalInMinutes, only first interval will be used for', name)\n      }\n      if (aggregationConfig.intervalInMinutes[0] > 0 && aggregationConfig.types.length === 0) {\n        aggregationConfig.types = [AggregationType.SUM, AggregationType.COUNT]\n      }\n    }\n  }\n}\n\nexport class MetricState extends MapStateStorage<Metric> {\n  static INSTANCE = new MetricState()\n\n  getOrRegisterMetric(type: MetricType, name: string, option?: CounterOptions | MetricOptions): Metric {\n    const metricMap = this.getOrRegister()\n    let metric = metricMap.get(name)\n    if (metric && metric.config.type !== type) {\n      throw Error(`redefine ${name} of metric type ${type} that is previously ${metric.config.type}`)\n    }\n\n    if (!metric) {\n      if (type === MetricType.COUNTER) {\n        metric = new Counter(name, option)\n      } else {\n        metric = new Gauge(name, option)\n      }\n    }\n    metricMap.set(name, metric)\n    return metric\n  }\n}\n\nexport class Counter extends Metric {\n  static register(name: string, option?: CounterOptions): Counter {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.COUNTER, name, option) as Counter\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.COUNTER, name, option)\n  }\n\n  add(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, true)\n  }\n\n  sub(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, false)\n  }\n\n  private record(ctx: BaseContext, value: Numberish, labels: Labels, add: boolean) {\n    ctx.res.counters.push({\n      metadata: ctx.getMetaData(this.name, labels),\n      metricValue: toMetricValue(value),\n      add: add,\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class CounterBinding {\n  private readonly ctx: BaseContext\n  private readonly counter: Counter\n\n  constructor(name: string, ctx: BaseContext) {\n    this.counter = new Counter(name)\n    this.ctx = ctx\n  }\n\n  add(value: Numberish, labels: Labels = {}) {\n    this.counter.add(this.ctx, value, labels)\n  }\n\n  sub(value: Numberish, labels: Labels = {}) {\n    this.counter.sub(this.ctx, value, labels)\n  }\n}\n\nexport class Gauge extends Metric {\n  static register(name: string, option?: MetricOptions): Gauge {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.GAUGE, name, option) as Gauge\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.GAUGE, name, option)\n  }\n\n  record(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    ctx.res.gauges.push({\n      metadata: ctx.getMetaData(this.config.name, labels),\n      metricValue: toMetricValue(value),\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class GaugeBinding {\n  private readonly gauge: Gauge\n  private readonly ctx: BaseContext\n\n  constructor(name: string, ctx: BaseContext) {\n    this.gauge = new Gauge(name)\n    this.ctx = ctx\n  }\n\n  record(value: Numberish, labels: Labels = {}) {\n    this.gauge.record(this.ctx, value, labels)\n  }\n}\n\nexport class Meter {\n  private readonly ctx: BaseContext\n\n  constructor(ctx: BaseContext) {\n    this.ctx = ctx\n  }\n\n  Counter(name: string): CounterBinding {\n    return new CounterBinding(name, this.ctx)\n  }\n\n  Gauge(name: string): GaugeBinding {\n    return new GaugeBinding(name, this.ctx)\n  }\n}\n"]}

package/lib/core/numberish.d.ts

@@ -1,8 +1,8 @@
 import { BigNumber } from 'ethers';
-import { BigInteger, MetricValue } from '../gen';
+import { BigInteger, MetricValue } from '@sentio/protos';
 import { BigDecimal } from '.';
-import Long from 'long';
-export declare type Numberish = number | BigNumber | bigint | BigDecimal;
+import { BlockTag } from '@ethersproject/providers';
+export declare type Numberish = number | BigNumber | bigint | BigDecimal | string;
+export declare function toBlockTag(a: number | bigint): BlockTag;
 export declare function toMetricValue(value: Numberish): MetricValue;
 export declare function toBigInteger(a: Numberish): BigInteger;
-export declare function toBigInt(v: Long): bigint;

package/lib/core/numberish.js

@@ -1,20 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBigInt = exports.toBigInteger = exports.toMetricValue = void 0;
+exports.toBigInteger = exports.toMetricValue = exports.toBlockTag = void 0;
 const ethers_1 = require("ethers");
-const gen_1 = require("../gen");
+const protos_1 = require("@sentio/protos");
 const _1 = require(".");
-const anchor_1 = require("@project-serum/anchor");
+function toBlockTag(a) {
+    if (typeof a === 'number') {
+        return a;
+    }
+    if (a > Number.MAX_SAFE_INTEGER) {
+        return '0x' + a.toString(16);
+    }
+    return Number(a);
+}
+exports.toBlockTag = toBlockTag;
 function toMetricValue(value) {
     if (value instanceof ethers_1.BigNumber) {
-        return gen_1.MetricValue.fromPartial({
+        return protos_1.MetricValue.fromPartial({
             bigInteger: toBigInteger(value.toBigInt()),
         });
     }
     if (value instanceof _1.BigDecimal) {
         // Carefully consider the use case here
         if (value.isInteger()) {
-            return gen_1.MetricValue.fromPartial({
+            return protos_1.MetricValue.fromPartial({
                 bigInteger: bigDecimalToBigInteger(value),
             });
         }
@@ -26,18 +35,18 @@ function toMetricValue(value) {
                 // NaN also not finite
                 throw new Error('Cannot record infinite value');
             }
-            return gen_1.MetricValue.fromPartial({
+            return protos_1.MetricValue.fromPartial({
                 bigDecimal: value.toString(), // e.g. -7.350918e-428
             });
         }
     }
-    if (anchor_1.BN.isBN(value)) {
-        return gen_1.MetricValue.fromPartial({
-            bigInteger: bnToBigInteger(value),
+    if (typeof value === 'string') {
+        return protos_1.MetricValue.fromPartial({
+            bigDecimal: value,
         });
     }
     if (typeof value === 'bigint' || Number.isInteger(value)) {
-        return gen_1.MetricValue.fromPartial({
+        return protos_1.MetricValue.fromPartial({
             bigInteger: toBigInteger(value),
         });
     }
@@ -49,7 +58,7 @@ function toMetricValue(value) {
             throw new Error('Cannot record infinite value');
         }
     }
-    return gen_1.MetricValue.fromPartial({
+    return protos_1.MetricValue.fromPartial({
         doubleValue: Number(value),
     });
 }
@@ -61,13 +70,6 @@ function bigDecimalToBigInteger(a) {
     }
     return hexToBigInteger(a.toString(16), negative);
 }
-function bnToBigInteger(a) {
-    const negative = a.isNeg();
-    if (negative) {
-        a = a.abs();
-    }
-    return hexToBigInteger(a.toString(16), negative);
-}
 function intToBigInteger(a) {
     const negative = a < 0;
     if (negative) {
@@ -79,12 +81,12 @@ function toBigInteger(a) {
     if (a instanceof _1.BigDecimal) {
         return bigDecimalToBigInteger(a);
     }
-    if (a instanceof anchor_1.BN) {
-        return bnToBigInteger(a);
-    }
     if (a instanceof ethers_1.BigNumber) {
         return intToBigInteger(a.toBigInt());
     }
+    if (typeof a === 'string') {
+        return intToBigInteger(BigInt(a));
+    }
     return intToBigInteger(a);
     // Following code is actually very slow
     // while (a > 0) {
@@ -108,8 +110,4 @@ function hexToBigInteger(hex, negative) {
         data: new Uint8Array(buffer),
     };
 }
-function toBigInt(v) {
-    return BigInt(v.toString());
-}
-exports.toBigInt = toBigInt;
 //# sourceMappingURL=numberish.js.map

package/lib/core/numberish.js.map

@@ -1 +1 @@
-{"version":3,"file":"numberish.js","sourceRoot":"","sources":["../../src/core/numberish.ts"],"names":[],"mappings":"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","sourcesContent":["import { BigNumber } from 'ethers'\nimport { BigInteger, MetricValue } from '../gen'\nimport { BigDecimal } from '.'\nimport { BN } from '@project-serum/anchor'\nimport Long from 'long'\n\nexport type Numberish = number | BigNumber | bigint | BigDecimal\n\nexport function toMetricValue(value: Numberish): MetricValue {\n  if (value instanceof BigNumber) {\n    return MetricValue.fromPartial({\n      bigInteger: toBigInteger(value.toBigInt()),\n    })\n  }\n  if (value instanceof BigDecimal) {\n    // Carefully consider the use case here\n    if (value.isInteger()) {\n      return MetricValue.fromPartial({\n        bigInteger: bigDecimalToBigInteger(value),\n      })\n    } else {\n      if (value.isNaN()) {\n        throw new Error('Cannot record NaN value')\n      }\n      if (!value.isFinite()) {\n        // NaN also not finite\n        throw new Error('Cannot record infinite value')\n      }\n      return MetricValue.fromPartial({\n        bigDecimal: value.toString(), // e.g. -7.350918e-428\n      })\n    }\n  }\n  if (BN.isBN(value)) {\n    return MetricValue.fromPartial({\n      bigInteger: bnToBigInteger(value),\n    })\n  }\n  if (typeof value === 'bigint' || Number.isInteger(value)) {\n    return MetricValue.fromPartial({\n      bigInteger: toBigInteger(value),\n    })\n  }\n\n  if (typeof value === 'number') {\n    if (Number.isNaN(value)) {\n      throw new Error('Cannot record NaN value')\n    }\n    if (!Number.isFinite(value)) {\n      throw new Error('Cannot record infinite value')\n    }\n  }\n\n  return MetricValue.fromPartial({\n    doubleValue: Number(value),\n  })\n}\n\nfunction bigDecimalToBigInteger(a: BigDecimal): BigInteger {\n  const negative = a.isNegative()\n  if (negative) {\n    a = a.abs()\n  }\n  return hexToBigInteger(a.toString(16), negative)\n}\n\nfunction bnToBigInteger(a: BN): BigInteger {\n  const negative = a.isNeg()\n  if (negative) {\n    a = a.abs()\n  }\n  return hexToBigInteger(a.toString(16), negative)\n}\n\nfunction intToBigInteger(a: bigint | number): BigInteger {\n  const negative = a < 0\n  if (negative) {\n    a = -a\n  }\n  return hexToBigInteger(a.toString(16), negative)\n}\n\nexport function toBigInteger(a: Numberish): BigInteger {\n  if (a instanceof BigDecimal) {\n    return bigDecimalToBigInteger(a)\n  }\n  if (a instanceof BN) {\n    return bnToBigInteger(a)\n  }\n  if (a instanceof BigNumber) {\n    return intToBigInteger(a.toBigInt())\n  }\n  return intToBigInteger(a)\n\n  // Following code is actually very slow\n  // while (a > 0) {\n  //   const d = a & 0xffn\n  //   a >>= 8n\n  //   value.push(Number(d))\n  // }\n  //\n  // return {\n  //   negative, value: new Uint8Array(value.reverse()),\n  // }\n}\n\nfunction hexToBigInteger(hex: string, negative: boolean): BigInteger {\n  if (hex.length % 2 === 1) {\n    hex = '0' + hex\n  }\n  const buffer = Buffer.from(hex, 'hex')\n\n  return {\n    negative: negative,\n    data: new Uint8Array(buffer),\n  }\n}\n\nexport function toBigInt(v: Long): bigint {\n  return BigInt(v.toString())\n}\n"]}
+{"version":3,"file":"numberish.js","sourceRoot":"","sources":["../../src/core/numberish.ts"],"names":[],"mappings":"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","sourcesContent":["import { BigNumber } from 'ethers'\nimport { BigInteger, MetricValue } from '@sentio/protos'\nimport { BigDecimal } from '.'\nimport { BlockTag } from '@ethersproject/providers'\n\nexport type Numberish = number | BigNumber | bigint | BigDecimal | string\n\nexport function toBlockTag(a: number | bigint): BlockTag {\n  if (typeof a === 'number') {\n    return a\n  }\n  if (a > Number.MAX_SAFE_INTEGER) {\n    return '0x' + a.toString(16)\n  }\n  return Number(a)\n}\n\nexport function toMetricValue(value: Numberish): MetricValue {\n  if (value instanceof BigNumber) {\n    return MetricValue.fromPartial({\n      bigInteger: toBigInteger(value.toBigInt()),\n    })\n  }\n  if (value instanceof BigDecimal) {\n    // Carefully consider the use case here\n    if (value.isInteger()) {\n      return MetricValue.fromPartial({\n        bigInteger: bigDecimalToBigInteger(value),\n      })\n    } else {\n      if (value.isNaN()) {\n        throw new Error('Cannot record NaN value')\n      }\n      if (!value.isFinite()) {\n        // NaN also not finite\n        throw new Error('Cannot record infinite value')\n      }\n      return MetricValue.fromPartial({\n        bigDecimal: value.toString(), // e.g. -7.350918e-428\n      })\n    }\n  }\n  if (typeof value === 'string') {\n    return MetricValue.fromPartial({\n      bigDecimal: value,\n    })\n  }\n  if (typeof value === 'bigint' || Number.isInteger(value)) {\n    return MetricValue.fromPartial({\n      bigInteger: toBigInteger(value),\n    })\n  }\n\n  if (typeof value === 'number') {\n    if (Number.isNaN(value)) {\n      throw new Error('Cannot record NaN value')\n    }\n    if (!Number.isFinite(value)) {\n      throw new Error('Cannot record infinite value')\n    }\n  }\n\n  return MetricValue.fromPartial({\n    doubleValue: Number(value),\n  })\n}\n\nfunction bigDecimalToBigInteger(a: BigDecimal): BigInteger {\n  const negative = a.isNegative()\n  if (negative) {\n    a = a.abs()\n  }\n  return hexToBigInteger(a.toString(16), negative)\n}\n\nfunction intToBigInteger(a: bigint | number): BigInteger {\n  const negative = a < 0\n  if (negative) {\n    a = -a\n  }\n  return hexToBigInteger(a.toString(16), negative)\n}\n\nexport function toBigInteger(a: Numberish): BigInteger {\n  if (a instanceof BigDecimal) {\n    return bigDecimalToBigInteger(a)\n  }\n\n  if (a instanceof BigNumber) {\n    return intToBigInteger(a.toBigInt())\n  }\n  if (typeof a === 'string') {\n    return intToBigInteger(BigInt(a))\n  }\n\n  return intToBigInteger(a)\n\n  // Following code is actually very slow\n  // while (a > 0) {\n  //   const d = a & 0xffn\n  //   a >>= 8n\n  //   value.push(Number(d))\n  // }\n  //\n  // return {\n  //   negative, value: new Uint8Array(value.reverse()),\n  // }\n}\n\nfunction hexToBigInteger(hex: string, negative: boolean): BigInteger {\n  if (hex.length % 2 === 1) {\n    hex = '0' + hex\n  }\n  const buffer = Buffer.from(hex, 'hex')\n\n  return {\n    negative: negative,\n    data: new Uint8Array(buffer),\n  }\n}\n"]}

package/lib/core/numberish.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"numberish.test.js","sourceRoot":"","sources":["../../src/core/numberish.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { expect } from 'chai'\nimport { toBigInteger, toMetricValue } from './numberish'\nimport { webcrypto } from 'crypto'\nimport { BigNumber } from 'ethers'\nimport { performance } from 'perf_hooks'\nimport { BigInteger } from '../gen'\nimport { BigDecimal } from '.'\n\n// TODO add test for type conversion\ndescribe('Numberish tests', () => {\n  const values: bigint[] = [0n, -0n, 3815372408723498172304781320847103784n, 2132n, -18708707n, 123n << 100n]\n\n  test('big integer conversion correctness ', async () => {\n    for (const v of values) {\n      const b = toBigInteger(v)\n      const hex1 = BigIntegerToHex(b)\n      const hex2 = v.toString(16)\n      expect(hex1).equals(hex2)\n    }\n  })\n\n  test('random big integer conversion correctness ', async () => {\n    for (let i = 0; i < 1000; i++) {\n      const random = webcrypto.getRandomValues(new Uint8Array(256))\n      const v = BigNumber.from(random).toBigInt()\n      const b = toBigInteger(v)\n\n      expect(BigNumber.from(b.data).eq(v)).to.equals(true)\n    }\n  })\n\n  test.skip('random big integer performance', async () => {\n    jest.setTimeout(100000)\n    jest.retryTimes(3)\n\n    let timer1 = 0\n    let timer2 = 0\n    for (let i = 0; i < 1000; i++) {\n      // Use higher value for local debugging\n      const random = webcrypto.getRandomValues(new Uint8Array(256))\n      const v = BigNumber.from(random).toBigInt()\n\n      let start = performance.now()\n      toBigInteger(v)\n      timer1 += performance.now() - start\n\n      start = performance.now()\n      v.toString(16)\n      timer2 += performance.now() - start\n    }\n\n    console.log(timer1, timer2)\n    expect(timer1).to.lessThan(timer2 * 3)\n  })\n\n  test('metric values', async () => {\n    const longDec = '12.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002'\n    expect(toMetricValue(new BigDecimal(longDec)).bigDecimal == longDec)\n\n    const complexDec = '-7.350918e-428'\n    expect(toMetricValue(new BigDecimal(complexDec)).bigDecimal == complexDec)\n\n    expect(BigIntegerToBigInt(toMetricValue(new BigDecimal('100000')).bigInteger!) === 100000n)\n  })\n})\n\n// Performance very bad\nfunction BigIntegerToHex(b: BigInteger): string {\n  let res = BigNumber.from(b.data).toBigInt().toString(16)\n  if (b.negative) {\n    res = '-' + res\n  }\n  return res\n}\n\nfunction BigIntegerToBigInt(b: BigInteger): bigint {\n  let res = BigNumber.from(b.data).toBigInt()\n  if (b.negative) {\n    res = -res\n  }\n  return res\n}\n"]}
+{"version":3,"file":"numberish.test.js","sourceRoot":"","sources":["../../src/core/numberish.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { expect } from 'chai'\nimport { toBigInteger, toMetricValue } from './numberish'\nimport { webcrypto } from 'crypto'\nimport { BigNumber } from 'ethers'\nimport { performance } from 'perf_hooks'\nimport { BigInteger } from '@sentio/protos'\nimport { BigDecimal } from '.'\n\n// TODO add test for type conversion\ndescribe('Numberish tests', () => {\n  const values: bigint[] = [0n, -0n, 3815372408723498172304781320847103784n, 2132n, -18708707n, 123n << 100n]\n\n  test('big integer conversion correctness ', async () => {\n    for (const v of values) {\n      const b = toBigInteger(v)\n      const hex1 = BigIntegerToHex(b)\n      const hex2 = v.toString(16)\n      expect(hex1).equals(hex2)\n    }\n  })\n\n  test('random big integer conversion correctness ', async () => {\n    for (let i = 0; i < 1000; i++) {\n      const random = webcrypto.getRandomValues(new Uint8Array(256))\n      const v = BigNumber.from(random).toBigInt()\n      const b = toBigInteger(v)\n\n      expect(BigNumber.from(b.data).eq(v)).to.equals(true)\n    }\n  })\n\n  test.skip('random big integer performance', async () => {\n    jest.setTimeout(100000)\n    jest.retryTimes(3)\n\n    let timer1 = 0\n    let timer2 = 0\n    for (let i = 0; i < 1000; i++) {\n      // Use higher value for local debugging\n      const random = webcrypto.getRandomValues(new Uint8Array(256))\n      const v = BigNumber.from(random).toBigInt()\n\n      let start = performance.now()\n      toBigInteger(v)\n      timer1 += performance.now() - start\n\n      start = performance.now()\n      v.toString(16)\n      timer2 += performance.now() - start\n    }\n\n    console.log(timer1, timer2)\n    expect(timer1).to.lessThan(timer2 * 3)\n  })\n\n  test('metric values', async () => {\n    const longDec = '12.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002'\n    expect(toMetricValue(new BigDecimal(longDec)).bigDecimal == longDec)\n\n    const complexDec = '-7.350918e-428'\n    expect(toMetricValue(new BigDecimal(complexDec)).bigDecimal == complexDec)\n\n    expect(BigIntegerToBigInt(toMetricValue(new BigDecimal('100000')).bigInteger!) === 100000n)\n  })\n})\n\n// Performance very bad\nfunction BigIntegerToHex(b: BigInteger): string {\n  let res = BigNumber.from(b.data).toBigInt().toString(16)\n  if (b.negative) {\n    res = '-' + res\n  }\n  return res\n}\n\nfunction BigIntegerToBigInt(b: BigInteger): bigint {\n  let res = BigNumber.from(b.data).toBigInt()\n  if (b.negative) {\n    res = -res\n  }\n  return res\n}\n"]}

package/lib/core/solana-context.d.ts

@@ -1,12 +1,11 @@
 import { BaseContext } from './base-context';
-import Long from 'long';
 import { Labels } from './metadata';
 import { RecordMetaData } from '@sentio/sdk';
 export declare class SolanaContext extends BaseContext {
     network: string;
     address: string;
     programName: string;
-    blockNumber: Long;
-    constructor(programName: string, network: string, address: string, slot: Long);
+    blockNumber: bigint;
+    constructor(programName: string, network: string, address: string, slot: bigint);
     getMetaData(name: string, labels: Labels): RecordMetaData;
 }

package/lib/core/solana-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana-context.js","sourceRoot":"","sources":["../../src/core/solana-context.ts"],"names":[],"mappings":";;;AAAA,iDAA4C;AAI5C,0CAA0C;AAC1C,mCAAyC;AAEzC,MAAa,aAAc,SAAQ,0BAAW;IAC5C,OAAO,CAAQ;IACf,OAAO,CAAQ;IACf,WAAW,CAAQ;IACnB,WAAW,CAAM;IAEjB,YAAY,WAAmB,EAAE,OAAe,EAAE,OAAe,EAAE,IAAU;QAC3E,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,iBAAS,CAAC,cAAc,CAAA;QAClD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;IACzB,CAAC;IAED,WAAW,CAAC,IAAY,EAAE,MAAc;QACtC,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,IAAI,CAAC,WAAW;YAC9B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,gBAAgB,EAAE,CAAC;YACnB,eAAe,EAAE,EAAE;YACnB,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,IAAA,uBAAe,EAAC,MAAM,CAAC;SAChC,CAAA;IACH,CAAC;CACF;AA3BD,sCA2BC","sourcesContent":["import { BaseContext } from './base-context'\nimport Long from 'long'\nimport { Labels } from './metadata'\nimport { RecordMetaData } from '@sentio/sdk'\nimport { CHAIN_IDS } from '../utils/chain'\nimport { normalizeLabels } from './meter'\n\nexport class SolanaContext extends BaseContext {\n  network: string\n  address: string\n  programName: string\n  blockNumber: Long\n\n  constructor(programName: string, network: string, address: string, slot: Long) {\n    super()\n    this.network = network || CHAIN_IDS.SOLANA_MAINNET\n    this.programName = programName\n    this.address = address\n    this.blockNumber = slot\n  }\n\n  getMetaData(name: string, labels: Labels): RecordMetaData {\n    return {\n      address: this.address,\n      contractName: this.programName,\n      blockNumber: this.blockNumber,\n      transactionIndex: 0,\n      transactionHash: '', // TODO add\n      logIndex: 0,\n      chainId: this.network,\n      name: name,\n      labels: normalizeLabels(labels),\n    }\n  }\n}\n"]}
+{"version":3,"file":"solana-context.js","sourceRoot":"","sources":["../../src/core/solana-context.ts"],"names":[],"mappings":";;;AAAA,iDAA4C;AAG5C,0CAA0C;AAC1C,mCAAyC;AAEzC,MAAa,aAAc,SAAQ,0BAAW;IAC5C,OAAO,CAAQ;IACf,OAAO,CAAQ;IACf,WAAW,CAAQ;IACnB,WAAW,CAAQ;IAEnB,YAAY,WAAmB,EAAE,OAAe,EAAE,OAAe,EAAE,IAAY;QAC7E,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,iBAAS,CAAC,cAAc,CAAA;QAClD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;IACzB,CAAC;IAED,WAAW,CAAC,IAAY,EAAE,MAAc;QACtC,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,IAAI,CAAC,WAAW;YAC9B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,gBAAgB,EAAE,CAAC;YACnB,eAAe,EAAE,EAAE;YACnB,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,IAAA,uBAAe,EAAC,MAAM,CAAC;SAChC,CAAA;IACH,CAAC;CACF;AA3BD,sCA2BC","sourcesContent":["import { BaseContext } from './base-context'\nimport { Labels } from './metadata'\nimport { RecordMetaData } from '@sentio/sdk'\nimport { CHAIN_IDS } from '../utils/chain'\nimport { normalizeLabels } from './meter'\n\nexport class SolanaContext extends BaseContext {\n  network: string\n  address: string\n  programName: string\n  blockNumber: bigint\n\n  constructor(programName: string, network: string, address: string, slot: bigint) {\n    super()\n    this.network = network || CHAIN_IDS.SOLANA_MAINNET\n    this.programName = programName\n    this.address = address\n    this.blockNumber = slot\n  }\n\n  getMetaData(name: string, labels: Labels): RecordMetaData {\n    return {\n      address: this.address,\n      contractName: this.programName,\n      blockNumber: this.blockNumber,\n      transactionIndex: 0,\n      transactionHash: '', // TODO add\n      logIndex: 0,\n      chainId: this.network,\n      name: name,\n      labels: normalizeLabels(labels),\n    }\n  }\n}\n"]}

package/lib/core/solana-options.d.ts

@@ -1,9 +1,8 @@
-import Long from 'long';
 export declare class SolanaBindOptions {
     address: string;
     network?: string;
     name?: string;
-    startBlock?: Long | number;
-    endBlock?: Long | number;
+    startBlock?: bigint | number;
+    endBlock?: bigint | number;
     processInnerInstruction?: boolean;
 }

package/lib/core/solana-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana-options.js","sourceRoot":"","sources":["../../src/core/solana-options.ts"],"names":[],"mappings":";;;AAEA,MAAa,iBAAiB;IAC5B,OAAO,CAAQ;IACf,OAAO,CAAS;IAChB,IAAI,CAAS;IACb,UAAU,CAAgB;IAC1B,QAAQ,CAAgB;IACxB,uBAAuB,CAAU;CAClC;AAPD,8CAOC","sourcesContent":["import Long from 'long'\n\nexport class SolanaBindOptions {\n  address: string\n  network?: string\n  name?: string\n  startBlock?: Long | number\n  endBlock?: Long | number\n  processInnerInstruction?: boolean\n}\n"]}
+{"version":3,"file":"solana-options.js","sourceRoot":"","sources":["../../src/core/solana-options.ts"],"names":[],"mappings":";;;AAAA,MAAa,iBAAiB;IAC5B,OAAO,CAAQ;IACf,OAAO,CAAS;IAChB,IAAI,CAAS;IACb,UAAU,CAAkB;IAC5B,QAAQ,CAAkB;IAC1B,uBAAuB,CAAU;CAClC;AAPD,8CAOC","sourcesContent":["export class SolanaBindOptions {\n  address: string\n  network?: string\n  name?: string\n  startBlock?: bigint | number\n  endBlock?: bigint | number\n  processInnerInstruction?: boolean\n}\n"]}

package/lib/core/solana-plugin.d.ts

@@ -1,5 +1,5 @@
-import { Plugin } from '../plugin';
-import { DataBinding, HandlerType, ProcessConfigResponse, ProcessResult } from '../gen/processor/protos/processor';
+import { Plugin } from '@sentio/base';
+import { DataBinding, HandlerType, ProcessConfigResponse, ProcessResult } from '@sentio/protos';
 export declare class SolanaPlugin implements Plugin {
     name: string;
     configure(config: ProcessConfigResponse): void;

package/lib/core/solana-plugin.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaPlugin = void 0;
-const plugin_1 = require("../plugin");
-const processor_1 = require("../gen/processor/protos/processor");
+const base_1 = require("@sentio/base");
+const protos_1 = require("@sentio/protos");
 const service_1 = require("../service");
 const nice_grpc_1 = require("nice-grpc");
 const solana_processor_1 = require("./solana-processor");
@@ -35,10 +35,10 @@ class SolanaPlugin {
             config.contractConfigs.push(contractConfig);
         }
     }
-    supportedHandlers = [processor_1.HandlerType.SOL_INSTRUCTION];
+    supportedHandlers = [protos_1.HandlerType.SOL_INSTRUCTION];
     processBinding(request) {
         switch (request.handlerType) {
-            case processor_1.HandlerType.SOL_INSTRUCTION:
+            case protos_1.HandlerType.SOL_INSTRUCTION:
                 return this.processSolInstruction(request);
             default:
                 throw new nice_grpc_1.ServerError(nice_grpc_1.Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType);
@@ -48,7 +48,7 @@ class SolanaPlugin {
         if (!request.data) {
             throw new nice_grpc_1.ServerError(nice_grpc_1.Status.INVALID_ARGUMENT, 'instruction data cannot be empty');
         }
-        const instruction = request.data.solInstruction || processor_1.Data_SolInstruction.decode(request.data.raw); // JSON.parse(jsonString)
+        const instruction = request.data.solInstruction || protos_1.Data_SolInstruction.decode(request.data.raw); // JSON.parse(jsonString)
         const promises = [];
         // Only have instruction handlers for solana processors
         for (const processor of solana_processor_1.SolanaProcessorState.INSTANCE.getValues()) {
@@ -75,5 +75,5 @@ class SolanaPlugin {
     }
 }
 exports.SolanaPlugin = SolanaPlugin;
-plugin_1.PluginManager.INSTANCE.register(new SolanaPlugin());
+base_1.PluginManager.INSTANCE.register(new SolanaPlugin());
 //# sourceMappingURL=solana-plugin.js.map

package/lib/core/solana-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana-plugin.js","sourceRoot":"","sources":["../../src/core/solana-plugin.ts"],"names":[],"mappings":"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","sourcesContent":["import { Plugin, PluginManager } from '../plugin'\nimport {\n  ContractConfig,\n  Data_SolInstruction,\n  DataBinding,\n  HandlerType,\n  ProcessConfigResponse,\n  ProcessResult,\n} from '../gen/processor/protos/processor'\nimport { DEFAULT_MAX_BLOCK, errorString, mergeProcessResults, USER_PROCESSOR, Utf8ArrayToStr } from '../service'\n\nimport { ServerError, Status } from 'nice-grpc'\n\nimport { SolanaProcessorState } from './solana-processor'\nimport { Instruction as SolInstruction } from '@project-serum/anchor/dist/cjs/coder/borsh/instruction'\n\nexport class SolanaPlugin implements Plugin {\n  name: string = 'SolanaPlugin'\n\n  configure(config: ProcessConfigResponse): void {\n    // Part 2, prepare solana constractors\n    for (const solanaProcessor of SolanaProcessorState.INSTANCE.getValues()) {\n      const contractConfig: ContractConfig = {\n        processorType: USER_PROCESSOR,\n        contract: {\n          name: solanaProcessor.contractName,\n          chainId: solanaProcessor.network,\n          address: solanaProcessor.address,\n          abi: '',\n        },\n        logConfigs: [],\n        traceConfigs: [],\n        intervalConfigs: [],\n        startBlock: solanaProcessor.config.startSlot,\n        endBlock: DEFAULT_MAX_BLOCK,\n        instructionConfig: {\n          innerInstruction: solanaProcessor.processInnerInstruction,\n          parsedInstruction: solanaProcessor.fromParsedInstruction !== null,\n          rawDataInstruction: solanaProcessor.decodeInstruction !== null,\n        },\n        aptosEventConfigs: [],\n        aptosCallConfigs: [],\n      }\n      config.contractConfigs.push(contractConfig)\n    }\n  }\n\n  supportedHandlers = [HandlerType.SOL_INSTRUCTION]\n\n  processBinding(request: DataBinding): Promise<ProcessResult> {\n    switch (request.handlerType) {\n      case HandlerType.SOL_INSTRUCTION:\n        return this.processSolInstruction(request)\n      default:\n        throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType)\n    }\n  }\n\n  async processSolInstruction(request: DataBinding): Promise<ProcessResult> {\n    if (!request.data) {\n      throw new ServerError(Status.INVALID_ARGUMENT, 'instruction data cannot be empty')\n    }\n\n    const instruction = request.data.solInstruction || Data_SolInstruction.decode(request.data.raw) // JSON.parse(jsonString)\n    const promises: Promise<ProcessResult>[] = []\n\n    // Only have instruction handlers for solana processors\n    for (const processor of SolanaProcessorState.INSTANCE.getValues()) {\n      if (processor.address === instruction.programAccountId) {\n        let parsedInstruction: SolInstruction | null = null\n        if (instruction.parsed) {\n          parsedInstruction = processor.getParsedInstruction(instruction.parsed as { type: string; info: any })\n        } else if (instruction.instructionData) {\n          parsedInstruction = processor.getParsedInstruction(instruction.instructionData)\n        }\n        if (parsedInstruction == null) {\n          continue\n        }\n        const insHandler = processor.getInstructionHandler(parsedInstruction)\n        if (insHandler == null) {\n          continue\n        }\n        const res = await processor.handleInstruction(\n          parsedInstruction,\n          instruction.accounts,\n          insHandler,\n          instruction.slot\n        )\n\n        promises.push(Promise.resolve(res))\n      }\n    }\n    return mergeProcessResults(await Promise.all(promises))\n  }\n}\n\nPluginManager.INSTANCE.register(new SolanaPlugin())\n"]}
+{"version":3,"file":"solana-plugin.js","sourceRoot":"","sources":["../../src/core/solana-plugin.ts"],"names":[],"mappings":"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","sourcesContent":["import { Plugin, PluginManager } from '@sentio/base'\nimport {\n  ContractConfig,\n  Data_SolInstruction,\n  DataBinding,\n  HandlerType,\n  ProcessConfigResponse,\n  ProcessResult,\n} from '@sentio/protos'\nimport { DEFAULT_MAX_BLOCK, mergeProcessResults, USER_PROCESSOR } from '../service'\n\nimport { ServerError, Status } from 'nice-grpc'\n\nimport { SolanaProcessorState } from './solana-processor'\nimport { Instruction as SolInstruction } from '@project-serum/anchor/dist/cjs/coder/borsh/instruction'\n\nexport class SolanaPlugin implements Plugin {\n  name: string = 'SolanaPlugin'\n\n  configure(config: ProcessConfigResponse): void {\n    // Part 2, prepare solana constractors\n    for (const solanaProcessor of SolanaProcessorState.INSTANCE.getValues()) {\n      const contractConfig: ContractConfig = {\n        processorType: USER_PROCESSOR,\n        contract: {\n          name: solanaProcessor.contractName,\n          chainId: solanaProcessor.network,\n          address: solanaProcessor.address,\n          abi: '',\n        },\n        logConfigs: [],\n        traceConfigs: [],\n        intervalConfigs: [],\n        startBlock: solanaProcessor.config.startSlot,\n        endBlock: DEFAULT_MAX_BLOCK,\n        instructionConfig: {\n          innerInstruction: solanaProcessor.processInnerInstruction,\n          parsedInstruction: solanaProcessor.fromParsedInstruction !== null,\n          rawDataInstruction: solanaProcessor.decodeInstruction !== null,\n        },\n        aptosEventConfigs: [],\n        aptosCallConfigs: [],\n      }\n      config.contractConfigs.push(contractConfig)\n    }\n  }\n\n  supportedHandlers = [HandlerType.SOL_INSTRUCTION]\n\n  processBinding(request: DataBinding): Promise<ProcessResult> {\n    switch (request.handlerType) {\n      case HandlerType.SOL_INSTRUCTION:\n        return this.processSolInstruction(request)\n      default:\n        throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType)\n    }\n  }\n\n  async processSolInstruction(request: DataBinding): Promise<ProcessResult> {\n    if (!request.data) {\n      throw new ServerError(Status.INVALID_ARGUMENT, 'instruction data cannot be empty')\n    }\n\n    const instruction = request.data.solInstruction || Data_SolInstruction.decode(request.data.raw) // JSON.parse(jsonString)\n    const promises: Promise<ProcessResult>[] = []\n\n    // Only have instruction handlers for solana processors\n    for (const processor of SolanaProcessorState.INSTANCE.getValues()) {\n      if (processor.address === instruction.programAccountId) {\n        let parsedInstruction: SolInstruction | null = null\n        if (instruction.parsed) {\n          parsedInstruction = processor.getParsedInstruction(instruction.parsed as { type: string; info: any })\n        } else if (instruction.instructionData) {\n          parsedInstruction = processor.getParsedInstruction(instruction.instructionData)\n        }\n        if (parsedInstruction == null) {\n          continue\n        }\n        const insHandler = processor.getInstructionHandler(parsedInstruction)\n        if (insHandler == null) {\n          continue\n        }\n        const res = await processor.handleInstruction(\n          parsedInstruction,\n          instruction.accounts,\n          insHandler,\n          instruction.slot\n        )\n\n        promises.push(Promise.resolve(res))\n      }\n    }\n    return mergeProcessResults(await Promise.all(promises))\n  }\n}\n\nPluginManager.INSTANCE.register(new SolanaPlugin())\n"]}

package/lib/core/solana-processor.d.ts

@@ -1,12 +1,11 @@
-import { ProcessResult } from '../gen';
+import { ProcessResult } from '@sentio/protos';
 import { SolanaContext } from './solana-context';
-import Long from 'long';
 import { Instruction } from '@project-serum/anchor';
 import { SolanaBindOptions } from './solana-options';
-import { ListStateStorage } from '../state/state-storage';
+import { ListStateStorage } from '@sentio/base';
 declare type IndexConfigure = {
-    startSlot: Long;
-    endSlot?: Long;
+    startSlot: bigint;
+    endSlot?: bigint;
 };
 export declare type SolanaInstructionHandler = (instruction: Instruction, ctx: SolanaContext, accounts?: string[]) => void;
 export declare class SolanaProcessorState extends ListStateStorage<SolanaBaseProcessor> {
@@ -33,9 +32,9 @@ export declare class SolanaBaseProcessor {
         info: any;
     }): Instruction | null;
     getInstructionHandler(parsedInstruction: Instruction): SolanaInstructionHandler | undefined;
-    handleInstruction(parsedInstruction: Instruction, accounts: string[], handler: SolanaInstructionHandler, slot: Long): ProcessResult;
+    handleInstruction(parsedInstruction: Instruction, accounts: string[], handler: SolanaInstructionHandler, slot: bigint): ProcessResult;
     isBind(): boolean;
-    startSlot(startSlot: Long | number): this;
-    endBlock(endBlock: Long | number): this;
+    startSlot(startSlot: bigint | number): this;
+    endBlock(endBlock: bigint | number): this;
 }
 export {};

package/lib/core/solana-processor.js

@@ -1,14 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaBaseProcessor = exports.SolanaProcessorState = void 0;
 const solana_context_1 = require("./solana-context");
-const long_1 = __importDefault(require("long"));
-const state_storage_1 = require("../state/state-storage");
+const base_1 = require("@sentio/base");
 const chain_1 = require("../utils/chain");
-class SolanaProcessorState extends state_storage_1.ListStateStorage {
+class SolanaProcessorState extends base_1.ListStateStorage {
     static INSTANCE = new SolanaProcessorState();
 }
 exports.SolanaProcessorState = SolanaProcessorState;
@@ -19,7 +15,7 @@ class SolanaBaseProcessor {
     contractName;
     network;
     processInnerInstruction;
-    config = { startSlot: new long_1.default(0) };
+    config = { startSlot: 0n };
     decodeInstruction;
     fromParsedInstruction;
     constructor(options) {
@@ -72,17 +68,11 @@ class SolanaBaseProcessor {
         return this.address !== null;
     }
     startSlot(startSlot) {
-        if (typeof startSlot === 'number') {
-            startSlot = long_1.default.fromNumber(startSlot);
-        }
-        this.config.startSlot = startSlot;
+        this.config.startSlot = BigInt(startSlot);
         return this;
     }
     endBlock(endBlock) {
-        if (typeof endBlock === 'number') {
-            endBlock = long_1.default.fromNumber(endBlock);
-        }
-        this.config.endSlot = endBlock;
+        this.config.endSlot = BigInt(endBlock);
         return this;
     }
 }

package/lib/core/solana-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana-processor.js","sourceRoot":"","sources":["../../src/core/solana-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import { ProcessResult } from '../gen'\nimport { SolanaContext } from './solana-context'\nimport Long from 'long'\nimport { Instruction } from '@project-serum/anchor'\nimport { SolanaBindOptions } from './solana-options'\nimport { ListStateStorage } from '../state/state-storage'\nimport { CHAIN_IDS } from '../utils/chain'\n\ntype IndexConfigure = {\n  startSlot: Long\n  endSlot?: Long\n}\n\nexport type SolanaInstructionHandler = (instruction: Instruction, ctx: SolanaContext, accounts?: string[]) => void\n\nexport class SolanaProcessorState extends ListStateStorage<SolanaBaseProcessor> {\n  static INSTANCE: SolanaProcessorState = new SolanaProcessorState()\n}\n\nexport class SolanaBaseProcessor {\n  public instructionHandlerMap: Map<string, SolanaInstructionHandler> = new Map()\n  address: string\n  endpoint: string\n  contractName: string\n  network: string\n  processInnerInstruction: boolean\n  config: IndexConfigure = { startSlot: new Long(0) }\n  decodeInstruction: (rawInstruction: string) => Instruction | null\n  fromParsedInstruction: (instruction: { type: string; info: any }) => Instruction | null\n\n  constructor(options: SolanaBindOptions) {\n    if (options) {\n      this.bind(options)\n    }\n    SolanaProcessorState.INSTANCE.addValue(this)\n  }\n\n  bind(options: SolanaBindOptions) {\n    this.address = options.address\n    this.contractName = options.name || ''\n    this.processInnerInstruction = options.processInnerInstruction || false\n    this.network = options.network || CHAIN_IDS.SOLANA_MAINNET\n    if (options.startBlock) {\n      this.startSlot(options.startBlock)\n    }\n    if (options.endBlock) {\n      this.endBlock(options.endBlock)\n    }\n    this.endpoint = options.network || 'https://api.mainnet-beta.solana.com'\n  }\n\n  public onInstruction(instructionName: string, handler: SolanaInstructionHandler) {\n    if (!this.isBind()) {\n      throw new Error(\"Processor doesn't bind to an address\")\n    }\n\n    this.instructionHandlerMap.set(instructionName, handler)\n\n    return this\n  }\n\n  public getParsedInstruction(ins: string | { type: string; info: any }): Instruction | null {\n    if (ins) {\n      if ((ins as { type: string; info: any }).info) {\n        return this.fromParsedInstruction ? this.fromParsedInstruction(ins as { type: string; info: any }) : null\n      }\n      if (this.decodeInstruction != null) {\n        return this.decodeInstruction(ins as string)\n      }\n    }\n    return null\n  }\n\n  public getInstructionHandler(parsedInstruction: Instruction): SolanaInstructionHandler | undefined {\n    return this.instructionHandlerMap.get(parsedInstruction.name)\n  }\n\n  // TODO this should be a async function\n  public handleInstruction(\n    parsedInstruction: Instruction,\n    accounts: string[],\n    handler: SolanaInstructionHandler,\n    slot: Long\n  ): ProcessResult {\n    const ctx = new SolanaContext(this.contractName, this.network, this.address, slot)\n    handler(parsedInstruction, ctx, accounts)\n    return ctx.getProcessResult()\n  }\n\n  public isBind() {\n    return this.address !== null\n  }\n\n  public startSlot(startSlot: Long | number) {\n    if (typeof startSlot === 'number') {\n      startSlot = Long.fromNumber(startSlot)\n    }\n    this.config.startSlot = startSlot\n    return this\n  }\n\n  public endBlock(endBlock: Long | number) {\n    if (typeof endBlock === 'number') {\n      endBlock = Long.fromNumber(endBlock)\n    }\n    this.config.endSlot = endBlock\n    return this\n  }\n}\n"]}
+{"version":3,"file":"solana-processor.js","sourceRoot":"","sources":["../../src/core/solana-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import { ProcessResult } from '@sentio/protos'\nimport { SolanaContext } from './solana-context'\nimport { Instruction } from '@project-serum/anchor'\nimport { SolanaBindOptions } from './solana-options'\nimport { ListStateStorage } from '@sentio/base'\nimport { CHAIN_IDS } from '../utils/chain'\n\ntype IndexConfigure = {\n  startSlot: bigint\n  endSlot?: bigint\n}\n\nexport type SolanaInstructionHandler = (instruction: Instruction, ctx: SolanaContext, accounts?: string[]) => void\n\nexport class SolanaProcessorState extends ListStateStorage<SolanaBaseProcessor> {\n  static INSTANCE: SolanaProcessorState = new SolanaProcessorState()\n}\n\nexport class SolanaBaseProcessor {\n  public instructionHandlerMap: Map<string, SolanaInstructionHandler> = new Map()\n  address: string\n  endpoint: string\n  contractName: string\n  network: string\n  processInnerInstruction: boolean\n  config: IndexConfigure = { startSlot: 0n }\n  decodeInstruction: (rawInstruction: string) => Instruction | null\n  fromParsedInstruction: (instruction: { type: string; info: any }) => Instruction | null\n\n  constructor(options: SolanaBindOptions) {\n    if (options) {\n      this.bind(options)\n    }\n    SolanaProcessorState.INSTANCE.addValue(this)\n  }\n\n  bind(options: SolanaBindOptions) {\n    this.address = options.address\n    this.contractName = options.name || ''\n    this.processInnerInstruction = options.processInnerInstruction || false\n    this.network = options.network || CHAIN_IDS.SOLANA_MAINNET\n    if (options.startBlock) {\n      this.startSlot(options.startBlock)\n    }\n    if (options.endBlock) {\n      this.endBlock(options.endBlock)\n    }\n    this.endpoint = options.network || 'https://api.mainnet-beta.solana.com'\n  }\n\n  public onInstruction(instructionName: string, handler: SolanaInstructionHandler) {\n    if (!this.isBind()) {\n      throw new Error(\"Processor doesn't bind to an address\")\n    }\n\n    this.instructionHandlerMap.set(instructionName, handler)\n\n    return this\n  }\n\n  public getParsedInstruction(ins: string | { type: string; info: any }): Instruction | null {\n    if (ins) {\n      if ((ins as { type: string; info: any }).info) {\n        return this.fromParsedInstruction ? this.fromParsedInstruction(ins as { type: string; info: any }) : null\n      }\n      if (this.decodeInstruction != null) {\n        return this.decodeInstruction(ins as string)\n      }\n    }\n    return null\n  }\n\n  public getInstructionHandler(parsedInstruction: Instruction): SolanaInstructionHandler | undefined {\n    return this.instructionHandlerMap.get(parsedInstruction.name)\n  }\n\n  // TODO this should be a async function\n  public handleInstruction(\n    parsedInstruction: Instruction,\n    accounts: string[],\n    handler: SolanaInstructionHandler,\n    slot: bigint\n  ): ProcessResult {\n    const ctx = new SolanaContext(this.contractName, this.network, this.address, slot)\n    handler(parsedInstruction, ctx, accounts)\n    return ctx.getProcessResult()\n  }\n\n  public isBind() {\n    return this.address !== null\n  }\n\n  public startSlot(startSlot: bigint | number) {\n    this.config.startSlot = BigInt(startSlot)\n    return this\n  }\n\n  public endBlock(endBlock: bigint | number) {\n    this.config.endSlot = BigInt(endBlock)\n    return this\n  }\n}\n"]}

package/lib/core/sui-plugin.d.ts

@@ -1,5 +1,5 @@
-import { Plugin } from '../plugin';
-import { DataBinding, HandlerType, ProcessConfigResponse, ProcessResult } from '../gen/processor/protos/processor';
+import { Plugin } from '@sentio/base';
+import { DataBinding, HandlerType, ProcessConfigResponse, ProcessResult } from '@sentio/protos';
 export declare class SuiPlugin implements Plugin {
     name: string;
     configure(config: ProcessConfigResponse): void;

package/lib/core/sui-plugin.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SuiPlugin = void 0;
-const plugin_1 = require("../plugin");
-const processor_1 = require("../gen/processor/protos/processor");
+const base_1 = require("@sentio/base");
+const protos_1 = require("@sentio/protos");
 const service_1 = require("../service");
 const nice_grpc_1 = require("nice-grpc");
 const chain_1 = require("../utils/chain");
@@ -31,10 +31,10 @@ class SuiPlugin {
             config.contractConfigs.push(contractConfig);
         }
     }
-    supportedHandlers = [processor_1.HandlerType.SUI_TRANSACTION];
+    supportedHandlers = [protos_1.HandlerType.SUI_TRANSACTION];
     processBinding(request) {
         switch (request.handlerType) {
-            case processor_1.HandlerType.SUI_TRANSACTION:
+            case protos_1.HandlerType.SUI_TRANSACTION:
             // return this.processSolInstruction(request)
             default:
                 throw new nice_grpc_1.ServerError(nice_grpc_1.Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType);
@@ -42,5 +42,5 @@ class SuiPlugin {
     }
 }
 exports.SuiPlugin = SuiPlugin;
-plugin_1.PluginManager.INSTANCE.register(new SuiPlugin());
+base_1.PluginManager.INSTANCE.register(new SuiPlugin());
 //# sourceMappingURL=sui-plugin.js.map

package/lib/core/sui-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"sui-plugin.js","sourceRoot":"","sources":["../../src/core/sui-plugin.ts"],"names":[],"mappings":";;;AAAA,sCAAiD;AACjD,iEAM0C;AAC1C,wCAA8D;AAE9D,yCAA+C;AAE/C,0CAA0C;AAC1C,mDAAmD;AAEnD,MAAa,SAAS;IACpB,IAAI,GAAW,cAAc,CAAA;IAE7B,SAAS,CAAC,MAA6B;QACrC,KAAK,MAAM,YAAY,IAAI,iCAAiB,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;YACjE,MAAM,cAAc,GAAmB;gBACrC,aAAa,EAAE,wBAAc;gBAC7B,QAAQ,EAAE;oBACR,IAAI,EAAE,cAAc;oBACpB,OAAO,EAAE,iBAAS,CAAC,UAAU;oBAC7B,OAAO,EAAE,YAAY,CAAC,OAAO;oBAC7B,GAAG,EAAE,EAAE;iBACR;gBACD,UAAU,EAAE,EAAE;gBACd,eAAe,EAAE,EAAE;gBACnB,YAAY,EAAE,EAAE;gBAChB,UAAU,EAAE,YAAY,CAAC,MAAM,CAAC,cAAc;gBAC9C,QAAQ,EAAE,2BAAiB;gBAC3B,iBAAiB,EAAE,SAAS;gBAC5B,iBAAiB,EAAE,EAAE;gBACrB,gBAAgB,EAAE,EAAE;aACrB,CAAA;YACD,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;SAC5C;IACH,CAAC;IAED,iBAAiB,GAAG,CAAC,uBAAW,CAAC,eAAe,CAAC,CAAA;IAEjD,cAAc,CAAC,OAAoB;QACjC,QAAQ,OAAO,CAAC,WAAW,EAAE;YAC3B,KAAK,uBAAW,CAAC,eAAe,CAAC;YACjC,6CAA6C;YAC7C;gBACE,MAAM,IAAI,uBAAW,CAAC,kBAAM,CAAC,gBAAgB,EAAE,4BAA4B,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;SACrG;IACH,CAAC;CACF;AApCD,8BAoCC;AAED,sBAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,SAAS,EAAE,CAAC,CAAA","sourcesContent":["import { Plugin, PluginManager } from '../plugin'\nimport {\n  ContractConfig,\n  DataBinding,\n  HandlerType,\n  ProcessConfigResponse,\n  ProcessResult,\n} from '../gen/processor/protos/processor'\nimport { DEFAULT_MAX_BLOCK, USER_PROCESSOR } from '../service'\n\nimport { ServerError, Status } from 'nice-grpc'\n\nimport { CHAIN_IDS } from '../utils/chain'\nimport { SuiProcessorState } from './sui-processor'\n\nexport class SuiPlugin implements Plugin {\n  name: string = 'SolanaPlugin'\n\n  configure(config: ProcessConfigResponse): void {\n    for (const suiProcessor of SuiProcessorState.INSTANCE.getValues()) {\n      const contractConfig: ContractConfig = {\n        processorType: USER_PROCESSOR,\n        contract: {\n          name: 'sui contract',\n          chainId: CHAIN_IDS.SUI_DEVNET,\n          address: suiProcessor.address,\n          abi: '',\n        },\n        logConfigs: [],\n        intervalConfigs: [],\n        traceConfigs: [],\n        startBlock: suiProcessor.config.startSeqNumber,\n        endBlock: DEFAULT_MAX_BLOCK,\n        instructionConfig: undefined,\n        aptosEventConfigs: [],\n        aptosCallConfigs: [],\n      }\n      config.contractConfigs.push(contractConfig)\n    }\n  }\n\n  supportedHandlers = [HandlerType.SUI_TRANSACTION]\n\n  processBinding(request: DataBinding): Promise<ProcessResult> {\n    switch (request.handlerType) {\n      case HandlerType.SUI_TRANSACTION:\n      // return this.processSolInstruction(request)\n      default:\n        throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType)\n    }\n  }\n}\n\nPluginManager.INSTANCE.register(new SuiPlugin())\n"]}
+{"version":3,"file":"sui-plugin.js","sourceRoot":"","sources":["../../src/core/sui-plugin.ts"],"names":[],"mappings":";;;AAAA,uCAAoD;AACpD,2CAA+G;AAE/G,wCAA8D;AAE9D,yCAA+C;AAE/C,0CAA0C;AAC1C,mDAAmD;AAEnD,MAAa,SAAS;IACpB,IAAI,GAAW,cAAc,CAAA;IAE7B,SAAS,CAAC,MAA6B;QACrC,KAAK,MAAM,YAAY,IAAI,iCAAiB,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;YACjE,MAAM,cAAc,GAAmB;gBACrC,aAAa,EAAE,wBAAc;gBAC7B,QAAQ,EAAE;oBACR,IAAI,EAAE,cAAc;oBACpB,OAAO,EAAE,iBAAS,CAAC,UAAU;oBAC7B,OAAO,EAAE,YAAY,CAAC,OAAO;oBAC7B,GAAG,EAAE,EAAE;iBACR;gBACD,UAAU,EAAE,EAAE;gBACd,eAAe,EAAE,EAAE;gBACnB,YAAY,EAAE,EAAE;gBAChB,UAAU,EAAE,YAAY,CAAC,MAAM,CAAC,cAAc;gBAC9C,QAAQ,EAAE,2BAAiB;gBAC3B,iBAAiB,EAAE,SAAS;gBAC5B,iBAAiB,EAAE,EAAE;gBACrB,gBAAgB,EAAE,EAAE;aACrB,CAAA;YACD,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;SAC5C;IACH,CAAC;IAED,iBAAiB,GAAG,CAAC,oBAAW,CAAC,eAAe,CAAC,CAAA;IAEjD,cAAc,CAAC,OAAoB;QACjC,QAAQ,OAAO,CAAC,WAAW,EAAE;YAC3B,KAAK,oBAAW,CAAC,eAAe,CAAC;YACjC,6CAA6C;YAC7C;gBACE,MAAM,IAAI,uBAAW,CAAC,kBAAM,CAAC,gBAAgB,EAAE,4BAA4B,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;SACrG;IACH,CAAC;CACF;AApCD,8BAoCC;AAED,oBAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,SAAS,EAAE,CAAC,CAAA","sourcesContent":["import { Plugin, PluginManager } from '@sentio/base'\nimport { ContractConfig, DataBinding, HandlerType, ProcessConfigResponse, ProcessResult } from '@sentio/protos'\n\nimport { DEFAULT_MAX_BLOCK, USER_PROCESSOR } from '../service'\n\nimport { ServerError, Status } from 'nice-grpc'\n\nimport { CHAIN_IDS } from '../utils/chain'\nimport { SuiProcessorState } from './sui-processor'\n\nexport class SuiPlugin implements Plugin {\n  name: string = 'SolanaPlugin'\n\n  configure(config: ProcessConfigResponse): void {\n    for (const suiProcessor of SuiProcessorState.INSTANCE.getValues()) {\n      const contractConfig: ContractConfig = {\n        processorType: USER_PROCESSOR,\n        contract: {\n          name: 'sui contract',\n          chainId: CHAIN_IDS.SUI_DEVNET,\n          address: suiProcessor.address,\n          abi: '',\n        },\n        logConfigs: [],\n        intervalConfigs: [],\n        traceConfigs: [],\n        startBlock: suiProcessor.config.startSeqNumber,\n        endBlock: DEFAULT_MAX_BLOCK,\n        instructionConfig: undefined,\n        aptosEventConfigs: [],\n        aptosCallConfigs: [],\n      }\n      config.contractConfigs.push(contractConfig)\n    }\n  }\n\n  supportedHandlers = [HandlerType.SUI_TRANSACTION]\n\n  processBinding(request: DataBinding): Promise<ProcessResult> {\n    switch (request.handlerType) {\n      case HandlerType.SUI_TRANSACTION:\n      // return this.processSolInstruction(request)\n      default:\n        throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType)\n    }\n  }\n}\n\nPluginManager.INSTANCE.register(new SuiPlugin())\n"]}