@xyo-network/uniswap-crypto-market-plugin 2.64.9 → 2.65.0

package/dist/cjs/Witness.js

@@ -10,10 +10,17 @@ class UniswapCryptoMarketWitness extends witness_1.AbstractWitness {
     get provider() {
         return this.params.provider;
     }
-    observe() {
+    start() {
         const _super = Object.create(null, {
-            observe: { get: () => super.observe }
+            start: { get: () => super.start }
         });
+        var _a, _b;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield _super.start.call(this);
+            this.pairs = (0, lib_1.createUniswapPoolContracts)((0, assert_1.assertEx)(this.provider, 'Provider Required'), (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.pools) !== null && _b !== void 0 ? _b : lib_1.UniswapPoolContracts);
+        });
+    }
+    observeHandler() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             this.started('throw');
             const pairs = yield (0, lib_1.pricesFromUniswap3)((0, assert_1.assertEx)(this.pairs));
@@ -23,17 +30,7 @@ class UniswapCryptoMarketWitness extends witness_1.AbstractWitness {
                 schema: uniswap_crypto_market_payload_plugin_1.UniswapCryptoMarketSchema,
                 timestamp,
             };
-            return _super.observe.call(this, [payload]);
-        });
-    }
-    start() {
-        const _super = Object.create(null, {
-            start: { get: () => super.start }
-        });
-        var _a, _b;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield _super.start.call(this);
-            this.pairs = (0, lib_1.createUniswapPoolContracts)((0, assert_1.assertEx)(this.provider, 'Provider Required'), (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.pools) !== null && _b !== void 0 ? _b : lib_1.UniswapPoolContracts);
+            return [payload];
         });
     }
 }

package/dist/cjs/Witness.js.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":";;;;AACA,2CAAyC;AAGzC,4GAI0D;AAC1D,kDAAqE;AAGrE,+BAAgH;AAShH,MAAa,0BAEX,SAAQ,yBAAwB;IAIhC,IAAc,QAAQ;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAA;IAC7B,CAAC;IAEc,OAAO;;;;;YACpB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACrB,MAAM,KAAK,GAAG,MAAM,IAAA,wBAAkB,EAAC,IAAA,iBAAQ,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;YAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAE5B,MAAM,OAAO,GAA+B;gBAC1C,KAAK;gBACL,MAAM,EAAE,gEAAyB;gBACjC,SAAS;aACV,CAAA;YAED,OAAO,OAAM,OAAO,YAAC,CAAC,OAAO,CAAC,EAAC;QACjC,CAAC;KAAA;IAEc,KAAK;;;;;;YAClB,MAAM,OAAM,KAAK,WAAE,CAAA;YACnB,IAAI,CAAC,KAAK,GAAG,IAAA,gCAA0B,EAAC,IAAA,iBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,EAAE,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,mCAAI,0BAAoB,CAAC,CAAA;;KAClI;;AA3BH,gEA4BC;AAzBiB,wCAAa,GAAG,CAAC,6EAAsC,CAAC,CAAA"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":";;;;AACA,2CAAyC;AAGzC,4GAI0D;AAC1D,kDAAqE;AAGrE,+BAAgH;AAShH,MAAa,0BAEX,SAAQ,yBAAwB;IAIhC,IAAc,QAAQ;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAA;IAC7B,CAAC;IAEc,KAAK;;;;;;YAClB,MAAM,OAAM,KAAK,WAAE,CAAA;YACnB,IAAI,CAAC,KAAK,GAAG,IAAA,gCAA0B,EAAC,IAAA,iBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,EAAE,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,mCAAI,0BAAoB,CAAC,CAAA;;KAClI;IAEwB,cAAc;;YACrC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACrB,MAAM,KAAK,GAAG,MAAM,IAAA,wBAAkB,EAAC,IAAA,iBAAQ,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;YAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAE5B,MAAM,OAAO,GAA+B;gBAC1C,KAAK;gBACL,MAAM,EAAE,gEAAyB;gBACjC,SAAS;aACV,CAAA;YAED,OAAO,CAAC,OAAO,CAAC,CAAA;QAClB,CAAC;KAAA;;AA3BH,gEA4BC;AAzBiB,wCAAa,GAAG,CAAC,6EAAsC,CAAC,CAAA"}

package/dist/esm/Witness.js

