@keplr-wallet/stores-etc 0.12.285 → 0.12.286-rc.1

package/build/queries.js

@@ -26,7 +26,7 @@ class KeplrETCQueriesImpl {
         this.queryTerraClassicTaxCaps = new treasury_1.ObservableQueryTaxCaps(sharedContext, chainId, chainGetter);
         this.queryInitiaDynamicFee = new dynamicfee_1.ObservableQueryInitiaDynamicFee(sharedContext, chainId, chainGetter);
         this.queryTxMsgDecoder = new tx_msg_decoder_1.ObservablePostTxMsgDecoder(sharedContext, txCodecBaseURL);
-        this.queryTopUpStatus = new top_up_status_1.ObservableQueryTopUpStatus(sharedContext, chainId, chainGetter, topupBaseURL);
+        this.queryTopUpStatus = new top_up_status_1.ObservableQueryTopUpStatus(sharedContext, chainId, topupBaseURL);
     }
 }
 exports.KeplrETCQueriesImpl = KeplrETCQueriesImpl;

package/build/queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"queries.js","sourceRoot":"","sources":["../src/queries.ts"],"names":[],"mappings":";;;AAMA,mCAAuD;AACvD,qCAAuD;AACvD,uDAGkC;AAClC,6CAA4D;AAC5D,oDAAsE;AACtE,qDAA8D;AAC9D,mDAA6D;AAMhD,QAAA,eAAe,GAAG;IAC7B,GAAG,CAAC,OAMH;QAMC,OAAO,CACL,cAA8B,EAC9B,aAAiC,EACjC,OAAe,EACf,WAAwB,EACxB,EAAE;YACF,OAAO;gBACL,QAAQ,EAAE,IAAI,mBAAmB,CAC/B,cAAc,EACd,aAAa,EACb,OAAO,EACP,WAAW,EACX,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,oBAAoB,EAC5B,OAAO,CAAC,mBAAmB,EAC3B,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,YAAY,CACrB;aACF,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,MAAa,mBAAmB;IAa9B,YACE,KAAqB,EACrB,aAAiC,EACjC,OAAe,EACf,WAAwB,EACxB,WAAmB,EACnB,oBAA4B,EAC5B,mBAA2B,EAC3B,cAAsB,EACtB,YAAoB;QAEpB,IAAI,CAAC,kBAAkB,GAAG,IAAI,oCAA4B,CACxD,aAAa,EACb,WAAW,CACZ,CAAC;QACF,IAAI,CAAC,iBAAiB,GAAG,IAAI,oCAA2B,CACtD,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QACF,IAAI,CAAC,kBAAkB,GAAG,IAAI,yCAA4B,CACxD,aAAa,EACb,OAAO,EACP,WAAW,EACX,oBAAoB,EACpB,mBAAmB,CACpB,CAAC;QAEF,IAAI,CAAC,wBAAwB,GAAG,IAAI,iCAAsB,CACxD,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QACF,IAAI,CAAC,wBAAwB,GAAG,IAAI,iCAAsB,CACxD,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,qBAAqB,GAAG,IAAI,4CAA+B,CAC9D,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,iBAAiB,GAAG,IAAI,2CAA0B,CACrD,aAAa,EACb,cAAc,CACf,CAAC;QAEF,IAAI,CAAC,gBAAgB,GAAG,IAAI,0CAA0B,CACpD,aAAa,EACb,OAAO,EACP,WAAW,EACX,YAAY,CACb,CAAC;IACJ,CAAC;CACF;AAtED,kDAsEC"}
+{"version":3,"file":"queries.js","sourceRoot":"","sources":["../src/queries.ts"],"names":[],"mappings":";;;AAMA,mCAAuD;AACvD,qCAAuD;AACvD,uDAGkC;AAClC,6CAA4D;AAC5D,oDAAsE;AACtE,qDAA8D;AAC9D,mDAA6D;AAMhD,QAAA,eAAe,GAAG;IAC7B,GAAG,CAAC,OAMH;QAMC,OAAO,CACL,cAA8B,EAC9B,aAAiC,EACjC,OAAe,EACf,WAAwB,EACxB,EAAE;YACF,OAAO;gBACL,QAAQ,EAAE,IAAI,mBAAmB,CAC/B,cAAc,EACd,aAAa,EACb,OAAO,EACP,WAAW,EACX,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,oBAAoB,EAC5B,OAAO,CAAC,mBAAmB,EAC3B,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,YAAY,CACrB;aACF,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,MAAa,mBAAmB;IAa9B,YACE,KAAqB,EACrB,aAAiC,EACjC,OAAe,EACf,WAAwB,EACxB,WAAmB,EACnB,oBAA4B,EAC5B,mBAA2B,EAC3B,cAAsB,EACtB,YAAoB;QAEpB,IAAI,CAAC,kBAAkB,GAAG,IAAI,oCAA4B,CACxD,aAAa,EACb,WAAW,CACZ,CAAC;QACF,IAAI,CAAC,iBAAiB,GAAG,IAAI,oCAA2B,CACtD,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QACF,IAAI,CAAC,kBAAkB,GAAG,IAAI,yCAA4B,CACxD,aAAa,EACb,OAAO,EACP,WAAW,EACX,oBAAoB,EACpB,mBAAmB,CACpB,CAAC;QAEF,IAAI,CAAC,wBAAwB,GAAG,IAAI,iCAAsB,CACxD,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QACF,IAAI,CAAC,wBAAwB,GAAG,IAAI,iCAAsB,CACxD,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,qBAAqB,GAAG,IAAI,4CAA+B,CAC9D,aAAa,EACb,OAAO,EACP,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,iBAAiB,GAAG,IAAI,2CAA0B,CACrD,aAAa,EACb,cAAc,CACf,CAAC;QAEF,IAAI,CAAC,gBAAgB,GAAG,IAAI,0CAA0B,CACpD,aAAa,EACb,OAAO,EACP,YAAY,CACb,CAAC;IACJ,CAAC;CACF;AArED,kDAqEC"}

