@keplr-wallet/stores-eth 0.13.32 → 0.13.34

package/build/queries/erc20-balance.js

@@ -5,6 +5,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -13,56 +22,137 @@ exports.ObservableQueryEthereumERC20BalanceRegistry = exports.ObservableQueryEth
 const unit_1 = require("@keplr-wallet/unit");
 const mobx_1 = require("mobx");
 const big_integer_1 = __importDefault(require("big-integer"));
-const constants_1 = require("../constants");
 const common_1 = require("@keplr-wallet/common");
 const account_1 = require("../account");
-const evm_chain_json_rpc_1 = require("./evm-chain-json-rpc");
-class ObservableQueryEthereumERC20BalanceImpl extends evm_chain_json_rpc_1.ObservableEvmChainJsonRpcQuery {
-    constructor(sharedContext, chainId, chainGetter, denomHelper, ethereumHexAddress, contractAddress) {
-        super(sharedContext, chainId, chainGetter, "eth_call", [
-            {
-                to: contractAddress,
-                data: constants_1.erc20ContractInterface.encodeFunctionData("balanceOf", [
-                    ethereumHexAddress,
-                ]),
-            },
-            "latest",
-        ]);
+class ObservableQueryEthereumERC20BalanceImpl {
+    constructor(parent, chainId, chainGetter, denomHelper, contractAddress) {
+        this.parent = parent;
+        this.chainId = chainId;
+        this.chainGetter = chainGetter;
         this.denomHelper = denomHelper;
-        this.ethereumHexAddress = ethereumHexAddress;
         this.contractAddress = contractAddress;
+        this._observedProps = 0;
         (0, mobx_1.makeObservable)(this);
+        // Readiness gates (hooks-evm) can early-return on `response` before
+        // reading `balance`, so either property being observed must register
+        // the contract into the shared batch parent.
+        const attach = (prop) => {
+            (0, mobx_1.onBecomeObserved)(this, prop, () => {
+                (0, mobx_1.runInAction)(() => {
+                    this._observedProps += 1;
+                });
+                if (this._observedProps === 1) {
+                    this.parent.addContract(contractAddress);
+                }
+            });
+            (0, mobx_1.onBecomeUnobserved)(this, prop, () => {
+                (0, mobx_1.runInAction)(() => {
+                    this._observedProps -= 1;
+                });
+                if (this._observedProps === 0) {
+                    this.parent.removeContract(contractAddress);
+                }
+            });
+        };
+        attach("balance");
+        attach("response");
+        attach("error");
     }
     get balance() {
-        const denom = this.denomHelper.denom;
-        const currency = this.chainGetter
-            .getModularChain(this.chainId)
-            .findCurrency(denom);
-        if (!currency) {
-            throw new Error(`Unknown currency: ${this.contractAddress}`);
-        }
-        if (!this.response || !this.response.data) {
+        const currency = this.currency;
+        const raw = this.parent.getBalance(this.contractAddress);
+        if (raw === undefined) {
             return new unit_1.CoinPretty(currency, new unit_1.Int(0)).ready(false);
         }
-        return new unit_1.CoinPretty(currency, new unit_1.Int((0, big_integer_1.default)(this.response.data.replace("0x", ""), 16).toString()));
+        return new unit_1.CoinPretty(currency, new unit_1.Int((0, big_integer_1.default)(raw.replace("0x", ""), 16).toString()));
     }
     get currency() {
-        const denom = this.denomHelper.denom;
         return this.chainGetter
             .getModularChain(this.chainId)
-            .forceFindCurrency(denom);
+            .forceFindCurrency(this.denomHelper.denom);
+    }
+    get isFetching() {
+        return this.parent.isFetching;
+    }
+    get isObserved() {
+        return this._observedProps > 0;
+    }
+    get isStarted() {
+        return this._observedProps > 0;
+    }
+    get error() {
+        return this.parent.getError(this.contractAddress);
+    }
+    get response() {
+        // hooks-evm tx flow gates readiness on truthy `bal.response`. Synthesize
+        // from the shared batch parent so the Child advertises fetch completion.
+        const raw = this.parent.getBalance(this.contractAddress);
+        if (raw === undefined)
+            return undefined;
+        return {
+            data: raw,
+            staled: false,
+            local: false,
+            timestamp: 0,
+        };
+    }
+    ensureFetched() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // balanceImplMap doesn't evict on currency removal.
+            if (!this.isCurrencyRegistered())
+                return;
+            // Force temporary registration so imperative callers (outside a reactive
+            // observer) still trigger an actual eth_call.
+            this.parent.addContract(this.contractAddress);
+            try {
+                yield this.parent.waitFreshResponse();
+            }
+            finally {
+                this.parent.removeContract(this.contractAddress);
+            }
+        });
+    }
+    isCurrencyRegistered() {
+        const target = common_1.DenomHelper.normalizeDenom(this.denomHelper.denom);
+        return this.chainGetter
+            .getModularChain(this.chainId)
+            .currencies.some((c) => common_1.DenomHelper.normalizeDenom(c.coinMinimalDenom) === target);
+    }
+    fetch() {
+        return this.ensureFetched();
+    }
+    waitFreshResponse() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.ensureFetched();
+            return this.response;
+        });
+    }
+    waitResponse() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.waitFreshResponse();
+        });
     }
 }