@@ -8,7 +8,11 @@ export class UniswapCryptoMarketWitness extends AbstractWitness {
     get provider() {
         return this.params.provider;
     }
-    async observe() {
+    async start() {
+        await super.start();
+        this.pairs = createUniswapPoolContracts(assertEx(this.provider, 'Provider Required'), this.config?.pools ?? UniswapPoolContracts);
+    }
+    async observeHandler() {
         this.started('throw');
         const pairs = await pricesFromUniswap3(assertEx(this.pairs));
         const timestamp = Date.now();
@@ -17,11 +21,7 @@ export class UniswapCryptoMarketWitness extends AbstractWitness {
             schema: UniswapCryptoMarketSchema,
             timestamp,
         };
-        return super.observe([payload]);
-    }
-    async start() {
-        await super.start();
-        this.pairs = createUniswapPoolContracts(assertEx(this.provider, 'Provider Required'), this.config?.pools ?? UniswapPoolContracts);
+        return [payload];
     }
 }
 //# sourceMappingURL=Witness.js.map

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;AAGzC,OAAO,EAEL,yBAAyB,EACzB,sCAAsC,GACvC,MAAM,mDAAmD,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAiB,MAAM,sBAAsB,CAAA;AAGrE,OAAO,EAAE,0BAA0B,EAAsB,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAShH,MAAM,OAAO,0BAEX,SAAQ,eAAwB;IAChC,MAAM,CAAU,aAAa,GAAG,CAAC,sCAAsC,CAAC,CAAA;IAE9D,KAAK,CAAuB;IACtC,IAAc,QAAQ;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAA;IAC7B,CAAC;IAEQ,KAAK,CAAC,OAAO;QACpB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACrB,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAE5B,MAAM,OAAO,GAA+B;YAC1C,KAAK;YACL,MAAM,EAAE,yBAAyB;YACjC,SAAS;SACV,CAAA;QAED,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;IACjC,CAAC;IAEQ,KAAK,CAAC,KAAK;QAClB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAA;QACnB,IAAI,CAAC,KAAK,GAAG,0BAA0B,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,oBAAoB,CAAC,CAAA;IACnI,CAAC"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAGzC,OAAO,EAEL,yBAAyB,EACzB,sCAAsC,GACvC,MAAM,mDAAmD,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAiB,MAAM,sBAAsB,CAAA;AAGrE,OAAO,EAAE,0BAA0B,EAAsB,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAShH,MAAM,OAAO,0BAEX,SAAQ,eAAwB;IAChC,MAAM,CAAU,aAAa,GAAG,CAAC,sCAAsC,CAAC,CAAA;IAE9D,KAAK,CAAuB;IACtC,IAAc,QAAQ;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAA;IAC7B,CAAC;IAEQ,KAAK,CAAC,KAAK;QAClB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAA;QACnB,IAAI,CAAC,KAAK,GAAG,0BAA0B,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,oBAAoB,CAAC,CAAA;IACnI,CAAC;IAEkB,KAAK,CAAC,cAAc;QACrC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACrB,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAE5B,MAAM,OAAO,GAA+B;YAC1C,KAAK;YACL,MAAM,EAAE,yBAAyB;YACjC,SAAS;SACV,CAAA;QAED,OAAO,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC"}

package/dist/types/Witness.d.ts

@@ -1,5 +1,5 @@
 import { Provider } from '@ethersproject/providers';
-import { AnyConfigSchema } from '@xyo-network/modules';
+import { AnyConfigSchema } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
 import { AbstractWitness, WitnessParams } from '@xyo-network/witness';
 import { UniswapCryptoMarketWitnessConfig } from './Config';
@@ -11,7 +11,7 @@ export declare class UniswapCryptoMarketWitness<TParams extends UniswapCryptoMar
     static configSchemas: "network.xyo.crypto.market.uniswap.witness.config"[];
     protected pairs?: EthersUniSwap3Pair[];
     protected get provider(): Provider | undefined;
-    observe(): Promise<Payload[]>;
     start(): Promise<void>;
