diff --git a/src/pages/pool/_id.vue b/src/pages/pool/_id.vue
index 32627dbd..b58c6223 100644
--- a/src/pages/pool/_id.vue
+++ b/src/pages/pool/_id.vue
@@ -36,6 +36,7 @@ import PoolRisks from '@/components/contextual/pages/pool/risks/PoolRisks.vue';
import { usePool } from '@/providers/local/pool.provider';
import { provideUserStaking } from '@/providers/local/user-staking.provider';
import { providerUserPools } from '@/providers/local/user-pools.provider';
+import PointsIncentivesCard from '@/components/contextual/pages/pool/staking/PointsIncentivesCard.vue';
const userStaking = provideUserStaking();
providerUserPools(userStaking);
@@ -157,6 +158,13 @@ const titleTokens = computed
(() => {
return orderedPoolTokens(pool.value, pool.value.tokens);
});
+const isPointsStakablePool = computed(() => {
+ if (!pool.value || POOLS.PointsGauges === undefined) return false;
+ return Object.keys(POOLS.PointsGauges).includes(poolId);
+});
+
+console.log('isPointsStakablePool', isPointsStakablePool);
+
const isStakablePool = computed(
(): boolean =>
POOLS.Stakable.VotingGaugePools.includes(poolId) ||
@@ -286,6 +294,12 @@ watch(
class="staking-incentives"
@set-restake-visibility="setRestakeVisibility"
/>
+
{
+ /**
+ * STATE
+ */
+
+ const poolId = ref(_poolId);
+ const poolAddress = computed((): string | undefined =>
+ poolId.value ? getAddressFromPoolId(poolId.value) : undefined
+ );
+
+ // const isPointsPool = computed((): boolean => {
+ // if (!poolId.value) return false;
+ // return POOLS.PointsGauges?.[poolId.value] !== undefined;
+ // });
+
+ /**
+ * COMPOSABLES
+ */
+ const { balanceFor } = useTokens();
+ const { account, isWalletReady } = useWeb3();
+
+ // // Fetches all gauges for specified pool (incl. preferential gauge).
+ // const poolGaugesQuery = usePoolGaugesQuery(poolAddress);
+ // const { data: poolGauges, refetch: refetchPoolGauges } = poolGaugesQuery;
+
+ // // Access user data fetched on wallet connection/change.
+ // const { userGaugeSharesQuery, userBoostsQuery, stakedSharesQuery } =
+ // useUserData();
+ // const { data: userGaugeShares, refetch: refetchUserGaugeShares } =
+ // userGaugeSharesQuery;
+ // const { data: boostsMap, refetch: refetchUserBoosts } = userBoostsQuery;
+ // const {
+ // data: _stakedShares,
+ // refetch: refetchStakedShares,
+ // isRefetching: isRefetchingStakedShares,
+ // } = stakedSharesQuery;
+
+ /**
+ * COMPUTED
+ */
+ // const isLoading = computed(
+ // (): boolean =>
+ // isQueryLoading(poolGaugesQuery) ||
+ // (isWalletReady.value &&
+ // (isQueryLoading(stakedSharesQuery) ||
+ // isQueryLoading(userGaugeSharesQuery) ||
+ // isQueryLoading(userBoostsQuery)))
+ // );
+
+ const isLoading = computed((): boolean => !isWalletReady.value);
+
+ const pointsGaugeAddress = computed((): string | undefined | null => {
+ const gauges = configService.network.pools.PointsGauges;
+ if (!gauges || !poolId.value) return null;
+ return gauges[poolId.value] ? gauges[poolId.value] : null;
+ });
+
+ const isStakablePool = computed(
+ (): boolean => !!poolId.value && pointsGaugeAddress.value !== null
+ );
+
+ /**
+ * METHODS
+ */
+
+ /**
+ * Set current pool ID for this provider.
+ *
+ * @param {string} id - The pool ID to get staking data for.
+ */
+ function setCurrentPool(id: string) {
+ poolId.value = id;
+ }
+
+ // Triggers refetch of all queries in this provider.
+ async function refetchAllPoolStakingData() {
+ return Promise.all([
+ // refetchPoolGauges(),
+ // refetchStakedShares(),
+ // refetchUserGaugeShares(),
+ // refetchUserBoosts(),
+ ]);
+ }
+
+ /**
+ * stake
+ *
+ * Trigger stake transaction using the current user's full BPT balance for
+ * this pool.
+ */
+ // async function stake(): Promise {
+ // if (!poolAddress.value) throw new Error('No pool to stake.');
+ // if (!preferentialGaugeAddress.value) {
+ // throw new Error(
+ // `No preferential gauge found for this pool: ${poolId.value}`
+ // );
+ // }
+
+ // const gauge = new LiquidityGauge(preferentialGaugeAddress.value);
+ // // User's current full BPT balance for this pool.
+ // const userBptBalance = parseUnits(
+ // balanceFor(getAddress(poolAddress.value))
+ // );
+
+ // return await gauge.stake(userBptBalance);
+ // }
+
+ async function stakeForPoints(): Promise {
+ if (!poolAddress.value) throw new Error('No pool to stake.');
+ if (!pointsGaugeAddress.value) {
+ throw new Error(`No points gauge found for this pool: ${poolId.value}`);
+ }
+
+ const gauge = new LiquidityGauge(pointsGaugeAddress.value);
+ // User's current full BPT balance for this pool.
+ const userBptBalance = parseUnits(
+ balanceFor(getAddress(poolAddress.value))
+ );
+
+ return await gauge.stake(userBptBalance);
+ }
+
+ /**
+ * unstake
+ *
+ * Trigger unstake transaction using the first pool gauge that the user has a
+ * balance in.
+ */
+ // async function unstake(): Promise {
+ // if (!poolGauges.value?.pool?.gauges)
+ // throw new Error('Unable to unstake, no pool gauges');
+
+ // const gaugesWithUserBalance = await filterGaugesWhereUserHasBalance(
+ // poolGauges.value,
+ // account.value
+ // );
+ // const firstGaugeWithUserBalance = gaugesWithUserBalance[0];
+ // const gauge = new LiquidityGauge(firstGaugeWithUserBalance.id);
+ // const balance = await gauge.balance(account.value);
+ // return await gauge.unstake(balance);
+ // }
+
+ async function unstakeForPoints(): Promise {
+ if (!pointsGaugeAddress.value) {
+ throw new Error(`No points gauge found for this pool: ${poolId.value}`);
+ }
+ const gauge = new LiquidityGauge(pointsGaugeAddress.value);
+ const balance = await gauge.balance(account.value);
+ return await gauge.unstake(balance);
+ }
+
+ return {
+ isLoading,
+ // stakedShares,
+ isStakablePool,
+ pointsGaugeAddress,
+ setCurrentPool,
+ refetchAllPoolStakingData,
+ stakeForPoints,
+ unstakeForPoints,
+ };
+};
+
+/**
+ * Provide setup: response type + symbol.
+ */
+export type PoolStakingProviderResponse = ReturnType<
+ typeof poolStakingProvider
+>;
+export const PoolStakingProviderSymbol: InjectionKey =
+ Symbol(symbolKeys.Providers.PoolStaking);
+
+export function providePoolPointsStaking(poolId?: string) {
+ provide(PoolStakingProviderSymbol, poolStakingProvider(poolId));
+}
+
+export function usePoolPointsStaking(): PoolStakingProviderResponse {
+ return safeInject(PoolStakingProviderSymbol);
+}
diff --git a/src/providers/local/pool-staking.provider.ts b/src/providers/local/pool-staking.provider.ts
index f963cb99..1a62b44d 100644
--- a/src/providers/local/pool-staking.provider.ts
+++ b/src/providers/local/pool-staking.provider.ts
@@ -26,11 +26,19 @@ export const poolStakingProvider = (_poolId?: string) => {
/**
* STATE
*/
+
const poolId = ref(_poolId);
const poolAddress = computed((): string | undefined =>
poolId.value ? getAddressFromPoolId(poolId.value) : undefined
);
+ // const isPointsPool = computed((): boolean => {
+ // if (!poolId.value) return false;
+ // return (
+ // configService.network.pools.PointsGauges?.[poolId.value] !== undefined
+ // );
+ // });
+
/**
* COMPOSABLES
*/
@@ -65,12 +73,20 @@ export const poolStakingProvider = (_poolId?: string) => {
isQueryLoading(userBoostsQuery)))
);
+ const isPointsLoading = computed((): boolean => !isWalletReady.value);
+
// The current preferential gauge for the specified pool.
const preferentialGaugeAddress = computed(
(): string | undefined | null =>
poolGauges.value?.pool?.preferentialGauge?.id
);
+ const pointsGaugeAddress = computed((): string | undefined | null => {
+ const gauges = configService.network.pools.PointsGauges;
+ if (!gauges || !poolId.value) return null;
+ return gauges[poolId.value] ? gauges[poolId.value] : null;
+ });
+
// Is it possible to stake this pool's BPT?
const isStakablePool = computed(
(): boolean =>
@@ -81,6 +97,10 @@ export const poolStakingProvider = (_poolId?: string) => {
)
);
+ const isStakablePoolForPoints = computed(
+ (): boolean => !!poolId.value && pointsGaugeAddress.value !== null
+ );
+
const gaugeTotalSupply = computed((): string => {
return poolGauges.value?.liquidityGauges?.[0]?.totalSupply || '0';
});
@@ -178,6 +198,21 @@ export const poolStakingProvider = (_poolId?: string) => {
return await gauge.stake(userBptBalance);
}
+ async function stakeForPoints(): Promise {
+ if (!poolAddress.value) throw new Error('No pool to stake.');
+ if (!pointsGaugeAddress.value) {
+ throw new Error(`No points gauge found for this pool: ${poolId.value}`);
+ }
+
+ const gauge = new LiquidityGauge(pointsGaugeAddress.value);
+ // User's current full BPT balance for this pool.
+ const userBptBalance = parseUnits(
+ balanceFor(getAddress(poolAddress.value))
+ );
+
+ return await gauge.stake(userBptBalance);
+ }
+
/**
* unstake
*
@@ -198,6 +233,15 @@ export const poolStakingProvider = (_poolId?: string) => {
return await gauge.unstake(balance);
}
+ async function unstakeForPoints(): Promise {
+ if (!pointsGaugeAddress.value) {
+ throw new Error(`No points gauge found for this pool: ${poolId.value}`);
+ }
+ const gauge = new LiquidityGauge(pointsGaugeAddress.value);
+ const balance = await gauge.balance(account.value);
+ return await gauge.unstake(balance);
+ }
+
/**
* Fetch preferential gauge address for pool.
*
@@ -233,19 +277,24 @@ export const poolStakingProvider = (_poolId?: string) => {
return {
isLoading,
+ isPointsLoading,
stakedShares,
isStakablePool,
+ isStakablePoolForPoints,
boost,
hasNonPrefGaugeBalance,
isRefetchingStakedShares,
refetchStakedShares,
preferentialGaugeAddress,
fetchPreferentialGaugeAddress,
+ pointsGaugeAddress,
gaugeTotalSupply,
setCurrentPool,
refetchAllPoolStakingData,
stake,
unstake,
+ stakeForPoints,
+ unstakeForPoints,
poolGauges,
};
};
diff --git a/src/services/api/graphql/generated/api-types.ts b/src/services/api/graphql/generated/api-types.ts
index 73429948..26bd0f77 100644
--- a/src/services/api/graphql/generated/api-types.ts
+++ b/src/services/api/graphql/generated/api-types.ts
@@ -55,6 +55,9 @@ export enum GqlChain {
Zkevm = 'ZKEVM',
Telos = 'telos',
Meter = 'meter',
+ Taiko = 'taiko',
+ Etherlink = 'etherlink',
+ VanaMoksha = 'vana-moksha',
}
export type GqlContentNewsItem = {
diff --git a/src/services/api/graphql/mappers.ts b/src/services/api/graphql/mappers.ts
index 6e65537c..c0401594 100644
--- a/src/services/api/graphql/mappers.ts
+++ b/src/services/api/graphql/mappers.ts
@@ -32,6 +32,12 @@ export function mapApiChain(
return Network.TELOS;
case 'meter':
return Network.METER;
+ case 'taiko':
+ return Network.TAIKO;
+ case 'etherlink':
+ return Network.ETHERLINK;
+ case 'vana-moksha':
+ return Network.VANAMOKSHA;
default:
throw new Error(`Unexpected API chain: ${apiChain}`);
diff --git a/src/services/web3/wallet.service.ts b/src/services/web3/wallet.service.ts
index 1e2505e4..5decbf07 100644
--- a/src/services/web3/wallet.service.ts
+++ b/src/services/web3/wallet.service.ts
@@ -27,7 +27,9 @@ export default class WalletService {
private readonly config: ConfigService = configService
) {
this.appProvider = this.rpcProviderService.jsonProvider;
- this.ensProvider = this.rpcProviderService.getJsonProvider(Network.TELOS);
+ this.ensProvider = this.rpcProviderService.getJsonProvider(
+ Network.VANAMOKSHA
+ );
}
public setUserProvider(provider: ComputedRef) {
diff --git a/src/types/pools.ts b/src/types/pools.ts
index 03ee428c..521a9be0 100644
--- a/src/types/pools.ts
+++ b/src/types/pools.ts
@@ -162,6 +162,7 @@ export type Pools = {
// Pools that have additional rewards and therefore should be stakable but are not included in the VotingGaugePools list.
AllowList: string[];
};
+ PointsGauges?: Record;
Metadata: Record;
Deep: string[];
BoostedApr: string[];
From ddaa1bc1b991b0bf20e8e13da305c6a9318b4ac0 Mon Sep 17 00:00:00 2001
From: stephen <991266+stxphxn@users.noreply.github.com>
Date: Tue, 24 Sep 2024 19:49:28 +0100
Subject: [PATCH 3/5] feat: update initial swap tokens
---
src/lib/config/vana-moksha/tokens.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/config/vana-moksha/tokens.ts b/src/lib/config/vana-moksha/tokens.ts
index b5641b25..83fceddc 100644
--- a/src/lib/config/vana-moksha/tokens.ts
+++ b/src/lib/config/vana-moksha/tokens.ts
@@ -6,7 +6,7 @@ const tokens: TokenConstants = {
},
InitialSwapTokens: {
input: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
- output: '0xa9d23408b9ba935c230493c40c73824df71a0975',
+ output: '0xb39a50b5806039c82932bb96cefbcbc61231045c',
},
Addresses: {
nativeAsset: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
From 2276c4aaef78d460d8c112c956f651d12cbaa392 Mon Sep 17 00:00:00 2001
From: stephen <991266+stxphxn@users.noreply.github.com>
Date: Thu, 26 Sep 2024 13:28:42 +0100
Subject: [PATCH 4/5] Merge branch 'vana-moksha' into taiko-staking
From ef291d3529338494cdd1e6151fd113b18814add9 Mon Sep 17 00:00:00 2001
From: stephen <991266+stxphxn@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:14:47 +0100
Subject: [PATCH 5/5] Add Taiko staking
---
.../pool/staking/PointsIncentivesCard.vue | 52 +++++---------
.../staking/composables/useStakePreview.ts | 44 +++++-------
.../tables/FaucetTable/FaucetTable.vue | 3 +-
src/composables/useNetwork.ts | 2 +-
src/constants/symbol.keys.ts | 1 +
src/lib/config/index.ts | 28 ++++----
src/lib/config/taiko/pools.ts | 4 ++
src/locales/default.json | 2 +
src/pages/_layouts/PoolLayout.vue | 2 +
src/plugins/router/nav-guards.ts | 4 +-
.../local/pool-points-staking.provider.ts | 71 ++++++++++++-------
src/providers/tokens.provider.ts | 9 ++-
src/services/web3/wallet.service.ts | 4 +-
13 files changed, 119 insertions(+), 107 deletions(-)
diff --git a/src/components/contextual/pages/pool/staking/PointsIncentivesCard.vue b/src/components/contextual/pages/pool/staking/PointsIncentivesCard.vue
index 9a2b3f09..e4bbc47a 100644
--- a/src/components/contextual/pages/pool/staking/PointsIncentivesCard.vue
+++ b/src/components/contextual/pages/pool/staking/PointsIncentivesCard.vue
@@ -9,12 +9,10 @@ import { bnum } from '@/lib/utils';
import { Pool } from '@/services/pool/types';
import StakePreviewModal from './StakePreviewModal.vue';
-import { usePoolStaking } from '@/providers/local/pool-staking.provider';
+import { usePoolPointsStaking } from '@/providers/local/pool-points-staking.provider';
import { deprecatedDetails } from '@/composables/usePoolHelpers';
import { StakeAction } from './composables/useStakePreview';
-import { GaugeShare } from '@/composables/queries/useUserGaugeSharesQuery';
-import useStakedSharesQuery from '@/composables/queries/useStakedSharesQuery';
type Props = {
pool: Pool;
@@ -27,7 +25,6 @@ const props = defineProps();
const isStakePreviewVisible = ref(false);
const stakeAction = ref('stakeForPoints');
-const poolId = computed(() => props.pool.id);
const isOpenedByDefault = ref(true);
/**
* COMPOSABLES
@@ -35,40 +32,23 @@ const isOpenedByDefault = ref(true);
const { fNum } = useNumbers();
const { balanceFor } = useTokens();
const {
- isStakablePoolForPoints: isStakablePool,
- isPointsLoading: isLoadingStakingData,
+ isStakablePool,
+ isLoading: isLoadingStakingData,
+ isRefetchingStakedShares,
+ stakedShares,
pointsGaugeAddress,
-} = usePoolStaking();
+} = usePoolPointsStaking();
-const { data: stakedShares, isRefetching } = useStakedSharesQuery(
- ref([
- {
- balance: '0',
- gauge: {
- id: pointsGaugeAddress.value,
- poolAddress: getAddress(props.pool.address),
- poolId: props.pool.id,
- totalSupply: '0',
- isPreferentialGauge: true,
- isKilled: false,
- },
- },
- ] as GaugeShare[])
-);
+console.log(stakedShares.value);
-console.log('stakedShares', stakedShares);
/**
* COMPUTED
*/
-const stakedShare = computed(() => {
- return stakedShares.value ? stakedShares.value[poolId.value] : '0';
-});
-
const fiatValueOfStakedShares = computed(() => {
return bnum(props.pool.totalLiquidity)
.div(props.pool.totalShares)
- .times((stakedShare.value || '0').toString())
+ .times((stakedShares.value || '0').toString())
.toString();
});
@@ -115,7 +95,7 @@ function handlePreviewClose() {
:class="['shadow-2xl', { handle: isStakablePool }]"
:sections="[
{
- title: $t('staking.stakingIncentives'),
+ title: $t('staking.pointsStakingIncentives'),
id: 'staking-incentives',
handle: 'staking-handle',
isDisabled: isStakablePool,
@@ -142,7 +122,7 @@ function handlePreviewClose() {
-
{{ $t('staking.stakingIncentives') }}
+
{{ $t('staking.pointsStakingIncentives') }}
-
+
+
+
@@ -165,10 +147,10 @@ function handlePreviewClose() {
{{ $t('staked') }} {{ $t('lpTokens') }}
-
+
-
+
{{ fNum(fiatValueOfStakedShares, FNumFormats.fiat) }}
@@ -179,10 +161,10 @@ function handlePreviewClose() {
{{ $t('unstaked') }} {{ $t('lpTokens') }}
-
+
-
+
{{ fNum(fiatValueOfUnstakedShares, FNumFormats.fiat) }}
diff --git a/src/components/contextual/pages/pool/staking/composables/useStakePreview.ts b/src/components/contextual/pages/pool/staking/composables/useStakePreview.ts
index 02b37f1a..53600c22 100644
--- a/src/components/contextual/pages/pool/staking/composables/useStakePreview.ts
+++ b/src/components/contextual/pages/pool/staking/composables/useStakePreview.ts
@@ -14,8 +14,7 @@ import {
import { getAddress } from '@ethersproject/address';
import { useI18n } from 'vue-i18n';
import useTokenApprovalActions from '@/composables/approvals/useTokenApprovalActions';
-import useStakedSharesQuery from '@/composables/queries/useStakedSharesQuery';
-import { GaugeShare } from '@/composables/queries/useUserGaugeSharesQuery';
+import { usePoolPointsStaking } from '@/providers/local/pool-points-staking.provider';
/**
* TYPES
@@ -51,41 +50,29 @@ export function useStakePreview(props: StakePreviewProps, emit) {
const { getTokenApprovalActions } = useTokenApprovalActions();
const {
isLoading: isPoolStakingLoading,
- isPointsLoading,
stake,
unstake,
- stakeForPoints,
- unstakeForPoints,
stakedShares,
refetchAllPoolStakingData,
preferentialGaugeAddress,
- pointsGaugeAddress,
} = usePoolStaking();
+ const {
+ isLoading: isPointsLoading,
+ stakeForPoints,
+ unstakeForPoints,
+ stakedShares: stakedPointsShares,
+ refetchAllPoolStakingData: refetchAllPointsStakingData,
+ pointsGaugeAddress,
+ } = usePoolPointsStaking();
+
// Staked or unstaked shares depending on action type.
let currentShares = '0';
if (props.action === 'stake' || props.action === 'stakeForPoints') {
currentShares = balanceFor(getAddress(props.pool.address));
} else if (props.action === 'unstakeForPoints') {
- const { data: stakedPointsShares } = useStakedSharesQuery(
- ref([
- {
- balance: '0',
- gauge: {
- id: pointsGaugeAddress.value,
- poolAddress: getAddress(props.pool.address),
- poolId: props.pool.id,
- totalSupply: '0',
- isPreferentialGauge: true,
- isKilled: false,
- },
- },
- ] as GaugeShare[])
- );
- currentShares = stakedPointsShares.value
- ? stakedPointsShares.value[props.pool.id]
- : '0';
+ currentShares = stakedPointsShares.value;
} else {
currentShares = stakedShares.value;
}
@@ -223,7 +210,14 @@ export function useStakePreview(props: StakePreviewProps, emit) {
async function handleSuccess(receipt: TransactionReceipt) {
isActionConfirmed.value = true;
confirmationReceipt.value = receipt;
- await Promise.all([refetchBalances(), refetchAllPoolStakingData()]);
+ if (
+ props.action === 'unstakeForPoints' ||
+ props.action === 'stakeForPoints'
+ ) {
+ await Promise.all([refetchBalances(), refetchAllPointsStakingData()]);
+ } else {
+ await Promise.all([refetchBalances(), refetchAllPoolStakingData()]);
+ }
emit('success');
}
diff --git a/src/components/tables/FaucetTable/FaucetTable.vue b/src/components/tables/FaucetTable/FaucetTable.vue
index 9e825d37..da05be12 100644
--- a/src/components/tables/FaucetTable/FaucetTable.vue
+++ b/src/components/tables/FaucetTable/FaucetTable.vue
@@ -24,7 +24,7 @@ const tokens = computed(() => {
const tokensWithValues = Object.values(balancerTokenList.value.tokens)
.map(token => {
const balance = balanceFor(token.address);
- const price = priceFor(token.address);
+ const price = priceFor(token.address.toLowerCase());
const value = Number(balance) * price;
return {
...token,
@@ -34,6 +34,7 @@ const tokens = computed(() => {
};
})
.filter(t => t.address != '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE');
+ console.log('tokensWithValues', tokensWithValues);
return orderBy(tokensWithValues, ['value', 'balance'], ['desc', 'desc']);
});
diff --git a/src/composables/useNetwork.ts b/src/composables/useNetwork.ts
index 4f36bdf1..f7944186 100644
--- a/src/composables/useNetwork.ts
+++ b/src/composables/useNetwork.ts
@@ -24,7 +24,7 @@ const NETWORK_ID =
urlNetworkId ||
localStorageNetworkId ||
(Number(import.meta.env.VITE_NETWORK) as Network) ||
- Network.VANAMOKSHA;
+ Network.CELO;
if (windowAvailable) localStorage.setItem('networkId', NETWORK_ID.toString());
export const networkSlug = config[NETWORK_ID].slug;
export const networkConfig = config[NETWORK_ID];
diff --git a/src/constants/symbol.keys.ts b/src/constants/symbol.keys.ts
index 1cc8cd89..00e6f706 100644
--- a/src/constants/symbol.keys.ts
+++ b/src/constants/symbol.keys.ts
@@ -7,6 +7,7 @@ export default {
JoinPool: 'provider.joinPool',
ExitPool: 'provider.exitPool',
PoolStaking: 'provider.poolStaking',
+ PoolPointsStaking: 'provider.poolPointsStaking',
UserStaking: 'provider.userStaking',
UserData: 'provider.userData',
UserPools: 'provider.userPools',
diff --git a/src/lib/config/index.ts b/src/lib/config/index.ts
index 2f2ac504..245b9aac 100644
--- a/src/lib/config/index.ts
+++ b/src/lib/config/index.ts
@@ -4,28 +4,28 @@ import { Config, Network } from './types';
// import avalanche from './avalanche';
// import base from './base';
// import goerli from './goerli';
-// import gnosisChain from './gnosis-chain';
+import gnosisChain from './gnosis-chain';
// import mainnet from './mainnet';
// import optimism from './optimism';
// import polygon from './polygon';
// import sepolia from './sepolia';
// import zkevm from './zkevm';
-// import telos from './telos';
+import telos from './telos';
// import telosTestnet from './telos-testnet';
-// import celo from './celo';
-// import meter from './meter';
-// import taiko from './taiko';
-// import etherlink from './etherlink';
-import vanaMoksha from './vana-moksha';
+import celo from './celo';
+import meter from './meter';
+import taiko from './taiko';
+import etherlink from './etherlink';
+// import vanaMoksha from './vana-moksha';
const config: Record = {
- // [Network.TELOS]: telos,
- // [Network.CELO]: celo,
- // [Network.GNOSIS]: gnosisChain,
- // [Network.METER]: meter,
- // [Network.TAIKO]: taiko,
- // [Network.ETHERLINK]: etherlink,
- [Network.VANAMOKSHA]: vanaMoksha,
+ [Network.TELOS]: telos,
+ [Network.CELO]: celo,
+ [Network.GNOSIS]: gnosisChain,
+ [Network.METER]: meter,
+ [Network.TAIKO]: taiko,
+ [Network.ETHERLINK]: etherlink,
+ //[Network.VANAMOKSHA]: vanaMoksha,
};
export default config;
diff --git a/src/lib/config/taiko/pools.ts b/src/lib/config/taiko/pools.ts
index 4d125ca9..9beb2f8f 100644
--- a/src/lib/config/taiko/pools.ts
+++ b/src/lib/config/taiko/pools.ts
@@ -34,6 +34,10 @@ const pools: Pools = {
PointsGauges: {
'0x65d5eebb5f1c767ce42c3ccc8cfd00fb3a114122000000000000000000000003':
'0x0447cb41A2a0D4C4A76cA3e2b1be65076DD48A06', //USDC-USDC.e
+ '0xe0f51bf8d30db81d0a93125a17a2a40130ad9f7e000200000000000000000004':
+ '0xc4E44B978c814F9223784031474ba1498bd23335', //WETH-USDC
+ '0x27ebdb9db75b8ca967ec331cb1e74880f1d7f0a8000200000000000000000005':
+ '0x76930FbaAbDB2D04B41835029D2320B2A0139cc5', //TAIKO-WETH
},
Investment: {
AllowList: [],
diff --git a/src/locales/default.json b/src/locales/default.json
index 9b28a24a..b48a1ab2 100644
--- a/src/locales/default.json
+++ b/src/locales/default.json
@@ -999,6 +999,8 @@
"stakedPercentage": "Staked %",
"stakingAprTooltip": "Your potential staking APR",
"stakingIncentives": "Staking incentives",
+ "pointsStakingIncentives": "Earn SYMM Points",
+ "pointsIncentivesTooltip": "Earn SYMM Points for staking LP tokens in eligible pools. SYMM Points can be redeemed for rewards in the future.",
"totalShareTooltip": "Your current total share of LP tokens in the pool",
"restakeGauge": "Restake to receive future liquidity mining incentives",
"restakeGaugeDescription": "You are staking in a gauge which has been deprecated. Restake to the new gauge for this pool to receive future liquidity mining incentives.",
diff --git a/src/pages/_layouts/PoolLayout.vue b/src/pages/_layouts/PoolLayout.vue
index 3935ac2f..ac1b4198 100644
--- a/src/pages/_layouts/PoolLayout.vue
+++ b/src/pages/_layouts/PoolLayout.vue
@@ -4,6 +4,7 @@ import FocussedLayout from '@/components/layouts/FocussedLayout.vue';
import { createProviderComponent } from '@/providers/createProviderComponent';
import { providePool } from '@/providers/local/pool.provider';
import { providePoolStaking } from '@/providers/local/pool-staking.provider';
+import { providePoolPointsStaking } from '@/providers/local/pool-points-staking.provider';
import { provideUserTokens } from '@/providers/local/user-tokens.provider';
/**
@@ -24,6 +25,7 @@ const PoolProvider = createProviderComponent(() => {
providePool(poolId);
providePoolStaking(poolId);
+ providePoolPointsStaking(poolId);
provideUserTokens();
});
diff --git a/src/plugins/router/nav-guards.ts b/src/plugins/router/nav-guards.ts
index d9df45d8..ed9000b5 100644
--- a/src/plugins/router/nav-guards.ts
+++ b/src/plugins/router/nav-guards.ts
@@ -113,7 +113,7 @@ function applyNetworkPathRedirects(router: Router): Router {
) {
const newPath = to.redirectedFrom?.fullPath ?? to.fullPath;
router.push({
- path: `/${config[Network.VANAMOKSHA].slug}${newPath}`,
+ path: `/${config[Network.TELOS].slug}${newPath}`,
});
} else if (
!to.redirectedFrom ||
@@ -124,7 +124,7 @@ function applyNetworkPathRedirects(router: Router): Router {
} else {
const newPath = to.redirectedFrom?.fullPath ?? to.fullPath;
const newNetwork = newPath.includes('/pool')
- ? config[Network.VANAMOKSHA].slug
+ ? config[Network.TELOS].slug
: networkSlug;
router.push({ path: `/${newNetwork}${newPath}` });
}
diff --git a/src/providers/local/pool-points-staking.provider.ts b/src/providers/local/pool-points-staking.provider.ts
index aab13ac4..0afa2f3c 100644
--- a/src/providers/local/pool-points-staking.provider.ts
+++ b/src/providers/local/pool-points-staking.provider.ts
@@ -10,13 +10,15 @@ import useWeb3 from '@/services/web3/useWeb3';
// import { POOLS } from '@/constants/pools';
import { safeInject } from '../inject';
import { configService } from '@/services/config/config.service';
+import useStakedSharesQuery from '@/composables/queries/useStakedSharesQuery';
+import { GaugeShare } from '@/composables/queries/useUserGaugeSharesQuery';
/**
* PoolStakingProvider
*
* Fetches data and provides functionality for a specific pool's gauge.
*/
-export const poolStakingProvider = (_poolId?: string) => {
+export const poolPointsStakingProvider = (_poolId?: string) => {
/**
* STATE
*/
@@ -26,10 +28,31 @@ export const poolStakingProvider = (_poolId?: string) => {
poolId.value ? getAddressFromPoolId(poolId.value) : undefined
);
- // const isPointsPool = computed((): boolean => {
- // if (!poolId.value) return false;
- // return POOLS.PointsGauges?.[poolId.value] !== undefined;
- // });
+ const pointsGaugeAddress = computed((): string | undefined | null => {
+ const gauges = configService.network.pools.PointsGauges;
+ if (!gauges || !poolId.value) return null;
+ return gauges[poolId.value] ? gauges[poolId.value] : null;
+ });
+
+ const {
+ data: _stakedShares,
+ isRefetching: isRefetchingStakedShares,
+ refetch: refetchStakedShares,
+ } = useStakedSharesQuery(
+ ref([
+ {
+ balance: '0',
+ gauge: {
+ id: pointsGaugeAddress.value,
+ poolAddress: poolAddress.value,
+ poolId: poolId.value,
+ totalSupply: '0',
+ isPreferentialGauge: true,
+ isKilled: false,
+ },
+ },
+ ] as GaugeShare[])
+ );
/**
* COMPOSABLES
@@ -67,16 +90,17 @@ export const poolStakingProvider = (_poolId?: string) => {
const isLoading = computed((): boolean => !isWalletReady.value);
- const pointsGaugeAddress = computed((): string | undefined | null => {
- const gauges = configService.network.pools.PointsGauges;
- if (!gauges || !poolId.value) return null;
- return gauges[poolId.value] ? gauges[poolId.value] : null;
- });
-
const isStakablePool = computed(
(): boolean => !!poolId.value && pointsGaugeAddress.value !== null
);
+ // User's staked shares for pool (onchain data).
+ const stakedShares = computed((): string => {
+ if (!poolId.value) return '0';
+
+ return _stakedShares?.value?.[poolId.value] || '0';
+ });
+
/**
* METHODS
*/
@@ -92,12 +116,7 @@ export const poolStakingProvider = (_poolId?: string) => {
// Triggers refetch of all queries in this provider.
async function refetchAllPoolStakingData() {
- return Promise.all([
- // refetchPoolGauges(),
- // refetchStakedShares(),
- // refetchUserGaugeShares(),
- // refetchUserBoosts(),
- ]);
+ return Promise.all([refetchStakedShares()]);
}
/**
@@ -169,10 +188,12 @@ export const poolStakingProvider = (_poolId?: string) => {
return {
isLoading,
- // stakedShares,
+ stakedShares,
isStakablePool,
pointsGaugeAddress,
setCurrentPool,
+ isRefetchingStakedShares,
+ refetchStakedShares,
refetchAllPoolStakingData,
stakeForPoints,
unstakeForPoints,
@@ -182,16 +203,16 @@ export const poolStakingProvider = (_poolId?: string) => {
/**
* Provide setup: response type + symbol.
*/
-export type PoolStakingProviderResponse = ReturnType<
- typeof poolStakingProvider
+export type PoolPointsStakingProviderResponse = ReturnType<
+ typeof poolPointsStakingProvider
>;
-export const PoolStakingProviderSymbol: InjectionKey =
- Symbol(symbolKeys.Providers.PoolStaking);
+export const PoolPointsStakingProviderSymbol: InjectionKey =
+ Symbol(symbolKeys.Providers.PoolPointsStaking);
export function providePoolPointsStaking(poolId?: string) {
- provide(PoolStakingProviderSymbol, poolStakingProvider(poolId));
+ provide(PoolPointsStakingProviderSymbol, poolPointsStakingProvider(poolId));
}
-export function usePoolPointsStaking(): PoolStakingProviderResponse {
- return safeInject(PoolStakingProviderSymbol);
+export function usePoolPointsStaking(): PoolPointsStakingProviderResponse {
+ return safeInject(PoolPointsStakingProviderSymbol);
}
diff --git a/src/providers/tokens.provider.ts b/src/providers/tokens.provider.ts
index 6beedabe..004d31ec 100644
--- a/src/providers/tokens.provider.ts
+++ b/src/providers/tokens.provider.ts
@@ -534,6 +534,7 @@ export const tokensProvider = (
const response = await axios.get(
`https://symm-prices.symmetric.workers.dev/${networkSlug}/prices/${tokenAddressesString}`
);
+ console.log(response);
let symmPrice = 0;
let rewardPrice = 0;
response.data.forEach(price => {
@@ -567,7 +568,11 @@ export const tokensProvider = (
// Inject veBAL because it's not in tokenlists.
const { veBAL } = configService.network.addresses;
await injectTokens([veBAL]);
- if (networkSlug === 'telos' || networkSlug === 'meter') {
+ if (
+ networkSlug === 'telos' ||
+ networkSlug === 'meter' ||
+ networkSlug === 'vana-moksha'
+ ) {
await getTokenPrices();
}
queriesEnabled.value = true;
@@ -624,7 +629,9 @@ export function provideTokens(
userSettings: UserSettingsResponse,
tokenLists: TokenListsResponse
) {
+ console.log('PROVIDE TOKENS');
const tokensResponse = tokensProvider(userSettings, tokenLists);
+
provide(TokensProviderSymbol, tokensResponse);
return tokensResponse;
}
diff --git a/src/services/web3/wallet.service.ts b/src/services/web3/wallet.service.ts
index 5decbf07..1e2505e4 100644
--- a/src/services/web3/wallet.service.ts
+++ b/src/services/web3/wallet.service.ts
@@ -27,9 +27,7 @@ export default class WalletService {
private readonly config: ConfigService = configService
) {
this.appProvider = this.rpcProviderService.jsonProvider;
- this.ensProvider = this.rpcProviderService.getJsonProvider(
- Network.VANAMOKSHA
- );
+ this.ensProvider = this.rpcProviderService.getJsonProvider(Network.TELOS);
}
public setUserProvider(provider: ComputedRef) {