@xyo-network/ethers-ethereum-gas-plugin 2.51.8 → 2.51.10

package/dist/esm/Plugin.js

@@ -1,11 +1,10 @@
 import { XyoEthereumGasEthersSchema } from '@xyo-network/ethers-ethereum-gas-payload-plugin';
 import { PayloadSetSchema } from '@xyo-network/payload-model';
-import { createPayloadSetPlugin } from '@xyo-network/payloadset-plugin';
+import { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin';
 import { XyoEthereumGasEthersWitness } from './Witness';
-export const XyoEthereumGasEthersPlugin = () => createPayloadSetPlugin({ required: { [XyoEthereumGasEthersSchema]: 1 }, schema: PayloadSetSchema }, {
+export const XyoEthereumGasEthersPlugin = () => createPayloadSetWitnessPlugin({ required: { [XyoEthereumGasEthersSchema]: 1 }, schema: PayloadSetSchema }, {
     witness: async (params) => {
-        const result = await XyoEthereumGasEthersWitness.create(params);
-        return result;
+        return await XyoEthereumGasEthersWitness.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,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,sBAAsB,EAA2B,MAAM,gCAAgC,CAAA;AAEhG,OAAO,EAAE,2BAA2B,EAAqC,MAAM,WAAW,CAAA;AAE1F,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,EAAE,CAC7C,sBAAsB,CACpB,EAAE,QAAQ,EAAE,EAAE,CAAC,0BAA0B,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAC3E;IACE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC/D,OAAO,MAAM,CAAA;IACf,CAAC;CACF,CACF,CAAA"}
+{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAC5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAA;AAE9E,OAAO,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAA;AAEvD,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,EAAE,CAC7C,6BAA6B,CAC3B,EAAE,QAAQ,EAAE,EAAE,CAAC,0BAA0B,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAC3E;IACE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,OAAO,MAAM,2BAA2B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACzD,CAAC;CACF,CACF,CAAA"}

package/dist/esm/Witness.js

@@ -6,13 +6,10 @@ import { getGasFromEthers } from './lib';
 import { XyoEthereumGasEthersWitnessConfigSchema } from './Schema';
 export class XyoEthereumGasEthersWitness extends TimestampWitness {
     static configSchema = XyoEthereumGasEthersWitnessConfigSchema;
-    provider;
-    constructor(params) {
-        super(params);
-        this.provider = params?.provider;
-    }
-    static async create(params) {
-        return (await super.create(params));
+    _provider;
+    get provider() {
+        this._provider = this._provider ?? this.params?.provider;
+        return this._provider;
     }
     async observe() {
         const payload = new XyoPayloadBuilder({ schema: XyoEthereumGasEthersSchema })

package/dist/esm/Witness.js.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAA+B,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAEzH,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAEhE,OAAO,EAAE,gBAAgB,EAAiB,MAAM,sBAAsB,CAAA;AAGtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAA;AACxC,OAAO,EAAE,uCAAuC,EAAE,MAAM,UAAU,CAAA;AASlE,MAAM,OAAO,2BAA4B,SAAQ,gBAAkE;IACjH,MAAM,CAAU,YAAY,GAAG,uCAAuC,CAAA;IAE5D,QAAQ,CAAW;IAE7B,YAAsB,MAAyC;QAC7D,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,QAAQ,GAAG,MAAM,EAAE,QAAQ,CAAA;IAClC,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAA0C;QACrE,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAgC,CAAA;IACpE,CAAC;IAEQ,KAAK,CAAC,OAAO;QACpB,MAAM,OAAO,GAAG,IAAI,iBAAiB,CAA8B,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC;aACvG,MAAM,CAAC,MAAM,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC,CAAC;aAC5E,KAAK,EAAE,CAAA;QACV,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;IACjC,CAAC"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAA+B,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAEzH,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAEhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAGvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAA;AACxC,OAAO,EAAE,uCAAuC,EAAE,MAAM,UAAU,CAAA;AAUlE,MAAM,OAAO,2BAEX,SAAQ,gBAAyB;IACjC,MAAM,CAAU,YAAY,GAAG,uCAAuC,CAAA;IAE9D,SAAS,CAAW;IAE5B,IAAc,QAAQ;QACpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAA;QACxD,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;IAEQ,KAAK,CAAC,OAAO;QACpB,MAAM,OAAO,GAAG,IAAI,iBAAiB,CAA8B,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC;aACvG,MAAM,CAAC,MAAM,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC,CAAC;aAC5E,KAAK,EAAE,CAAA;QACV,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;IACjC,CAAC"}

package/dist/types/Plugin.d.ts

@@ -1,4 +1,3 @@
-import { PayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin';
-import { XyoEthereumGasEthersWitness, XyoEthereumGasEthersWitnessParams } from './Witness';
-export declare const XyoEthereumGasEthersPlugin: () => PayloadSetWitnessPlugin<XyoEthereumGasEthersWitness, XyoEthereumGasEthersWitnessParams>;
+import { XyoEthereumGasEthersWitness } from './Witness';
+export declare const XyoEthereumGasEthersPlugin: () => import("@xyo-network/payloadset-plugin").PayloadSetWitnessPlugin<XyoEthereumGasEthersWitness<import("./Witness").XyoEthereumGasEthersWitnessParams>>;
 //# 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":"AAEA,OAAO,EAA0B,uBAAuB,EAAE,MAAM,gCAAgC,CAAA;AAEhG,OAAO,EAAE,2BAA2B,EAAE,iCAAiC,EAAE,MAAM,WAAW,CAAA;AAE1F,eAAO,MAAM,0BAA0B,+FASpC,CAAA"}
+{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAA;AAEvD,eAAO,MAAM,0BAA0B,4JAQpC,CAAA"}

package/dist/types/Witness.d.ts

@@ -1,16 +1,15 @@
 import { Provider } from '@ethersproject/providers';
-import { ModuleParams } from '@xyo-network/module';
+import { AnyConfigSchema, ModuleParams } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload-model';
-import { TimestampWitness, WitnessParams } from '@xyo-network/witness';
+import { TimestampWitness } from '@xyo-network/witness';
 import { XyoEthereumGasEthersWitnessConfig } from './Config';
-export type XyoEthereumGasEthersWitnessParams = ModuleParams<XyoEthereumGasEthersWitnessConfig, {
-    provider: Provider;
+export type XyoEthereumGasEthersWitnessParams = ModuleParams<AnyConfigSchema<XyoEthereumGasEthersWitnessConfig>, undefined, {
+    provider?: Provider;
 }>;
-export declare class XyoEthereumGasEthersWitness extends TimestampWitness<WitnessParams<XyoEthereumGasEthersWitnessConfig>> {
+export declare class XyoEthereumGasEthersWitness<TParams extends XyoEthereumGasEthersWitnessParams = XyoEthereumGasEthersWitnessParams> extends TimestampWitness<TParams> {
     static configSchema: "network.xyo.blockchain.ethereum.gas.ethers.witness.config";
-    protected provider?: Provider;
-    protected constructor(params: XyoEthereumGasEthersWitnessParams);
-    static create(params?: XyoEthereumGasEthersWitnessParams): Promise<XyoEthereumGasEthersWitness>;
+    private _provider?;
+    protected get provider(): Provider | undefined;
     observe(): Promise<XyoPayload[]>;
 }
 //# sourceMappingURL=Witness.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAGnD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEtE,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAA;AAI5D,MAAM,MAAM,iCAAiC,GAAG,YAAY,CAC1D,iCAAiC,EACjC;IACE,QAAQ,EAAE,QAAQ,CAAA;CACnB,CACF,CAAA;AAED,qBAAa,2BAA4B,SAAQ,gBAAgB,CAAC,aAAa,CAAC,iCAAiC,CAAC,CAAC;IACjH,OAAgB,YAAY,8DAA0C;IAEtE,SAAS,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAA;IAE7B,SAAS,aAAa,MAAM,EAAE,iCAAiC;WAKzC,MAAM,CAAC,MAAM,CAAC,EAAE,iCAAiC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAI/F,OAAO,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;CAMhD"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAGnD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAEnE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAA;AAI5D,MAAM,MAAM,iCAAiC,GAAG,YAAY,CAC1D,eAAe,CAAC,iCAAiC,CAAC,EAClD,SAAS,EACT;IACE,QAAQ,CAAC,EAAE,QAAQ,CAAA;CACpB,CACF,CAAA;AAED,qBAAa,2BAA2B,CACtC,OAAO,SAAS,iCAAiC,GAAG,iCAAiC,CACrF,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACjC,OAAgB,YAAY,8DAA0C;IAEtE,OAAO,CAAC,SAAS,CAAC,CAAU;IAE5B,SAAS,KAAK,QAAQ,yBAGrB;IAEc,OAAO,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;CAMhD"}

package/package.json

@@ -12,12 +12,12 @@
   "dependencies": {
     "@ethersproject/providers": "^5.7.2",
     "@xylabs/assert": "^2.7.4",
-    "@xyo-network/ethers-ethereum-gas-payload-plugin": "^2.51.8",
-    "@xyo-network/module": "^2.51.8",
-    "@xyo-network/payload-builder": "^2.51.8",
-    "@xyo-network/payload-model": "^2.51.8",
-    "@xyo-network/payloadset-plugin": "^2.51.8",
-    "@xyo-network/witness": "^2.51.8"
+    "@xyo-network/ethers-ethereum-gas-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/witness": "^2.51.10"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^2.16.1",
@@ -57,5 +57,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.51.8"
+  "version": "2.51.10"
 }

package/src/Plugin.ts

@@ -1,16 +1,15 @@
 import { XyoEthereumGasEthersSchema } from '@xyo-network/ethers-ethereum-gas-payload-plugin'
 import { PayloadSetSchema } from '@xyo-network/payload-model'
-import { createPayloadSetPlugin, PayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'
+import { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'
 
-import { XyoEthereumGasEthersWitness, XyoEthereumGasEthersWitnessParams } from './Witness'
+import { XyoEthereumGasEthersWitness } from './Witness'
 
 export const XyoEthereumGasEthersPlugin = () =>
-  createPayloadSetPlugin<PayloadSetWitnessPlugin<XyoEthereumGasEthersWitness, XyoEthereumGasEthersWitnessParams>>(
+  createPayloadSetWitnessPlugin<XyoEthereumGasEthersWitness>(
     { required: { [XyoEthereumGasEthersSchema]: 1 }, schema: PayloadSetSchema },
     {
       witness: async (params) => {
-        const result = await XyoEthereumGasEthersWitness.create(params)
-        return result
+        return await XyoEthereumGasEthersWitness.create(params)
       },
     },
   )

package/src/Witness.ts

@@ -1,34 +1,33 @@
 import { Provider } from '@ethersproject/providers'
 import { assertEx } from '@xylabs/assert'
 import { XyoEthereumGasEthersPayload, XyoEthereumGasEthersSchema } from '@xyo-network/ethers-ethereum-gas-payload-plugin'
-import { ModuleParams } from '@xyo-network/module'
+import { AnyConfigSchema, ModuleParams } from '@xyo-network/module'
 import { XyoPayloadBuilder } from '@xyo-network/payload-builder'
 import { XyoPayload } from '@xyo-network/payload-model'
-import { TimestampWitness, WitnessParams } from '@xyo-network/witness'
+import { TimestampWitness } from '@xyo-network/witness'
 
 import { XyoEthereumGasEthersWitnessConfig } from './Config'
 import { getGasFromEthers } from './lib'
 import { XyoEthereumGasEthersWitnessConfigSchema } from './Schema'
 
 export type XyoEthereumGasEthersWitnessParams = ModuleParams<
-  XyoEthereumGasEthersWitnessConfig,
+  AnyConfigSchema<XyoEthereumGasEthersWitnessConfig>,
+  undefined,
   {
-    provider: Provider
+    provider?: Provider
   }
 >
 
-export class XyoEthereumGasEthersWitness extends TimestampWitness<WitnessParams<XyoEthereumGasEthersWitnessConfig>> {
+export class XyoEthereumGasEthersWitness<
+  TParams extends XyoEthereumGasEthersWitnessParams = XyoEthereumGasEthersWitnessParams,
+> extends TimestampWitness<TParams> {
   static override configSchema = XyoEthereumGasEthersWitnessConfigSchema
 
-  protected provider?: Provider
+  private _provider?: Provider
 
-  protected constructor(params: XyoEthereumGasEthersWitnessParams) {
-    super(params)
-    this.provider = params?.provider
-  }
-
-  static override async create(params?: XyoEthereumGasEthersWitnessParams): Promise<XyoEthereumGasEthersWitness> {
-    return (await super.create(params)) as XyoEthereumGasEthersWitness
+  protected get provider() {
+    this._provider = this._provider ?? this.params?.provider
+    return this._provider
   }
 
   override async observe(): Promise<XyoPayload[]> {