+    protected observeHandler(): Promise<Payload[]>;
 }
 //# 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;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAMpD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAErE,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAA;AAC3D,OAAO,EAA8B,kBAAkB,EAA4C,MAAM,OAAO,CAAA;AAEhH,MAAM,MAAM,gCAAgC,GAAG,aAAa,CAC1D,eAAe,CAAC,gCAAgC,CAAC,EACjD;IACE,QAAQ,CAAC,EAAE,QAAQ,CAAA;CACpB,CACF,CAAA;AAED,qBAAa,0BAA0B,CACrC,OAAO,SAAS,gCAAgC,GAAG,gCAAgC,CACnF,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,OAAgB,aAAa,uDAA2C;IAExE,SAAS,CAAC,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAA;IACtC,SAAS,KAAK,QAAQ,yBAErB;IAEc,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAc7B,KAAK;CAIrB"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAMpD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAErE,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAA;AAC3D,OAAO,EAA8B,kBAAkB,EAA4C,MAAM,OAAO,CAAA;AAEhH,MAAM,MAAM,gCAAgC,GAAG,aAAa,CAC1D,eAAe,CAAC,gCAAgC,CAAC,EACjD;IACE,QAAQ,CAAC,EAAE,QAAQ,CAAA;CACpB,CACF,CAAA;AAED,qBAAa,0BAA0B,CACrC,OAAO,SAAS,gCAAgC,GAAG,gCAAgC,CACnF,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,OAAgB,aAAa,uDAA2C;IAExE,SAAS,CAAC,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAA;IACtC,SAAS,KAAK,QAAQ,yBAErB;IAEc,KAAK;cAKK,cAAc,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;CAa9D"}

package/package.json

@@ -20,13 +20,13 @@
     "@xylabs/bignumber": "^2.9.3",
     "@xylabs/delay": "^2.9.3",
     "@xylabs/promise": "^2.9.3",
-    "@xyo-network/modules": "^2.64.9",
-    "@xyo-network/payload-model": "^2.64.9",
-    "@xyo-network/payloadset-plugin": "^2.64.9",
+    "@xyo-network/module-model": "^2.65.0",
+    "@xyo-network/payload-model": "^2.65.0",
+    "@xyo-network/payloadset-plugin": "^2.65.0",
     "@xyo-network/typechain": "^2.1.6",
-    "@xyo-network/uniswap-crypto-market-payload-plugin": "^2.64.9",
+    "@xyo-network/uniswap-crypto-market-payload-plugin": "^2.65.0",
     "@xyo-network/uniswap-typechain": "^2.1.6",
-    "@xyo-network/witness": "^2.64.9"
+    "@xyo-network/witness": "^2.65.0"
   },
   "peerDependencies": {
     "@uniswap/sdk": "^3.0.3",
@@ -38,8 +38,8 @@
     "@uniswap/sdk-core": "^3.2.6",
     "@uniswap/v3-sdk": "^3.9.0",
     "@xylabs/jest-helpers": "^2.9.3",
-    "@xylabs/ts-scripts-yarn3": "^2.18.7",
-    "@xylabs/tsconfig": "^2.18.7",
+    "@xylabs/ts-scripts-yarn3": "^2.18.10",
+    "@xylabs/tsconfig": "^2.18.10",
     "ethers": "^5.7.2",
     "jest": "^29.6.1",
     "typescript": "^5.1.6"
@@ -77,5 +77,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.64.9"
+  "version": "2.65.0"
 }

package/src/Witness.ts

@@ -1,6 +1,6 @@
 import { Provider } from '@ethersproject/providers'
 import { assertEx } from '@xylabs/assert'
-import { AnyConfigSchema } from '@xyo-network/modules'
+import { AnyConfigSchema } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
 import {
   UniswapCryptoMarketPayload,
@@ -29,7 +29,12 @@ export class UniswapCryptoMarketWitness<
     return this.params.provider
   }
 
-  override async observe(): Promise<Payload[]> {
+  override async start() {
+    await super.start()
+    this.pairs = createUniswapPoolContracts(assertEx(this.provider, 'Provider Required'), this.config?.pools ?? UniswapPoolContracts)
+  }
+
+  protected override async observeHandler(): Promise<Payload[]> {
     this.started('throw')
     const pairs = await pricesFromUniswap3(assertEx(this.pairs))
     const timestamp = Date.now()
@@ -40,11 +45,6 @@ export class UniswapCryptoMarketWitness<
       timestamp,
     }
 
-    return super.observe([payload])
-  }
-
-  override async start() {
-    await super.start()
-    this.pairs = createUniswapPoolContracts(assertEx(this.provider, 'Provider Required'), this.config?.pools ?? UniswapPoolContracts)
+    return [payload]
   }
 }