@xyo-network/gas-price-plugin 2.51.9 → 2.51.10

package/dist/esm/Diviner.js

@@ -5,9 +5,6 @@ import { XyoEthereumGasDivinerConfigSchema } from './Schema';
 export class XyoEthereumGasDiviner extends AbstractDiviner {
     static configSchema = XyoEthereumGasDivinerConfigSchema;
     static targetSchema = XyoEthereumGasSchema;
-    static async create(params) {
-        return (await super.create(params));
-    }
     divine(payloads) {
         const cost = divineGas(payloads ?? []);
         return [cost];

package/dist/esm/Diviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAgC,MAAM,sBAAsB,CAAA;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAA;AAK5E,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAA;AAI5D,MAAM,OAAO,qBAAsB,SAAQ,eAAe;IACxD,MAAM,CAAU,YAAY,GAAG,iCAAiC,CAAA;IAChE,MAAM,CAAU,YAAY,GAAG,oBAAoB,CAAA;IAEnD,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAkD;QAC7E,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAA0B,CAAA;IAC9D,CAAC;IAEQ,MAAM,CAAC,QAAsB;QACpC,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAA;QACtC,OAAO,CAAC,IAAI,CAAC,CAAA;IACf,CAAC"}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAA+C,MAAM,sBAAsB,CAAA;AACnG,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAA;AAK5E,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAA;AAK5D,MAAM,OAAO,qBACX,SAAQ,eAAwB;IAGhC,MAAM,CAAU,YAAY,GAAW,iCAAiC,CAAA;IACxE,MAAM,CAAU,YAAY,GAAW,oBAAoB,CAAA;IAElD,MAAM,CAAC,QAAsB;QACpC,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAA;QACtC,OAAO,CAAC,IAAI,CAAC,CAAA;IACf,CAAC"}

package/dist/esm/Plugin.js

@@ -1,10 +1,10 @@
 import { XyoEthereumGasSchema } from '@xyo-network/gas-price-payload-plugin';
 import { PayloadSetSchema } from '@xyo-network/payload-model';
-import { createPayloadSetPlugin } from '@xyo-network/payloadset-plugin';
+import { createPayloadSetDivinerPlugin } from '@xyo-network/payloadset-plugin';
 import { XyoEthereumGasDiviner } from './Diviner';
-export const XyoEthereumGasPlugin = () => createPayloadSetPlugin({ required: { [XyoEthereumGasSchema]: 1 }, schema: PayloadSetSchema }, {
+export const XyoEthereumGasPlugin = () => createPayloadSetDivinerPlugin({ required: { [XyoEthereumGasSchema]: 1 }, schema: PayloadSetSchema }, {
     diviner: async (params) => {
-        return await XyoEthereumGasDiviner.create(params);
+        return (await XyoEthereumGasDiviner.create(params));
     },
 });
 //# sourceMappingURL=Plugin.js.map

package/dist/esm/Plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAA;AAE5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,sBAAsB,EAA2B,MAAM,gCAAgC,CAAA;AAEhG,OAAO,EAAE,qBAAqB,EAA+B,MAAM,WAAW,CAAA;AAE9E,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE,CACvC,sBAAsB,CACpB,EAAE,QAAQ,EAAE,EAAE,CAAC,oBAAoB,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EACrE;IACE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,OAAO,MAAM,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACnD,CAAC;CACF,CACF,CAAA"}
+{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAA;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAA;AAE9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE,CACvC,6BAA6B,CAC3B,EAAE,QAAQ,EAAE,EAAE,CAAC,oBAAoB,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EACrE;IACE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,OAAO,CAAC,MAAM,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,CAA0B,CAAA;IAC9E,CAAC;CACF,CACF,CAAA"}

package/dist/types/Diviner.d.ts

@@ -1,15 +1,15 @@
-import { AbstractDiviner, DivinerConfig, DivinerModule } from '@xyo-network/diviner';
-import { ModuleParams } from '@xyo-network/module';
+import { AbstractDiviner, DivinerConfig, DivinerModule, DivinerParams } from '@xyo-network/diviner';
+import { AnyConfigSchema } from '@xyo-network/module';
 import { XyoPayloads } from '@xyo-network/payload-model';
 import { Promisable } from '@xyo-network/promise';
 import { XyoEthereumGasDivinerConfigSchema } from './Schema';
 export type XyoEthereumGasDivinerConfig = DivinerConfig<{
     schema: XyoEthereumGasDivinerConfigSchema;
 }>;
-export declare class XyoEthereumGasDiviner extends AbstractDiviner implements DivinerModule {
-    static configSchema: "network.xyo.blockchain.ethereum.gas.diviner.config";
-    static targetSchema: "network.xyo.blockchain.ethereum.gas";
-    static create(params?: ModuleParams<XyoEthereumGasDivinerConfig>): Promise<XyoEthereumGasDiviner>;
+export type XyoEthereumGasDivinerParams = DivinerParams<AnyConfigSchema<XyoEthereumGasDivinerConfig>>;
+export declare class XyoEthereumGasDiviner<TParams extends XyoEthereumGasDivinerParams = XyoEthereumGasDivinerParams> extends AbstractDiviner<TParams> implements DivinerModule {
+    static configSchema: string;
+    static targetSchema: string;
     divine(payloads?: XyoPayloads): Promisable<XyoPayloads>;
 }
 //# sourceMappingURL=Diviner.d.ts.map

package/dist/types/Diviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEpF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAA;AAE5D,MAAM,MAAM,2BAA2B,GAAG,aAAa,CAAC;IAAE,MAAM,EAAE,iCAAiC,CAAA;CAAE,CAAC,CAAA;AAEtG,qBAAa,qBAAsB,SAAQ,eAAgB,YAAW,aAAa;IACjF,OAAgB,YAAY,uDAAoC;IAChE,OAAgB,YAAY,wCAAuB;WAE7B,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,2BAA2B,CAAC;IAItE,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;CAIjE"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEnG,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAA;AAE5D,MAAM,MAAM,2BAA2B,GAAG,aAAa,CAAC;IAAE,MAAM,EAAE,iCAAiC,CAAA;CAAE,CAAC,CAAA;AACtG,MAAM,MAAM,2BAA2B,GAAG,aAAa,CAAC,eAAe,CAAC,2BAA2B,CAAC,CAAC,CAAA;AAErG,qBAAa,qBAAqB,CAAC,OAAO,SAAS,2BAA2B,GAAG,2BAA2B,CAC1G,SAAQ,eAAe,CAAC,OAAO,CAC/B,YAAW,aAAa;IAExB,OAAgB,YAAY,EAAE,MAAM,CAAoC;IACxE,OAAgB,YAAY,EAAE,MAAM,CAAuB;IAElD,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;CAIjE"}

package/dist/types/Plugin.d.ts

@@ -1,17 +1,3 @@
-import { ModuleParams } from '@xyo-network/module';
-import { PayloadSetDivinerPlugin } from '@xyo-network/payloadset-plugin';
 import { XyoEthereumGasDiviner } from './Diviner';
-export declare const XyoEthereumGasPlugin: () => PayloadSetDivinerPlugin<XyoEthereumGasDiviner, ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    name?: string | undefined;
-    security?: {
-        allowAnonymous?: boolean | undefined;
-        allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    storeQueries?: boolean | undefined;
-} & {
-    targetSchema?: "network.xyo.blockchain.ethereum.gas.diviner.config" | undefined;
-} & {
-    schema: string;
-}, undefined>>;
+export declare const XyoEthereumGasPlugin: () => import("@xyo-network/payloadset-plugin").PayloadSetDivinerPlugin<XyoEthereumGasDiviner<import("./Diviner").XyoEthereumGasDivinerParams>>;
 //# sourceMappingURL=Plugin.d.ts.map

package/dist/types/Plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,EAA0B,uBAAuB,EAAE,MAAM,gCAAgC,CAAA;AAEhG,OAAO,EAAE,qBAAqB,EAA+B,MAAM,WAAW,CAAA;AAE9E,eAAO,MAAM,oBAAoB;;;;;;;;;;;;cAQ9B,CAAA"}
+{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD,eAAO,MAAM,oBAAoB,gJAQ9B,CAAA"}

package/package.json

@@ -11,18 +11,18 @@
   },
   "dependencies": {
     "@xylabs/exists": "^2.7.4",
-    "@xyo-network/blocknative-ethereum-gas-payload-plugin": "^2.51.9",
-    "@xyo-network/diviner": "^2.51.9",
-    "@xyo-network/etherchain-gas-ethereum-blockchain-payload-plugins": "^2.51.9",
-    "@xyo-network/ethers-ethereum-gas-payload-plugin": "^2.51.9",
-    "@xyo-network/etherscan-ethereum-gas-payload-plugin": "^2.51.9",
-    "@xyo-network/ethgasstation-ethereum-gas-payload-plugin": "^2.51.9",
-    "@xyo-network/gas-price-payload-plugin": "^2.51.9",
-    "@xyo-network/module": "^2.51.9",
-    "@xyo-network/payload-builder": "^2.51.9",
-    "@xyo-network/payload-model": "^2.51.9",
-    "@xyo-network/payloadset-plugin": "^2.51.9",
-    "@xyo-network/promise": "^2.51.9",
+    "@xyo-network/blocknative-ethereum-gas-payload-plugin": "^2.51.10",
+    "@xyo-network/diviner": "^2.51.10",
+    "@xyo-network/etherchain-gas-ethereum-blockchain-payload-plugins": "^2.51.10",
+    "@xyo-network/ethers-ethereum-gas-payload-plugin": "^2.51.10",
+    "@xyo-network/etherscan-ethereum-gas-payload-plugin": "^2.51.10",
+    "@xyo-network/ethgasstation-ethereum-gas-payload-plugin": "^2.51.10",
+    "@xyo-network/gas-price-payload-plugin": "^2.51.10",
+    "@xyo-network/module": "^2.51.10",
+    "@xyo-network/payload-builder": "^2.51.10",
+    "@xyo-network/payload-model": "^2.51.10",
+    "@xyo-network/payloadset-plugin": "^2.51.10",
+    "@xyo-network/promise": "^2.51.10",
     "regression": "^2.0.1"
   },
   "devDependencies": {
@@ -33,7 +33,7 @@
     "@ethersproject/solidity": "^5.7.0",
     "@types/regression": "^2.0.2",
     "@uniswap/sdk": "^3.0.3",
-    "@uniswap/sdk-core": "^3.2.0",
+    "@uniswap/sdk-core": "^3.2.2",
     "@uniswap/v3-sdk": "^3.9.0",
     "@xylabs/ts-scripts-yarn3": "^2.16.1",
     "@xylabs/tsconfig": "^2.16.1",
@@ -82,5 +82,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.51.9"
+  "version": "2.51.10"
 }

package/src/Diviner.ts

@@ -1,6 +1,6 @@
-import { AbstractDiviner, DivinerConfig, DivinerModule } from '@xyo-network/diviner'
+import { AbstractDiviner, DivinerConfig, DivinerModule, DivinerParams } from '@xyo-network/diviner'
 import { XyoEthereumGasSchema } from '@xyo-network/gas-price-payload-plugin'
-import { ModuleParams } from '@xyo-network/module'
+import { AnyConfigSchema } from '@xyo-network/module'
 import { XyoPayloads } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
 
@@ -8,14 +8,14 @@ import { divineGas } from './lib'
 import { XyoEthereumGasDivinerConfigSchema } from './Schema'
 
 export type XyoEthereumGasDivinerConfig = DivinerConfig<{ schema: XyoEthereumGasDivinerConfigSchema }>
+export type XyoEthereumGasDivinerParams = DivinerParams<AnyConfigSchema<XyoEthereumGasDivinerConfig>>
 
-export class XyoEthereumGasDiviner extends AbstractDiviner implements DivinerModule {
-  static override configSchema = XyoEthereumGasDivinerConfigSchema
-  static override targetSchema = XyoEthereumGasSchema
-
-  static override async create(params?: ModuleParams<XyoEthereumGasDivinerConfig>) {
-    return (await super.create(params)) as XyoEthereumGasDiviner
-  }
+export class XyoEthereumGasDiviner<TParams extends XyoEthereumGasDivinerParams = XyoEthereumGasDivinerParams>
+  extends AbstractDiviner<TParams>
+  implements DivinerModule
+{
+  static override configSchema: string = XyoEthereumGasDivinerConfigSchema
+  static override targetSchema: string = XyoEthereumGasSchema
 
   override divine(payloads?: XyoPayloads): Promisable<XyoPayloads> {
     const cost = divineGas(payloads ?? [])

package/src/Plugin.ts

@@ -1,16 +1,15 @@
 import { XyoEthereumGasSchema } from '@xyo-network/gas-price-payload-plugin'
-import { ModuleParams } from '@xyo-network/module'
 import { PayloadSetSchema } from '@xyo-network/payload-model'
-import { createPayloadSetPlugin, PayloadSetDivinerPlugin } from '@xyo-network/payloadset-plugin'
+import { createPayloadSetDivinerPlugin } from '@xyo-network/payloadset-plugin'
 
-import { XyoEthereumGasDiviner, XyoEthereumGasDivinerConfig } from './Diviner'
+import { XyoEthereumGasDiviner } from './Diviner'
 
 export const XyoEthereumGasPlugin = () =>
-  createPayloadSetPlugin<PayloadSetDivinerPlugin<XyoEthereumGasDiviner, ModuleParams<XyoEthereumGasDivinerConfig>>>(
+  createPayloadSetDivinerPlugin<XyoEthereumGasDiviner>(
     { required: { [XyoEthereumGasSchema]: 1 }, schema: PayloadSetSchema },
     {
       diviner: async (params) => {
-        return await XyoEthereumGasDiviner.create(params)
+        return (await XyoEthereumGasDiviner.create(params)) as XyoEthereumGasDiviner
       },
     },
   )