@xyo-network/gas-price-plugin 2.61.1 → 2.61.2

package/dist/types/lib/transforms/transformGasFromEtherscan.d.ts

@@ -1,4 +1,4 @@
-import { XyoEthereumGasEtherscanPayload } from '@xyo-network/etherscan-ethereum-gas-payload-plugin';
+import { EthereumGasEtherscanPayload } from '@xyo-network/etherscan-ethereum-gas-payload-plugin';
 import { FeeData } from '@xyo-network/gas-price-payload-plugin';
-export declare const transformGasFromEtherscan: (payload: XyoEthereumGasEtherscanPayload) => FeeData;
+export declare const transformGasFromEtherscan: (payload: EthereumGasEtherscanPayload) => FeeData;
 //# sourceMappingURL=transformGasFromEtherscan.d.ts.map

package/dist/types/lib/transforms/transformGasFromEtherscan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformGasFromEtherscan.d.ts","sourceRoot":"","sources":["../../../../src/lib/transforms/transformGasFromEtherscan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,oDAAoD,CAAA;AACnG,OAAO,EAAE,OAAO,EAAa,MAAM,uCAAuC,CAAA;AAqB1E,eAAO,MAAM,yBAAyB,YAAa,8BAA8B,KAAG,OAKnF,CAAA"}
+{"version":3,"file":"transformGasFromEtherscan.d.ts","sourceRoot":"","sources":["../../../../src/lib/transforms/transformGasFromEtherscan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oDAAoD,CAAA;AAChG,OAAO,EAAE,OAAO,EAAa,MAAM,uCAAuC,CAAA;AAqB1E,eAAO,MAAM,yBAAyB,YAAa,2BAA2B,KAAG,OAKhF,CAAA"}

package/dist/types/lib/transforms/transformGasFromEthgasstation.d.ts

@@ -1,4 +1,4 @@
-import { XyoEthereumGasEthgasstationPayload } from '@xyo-network/ethgasstation-ethereum-gas-payload-plugin';
+import { EthereumGasEthgasstationPayload } from '@xyo-network/ethgasstation-ethereum-gas-payload-plugin';
 import { FeeData } from '@xyo-network/gas-price-payload-plugin';
-export declare const transformGasFromEthgasstation: (payload: XyoEthereumGasEthgasstationPayload) => FeeData;
+export declare const transformGasFromEthgasstation: (payload: EthereumGasEthgasstationPayload) => FeeData;
 //# sourceMappingURL=transformGasFromEthgasstation.d.ts.map

package/dist/types/lib/transforms/transformGasFromEthgasstation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformGasFromEthgasstation.d.ts","sourceRoot":"","sources":["../../../../src/lib/transforms/transformGasFromEthgasstation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kCAAkC,EAAE,MAAM,wDAAwD,CAAA;AAC3G,OAAO,EAAE,OAAO,EAAgC,MAAM,uCAAuC,CAAA;AA8B7F,eAAO,MAAM,6BAA6B,YAAa,kCAAkC,KAAG,OAK3F,CAAA"}
+{"version":3,"file":"transformGasFromEthgasstation.d.ts","sourceRoot":"","sources":["../../../../src/lib/transforms/transformGasFromEthgasstation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,+BAA+B,EAAE,MAAM,wDAAwD,CAAA;AACxG,OAAO,EAAE,OAAO,EAAgC,MAAM,uCAAuC,CAAA;AA8B7F,eAAO,MAAM,6BAA6B,YAAa,+BAA+B,KAAG,OAKxF,CAAA"}

package/dist/types/test/sampleBlocknativeGas.d.ts

@@ -1,3 +1,3 @@
-import { XyoEthereumGasBlocknativePayload } from '@xyo-network/blocknative-ethereum-gas-payload-plugin';
-export declare const sampleBlocknativeGas: XyoEthereumGasBlocknativePayload;
+import { EthereumGasBlocknativePayload } from '@xyo-network/blocknative-ethereum-gas-payload-plugin';
+export declare const sampleBlocknativeGas: EthereumGasBlocknativePayload;
 //# sourceMappingURL=sampleBlocknativeGas.d.ts.map

package/dist/types/test/sampleBlocknativeGas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sampleBlocknativeGas.d.ts","sourceRoot":"","sources":["../../../src/test/sampleBlocknativeGas.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gCAAgC,EAEjC,MAAM,sDAAsD,CAAA;AAE7D,eAAO,MAAM,oBAAoB,EAAE,gCA0FlC,CAAA"}
+{"version":3,"file":"sampleBlocknativeGas.d.ts","sourceRoot":"","sources":["../../../src/test/sampleBlocknativeGas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,6BAA6B,EAAgC,MAAM,sDAAsD,CAAA;AAEpJ,eAAO,MAAM,oBAAoB,EAAE,6BA0FlC,CAAA"}

package/dist/types/test/sampleEtherchainGasV2.d.ts

@@ -1,3 +1,3 @@
-import { XyoEthereumGasEtherchainV2Payload } from '@xyo-network/etherchain-gas-ethereum-blockchain-payload-plugins';
-export declare const sampleEtherchainGasV2: XyoEthereumGasEtherchainV2Payload;
+import { EthereumGasEtherchainV2Payload } from '@xyo-network/etherchain-gas-ethereum-blockchain-payload-plugins';
+export declare const sampleEtherchainGasV2: EthereumGasEtherchainV2Payload;
 //# sourceMappingURL=sampleEtherchainGasV2.d.ts.map

package/dist/types/test/sampleEtherchainGasV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sampleEtherchainGasV2.d.ts","sourceRoot":"","sources":["../../../src/test/sampleEtherchainGasV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAoC,MAAM,iEAAiE,CAAA;AAErJ,eAAO,MAAM,qBAAqB,EAAE,iCAYnC,CAAA"}
+{"version":3,"file":"sampleEtherchainGasV2.d.ts","sourceRoot":"","sources":["../../../src/test/sampleEtherchainGasV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAiC,MAAM,iEAAiE,CAAA;AAE/I,eAAO,MAAM,qBAAqB,EAAE,8BAYnC,CAAA"}

package/dist/types/test/sampleEthersGas.d.ts

@@ -1,3 +1,3 @@
-import { XyoEthereumGasEthersPayload } from '@xyo-network/ethers-ethereum-gas-payload-plugin';
-export declare const sampleEthersGas: XyoEthereumGasEthersPayload;
+import { EthereumGasEthersPayload } from '@xyo-network/ethers-ethereum-gas-payload-plugin';
+export declare const sampleEthersGas: EthereumGasEthersPayload;
 //# sourceMappingURL=sampleEthersGas.d.ts.map

package/dist/types/test/sampleEthersGas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sampleEthersGas.d.ts","sourceRoot":"","sources":["../../../src/test/sampleEthersGas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAA8B,MAAM,iDAAiD,CAAA;AAEzH,eAAO,MAAM,eAAe,EAAE,2BAO7B,CAAA"}
+{"version":3,"file":"sampleEthersGas.d.ts","sourceRoot":"","sources":["../../../src/test/sampleEthersGas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAA2B,MAAM,iDAAiD,CAAA;AAEnH,eAAO,MAAM,eAAe,EAAE,wBAO7B,CAAA"}

package/dist/types/test/sampleEtherscanGas.d.ts

@@ -1,3 +1,3 @@
-import { XyoEthereumGasEtherscanPayload } from '@xyo-network/etherscan-ethereum-gas-payload-plugin';
-export declare const sampleEtherscanGas: XyoEthereumGasEtherscanPayload;
+import { EthereumGasEtherscanPayload } from '@xyo-network/etherscan-ethereum-gas-payload-plugin';
+export declare const sampleEtherscanGas: EthereumGasEtherscanPayload;
 //# sourceMappingURL=sampleEtherscanGas.d.ts.map

package/dist/types/test/sampleEtherscanGas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sampleEtherscanGas.d.ts","sourceRoot":"","sources":["../../../src/test/sampleEtherscanGas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAiC,MAAM,oDAAoD,CAAA;AAElI,eAAO,MAAM,kBAAkB,EAAE,8BAahC,CAAA"}
+{"version":3,"file":"sampleEtherscanGas.d.ts","sourceRoot":"","sources":["../../../src/test/sampleEtherscanGas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAA8B,MAAM,oDAAoD,CAAA;AAE5H,eAAO,MAAM,kBAAkB,EAAE,2BAahC,CAAA"}

package/dist/types/test/sampleEthgasstationGas.d.ts

@@ -1,3 +1,3 @@
-import { XyoEthereumGasEthgasstationPayload } from '@xyo-network/ethgasstation-ethereum-gas-payload-plugin';
-export declare const sampleEthgasstationGas: XyoEthereumGasEthgasstationPayload;
+import { EthereumGasEthgasstationPayload } from '@xyo-network/ethgasstation-ethereum-gas-payload-plugin';
+export declare const sampleEthgasstationGas: EthereumGasEthgasstationPayload;
 //# sourceMappingURL=sampleEthgasstationGas.d.ts.map

package/dist/types/test/sampleEthgasstationGas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sampleEthgasstationGas.d.ts","sourceRoot":"","sources":["../../../src/test/sampleEthgasstationGas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,EAAqC,MAAM,wDAAwD,CAAA;AAE9I,eAAO,MAAM,sBAAsB,EAAE,kCAiBpC,CAAA"}
+{"version":3,"file":"sampleEthgasstationGas.d.ts","sourceRoot":"","sources":["../../../src/test/sampleEthgasstationGas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAkC,MAAM,wDAAwD,CAAA;AAExI,eAAO,MAAM,sBAAsB,EAAE,+BAiBpC,CAAA"}

package/package.json

@@ -11,19 +11,19 @@
   },
   "dependencies": {
     "@xylabs/exists": "^2.9.1",
-    "@xyo-network/abstract-diviner": "^2.61.1",
-    "@xyo-network/blocknative-ethereum-gas-payload-plugin": "^2.61.1",
-    "@xyo-network/diviner": "^2.61.1",
-    "@xyo-network/etherchain-gas-ethereum-blockchain-payload-plugins": "^2.61.1",
-    "@xyo-network/ethers-ethereum-gas-payload-plugin": "^2.61.1",
-    "@xyo-network/etherscan-ethereum-gas-payload-plugin": "^2.61.1",
-    "@xyo-network/ethgasstation-ethereum-gas-payload-plugin": "^2.61.1",
-    "@xyo-network/gas-price-payload-plugin": "^2.61.1",
-    "@xyo-network/module": "^2.61.1",
-    "@xyo-network/payload-builder": "^2.61.1",
-    "@xyo-network/payload-model": "^2.61.1",
-    "@xyo-network/payloadset-plugin": "^2.61.1",
-    "@xyo-network/promise": "^2.61.1",
+    "@xyo-network/abstract-diviner": "^2.61.2",
+    "@xyo-network/blocknative-ethereum-gas-payload-plugin": "^2.61.2",
+    "@xyo-network/diviner": "^2.61.2",
+    "@xyo-network/etherchain-gas-ethereum-blockchain-payload-plugins": "^2.61.2",
+    "@xyo-network/ethers-ethereum-gas-payload-plugin": "^2.61.2",
+    "@xyo-network/etherscan-ethereum-gas-payload-plugin": "^2.61.2",
+    "@xyo-network/ethgasstation-ethereum-gas-payload-plugin": "^2.61.2",
+    "@xyo-network/gas-price-payload-plugin": "^2.61.2",
+    "@xyo-network/module": "^2.61.2",
+    "@xyo-network/payload-builder": "^2.61.2",
+    "@xyo-network/payload-model": "^2.61.2",
+    "@xyo-network/payloadset-plugin": "^2.61.2",
+    "@xyo-network/promise": "^2.61.2",
     "regression": "^2.0.1"
   },
   "devDependencies": {
@@ -34,7 +34,7 @@
     "@ethersproject/solidity": "^5.7.0",
     "@types/regression": "^2.0.2",
     "@uniswap/sdk": "^3.0.3",
-    "@uniswap/sdk-core": "^3.2.3",
+    "@uniswap/sdk-core": "^3.2.6",
     "@uniswap/v3-sdk": "^3.9.0",
     "@xylabs/ts-scripts-yarn3": "^2.17.13",
     "@xylabs/tsconfig": "^2.17.13",
@@ -83,5 +83,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.61.1"
+  "version": "2.61.2"
 }

package/src/Diviner.ts

@@ -1,22 +1,22 @@
 import { AbstractDiviner } from '@xyo-network/abstract-diviner'
 import { DivinerConfig, DivinerModule, DivinerParams } from '@xyo-network/diviner'
-import { XyoEthereumGasSchema } from '@xyo-network/gas-price-payload-plugin'
+import { EthereumGasSchema } from '@xyo-network/gas-price-payload-plugin'
 import { AnyConfigSchema } from '@xyo-network/module'
 import { Payload } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
 
 import { divineGas } from './lib'
-import { XyoEthereumGasDivinerConfigSchema } from './Schema'
+import { EthereumGasDivinerConfigSchema } from './Schema'
 
-export type XyoEthereumGasDivinerConfig = DivinerConfig<{ schema: XyoEthereumGasDivinerConfigSchema }>
-export type XyoEthereumGasDivinerParams = DivinerParams<AnyConfigSchema<XyoEthereumGasDivinerConfig>>
+export type EthereumGasDivinerConfig = DivinerConfig<{ schema: EthereumGasDivinerConfigSchema }>
+export type EthereumGasDivinerParams = DivinerParams<AnyConfigSchema<EthereumGasDivinerConfig>>
 
-export class XyoEthereumGasDiviner<TParams extends XyoEthereumGasDivinerParams = XyoEthereumGasDivinerParams>
+export class EthereumGasDiviner<TParams extends EthereumGasDivinerParams = EthereumGasDivinerParams>
   extends AbstractDiviner<TParams>
   implements DivinerModule
 {
-  static override configSchema: string = XyoEthereumGasDivinerConfigSchema
-  static override targetSchema: string = XyoEthereumGasSchema
+  static override configSchema: string = EthereumGasDivinerConfigSchema
+  static override targetSchema: string = EthereumGasSchema
 
   override divine(payloads?: Payload[]): Promisable<Payload[]> {
     const cost = divineGas(payloads ?? [])

package/src/Plugin.ts

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

package/src/Schema.ts

@@ -1,5 +1,5 @@
-export type XyoEthereumGasDivinerQuerySchema = 'network.xyo.blockchain.ethereum.gas.diviner.query'
-export const XyoEthereumGasDivinerQuerySchema: XyoEthereumGasDivinerQuerySchema = 'network.xyo.blockchain.ethereum.gas.diviner.query'
+export type EthereumGasDivinerQuerySchema = 'network.xyo.blockchain.ethereum.gas.diviner.query'
+export const EthereumGasDivinerQuerySchema: EthereumGasDivinerQuerySchema = 'network.xyo.blockchain.ethereum.gas.diviner.query'
 
-export type XyoEthereumGasDivinerConfigSchema = 'network.xyo.blockchain.ethereum.gas.diviner.config'
-export const XyoEthereumGasDivinerConfigSchema: XyoEthereumGasDivinerConfigSchema = 'network.xyo.blockchain.ethereum.gas.diviner.config'
+export type EthereumGasDivinerConfigSchema = 'network.xyo.blockchain.ethereum.gas.diviner.config'
+export const EthereumGasDivinerConfigSchema: EthereumGasDivinerConfigSchema = 'network.xyo.blockchain.ethereum.gas.diviner.config'

package/src/index.ts

@@ -1,9 +1,9 @@
-import { XyoEthereumGasPlugin } from './Plugin'
+import { EthereumGasPlugin } from './Plugin'
 
 export * from './Diviner'
 export * from './Schema'
 
-export { XyoEthereumGasPlugin }
+export { EthereumGasPlugin }
 
 // eslint-disable-next-line import/no-default-export
-export default XyoEthereumGasPlugin
+export default EthereumGasPlugin

package/src/lib/divineGas.ts

@@ -1,14 +1,14 @@
-import { FeeData, XyoEthereumGasPayload, XyoEthereumGasSchema } from '@xyo-network/gas-price-payload-plugin'
+import { EthereumGasPayload, EthereumGasSchema, FeeData } from '@xyo-network/gas-price-payload-plugin'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { Payload } from '@xyo-network/payload-model'
 
 import { average } from './average'
 import {
-  isXyoEthereumGasBlocknativePayload,
-  isXyoEthereumGasEtherchainV2Payload,
-  isXyoEthereumGasEtherscanPayload,
-  isXyoEthereumGasEthersPayload,
-  isXyoEthereumGasEthgasstationPayload,
+  isEthereumGasBlocknativePayload,
+  isEthereumGasEtherchainV2Payload,
+  isEthereumGasEtherscanPayload,
+  isEthereumGasEthersPayload,
+  isEthereumGasEthgasstationPayload,
 } from './identities'
 import {
   transformGasFromBlocknative,
@@ -18,15 +18,15 @@ import {
   transformGasFromEthgasstation,
 } from './transforms'
 
-export const divineGas = (payloads: Payload[]): XyoEthereumGasPayload => {
-  const blocknative = payloads.filter(isXyoEthereumGasBlocknativePayload).map(transformGasFromBlocknative)
-  const etherchainV2 = payloads.filter(isXyoEthereumGasEtherchainV2Payload).map(transformGasFromEtherchainV2)
-  const ethers = payloads.filter(isXyoEthereumGasEthersPayload).map(transformGasFromEthers)
-  const etherscan = payloads.filter(isXyoEthereumGasEtherscanPayload).map(transformGasFromEtherscan)
-  const ethgasstation = payloads.filter(isXyoEthereumGasEthgasstationPayload).map(transformGasFromEthgasstation)
+export const divineGas = (payloads: Payload[]): EthereumGasPayload => {
+  const blocknative = payloads.filter(isEthereumGasBlocknativePayload).map(transformGasFromBlocknative)
+  const etherchainV2 = payloads.filter(isEthereumGasEtherchainV2Payload).map(transformGasFromEtherchainV2)
+  const ethers = payloads.filter(isEthereumGasEthersPayload).map(transformGasFromEthers)
+  const etherscan = payloads.filter(isEthereumGasEtherscanPayload).map(transformGasFromEtherscan)
+  const ethgasstation = payloads.filter(isEthereumGasEthgasstationPayload).map(transformGasFromEthgasstation)
   const transactionCosts: FeeData[] = [...blocknative, ...etherchainV2, ...ethers, ...etherscan, ...ethgasstation]
   const avg = average(transactionCosts)
   const timestamp = Date.now()
-  const payload = new PayloadBuilder<XyoEthereumGasPayload>({ schema: XyoEthereumGasSchema }).fields({ ...avg, timestamp }).build()
+  const payload = new PayloadBuilder<EthereumGasPayload>({ schema: EthereumGasSchema }).fields({ ...avg, timestamp }).build()
   return payload
 }

package/src/lib/identities/index.ts

@@ -1,5 +1,5 @@
-export * from './isXyoEthereumGasBlocknativePayload'
-export * from './isXyoEthereumGasEtherchainV2Payload'
-export * from './isXyoEthereumGasEtherscanPayload'
-export * from './isXyoEthereumGasEthersPayload'
-export * from './isXyoEthereumGasEthgasstationPayload'
+export * from './isEthereumGasBlocknativePayload'
+export * from './isEthereumGasEtherchainV2Payload'
+export * from './isEthereumGasEtherscanPayload'
+export * from './isEthereumGasEthersPayload'
+export * from './isEthereumGasEthgasstationPayload'

package/src/lib/identities/isEthereumGasBlocknativePayload.ts

@@ -0,0 +1,6 @@
+import { EthereumGasBlocknativePayload, EthereumGasBlocknativeSchema } from '@xyo-network/blocknative-ethereum-gas-payload-plugin'
+import { Payload } from '@xyo-network/payload-model'
+
+export const isEthereumGasBlocknativePayload = (payload?: Payload | null): payload is EthereumGasBlocknativePayload => {
+  return payload?.schema === EthereumGasBlocknativeSchema
+}

package/src/lib/identities/isEthereumGasEtherchainV2Payload.ts

@@ -0,0 +1,6 @@
+import { EthereumGasEtherchainV2Payload, EthereumGasEtherchainV2Schema } from '@xyo-network/etherchain-gas-ethereum-blockchain-payload-plugins'
+import { Payload } from '@xyo-network/payload-model'
+
+export const isEthereumGasEtherchainV2Payload = (payload?: Payload | null): payload is EthereumGasEtherchainV2Payload => {
+  return payload?.schema === EthereumGasEtherchainV2Schema
+}

package/src/lib/identities/isEthereumGasEthersPayload.ts

@@ -0,0 +1,6 @@
+import { EthereumGasEthersPayload, EthereumGasEthersSchema } from '@xyo-network/ethers-ethereum-gas-payload-plugin'
+import { Payload } from '@xyo-network/payload-model'
+
+export const isEthereumGasEthersPayload = (payload?: Payload | null): payload is EthereumGasEthersPayload => {
+  return payload?.schema === EthereumGasEthersSchema
+}

package/src/lib/identities/isEthereumGasEtherscanPayload.ts

@@ -0,0 +1,6 @@
+import { EthereumGasEtherscanPayload, EthereumGasEtherscanSchema } from '@xyo-network/etherscan-ethereum-gas-payload-plugin'
+import { Payload } from '@xyo-network/payload-model'
+
+export const isEthereumGasEtherscanPayload = (payload?: Payload | null): payload is EthereumGasEtherscanPayload => {
+  return payload?.schema === EthereumGasEtherscanSchema
+}

package/src/lib/identities/isEthereumGasEthgasstationPayload.ts

@@ -0,0 +1,6 @@
+import { EthereumGasEthgasstationPayload, EthereumGasEthgasstationSchema } from '@xyo-network/ethgasstation-ethereum-gas-payload-plugin'
+import { Payload } from '@xyo-network/payload-model'
+
+export const isEthereumGasEthgasstationPayload = (payload?: Payload | null): payload is EthereumGasEthgasstationPayload => {
+  return payload?.schema === EthereumGasEthgasstationSchema
+}

package/src/lib/transforms/transformGasFromBlocknative.ts

@@ -1,13 +1,13 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix */
-import { XyoEthereumGasBlocknativePayload } from '@xyo-network/blocknative-ethereum-gas-payload-plugin'
+import { EthereumGasBlocknativePayload } from '@xyo-network/blocknative-ethereum-gas-payload-plugin'
 import { FeeData, FeePerGas, PriorityFeePerGas } from '@xyo-network/gas-price-payload-plugin'
 import { linear } from 'regression'
 
-const getBaseFee = (payload: XyoEthereumGasBlocknativePayload): number | undefined => {
+const getBaseFee = (payload: EthereumGasBlocknativePayload): number | undefined => {
   return payload?.blockPrices?.[0]?.baseFeePerGas
 }
 
-const getFeePerGas = (payload: XyoEthereumGasBlocknativePayload): Partial<FeePerGas> => {
+const getFeePerGas = (payload: EthereumGasBlocknativePayload): Partial<FeePerGas> => {
   const sorted = payload.blockPrices?.[0].estimatedPrices?.sort((a, b) => a.confidence - b.confidence)
   const trend = linear([
     [0, sorted?.[0].price],
@@ -25,7 +25,7 @@ const getFeePerGas = (payload: XyoEthereumGasBlocknativePayload): Partial<FeePer
   return feePerGas
 }
 
-const getPriorityFeePerGas = (payload: XyoEthereumGasBlocknativePayload): Partial<PriorityFeePerGas> => {
+const getPriorityFeePerGas = (payload: EthereumGasBlocknativePayload): Partial<PriorityFeePerGas> => {
   const sorted = payload.blockPrices?.[0].estimatedPrices?.sort((a, b) => a.confidence - b.confidence)
   const trend = linear([
     [0, sorted?.[0].maxPriorityFeePerGas],
@@ -43,7 +43,7 @@ const getPriorityFeePerGas = (payload: XyoEthereumGasBlocknativePayload): Partia
   return priorityFeePerGas
 }
 
-export const transformGasFromBlocknative = (payload: XyoEthereumGasBlocknativePayload): FeeData => {
+export const transformGasFromBlocknative = (payload: EthereumGasBlocknativePayload): FeeData => {
   const baseFee = getBaseFee(payload)
   const feePerGas = getFeePerGas(payload)
   const priorityFeePerGas = getPriorityFeePerGas(payload)

package/src/lib/transforms/transformGasFromEtherchainV2.ts

@@ -1,7 +1,7 @@
-import { XyoEthereumGasEtherchainV2Payload } from '@xyo-network/etherchain-gas-ethereum-blockchain-payload-plugins'
+import { EthereumGasEtherchainV2Payload } from '@xyo-network/etherchain-gas-ethereum-blockchain-payload-plugins'
 import { FeeData, FeePerGas } from '@xyo-network/gas-price-payload-plugin'
 
-const getFeePerGas = (payload: XyoEthereumGasEtherchainV2Payload): Partial<FeePerGas> => {
+const getFeePerGas = (payload: EthereumGasEtherchainV2Payload): Partial<FeePerGas> => {
   const { slow, standard, fast, rapid } = payload.data
   const low = slow / 1_000_000_000
   const medium = standard / 1_000_000_000
@@ -10,7 +10,7 @@ const getFeePerGas = (payload: XyoEthereumGasEtherchainV2Payload): Partial<FeePe
   return { high, low, medium, veryHigh }
 }
 
-export const transformGasFromEtherchainV2 = (payload: XyoEthereumGasEtherchainV2Payload): FeeData => {
+export const transformGasFromEtherchainV2 = (payload: EthereumGasEtherchainV2Payload): FeeData => {
   const baseFee = undefined
   const feePerGas = getFeePerGas(payload)
   const priorityFeePerGas = {}

package/src/lib/transforms/transformGasFromEthers.ts

@@ -1,24 +1,24 @@
-import { XyoEthereumGasEthersPayload } from '@xyo-network/ethers-ethereum-gas-payload-plugin'
+import { EthereumGasEthersPayload } from '@xyo-network/ethers-ethereum-gas-payload-plugin'
 import { FeeData, FeePerGas, PriorityFeePerGas } from '@xyo-network/gas-price-payload-plugin'
 
-const getBaseFee = (payload: XyoEthereumGasEthersPayload): number | undefined => {
+const getBaseFee = (payload: EthereumGasEthersPayload): number | undefined => {
   const { lastBaseFeePerGas } = payload
   return lastBaseFeePerGas ? lastBaseFeePerGas / 1_000_000_000 : undefined
 }
 
-const getFeePerGas = (payload: XyoEthereumGasEthersPayload): Partial<FeePerGas> => {
+const getFeePerGas = (payload: EthereumGasEthersPayload): Partial<FeePerGas> => {
   const { maxFeePerGas } = payload
   const high = maxFeePerGas ? maxFeePerGas / 1_000_000_000 : undefined
   return { high }
 }
 
-const getPriorityFeePerGas = (payload: XyoEthereumGasEthersPayload): Partial<PriorityFeePerGas> => {
+const getPriorityFeePerGas = (payload: EthereumGasEthersPayload): Partial<PriorityFeePerGas> => {
   const { maxPriorityFeePerGas } = payload
   const high = maxPriorityFeePerGas ? maxPriorityFeePerGas / 1_000_000_000 : undefined
   return { high }
 }
 
-export const transformGasFromEthers = (payload: XyoEthereumGasEthersPayload): FeeData => {
+export const transformGasFromEthers = (payload: EthereumGasEthersPayload): FeeData => {
   const baseFee = getBaseFee(payload)
   const feePerGas = getFeePerGas(payload)
   const priorityFeePerGas = getPriorityFeePerGas(payload)

package/src/lib/transforms/transformGasFromEtherscan.ts

@@ -1,13 +1,13 @@
-import { XyoEthereumGasEtherscanPayload } from '@xyo-network/etherscan-ethereum-gas-payload-plugin'
+import { EthereumGasEtherscanPayload } from '@xyo-network/etherscan-ethereum-gas-payload-plugin'
 import { FeeData, FeePerGas } from '@xyo-network/gas-price-payload-plugin'
 import { linear } from 'regression'
 
-const getBaseFee = (payload: XyoEthereumGasEtherscanPayload): number | undefined => {
+const getBaseFee = (payload: EthereumGasEtherscanPayload): number | undefined => {
   const { suggestBaseFee } = payload.result
   return parseFloat(suggestBaseFee)
 }
 
-const getFeePerGas = (payload: XyoEthereumGasEtherscanPayload): Partial<FeePerGas> => {
+const getFeePerGas = (payload: EthereumGasEtherscanPayload): Partial<FeePerGas> => {
   const { FastGasPrice, ProposeGasPrice, SafeGasPrice } = payload.result
   const low = parseFloat(SafeGasPrice)
   const medium = parseFloat(ProposeGasPrice)
@@ -20,7 +20,7 @@ const getFeePerGas = (payload: XyoEthereumGasEtherscanPayload): Partial<FeePerGa
   return { high, low, medium, veryHigh }
 }
 
-export const transformGasFromEtherscan = (payload: XyoEthereumGasEtherscanPayload): FeeData => {
+export const transformGasFromEtherscan = (payload: EthereumGasEtherscanPayload): FeeData => {
   const baseFee = getBaseFee(payload)
   const feePerGas = getFeePerGas(payload)
   const priorityFeePerGas = {}

package/src/lib/transforms/transformGasFromEthgasstation.ts

@@ -1,14 +1,14 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix */
-import { XyoEthereumGasEthgasstationPayload } from '@xyo-network/ethgasstation-ethereum-gas-payload-plugin'
+import { EthereumGasEthgasstationPayload } from '@xyo-network/ethgasstation-ethereum-gas-payload-plugin'
 import { FeeData, FeePerGas, PriorityFeePerGas } from '@xyo-network/gas-price-payload-plugin'
 import { linear } from 'regression'
 
-const getBaseFee = (payload: XyoEthereumGasEthgasstationPayload): number | undefined => {
+const getBaseFee = (payload: EthereumGasEthgasstationPayload): number | undefined => {
   const { baseFee } = payload
   return baseFee
 }
 
-const getFeePerGas = (payload: XyoEthereumGasEthgasstationPayload): Partial<FeePerGas> => {
+const getFeePerGas = (payload: EthereumGasEthgasstationPayload): Partial<FeePerGas> => {
   const { standard: medium, fast: high, instant: veryHigh } = payload.gasPrice
   const trend = linear([
     [1, medium],
@@ -19,7 +19,7 @@ const getFeePerGas = (payload: XyoEthereumGasEthgasstationPayload): Partial<FeeP
   return { low, medium, high, veryHigh }
 }
 
-const getPriorityFeePerGas = (payload: XyoEthereumGasEthgasstationPayload): Partial<PriorityFeePerGas> => {
+const getPriorityFeePerGas = (payload: EthereumGasEthgasstationPayload): Partial<PriorityFeePerGas> => {
   const { standard: medium, fast: high, instant: veryHigh } = payload.priorityFee
   const trend = linear([
     [1, medium],
@@ -30,7 +30,7 @@ const getPriorityFeePerGas = (payload: XyoEthereumGasEthgasstationPayload): Part
   return { low, medium, high, veryHigh }
 }
 
-export const transformGasFromEthgasstation = (payload: XyoEthereumGasEthgasstationPayload): FeeData => {
+export const transformGasFromEthgasstation = (payload: EthereumGasEthgasstationPayload): FeeData => {
   const baseFee = getBaseFee(payload)
   const feePerGas = getFeePerGas(payload)
   const priorityFeePerGas = getPriorityFeePerGas(payload)

package/src/test/sampleBlocknativeGas.ts

@@ -1,10 +1,6 @@
-import {
-  EstimatedBaseFee,
-  XyoEthereumGasBlocknativePayload,
-  XyoEthereumGasBlocknativeSchema,
-} from '@xyo-network/blocknative-ethereum-gas-payload-plugin'
+import { EstimatedBaseFee, EthereumGasBlocknativePayload, EthereumGasBlocknativeSchema } from '@xyo-network/blocknative-ethereum-gas-payload-plugin'
 
-export const sampleBlocknativeGas: XyoEthereumGasBlocknativePayload = {
+export const sampleBlocknativeGas: EthereumGasBlocknativePayload = {
   blockPrices: [
     {
       baseFeePerGas: 13.691764456,
@@ -90,7 +86,7 @@ export const sampleBlocknativeGas: XyoEthereumGasBlocknativePayload = {
   maxPrice: 36,
   msSinceLastBlock: 3643,
   network: 'main',
-  schema: XyoEthereumGasBlocknativeSchema,
+  schema: EthereumGasBlocknativeSchema,
   system: 'ethereum',
   timestamp: 1668697958837,
   unit: 'gwei',

package/src/test/sampleEtherchainGasV2.ts

@@ -1,6 +1,6 @@
-import { XyoEthereumGasEtherchainV2Payload, XyoEthereumGasEtherchainV2Schema } from '@xyo-network/etherchain-gas-ethereum-blockchain-payload-plugins'
+import { EthereumGasEtherchainV2Payload, EthereumGasEtherchainV2Schema } from '@xyo-network/etherchain-gas-ethereum-blockchain-payload-plugins'
 
-export const sampleEtherchainGasV2: XyoEthereumGasEtherchainV2Payload = {
+export const sampleEtherchainGasV2: EthereumGasEtherchainV2Payload = {
   code: 200,
   data: {
     fast: 19803047330,
@@ -10,6 +10,6 @@ export const sampleEtherchainGasV2: XyoEthereumGasEtherchainV2Payload = {
     standard: 12000000000,
     timestamp: 1668621234096,
   },
-  schema: XyoEthereumGasEtherchainV2Schema,
+  schema: EthereumGasEtherchainV2Schema,
   timestamp: 1668621240790,
 }

package/src/test/sampleEthersGas.ts

@@ -1,10 +1,10 @@
-import { XyoEthereumGasEthersPayload, XyoEthereumGasEthersSchema } from '@xyo-network/ethers-ethereum-gas-payload-plugin'
+import { EthereumGasEthersPayload, EthereumGasEthersSchema } from '@xyo-network/ethers-ethereum-gas-payload-plugin'
 
-export const sampleEthersGas: XyoEthereumGasEthersPayload = {
+export const sampleEthersGas: EthereumGasEthersPayload = {
   gasPrice: 13547863640,
   lastBaseFeePerGas: 13447862081,
   maxFeePerGas: 28395724162,
   maxPriorityFeePerGas: 1500000000,
-  schema: XyoEthereumGasEthersSchema,
+  schema: EthereumGasEthersSchema,
   timestamp: 1668697958837,
 }

package/src/test/sampleEtherscanGas.ts

@@ -1,6 +1,6 @@
-import { XyoEthereumGasEtherscanPayload, XyoEthereumGasEtherscanSchema } from '@xyo-network/etherscan-ethereum-gas-payload-plugin'
+import { EthereumGasEtherscanPayload, EthereumGasEtherscanSchema } from '@xyo-network/etherscan-ethereum-gas-payload-plugin'
 
-export const sampleEtherscanGas: XyoEthereumGasEtherscanPayload = {
+export const sampleEtherscanGas: EthereumGasEtherscanPayload = {
   message: 'OK',
   result: {
     FastGasPrice: '30',
@@ -10,7 +10,7 @@ export const sampleEtherscanGas: XyoEthereumGasEtherscanPayload = {
     gasUsedRatio: '0.416266666666667,0.5672862,0.540979033333333,0.342410966666667,0.389071233333333',
     suggestBaseFee: '27.616709247',
   },
-  schema: XyoEthereumGasEtherscanSchema,
+  schema: EthereumGasEtherscanSchema,
   status: '1',
   timestamp: 1668697958837,
 }

package/src/test/sampleEthgasstationGas.ts

@@ -1,6 +1,6 @@
-import { XyoEthereumGasEthgasstationPayload, XyoEthereumGasEthgasstationSchema } from '@xyo-network/ethgasstation-ethereum-gas-payload-plugin'
+import { EthereumGasEthgasstationPayload, EthereumGasEthgasstationSchema } from '@xyo-network/ethgasstation-ethereum-gas-payload-plugin'
 
-export const sampleEthgasstationGas: XyoEthereumGasEthgasstationPayload = {
+export const sampleEthgasstationGas: EthereumGasEthgasstationPayload = {
   baseFee: 10,
   blockNumber: 16028883,
   blockTime: 11.88,
@@ -15,6 +15,6 @@ export const sampleEthgasstationGas: XyoEthereumGasEthgasstationPayload = {
     instant: 2,
     standard: 2,
   },
-  schema: XyoEthereumGasEthgasstationSchema,
+  schema: EthereumGasEthgasstationSchema,
   timestamp: 1668697958837,
 }

package/dist/cjs/lib/identities/isXyoEthereumGasBlocknativePayload.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isXyoEthereumGasBlocknativePayload = void 0;
-const blocknative_ethereum_gas_payload_plugin_1 = require("@xyo-network/blocknative-ethereum-gas-payload-plugin");
-const isXyoEthereumGasBlocknativePayload = (payload) => {
-    return (payload === null || payload === void 0 ? void 0 : payload.schema) === blocknative_ethereum_gas_payload_plugin_1.XyoEthereumGasBlocknativeSchema;
-};
-exports.isXyoEthereumGasBlocknativePayload = isXyoEthereumGasBlocknativePayload;
-//# sourceMappingURL=isXyoEthereumGasBlocknativePayload.js.map

package/dist/cjs/lib/identities/isXyoEthereumGasBlocknativePayload.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isXyoEthereumGasBlocknativePayload.js","sourceRoot":"","sources":["../../../../src/lib/identities/isXyoEthereumGasBlocknativePayload.ts"],"names":[],"mappings":";;;AAAA,kHAAwI;AAGjI,MAAM,kCAAkC,GAAG,CAAC,OAAwB,EAA+C,EAAE;IAC1H,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,yEAA+B,CAAA;AAC5D,CAAC,CAAA;AAFY,QAAA,kCAAkC,sCAE9C"}

package/dist/cjs/lib/identities/isXyoEthereumGasEtherchainV2Payload.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isXyoEthereumGasEtherchainV2Payload.js","sourceRoot":"","sources":["../../../../src/lib/identities/isXyoEthereumGasEtherchainV2Payload.ts"],"names":[],"mappings":";;;AAAA,wIAAqJ;AAG9I,MAAM,mCAAmC,GAAG,CAAC,OAAwB,EAAgD,EAAE;IAC5H,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,qFAAgC,CAAA;AAC7D,CAAC,CAAA;AAFY,QAAA,mCAAmC,uCAE/C"}

package/dist/cjs/lib/identities/isXyoEthereumGasEthersPayload.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isXyoEthereumGasEthersPayload = void 0;
-const ethers_ethereum_gas_payload_plugin_1 = require("@xyo-network/ethers-ethereum-gas-payload-plugin");
-const isXyoEthereumGasEthersPayload = (payload) => {
-    return (payload === null || payload === void 0 ? void 0 : payload.schema) === ethers_ethereum_gas_payload_plugin_1.XyoEthereumGasEthersSchema;
-};
-exports.isXyoEthereumGasEthersPayload = isXyoEthereumGasEthersPayload;
-//# sourceMappingURL=isXyoEthereumGasEthersPayload.js.map

package/dist/cjs/lib/identities/isXyoEthereumGasEthersPayload.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isXyoEthereumGasEthersPayload.js","sourceRoot":"","sources":["../../../../src/lib/identities/isXyoEthereumGasEthersPayload.ts"],"names":[],"mappings":";;;AAAA,wGAAyH;AAGlH,MAAM,6BAA6B,GAAG,CAAC,OAAwB,EAA0C,EAAE;IAChH,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,+DAA0B,CAAA;AACvD,CAAC,CAAA;AAFY,QAAA,6BAA6B,iCAEzC"}

package/dist/cjs/lib/identities/isXyoEthereumGasEtherscanPayload.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isXyoEthereumGasEtherscanPayload = void 0;
-const etherscan_ethereum_gas_payload_plugin_1 = require("@xyo-network/etherscan-ethereum-gas-payload-plugin");
-const isXyoEthereumGasEtherscanPayload = (payload) => {
-    return (payload === null || payload === void 0 ? void 0 : payload.schema) === etherscan_ethereum_gas_payload_plugin_1.XyoEthereumGasEtherscanSchema;
-};
-exports.isXyoEthereumGasEtherscanPayload = isXyoEthereumGasEtherscanPayload;
-//# sourceMappingURL=isXyoEthereumGasEtherscanPayload.js.map

package/dist/cjs/lib/identities/isXyoEthereumGasEtherscanPayload.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isXyoEthereumGasEtherscanPayload.js","sourceRoot":"","sources":["../../../../src/lib/identities/isXyoEthereumGasEtherscanPayload.ts"],"names":[],"mappings":";;;AAAA,8GAAkI;AAG3H,MAAM,gCAAgC,GAAG,CAAC,OAAwB,EAA6C,EAAE;IACtH,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,qEAA6B,CAAA;AAC1D,CAAC,CAAA;AAFY,QAAA,gCAAgC,oCAE5C"}