Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pool/712 balance issue #898

Merged
merged 6 commits into from
Oct 12, 2022
+31 −13
Merged

Fix pool/712 balance issue #898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
209cf01
Remove computed
jonator Oct 12, 2022
ddf85de
Fix query issue
jonator Oct 12, 2022
955f1cd
Allow for disconnected wallet
jonator Oct 12, 2022
64d17b5
Make bech32Address observable
jonator Oct 12, 2022
06a3d7a
Remove log
jonator Oct 12, 2022
2b1278c
Fix build error
jonator Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions packages/stores/src/queries/pools/pool-details.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { computed, makeObservable } from "mobx";
import { action, computed, makeObservable, observable } from "mobx";
import { computedFn } from "mobx-utils";
import { Duration } from "dayjs/plugin/duration";
import dayjs from "dayjs";
Expand Down Expand Up @@ -29,8 +29,10 @@ export type ExternalGauge = {

/** Convenience store for getting common details of a pool via many other query stores. */
export class ObservableQueryPoolDetails {
@observable
protected bech32Address: string = "";

constructor(
protected readonly bech32Address: string,
protected readonly fiatCurrency: FiatCurrency,
protected readonly queryPool: ObservableQueryPool,
protected readonly queries: {
Expand All @@ -48,6 +50,11 @@ export class ObservableQueryPoolDetails {
makeObservable(this);
}

@action
setBech32Address(bech32Address: string) {
this.bech32Address = bech32Address;
}

@computed
get pool() {
return this.queryPool;
Expand Down
11 changes: 9 additions & 2 deletions packages/stores/src/queries/superfluid-pools/pool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { computed, makeObservable } from "mobx";
import { computed, makeObservable, observable, action } from "mobx";
import { FiatCurrency } from "@keplr-wallet/types";
import {
ObservableQueryValidators,
Expand All @@ -23,8 +23,10 @@ import {

/** Convenience store getting common superfluid data for a pool via superfluid stores. */
export class ObservableQuerySuperfluidPool {
@observable
protected bech32Address: string = "";

constructor(
protected readonly bech32Address: string,
protected readonly fiatCurrency: FiatCurrency,
protected readonly queryPoolDetails: ObservableQueryPoolDetails,
protected readonly queryValidators: ObservableQueryValidators,
Expand All @@ -44,6 +46,11 @@ export class ObservableQuerySuperfluidPool {
makeObservable(this);
}

@action
setBech32Address(bech32Address: string) {
this.bech32Address = bech32Address;
}

@computed
get isSuperfluid() {
return this.queries.querySuperfluidPools.isSuperfluidPool(
Expand Down
5 changes: 3 additions & 2 deletions packages/stores/types/queries/pools/pool-details.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export declare type ExternalGauge = {
};
/** Convenience store for getting common details of a pool via many other query stores. */
export declare class ObservableQueryPoolDetails {
protected readonly bech32Address: string;
protected readonly fiatCurrency: FiatCurrency;
protected readonly queryPool: ObservableQueryPool;
protected readonly queries: {
Expand All @@ -30,7 +29,8 @@ export declare class ObservableQueryPoolDetails {
queryPoolsGaugeIds: ObservableQueryPoolsGaugeIds;
};
protected readonly priceStore: IPriceStore;
constructor(bech32Address: string, fiatCurrency: FiatCurrency, queryPool: ObservableQueryPool, queries: {
protected bech32Address: string;
constructor(fiatCurrency: FiatCurrency, queryPool: ObservableQueryPool, queries: {
queryGammPoolShare: ObservableQueryGammPoolShare;
queryIncentivizedPools: ObservableQueryIncentivizedPools;
queryAccountLocked: ObservableQueryAccountLocked;
Expand All @@ -40,6 +40,7 @@ export declare class ObservableQueryPoolDetails {
queryLockableDurations: ObservableQueryLockableDurations;
queryPoolsGaugeIds: ObservableQueryPoolsGaugeIds;
}, priceStore: IPriceStore);
setBech32Address(bech32Address: string): void;
get pool(): ObservableQueryPool;
get poolShareCurrency(): import("@keplr-wallet/types").Currency;
get isIncentivized(): boolean;
Expand Down
5 changes: 3 additions & 2 deletions packages/stores/types/queries/superfluid-pools/pool.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { ObservableQueryAccountLocked } from "../lockup";
import { ObservableQuerySuperfluidPools, ObservableQuerySuperfluidDelegations, ObservableQuerySuperfluidUndelegations, ObservableQuerySuperfluidOsmoEquivalent } from "../superfluid-pools";
/** Convenience store getting common superfluid data for a pool via superfluid stores. */
export declare class ObservableQuerySuperfluidPool {
protected readonly bech32Address: string;
protected readonly fiatCurrency: FiatCurrency;
protected readonly queryPoolDetails: ObservableQueryPoolDetails;
protected readonly queryValidators: ObservableQueryValidators;
Expand All @@ -25,7 +24,8 @@ export declare class ObservableQuerySuperfluidPool {
querySuperfluidOsmoEquivalent: ObservableQuerySuperfluidOsmoEquivalent;
};
protected readonly priceStore: IPriceStore;
constructor(bech32Address: string, fiatCurrency: FiatCurrency, queryPoolDetails: ObservableQueryPoolDetails, queryValidators: ObservableQueryValidators, queryInflation: ObservableQueryInflation, queries: {
protected bech32Address: string;
constructor(fiatCurrency: FiatCurrency, queryPoolDetails: ObservableQueryPoolDetails, queryValidators: ObservableQueryValidators, queryInflation: ObservableQueryInflation, queries: {
queryGammPoolShare: ObservableQueryGammPoolShare;
queryLockableDurations: ObservableQueryLockableDurations;
queryIncentivizedPools: ObservableQueryIncentivizedPools;
Expand All @@ -35,6 +35,7 @@ export declare class ObservableQuerySuperfluidPool {
querySuperfluidUndelegations: ObservableQuerySuperfluidUndelegations;
querySuperfluidOsmoEquivalent: ObservableQuerySuperfluidOsmoEquivalent;
}, priceStore: IPriceStore);
setBech32Address(bech32Address: string): void;
get isSuperfluid(): boolean;
/** Wraps `gauges` member of pool detail store with potential superfluid APR info. */
get gaugesWithSuperfluidApr(): {
Expand Down
12 changes: 7 additions & 5 deletions packages/web/pages/pool/[id].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,14 @@ const Pool: FunctionComponent = observer(() => {
}, [poolExists]);

// initialize pool data stores once root pool store is loaded
const [poolDetailStore, setPoolDetailStore] =
useState<ObservableQueryPoolDetails | null>(null);
const [superfluidPoolStore, setSuperfluidPoolStore] =
useState<ObservableQuerySuperfluidPool | null>(null);
useEffect(() => {
let newPoolDetailStore;
if (poolExists && pool && !poolDetailStore) {
newPoolDetailStore = new ObservableQueryPoolDetails(
bech32Address,
fiat,
pool,
queryOsmosis,
Expand All @@ -95,7 +96,6 @@ const Pool: FunctionComponent = observer(() => {
setPoolDetailStore(newPoolDetailStore);
setSuperfluidPoolStore(
new ObservableQuerySuperfluidPool(
bech32Address,
fiat,
newPoolDetailStore,
queriesStore.get(chainId).cosmos.queryValidators,
Expand All @@ -105,7 +105,11 @@ const Pool: FunctionComponent = observer(() => {
)
);
}
}, [poolExists, pool, bech32Address, fiat, queryOsmosis, priceStore]);
}, [poolExists, pool, fiat, queryOsmosis, priceStore]);
useEffect(() => {
poolDetailStore?.setBech32Address(bech32Address);
superfluidPoolStore?.setBech32Address(bech32Address);
}, [bech32Address, poolDetailStore, superfluidPoolStore]);

// Manage liquidity + bond LP tokens (modals) state
const [showManageLiquidityDialog, setShowManageLiquidityDialog] =
Expand Down Expand Up @@ -135,8 +139,6 @@ const Pool: FunctionComponent = observer(() => {
);

// pool gauges
const [poolDetailStore, setPoolDetailStore] =
useState<ObservableQueryPoolDetails | null>(null);
const allowedGauges =
pool && ExternalIncentiveGaugeAllowList[pool.id]
? poolDetailStore?.queryAllowedExternalGauges(
Expand Down