+__decorate([
+    mobx_1.observable
+], ObservableQueryEthereumERC20BalanceImpl.prototype, "_observedProps", void 0);
 __decorate([
     mobx_1.computed
 ], ObservableQueryEthereumERC20BalanceImpl.prototype, "balance", null);
 __decorate([
     mobx_1.computed
 ], ObservableQueryEthereumERC20BalanceImpl.prototype, "currency", null);
+__decorate([
+    mobx_1.computed
+], ObservableQueryEthereumERC20BalanceImpl.prototype, "error", null);
+__decorate([
+    mobx_1.computed
+], ObservableQueryEthereumERC20BalanceImpl.prototype, "response", null);
 exports.ObservableQueryEthereumERC20BalanceImpl = ObservableQueryEthereumERC20BalanceImpl;
 class ObservableQueryEthereumERC20BalanceRegistry {
-    constructor(sharedContext) {
+    constructor(sharedContext, batchParentStore) {
         this.sharedContext = sharedContext;
+        this.batchParentStore = batchParentStore;
     }
     getBalanceImpl(chainId, chainGetter, address, minimalDenom) {
         const denomHelper = new common_1.DenomHelper(minimalDenom);
@@ -73,7 +163,8 @@ class ObservableQueryEthereumERC20BalanceRegistry {
             (mcInfo.type !== "evm" && mcInfo.type !== "ethermint")) {
             return;
         }
-        return new ObservableQueryEthereumERC20BalanceImpl(this.sharedContext, chainId, chainGetter, denomHelper, address, denomHelper.contractAddress);
+        const parent = this.batchParentStore.getOrCreate(chainId, chainGetter, address);
+        return new ObservableQueryEthereumERC20BalanceImpl(parent, chainId, chainGetter, denomHelper, denomHelper.contractAddress);
     }
 }
 exports.ObservableQueryEthereumERC20BalanceRegistry = ObservableQueryEthereumERC20BalanceRegistry;

package/build/queries/erc20-balance.js.map

@@ -1 +1 @@
-{"version":3,"file":"erc20-balance.js","sourceRoot":"","sources":["../../src/queries/erc20-balance.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,6CAAqD;AACrD,+BAAgD;AAChD,8DAAqC;AACrC,4CAAsD;AACtD,iDAAmD;AACnD,wCAAiD;AACjD,6DAAsE;AAEtE,MAAa,uCACX,SAAQ,mDAAsC;IAG9C,YACE,aAAiC,EACjC,OAAe,EACf,WAAwB,EACL,WAAwB,EACxB,kBAA0B,EAC1B,eAAuB;QAE1C,KAAK,CAAC,aAAa,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE;YACrD;gBACE,EAAE,EAAE,eAAe;gBACnB,IAAI,EAAE,kCAAsB,CAAC,kBAAkB,CAAC,WAAW,EAAE;oBAC3D,kBAAkB;iBACnB,CAAC;aACH;YACD,QAAQ;SACT,CAAC,CAAC;QAZgB,gBAAW,GAAX,WAAW,CAAa;QACxB,uBAAkB,GAAlB,kBAAkB,CAAQ;QAC1B,oBAAe,GAAf,eAAe,CAAQ;QAY1C,IAAA,qBAAc,EAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAGD,IAAI,OAAO;QACT,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;QAErC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW;aAC9B,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC;aAC7B,YAAY,CAAC,KAAK,CAAC,CAAC;QAEvB,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SAC9D;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;YACzC,OAAO,IAAI,iBAAU,CAAC,QAAQ,EAAE,IAAI,UAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC1D;QAED,OAAO,IAAI,iBAAU,CACnB,QAAQ,EACR,IAAI,UAAG,CAAC,IAAA,qBAAU,EAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CACzE,CAAC;IACJ,CAAC;IAGD,IAAI,QAAQ;QACV,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;QAErC,OAAO,IAAI,CAAC,WAAW;aACpB,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC;aAC7B,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;CACF;AA7BC;IADC,eAAQ;sEAoBR;AAGD;IADC,eAAQ;uEAOR;AAtDH,0FAuDC;AAED,MAAa,2CAA2C;IAGtD,YAA+B,aAAiC;QAAjC,kBAAa,GAAb,aAAa,CAAoB;IAAG,CAAC;IAEpE,cAAc,CACZ,OAAe,EACf,WAAwB,EACxB,OAAe,EACf,YAAoB;QAEpB,MAAM,WAAW,GAAG,IAAI,oBAAW,CAAC,YAAY,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,YAAY,GAChB,6BAAmB,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC;QAChE,IACE,WAAW,CAAC,IAAI,KAAK,OAAO;YAC5B,CAAC,YAAY;YACb,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,CAAC,EACtD;YACA,OAAO;SACR;QAED,OAAO,IAAI,uCAAuC,CAChD,IAAI,CAAC,aAAa,EAClB,OAAO,EACP,WAAW,EACX,WAAW,EACX,OAAO,EACP,WAAW,CAAC,eAAe,CAC5B,CAAC;IACJ,CAAC;CACF;AAhCD,kGAgCC"}
+{"version":3,"file":"erc20-balance.js","sourceRoot":"","sources":["../../src/queries/erc20-balance.ts"],"names":[],"mappings":"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"}

package/build/queries/erc20-balance.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/build/queries/erc20-balance.spec.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const common_1 = require("@keplr-wallet/common");
+const stores_1 = require("@keplr-wallet/stores");
+const erc20_balance_1 = require("./erc20-balance");
+jest.mock("../account", () => ({
+    EthereumAccountBase: {
+        isEthereumHexAddressWithChecksum: jest.fn(() => true),
+    },
+}));
+jest.mock("@keplr-wallet/stores", () => {
+    const context = jest.requireActual("../../../stores/src/common/query/context");
+    const jsonRpc = jest.requireActual("../../../stores/src/common/query/json-rpc");
+    const map = jest.requireActual("../../../stores/src/common/map");
+    return {
+        QuerySharedContext: context.QuerySharedContext,
+        ObservableJsonRPCQuery: jsonRpc.ObservableJsonRPCQuery,
+        HasMapStore: map.HasMapStore,
+        getKeplrFromWindow: jest.fn(),
+    };
+});
+const ADDRESS = "0x0000000000000000000000000000000000000001";
+const CONTRACT = "0x0000000000000000000000000000000000000002";
+const DENOM = `erc20:${CONTRACT}`;
+const CURRENCY = {
+    coinMinimalDenom: DENOM,
+    coinDenom: "TEST",
+    coinDecimals: 18,
+};
+describe("ObservableQueryEthereumERC20BalanceRegistry", () => {
+    it("keeps ethermint ERC20 balances on the shared batch query for hex senders", () => {
+        const batchParentStore = mockBatchParentStore();
+        const chainGetter = mockChainGetter("ethermint");
+        const registry = createRegistry(batchParentStore);
+        const impl = registry.getBalanceImpl("injective-1", chainGetter, ADDRESS, DENOM);
+        expect(impl).toBeInstanceOf(erc20_balance_1.ObservableQueryEthereumERC20BalanceImpl);
+        expect(batchParentStore.getOrCreate).toHaveBeenCalledWith("injective-1", chainGetter, ADDRESS);
+    });
+    it("keeps pure EVM ERC20 balances on the shared batch query", () => {
+        const batchParentStore = mockBatchParentStore();
+        const chainGetter = mockChainGetter("evm");
+        const registry = createRegistry(batchParentStore);
+        const impl = registry.getBalanceImpl("eip155:1", chainGetter, ADDRESS, DENOM);
+        expect(impl).toBeInstanceOf(erc20_balance_1.ObservableQueryEthereumERC20BalanceImpl);
+        expect(batchParentStore.getOrCreate).toHaveBeenCalledWith("eip155:1", chainGetter, ADDRESS);
+    });
+});
+function createRegistry(batchParentStore) {
+    return new erc20_balance_1.ObservableQueryEthereumERC20BalanceRegistry(new stores_1.QuerySharedContext(new common_1.MemoryKVStore("erc20-balance-registry-test"), {
+        responseDebounceMs: 0,
+    }), batchParentStore);
+}
+function mockBatchParentStore() {
+    return {
+        getOrCreate: jest.fn(() => ({
+            addContract: jest.fn(),
+            removeContract: jest.fn(),
+            waitFreshResponse: jest.fn(),
+            getBalance: jest.fn(),
+            getError: jest.fn(),
+            isFetching: false,
+        })),
+    };
+}
+function mockChainGetter(type) {
+    return {
+        getModularChain() {
+            return {
+                type,
+                unwrapped: {
+                    type,
+                    evm: {
+                        rpc: "https://rpc.example",
+                    },
+                },
+                currencies: [CURRENCY],
+                forceFindCurrency(denom) {
+                    if (denom === DENOM) {
+                        return CURRENCY;
+                    }
+                    throw new Error(`Unknown currency: ${denom}`);
+                },
+            };
+        },
+        hasModularChain() {
+            return true;
+        },
+    };
+}
+//# sourceMappingURL=erc20-balance.spec.js.map

package/build/queries/erc20-balance.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"erc20-balance.spec.js","sourceRoot":"","sources":["../../src/queries/erc20-balance.spec.ts"],"names":[],"mappings":"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"}

package/build/queries/erc20-balances.d.ts

@@ -1,7 +1,10 @@
 import { DenomHelper } from "@keplr-wallet/common";
+import { IReactionDisposer } from "mobx";
 import { CoinPretty } from "@keplr-wallet/unit";
 import { AppCurrency } from "@keplr-wallet/types";
 import { BalanceRegistry, ChainGetter, IObservableQueryBalanceImpl, ObservableJsonRPCQuery, QueryError, QueryResponse, QuerySharedContext } from "@keplr-wallet/stores";
+import { ObservableQueryEthereumERC20BalancesBatchParent } from "./erc20-balance-batch";
+import { ERC20BalanceBatchParentStore } from "./erc20-batch-parent-store";
 interface ThirdpartyERC20TokenBalance {
     address: string;
     tokenBalances: {
@@ -12,39 +15,50 @@ interface ThirdpartyERC20TokenBalance {
             message: string;
         } | null;
     }[];
-    pageKey: string;
+    pageKey?: string;
 }
 export declare class ObservableQueryThirdpartyERC20BalancesImplParent extends ObservableJsonRPCQuery<ThirdpartyERC20TokenBalance> {
     protected readonly chainId: string;
     protected readonly chainGetter: ChainGetter;
     protected readonly ethereumHexAddress: string;
+    readonly batchParent: ObservableQueryEthereumERC20BalancesBatchParent;
     duplicatedFetchResolver?: Promise<void>;
-    constructor(sharedContext: QuerySharedContext, chainId: string, chainGetter: ChainGetter, ethereumHexAddress: string);
+    protected alchemyContractSet: Set<string>;
+    constructor(sharedContext: QuerySharedContext, chainId: string, chainGetter: ChainGetter, ethereumHexAddress: string, batchParent: ObservableQueryEthereumERC20BalancesBatchParent);
     protected canFetch(): boolean;
     protected onReceiveResponse(response: Readonly<QueryResponse<ThirdpartyERC20TokenBalance>>): void;
+    hasAlchemyBalance(contract: string): boolean;
+    getAlchemyTokenBalance(contract: string): ThirdpartyERC20TokenBalance["tokenBalances"][number] | undefined;
+    resolvesAlchemyBalance(contract: string): boolean;
 }
 export declare class ObservableQueryThirdpartyERC20BalancesImpl implements IObservableQueryBalanceImpl {
     protected readonly parent: ObservableQueryThirdpartyERC20BalancesImplParent;
     protected readonly chainId: string;
     protected readonly chainGetter: ChainGetter;
     protected readonly denomHelper: DenomHelper;
+    protected batchReactionDisposer?: IReactionDisposer;
+    protected isInBatch: boolean;
+    protected observedProps: number;
     constructor(parent: ObservableQueryThirdpartyERC20BalancesImplParent, chainId: string, chainGetter: ChainGetter, denomHelper: DenomHelper);
     get balance(): CoinPretty;
     get currency(): AppCurrency;
+    protected get alchemyResolvesBalance(): boolean;
     get error(): Readonly<QueryError<unknown>> | undefined;
     get isFetching(): boolean;
     get isObserved(): boolean;
     get isStarted(): boolean;
     get response(): Readonly<QueryResponse<ThirdpartyERC20TokenBalance>> | undefined;
     fetch(): Promise<void>;
+    protected awaitFallbackIfMissing(): Promise<void>;
+    protected isCurrencyRegistered(): boolean;
     waitFreshResponse(): Promise<Readonly<QueryResponse<unknown>> | undefined>;
     waitResponse(): Promise<Readonly<QueryResponse<unknown>> | undefined>;
 }
 export declare class ObservableQueryThirdpartyERC20BalanceRegistry implements BalanceRegistry {
     protected readonly sharedContext: QuerySharedContext;
-    protected readonly forceNativeERC20Query: (chainId: string, chainGetter: ChainGetter, address: string, minimalDenom: string) => boolean;
+    protected readonly batchParentStore: ERC20BalanceBatchParentStore;
     protected parentMap: Map<string, ObservableQueryThirdpartyERC20BalancesImplParent>;
-    constructor(sharedContext: QuerySharedContext, forceNativeERC20Query: (chainId: string, chainGetter: ChainGetter, address: string, minimalDenom: string) => boolean);
+    constructor(sharedContext: QuerySharedContext, batchParentStore: ERC20BalanceBatchParentStore);
     getBalanceImpl(chainId: string, chainGetter: ChainGetter, address: string, minimalDenom: string): ObservableQueryThirdpartyERC20BalancesImpl | undefined;
 }
 export {};