package/build/top-up-status/query.d.ts

@@ -1,23 +1,20 @@
-import { ObservableQuery, QuerySharedContext, ChainGetter, HasMapStore } from "@keplr-wallet/stores";
-export type StatusResponseBody = {
+import { ObservableQuery, QuerySharedContext, HasMapStore } from "@keplr-wallet/stores";
+export type TopUpStatus = {
     isTopUpAvailable: boolean;
     remainingTimeMs?: number;
-} | {
+};
+export type StatusResponse = TopUpStatus | {
     error: string;
 };
-declare class ObservableQueryTopUpStatusInner extends ObservableQuery<StatusResponseBody> {
+declare class ObservableQueryTopUpStatusInner extends ObservableQuery<StatusResponse> {
     constructor(sharedContext: QuerySharedContext, chainId: string, baseURL: string, recipientAddress: string);
-    get topUpStatus(): {
-        isTopUpAvailable: boolean;
-        remainingTimeMs?: number;
-    };
+    get topUpStatus(): TopUpStatus | undefined;
 }
 export declare class ObservableQueryTopUpStatus extends HasMapStore<ObservableQueryTopUpStatusInner> {
     protected readonly sharedContext: QuerySharedContext;
     protected readonly chainId: string;
-    protected readonly chainGetter: ChainGetter;
     protected readonly baseURL: string;
-    constructor(sharedContext: QuerySharedContext, chainId: string, chainGetter: ChainGetter, baseURL: string);
+    constructor(sharedContext: QuerySharedContext, chainId: string, baseURL: string);
     getTopUpStatus(recipientAddress: string): ObservableQueryTopUpStatusInner;
 }
 export {};

package/build/top-up-status/query.js

@@ -1,4 +1,10 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObservableQueryTopUpStatus = void 0;
 const stores_1 = require("@keplr-wallet/stores");
@@ -13,29 +19,25 @@ class ObservableQueryTopUpStatusInner extends stores_1.ObservableQuery {
     }
     get topUpStatus() {
         var _a, _b;
-        if (this.error || !((_a = this.response) === null || _a === void 0 ? void 0 : _a.data)) {
-            return {
-                isTopUpAvailable: false,
-                remainingTimeMs: undefined,
-            };
+        if (this.error || !((_a = this.response) === null || _a === void 0 ? void 0 : _a.data) || this.isFetching) {
+            return undefined;
         }
         if ("error" in ((_b = this.response) === null || _b === void 0 ? void 0 : _b.data)) {
-            return {
-                isTopUpAvailable: false,
-                remainingTimeMs: undefined,
-            };
+            return undefined;
         }
         return this.response.data;
     }
 }
+__decorate([
+    mobx_1.computed
+], ObservableQueryTopUpStatusInner.prototype, "topUpStatus", null);
 class ObservableQueryTopUpStatus extends stores_1.HasMapStore {
-    constructor(sharedContext, chainId, chainGetter, baseURL) {
+    constructor(sharedContext, chainId, baseURL) {
         super((recipientAddress) => {
             return new ObservableQueryTopUpStatusInner(this.sharedContext, this.chainId, this.baseURL, recipientAddress);
         });
         this.sharedContext = sharedContext;
         this.chainId = chainId;
-        this.chainGetter = chainGetter;
         this.baseURL = baseURL;
     }
     getTopUpStatus(recipientAddress) {

package/build/top-up-status/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/top-up-status/query.ts"],"names":[],"mappings":";;;AAAA,iDAK8B;AAC9B,+BAAsC;AAWtC,MAAM,+BAAgC,SAAQ,wBAAmC;IAC/E,YACE,aAAiC,EACjC,OAAe,EACf,OAAe,EACf,gBAAwB;QAExB,KAAK,CACH,aAAa,EACb,OAAO,EACP,UAAU,kBAAkB,CAC1B,OAAO,CACR,qBAAqB,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,EAC5D;YACE,YAAY,EAAE,IAAI;YAClB,gBAAgB,EAAE,KAAM;SACzB,CACF,CAAC;QAEF,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,WAAW;;QACb,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,IAAI,CAAA,EAAE;YACtC,OAAO;gBACL,gBAAgB,EAAE,KAAK;gBACvB,eAAe,EAAE,SAAS;aAC3B,CAAC;SACH;QAED,IAAI,OAAO,KAAI,MAAA,IAAI,CAAC,QAAQ,0CAAE,IAAI,CAAA,EAAE;YAClC,OAAO;gBACL,gBAAgB,EAAE,KAAK;gBACvB,eAAe,EAAE,SAAS;aAC3B,CAAC;SACH;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC5B,CAAC;CACF;AAED,MAAa,0BAA2B,SAAQ,oBAA4C;IAC1F,YACqB,aAAiC,EACjC,OAAe,EACf,WAAwB,EACxB,OAAe;QAElC,KAAK,CAAC,CAAC,gBAAwB,EAAE,EAAE;YACjC,OAAO,IAAI,+BAA+B,CACxC,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,OAAO,EACZ,gBAAgB,CACjB,CAAC;QACJ,CAAC,CAAC,CAAC;QAZgB,kBAAa,GAAb,aAAa,CAAoB;QACjC,YAAO,GAAP,OAAO,CAAQ;QACf,gBAAW,GAAX,WAAW,CAAa;QACxB,YAAO,GAAP,OAAO,CAAQ;IAUpC,CAAC;IAED,cAAc,CAAC,gBAAwB;QACrC,OAAO,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;CACF;AApBD,gEAoBC"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/top-up-status/query.ts"],"names":[],"mappings":";;;;;;;;;AAAA,iDAI8B;AAC9B,+BAAgD;AAShD,MAAM,+BAAgC,SAAQ,wBAA+B;IAC3E,YACE,aAAiC,EACjC,OAAe,EACf,OAAe,EACf,gBAAwB;QAExB,KAAK,CACH,aAAa,EACb,OAAO,EACP,UAAU,kBAAkB,CAC1B,OAAO,CACR,qBAAqB,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,EAC5D;YACE,YAAY,EAAE,IAAI;YAClB,gBAAgB,EAAE,KAAM;SACzB,CACF,CAAC;QAEF,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAGD,IAAI,WAAW;;QACb,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,IAAI,CAAA,IAAI,IAAI,CAAC,UAAU,EAAE;YACzD,OAAO,SAAS,CAAC;SAClB;QAED,IAAI,OAAO,KAAI,MAAA,IAAI,CAAC,QAAQ,0CAAE,IAAI,CAAA,EAAE;YAClC,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC5B,CAAC;CACF;AAXC;IADC,eAAQ;kEAWR;AAGH,MAAa,0BAA2B,SAAQ,oBAA4C;IAC1F,YACqB,aAAiC,EACjC,OAAe,EACf,OAAe;QAElC,KAAK,CAAC,CAAC,gBAAwB,EAAE,EAAE;YACjC,OAAO,IAAI,+BAA+B,CACxC,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,OAAO,EACZ,gBAAgB,CACjB,CAAC;QACJ,CAAC,CAAC,CAAC;QAXgB,kBAAa,GAAb,aAAa,CAAoB;QACjC,YAAO,GAAP,OAAO,CAAQ;QACf,YAAO,GAAP,OAAO,CAAQ;IAUpC,CAAC;IAED,cAAc,CAAC,gBAAwB;QACrC,OAAO,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;CACF;AAnBD,gEAmBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/stores-etc",
-  "version": "0.12.285",
+  "version": "0.12.286-rc.1",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",
@@ -17,16 +17,16 @@
   },
   "dependencies": {
     "@ethersproject/abi": "^5.6.0",
-    "@keplr-wallet/common": "0.12.285",
-    "@keplr-wallet/simple-fetch": "0.12.285",
-    "@keplr-wallet/stores": "0.12.285",
-    "@keplr-wallet/types": "0.12.285",
-    "@keplr-wallet/unit": "0.12.285",
+    "@keplr-wallet/common": "0.12.286-rc.1",
+    "@keplr-wallet/simple-fetch": "0.12.286-rc.1",
+    "@keplr-wallet/stores": "0.12.286-rc.1",
+    "@keplr-wallet/types": "0.12.286-rc.1",
+    "@keplr-wallet/unit": "0.12.286-rc.1",
     "utility-types": "^3.10.0"
   },
   "peerDependencies": {
     "mobx": "^6",
     "mobx-utils": "^6"
   },
-  "gitHead": "7d58472a1f7a2ed2a86a310f0319b9bb3bc0268b"
+  "gitHead": "b6bcd57e0fd14515eea8be9f8669e8f8e21e733f"
 }

package/src/queries.ts

@@ -121,7 +121,6 @@ export class KeplrETCQueriesImpl {
     this.queryTopUpStatus = new ObservableQueryTopUpStatus(
       sharedContext,
       chainId,
-      chainGetter,
       topupBaseURL
     );
   }

package/src/top-up-status/query.ts

@@ -1,21 +1,18 @@
 import {
   ObservableQuery,
   QuerySharedContext,
-  ChainGetter,
   HasMapStore,
 } from "@keplr-wallet/stores";
-import { makeObservable } from "mobx";
+import { computed, makeObservable } from "mobx";
 
-export type StatusResponseBody =
-  | {
-      isTopUpAvailable: boolean;
-      remainingTimeMs?: number;
-    }
-  | {
-      error: string;
-    };
+export type TopUpStatus = {
+  isTopUpAvailable: boolean;
+  remainingTimeMs?: number;
+};
+
+export type StatusResponse = TopUpStatus | { error: string };
 
-class ObservableQueryTopUpStatusInner extends ObservableQuery<StatusResponseBody> {
+class ObservableQueryTopUpStatusInner extends ObservableQuery<StatusResponse> {
   constructor(
     sharedContext: QuerySharedContext,
     chainId: string,
@@ -37,19 +34,14 @@ class ObservableQueryTopUpStatusInner extends ObservableQuery<StatusResponseBody
     makeObservable(this);
   }
 
-  get topUpStatus(): { isTopUpAvailable: boolean; remainingTimeMs?: number } {
-    if (this.error || !this.response?.data) {
-      return {
-        isTopUpAvailable: false,
-        remainingTimeMs: undefined,
-      };
+  @computed
+  get topUpStatus(): TopUpStatus | undefined {
+    if (this.error || !this.response?.data || this.isFetching) {
+      return undefined;
     }
 
     if ("error" in this.response?.data) {
-      return {
-        isTopUpAvailable: false,
-        remainingTimeMs: undefined,
-      };
+      return undefined;
     }
 
     return this.response.data;
@@ -60,7 +52,6 @@ export class ObservableQueryTopUpStatus extends HasMapStore<ObservableQueryTopUp
   constructor(
     protected readonly sharedContext: QuerySharedContext,
     protected readonly chainId: string,
-    protected readonly chainGetter: ChainGetter,
     protected readonly baseURL: string
   ) {
     super((recipientAddress: string) => {