Skip to content

Commit

Permalink
chore: Ease goerli restrictions (dm) (#4537)
Browse files Browse the repository at this point in the history
* fix: Ensure single asset exits hidden for edge case (#4522)

* 1.131.1

* fix: Remove selected token tag from filters (#4524)

* 1.131.2

* Add wusdm to stakable

* 1.131.3

* add gauges

* 1.131.4

* chore: Add Gyro pools to pools list (#4529)

* 1.131.5

* add beets pool

* 1.131.6

* chore: Allow pool creation on goerli

* chore: Allow progress if goerli

---------

Co-authored-by: Automated Version Bump <[email protected]>
Co-authored-by: ZeKraken <[email protected]>
Co-authored-by: Tritium <[email protected]>
Co-authored-by: Zen-Maxi <[email protected]>
  • Loading branch information
5 people authored Nov 7, 2023
1 parent 16deca8 commit 4e76aaf
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 9 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@balancer/frontend-v2",
"version": "1.131.4",
"version": "1.131.6",
"engines": {
"node": "=16",
"npm": ">=8"
Expand Down
3 changes: 2 additions & 1 deletion src/components/cards/CreatePool/ChooseWeights.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { useTokens } from '@/providers/tokens.provider';
import { bnum } from '@/lib/utils';
import { configService } from '@/services/config/config.service';
import useWeb3 from '@/services/web3/useWeb3';
import { isGoerli } from '@/composables/useNetwork';
const emit = defineEmits(['update:height', 'trigger:alert']);
Expand Down Expand Up @@ -102,7 +103,7 @@ const isProceedDisabled = computed(() => {
if (Number(totalAllocatedWeight.value) !== 100) return true;
if (seedTokens.value.length < 2) return true;
if (zeroWeightToken.value) return true;
if (hasUnlistedToken.value) return true;
if (hasUnlistedToken.value && !isGoerli.value) return true;
return false;
});
Expand Down
11 changes: 7 additions & 4 deletions src/components/contextual/pages/pool/PoolActionsCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
usePoolHelpers,
deprecatedDetails,
} from '@/composables/usePoolHelpers';
import useNetwork from '@/composables/useNetwork';
import useNetwork, { isGoerli } from '@/composables/useNetwork';
import { Pool } from '@/services/pool/types';
import useWeb3 from '@/services/web3/useWeb3';
Expand Down Expand Up @@ -62,14 +62,17 @@ const _hasNonApprovedRateProviders = computed(() => {
);
});
const joinDisabled = computed(
(): boolean =>
const joinDisabled = computed((): boolean => {
if (isGoerli.value) return false;
return (
!!deprecatedDetails(props.pool.id) ||
isJoinsDisabled(props.pool.id) ||
_hasNonApprovedRateProviders.value ||
isMigratablePool(props.pool) ||
shouldDisableJoins.value
);
);
});
</script>

<template>
Expand Down
3 changes: 2 additions & 1 deletion src/composables/pools/usePoolCreation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import useWeb3 from '@/services/web3/useWeb3';
import { useTokens } from '@/providers/tokens.provider';
import { PoolType } from '@balancer-labs/sdk';
import { wNativeAssetAddress } from '../usePoolHelpers';
import { isGoerli } from '../useNetwork';

export const POOL_CREATION_STATE_VERSION = '1.0';
export const POOL_CREATION_STATE_KEY = 'poolCreationState';
Expand Down Expand Up @@ -423,7 +424,7 @@ export default function usePoolCreation() {
}

async function createPool(): Promise<TransactionResponse> {
if (hasUnlistedToken.value) {
if (hasUnlistedToken.value && !isGoerli.value) {
throw new Error('Invalid pool creation due to unlisted tokens.');
}
const provider = getProvider();
Expand Down
1 change: 1 addition & 0 deletions src/lib/config/optimism/pools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const pools: Pools = {
'0x00b82bc5edea6e5e6c77635e31a1a25aad99f881000200000000000000000105', // OVN/wUSD
'0xd6e5824b54f64ce6f1161210bc17eebffc77e031000100000000000000000006', // OP/BEETS/BAL
'0x39965c9dab5448482cf7e002f583c812ceb53046000100000000000000000003', // WETH/OP/USDC
'0xc1f46ce83439886f0ea9c21512b36e7e67239d2c000200000000000000000108', // beets/reth
],
},
Factories: {
Expand Down

1 comment on commit 4e76aaf

@vercel
Copy link

@vercel vercel bot commented on 4e76aaf Nov 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.