From 1b1d75896534eb605c2f7f2946277cff65e239e5 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Tue, 27 Jun 2023 19:42:24 +1000 Subject: [PATCH 01/11] Remove docker and test networks --- src/lib/config/docker/contracts.ts | 27 ------ src/lib/config/docker/index.ts | 101 ---------------------- src/lib/config/docker/tokens.ts | 21 ----- src/lib/config/index.ts | 8 +- src/lib/config/test/index.ts | 134 ----------------------------- src/lib/config/test/keys.ts | 8 -- src/lib/config/types.ts | 2 +- 7 files changed, 2 insertions(+), 299 deletions(-) delete mode 100644 src/lib/config/docker/contracts.ts delete mode 100644 src/lib/config/docker/index.ts delete mode 100644 src/lib/config/docker/tokens.ts delete mode 100644 src/lib/config/test/index.ts delete mode 100644 src/lib/config/test/keys.ts diff --git a/src/lib/config/docker/contracts.ts b/src/lib/config/docker/contracts.ts deleted file mode 100644 index 59a75880ce..0000000000 --- a/src/lib/config/docker/contracts.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { Contracts } from '../types'; - -const contracts: Contracts = { - merkleRedeem: '', - merkleOrchard: '', - merkleOrchardV2: '', - multicall: '0xfe17B701A8F44D9D18D4f83dB71Bf9442D0003f1', - authorizer: '0x6Bff77238256fFF717e5Cc9A96640dC0D068b14D', - vault: '0x293f6758Fe4a4343E367Ac8E6A697eC6315fBEd7', - weightedPoolFactory: '0xE48Aae4178612fdF77af25C83fa1099491A8AD1B', - stablePoolFactory: '0xb4F97F452D71C3bba3c30c554305A7250c08b23A', - lidoRelayer: '', - balancerHelpers: '', - batchRelayer: '', - veBAL: '', - gaugeController: '', - gaugeFactory: '', - balancerMinter: '', - tokenAdmin: '', - veDelegationProxy: '', - veBALHelpers: '', - feeDistributor: '', - feeDistributorDeprecated: '', - faucet: '', -}; - -export default contracts; diff --git a/src/lib/config/docker/index.ts b/src/lib/config/docker/index.ts deleted file mode 100644 index bb9b74609b..0000000000 --- a/src/lib/config/docker/index.ts +++ /dev/null @@ -1,101 +0,0 @@ -import { Config } from '../types'; -import contracts from './contracts'; -import tokens from './tokens'; - -const config: Config = { - key: '17', - chainId: 17, - chainName: 'Ethereum', - name: 'Docker localhost 8545', - shortName: 'dockerLocalhost', - slug: 'docker', - network: 'docker localhost', - unknown: false, - visibleInUI: false, - testNetwork: true, - rpc: 'http://localhost:8545', - ws: 'ws://localhost:8546', - explorer: '', - explorerName: '', - subgraph: 'http://localhost:8000/subgraphs/name/balancer-labs/balancer-v2', - poolsUrlV2: '', - subgraphs: { - main: ['http://localhost:8000/subgraphs/name/balancer-labs/balancer-v2'], - aave: '', - gauge: '', - blocks: '', - }, - bridgeUrl: '', - supportsEIP1559: false, - blockTime: 12, - nativeAsset: { - name: 'Ether', - address: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', - symbol: 'ETH', - decimals: 18, - deeplinkId: 'ether', - logoURI: 'tokens/eth.png', - minTransactionBuffer: '0.05', - }, - thirdParty: { - coingecko: { - nativeAssetId: 'ethereum', - platformId: 'ethereum', - }, - }, - addresses: { - ...contracts, - }, - gauges: { - type: 1, - weight: 100, - }, - pools: { - IdsMap: {}, - Pagination: { - PerPage: 10, - PerPool: 10, - PerPoolInitial: 5, - }, - BoostsEnabled: false, - DelegateOwner: '', - ZeroAddress: '', - DynamicFees: { - Gauntlet: [], - }, - BlockList: [], - IncludedPoolTypes: [], - Stable: { - AllowList: [], - }, - Investment: { - AllowList: [], - }, - Weighted: { - AllowList: [], - }, - Factories: {}, - Stakable: { - VotingGaugePools: [], - AllowList: [], - }, - Metadata: {}, - Deep: [], - BoostedApr: [], - DisabledJoins: [], - BrandedRedirect: {}, - }, - tokens, - keys: {}, - supportsElementPools: false, - tokenlists: { - Balancer: { - Default: '', - Vetted: '', - }, - External: [], - }, - rateProviders: {}, -}; - -export default config; diff --git a/src/lib/config/docker/tokens.ts b/src/lib/config/docker/tokens.ts deleted file mode 100644 index 6558a7c79e..0000000000 --- a/src/lib/config/docker/tokens.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { TokenConstants } from '../types'; - -const tokens: TokenConstants = { - Popular: { - Symbols: ['WBTC', 'DAI', 'USDC', 'BAL', 'AAVE', 'WETH'], - }, - InitialSwapTokens: { - input: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', - output: '0x6B175474E89094C44Da98b954EedeAC495271d0F', - }, - Addresses: { - nativeAsset: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', - wNativeAsset: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', - WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', - BAL: '0xba100000625a3754423978a60c9317c58a424e3d', - bbaUSD: '0x7B50775383d3D6f0215A8F290f2C9e2eEBBEceb2', - bbaUSDv2: '0xA13a9247ea42D743238089903570127DdA72fE44', - }, -}; - -export default tokens; diff --git a/src/lib/config/index.ts b/src/lib/config/index.ts index fc964b3f3c..28b8332a0a 100644 --- a/src/lib/config/index.ts +++ b/src/lib/config/index.ts @@ -1,14 +1,12 @@ import { Config } from './types'; import arbitrum from './arbitrum'; -import docker from './docker'; import goerli from './goerli'; +import gnosisChain from './gnosis-chain'; import mainnet from './mainnet'; import optimism from './optimism'; import polygon from './polygon'; -import gnosisChain from './gnosis-chain'; import zkevm from './zkevm'; -import test from './test'; // We don't import Network from sdk to avoid extra bundle size when loading app (while the SDK is not tree-shakable) export enum Network { @@ -34,10 +32,6 @@ const config: Record = { [Network.OPTIMISM]: optimism, [Network.GNOSIS]: gnosisChain, [Network.ZKEVM]: zkevm, - // @ts-ignore - 12345: test, - // @ts-ignore - 17: docker, }; export default config; diff --git a/src/lib/config/test/index.ts b/src/lib/config/test/index.ts deleted file mode 100644 index 7b76064c44..0000000000 --- a/src/lib/config/test/index.ts +++ /dev/null @@ -1,134 +0,0 @@ -import { Config } from '../types'; -import keys from './keys'; - -const config: Config = { - key: '12345', - chainId: 12345, - chainName: 'test', - name: 'test', - shortName: 'test', - slug: 'test', - network: 'test', - unknown: false, - visibleInUI: false, - testNetwork: true, - rpc: `https://mainnet.infura.io/v3/${keys.infura}`, - ws: 'ws://balancer.fi:1234', - explorer: 'https://etherscan.io', - explorerName: 'Etherscan', - subgraph: 'https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-v2', - poolsUrlV2: - 'https://storageapi.fleek.co/johngrantuk-team-bucket/poolsV2.json', - subgraphs: { - main: ['https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-v2'], - aave: '', - gauge: '', - blocks: '', - }, - bridgeUrl: '', - supportsEIP1559: true, - supportsElementPools: true, - blockTime: 12, - nativeAsset: { - name: 'Ether', - address: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', - symbol: 'ETH', - decimals: 18, - deeplinkId: 'ether', - logoURI: 'tokens/eth.png', - minTransactionBuffer: '0.05', - }, - thirdParty: { - coingecko: { - nativeAssetId: 'ethereum', - platformId: 'ethereum', - }, - }, - addresses: { - merkleRedeem: '0x6d19b2bF3A36A61530909Ae65445a906D98A2Fa8', - merkleOrchard: '', - multicall: '0xeefba1e63905ef1d7acba5a8513c70307c1ce441', - authorizer: '0xA331D84eC860Bf466b4CdCcFb4aC09a1B43F3aE6', - vault: '0xBA12222222228d8Ba445958a75a0704d566BF2C8', - weightedPoolFactory: '0x8E9aa87E45e92bad84D5F8DD1bff34Fb92637dE9', - stablePoolFactory: '0xc66Ba2B6595D3613CCab350C886aCE23866EDe24', - lidoRelayer: '', - balancerHelpers: '0x5aDDCCa35b7A0D07C74063c48700C8590E87864E', - batchRelayer: '', - gaugeFactory: '', - balancerMinter: '', - gaugeController: '', - tokenAdmin: '', - veBAL: '', - veDelegationProxy: '', - veBALHelpers: '', - feeDistributor: '', - feeDistributorDeprecated: '', - faucet: '', - }, - keys, - gauges: { - type: 1, - weight: 100, - }, - pools: { - IdsMap: {}, - Pagination: { - PerPage: 10, - PerPool: 10, - PerPoolInitial: 5, - }, - BoostsEnabled: true, - DelegateOwner: '', - ZeroAddress: '', - DynamicFees: { - Gauntlet: [], - }, - BlockList: [], - IncludedPoolTypes: [], - Stable: { - AllowList: [], - }, - Investment: { - AllowList: [], - }, - Weighted: { - AllowList: [], - }, - Factories: {}, - Stakable: { - VotingGaugePools: [], - AllowList: [], - }, - Deep: [], - BoostedApr: [], - Metadata: {}, - DisabledJoins: [], - BrandedRedirect: {}, - }, - tokens: { - Popular: { - Symbols: [], - }, - InitialSwapTokens: { - input: '', - output: '', - }, - Addresses: { - nativeAsset: '', - wNativeAsset: '', - WETH: '', - BAL: '', - }, - }, - tokenlists: { - Balancer: { - Default: '', - Vetted: '', - }, - External: [], - }, - rateProviders: {}, -}; - -export default config; diff --git a/src/lib/config/test/keys.ts b/src/lib/config/test/keys.ts deleted file mode 100644 index 0785f6131b..0000000000 --- a/src/lib/config/test/keys.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Keys } from '../types'; - -const keys: Keys = { - infura: 'daaa68ec242643719749dd1caba2fc66', - alchemy: 'cQGZUiTLRCFsQS7kbRxPJK4eH4fTTu88', -}; - -export default keys; diff --git a/src/lib/config/types.ts b/src/lib/config/types.ts index 4df53defe4..a9612f48f4 100644 --- a/src/lib/config/types.ts +++ b/src/lib/config/types.ts @@ -68,7 +68,7 @@ export interface Keys { export interface Config { key: string; - chainId: Network | 12345 | 17; + chainId: Network; chainName: string; name: string; shortName: string; From 46a5799d3954ea7954e95813afd458b9cd7f7591 Mon Sep 17 00:00:00 2001 From: dakotajakiser <31942806+dakotajakiser@users.noreply.github.com> Date: Wed, 28 Jun 2023 07:16:43 -0600 Subject: [PATCH 02/11] Update pools.ts removed two experimental pools that are not longer in use. --- src/lib/config/polygon/pools.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib/config/polygon/pools.ts b/src/lib/config/polygon/pools.ts index c68a5ed744..03af1efa02 100644 --- a/src/lib/config/polygon/pools.ts +++ b/src/lib/config/polygon/pools.ts @@ -114,8 +114,6 @@ const pools: Pools = { '0x9841438683c2efbfb28c94ec341544b94e4f6dd5000100000000000000000b8f', // WBTC/USDC/PAXG/WETH '0x945f337307ea76fdaa2590d083423850f64e247f000100000000000000000b98', // 27wstETH-7WMATIC-25WBTC-7USDC-18stMATIC-8WETH-8DAI '0xd7786ac3f9071ddacaf9a5b0bf443c58f8d6cf67000100000000000000000ba8', // 25MKR-25WETH-25DAI-25NEX - '0x7f6a9b65cf1fc091b0e012c2908f0f711dfc95b5000200000000000000000bab', // 80mooMvxMVLP-20wUSDR - '0xed35f28f837e96f81240ebb82e0e3f518c7e8a2f000100000000000000000bb5', // STARV2-SuperPoolV1 ], }, Factories: { From e71f63bb680525ff7a1aa772c89674aecca3179e Mon Sep 17 00:00:00 2001 From: AGAToken <69120271+AGAToken@users.noreply.github.com> Date: Wed, 28 Jun 2023 09:11:20 -0700 Subject: [PATCH 03/11] Update pools.ts Added AGA/AGAr/wstETH/stMATIC/USDC Pool --- src/lib/config/polygon/pools.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/config/polygon/pools.ts b/src/lib/config/polygon/pools.ts index c68a5ed744..e9c0f2ccb0 100644 --- a/src/lib/config/polygon/pools.ts +++ b/src/lib/config/polygon/pools.ts @@ -116,6 +116,7 @@ const pools: Pools = { '0xd7786ac3f9071ddacaf9a5b0bf443c58f8d6cf67000100000000000000000ba8', // 25MKR-25WETH-25DAI-25NEX '0x7f6a9b65cf1fc091b0e012c2908f0f711dfc95b5000200000000000000000bab', // 80mooMvxMVLP-20wUSDR '0xed35f28f837e96f81240ebb82e0e3f518c7e8a2f000100000000000000000bb5', // STARV2-SuperPoolV1 + '0xe93a1e6fb57d2e2be40377841a6477cfe1ef55c2000100000000000000000bbb', // AGA/AGAR/WSTETH/STMATIC/USDC ], }, Factories: { From e9654aeefa06a6db0c968b5355be84b98f3e8f44 Mon Sep 17 00:00:00 2001 From: Ser Lancelot Date: Wed, 28 Jun 2023 12:15:35 -0600 Subject: [PATCH 04/11] feat: add 50weth-50fief pool --- src/lib/config/mainnet/pools.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/config/mainnet/pools.ts b/src/lib/config/mainnet/pools.ts index ce940c5100..817dde57aa 100644 --- a/src/lib/config/mainnet/pools.ts +++ b/src/lib/config/mainnet/pools.ts @@ -142,6 +142,7 @@ const pools: Pools = { '0x4729f67394030472e853cb61954fe784bfb36c3b000100000000000000000569', // 25WBTC-50USDC-25WETH '0xd8721e92ba0f8235b375e9ec9a7b697ec4e2d6c6000200000000000000000575', // 80BIDS-20WETH '0x911fc393355fe415a667893d55fff6703c57c72e000200000000000000000574', // 50ETHx-50WETH + '0x8334215586e93ee85e3f1a281eaf66e52015754d00020000000000000000057e', // 50WETH-50FIEF ], }, Factories: { From 36436a7da0d17fff551e4add3fa9e44fb34b5362 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Fri, 30 Jun 2023 23:29:05 +1000 Subject: [PATCH 05/11] Fix allowance validation when staking in gauges (#3595) * Revert "Hotfix - remove post validation" * Fix approving BPT spending with Gauges When staking a user must allow a gauge to spend their token. However when we check for user allowances we only check for tokens the vault can spend, not the allowances for gauges. By allowing injecting a spender we can inject the gauge into the spenders list which then fetches allowances for it when then makes it able to correctly tell if the user has allowed the gauge to spend their BPT. This fixes the post approval check always failing when staking BPT. * Fake injectSpender function to avoid onchain calls during unit testing * fix: Don't fetch allowances twice --------- Co-authored-by: Alberto Gualis Co-authored-by: Gareth Fuller --- .../_global/BalActionSteps/BalActionSteps.vue | 29 +++++++++--------- .../approvals/useTokenApprovalActions.ts | 8 +++-- .../queries/useAllowancesQuery.spec.ts | 4 +-- .../__mocks__/tokens.provider.fake.ts | 8 ++++- src/providers/tokens.provider.ts | 30 +++++++++++++++---- 5 files changed, 52 insertions(+), 27 deletions(-) diff --git a/src/components/_global/BalActionSteps/BalActionSteps.vue b/src/components/_global/BalActionSteps/BalActionSteps.vue index a4a9778403..04ebb407c5 100644 --- a/src/components/_global/BalActionSteps/BalActionSteps.vue +++ b/src/components/_global/BalActionSteps/BalActionSteps.vue @@ -213,10 +213,9 @@ function handleSignAction(state: TransactionActionState) { async function handleTransaction( tx: TransactionResponse, state: TransactionActionState, - // eslint-disable-next-line @typescript-eslint/no-unused-vars actionInfo: TransactionActionInfo ): Promise { - // const { postActionValidation, actionInvalidReason } = actionInfo; + const { postActionValidation, actionInvalidReason } = actionInfo; await txListener(tx, { onTxConfirmed: async (receipt: TransactionReceipt) => { @@ -230,21 +229,21 @@ async function handleTransaction( state.confirming = false; - // const isValid = await postActionValidation?.(); - // if (isValid || !postActionValidation) { - const confirmedAt = await getTxConfirmedAt(receipt); - state.confirmedAt = dateTimeLabelFor(confirmedAt); - state.confirmed = true; - if (currentActionIndex.value >= actions.value.length - 1) { - emit('success', { receipt, confirmedAt: state.confirmedAt }); + const isValid = await postActionValidation?.(); + if (isValid || !postActionValidation) { + const confirmedAt = await getTxConfirmedAt(receipt); + state.confirmedAt = dateTimeLabelFor(confirmedAt); + state.confirmed = true; + if (currentActionIndex.value >= actions.value.length - 1) { + emit('success', { receipt, confirmedAt: state.confirmedAt }); + } else { + currentActionIndex.value += 1; + } } else { - currentActionIndex.value += 1; + // post action validation failed, display reason. + if (actionInvalidReason) state.error = actionInvalidReason; + state.init = false; } - // } else { - // // post action validation failed, display reason. - // if (actionInvalidReason) state.error = actionInvalidReason; - // state.init = false; - // } }, onTxFailed: () => { state.confirming = false; diff --git a/src/composables/approvals/useTokenApprovalActions.ts b/src/composables/approvals/useTokenApprovalActions.ts index 076635b639..b9a781223c 100644 --- a/src/composables/approvals/useTokenApprovalActions.ts +++ b/src/composables/approvals/useTokenApprovalActions.ts @@ -37,7 +37,7 @@ export default function useTokenApprovalActions() { /** * COMPOSABLES */ - const { refetchAllowances, approvalsRequired, approvalRequired, getToken } = + const { approvalsRequired, approvalRequired, getToken, injectSpenders } = useTokens(); const { t } = useI18n(); const { getSigner } = useWeb3(); @@ -89,7 +89,8 @@ export default function useTokenApprovalActions() { amountsToApprove: AmountToApprove[], spender: string ): Promise { - await refetchAllowances(); + await injectSpenders([spender]); + return approvalsRequired(amountsToApprove, spender); } @@ -97,7 +98,8 @@ export default function useTokenApprovalActions() { amountToApprove: AmountToApprove, spender: string ): Promise { - await refetchAllowances(); + await injectSpenders([spender]); + return !approvalRequired( amountToApprove.address, amountToApprove.amount, diff --git a/src/composables/queries/useAllowancesQuery.spec.ts b/src/composables/queries/useAllowancesQuery.spec.ts index b4fb334f82..1fbd0e67b2 100644 --- a/src/composables/queries/useAllowancesQuery.spec.ts +++ b/src/composables/queries/useAllowancesQuery.spec.ts @@ -35,14 +35,14 @@ test('Returns token allowances from balancer SDK', async () => { initMulticall(generateMulticallMock(processCall)); - const allowanceContracts = ref([ + const spenders = ref([ '0xBA12222222228d8Ba445958a75a0704d566BF2C8', '0x6320cD32aA674d2898A68ec82e869385Fc5f7E2f', '0x33A99Dcc4C85C014cf12626959111D5898bbCAbF', ]); const { result } = mountComposable(() => - useAllowancesQuery(tokens, allowanceContracts) + useAllowancesQuery(tokens, spenders) ); const data = await waitForQueryData(result); diff --git a/src/providers/__mocks__/tokens.provider.fake.ts b/src/providers/__mocks__/tokens.provider.fake.ts index 7befb06514..5dccf14708 100644 --- a/src/providers/__mocks__/tokens.provider.fake.ts +++ b/src/providers/__mocks__/tokens.provider.fake.ts @@ -39,7 +39,7 @@ silenceConsoleLog(vi, message => message.startsWith('Fetching')); export interface TokensProviderState { loading: boolean; injectedTokens: TokenInfoMap; - allowanceContracts: string[]; + spenders: string[]; injectedPrices: TokenPrices; } @@ -89,6 +89,11 @@ export const fakeTokensProvider = ( /** * METHODS */ + async function injectSpenders(addresses: string[]): Promise { + //TODO: add logic test scenarios using spenders in a more realistic way + return Promise.resolve(); + } + /** * Fetch price for a token */ @@ -147,6 +152,7 @@ export const fakeTokensProvider = ( refetchBalances, refetchAllowances, hasBalance, + injectSpenders, priceFor, balanceFor, getMaxBalanceFor, diff --git a/src/providers/tokens.provider.ts b/src/providers/tokens.provider.ts index d0d3dcd903..43c394f86a 100644 --- a/src/providers/tokens.provider.ts +++ b/src/providers/tokens.provider.ts @@ -53,7 +53,7 @@ const { uris: tokenListUris } = tokenListService; export interface TokensProviderState { loading: boolean; injectedTokens: TokenInfoMap; - allowanceContracts: string[]; + spenders: string[]; injectedPrices: TokenPrices; } @@ -87,7 +87,7 @@ export const tokensProvider = ( const state: TokensProviderState = reactive({ loading: true, injectedTokens: {}, - allowanceContracts: compact([ + spenders: compact([ networkConfig.addresses.vault, networkConfig.tokens.Addresses.wstETH, configService.network.addresses.veBAL, @@ -173,7 +173,7 @@ export const tokensProvider = ( isRefetching: allowanceQueryRefetching, isError: allowancesQueryError, refetch: refetchAllowances, - } = useAllowancesQuery(tokens, toRef(state, 'allowanceContracts')); + } = useAllowancesQuery(tokens, toRef(state, 'spenders')); const prices = computed( (): TokenPrices => (priceData.value ? priceData.value : {}) @@ -278,6 +278,21 @@ export const tokensProvider = ( await forChange(onchainDataLoading, false); } + /** + * Injects contract addresses that could possibly spend the users tokens into + * the spenders map. E.g. This is used for injecting gauges into the map as they + * must be allowed to spend a users BPT in order to stake the BPT in the gauge. + */ + async function injectSpenders(addresses: string[]): Promise { + addresses = addresses.filter(a => a).map(getAddress); + + state.spenders = [...new Set(state.spenders.concat(addresses))]; + + // Wait for balances/allowances to be fetched for newly injected tokens. + await nextTick(); + await forChange(onchainDataLoading, false); + } + /** * Given query, filters tokens map by name, symbol or address. * If address is provided, search for address in tokens or injectToken @@ -344,14 +359,16 @@ export const tokensProvider = ( function approvalRequired( tokenAddress: string, amount: string, - contractAddress = networkConfig.addresses.vault + spenderAddress = networkConfig.addresses.vault ): boolean { if (!amount || bnum(amount).eq(0)) return false; - if (!contractAddress) return false; + if (!spenderAddress) return false; if (isSameAddress(tokenAddress, nativeAsset.address)) return false; const allowance = bnum( - (allowances.value[contractAddress] || {})[getAddress(tokenAddress)] + (allowances.value[getAddress(spenderAddress)] || {})[ + getAddress(tokenAddress) + ] ); return allowance.lt(amount); } @@ -510,6 +527,7 @@ export const tokensProvider = ( refetchBalances, refetchAllowances, injectTokens, + injectSpenders, searchTokens, hasBalance, approvalRequired, From 078e4e0f0cb6f8d855fa852ab003236b700817e4 Mon Sep 17 00:00:00 2001 From: Gareth Fuller Date: Sat, 1 Jul 2023 13:42:52 +0100 Subject: [PATCH 06/11] fix: Bump sdk version --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8ad92ff8f7..ae94f2b756 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@aave/protocol-js": "^4.3.0", "@balancer-labs/assets": "github:balancer-labs/assets#master", - "@balancer-labs/sdk": "^1.1.2-beta.1", + "@balancer-labs/sdk": "^1.1.3-beta.0", "@balancer-labs/typechain": "^1.0.0", "@balancer-labs/v2-deployments": "^3.2.0", "@cowprotocol/contracts": "^1.3.1", @@ -1520,9 +1520,9 @@ } }, "node_modules/@balancer-labs/sdk": { - "version": "1.1.2-beta.1", - "resolved": "https://registry.npmjs.org/@balancer-labs/sdk/-/sdk-1.1.2-beta.1.tgz", - "integrity": "sha512-8FI/usnlqracnvqOI04lvJQyZlHaX24k9LNR4Bt7XZWuX4wgbcHf1aUhwCM9ebvKf5RVqiV+5ZOFTXB/kqh2NQ==", + "version": "1.1.3-beta.0", + "resolved": "https://registry.npmjs.org/@balancer-labs/sdk/-/sdk-1.1.3-beta.0.tgz", + "integrity": "sha512-7QZbD1kB75x8Q30YOVhpVDDpwbKrpTdi/kQIZUQW9Z6jLSetsfVDrz+NTEBQguyO2dwLOTSwxfFBaU/2qs9L5Q==", "dev": true, "dependencies": { "@balancer-labs/sor": "4.1.1-beta.9", @@ -25487,9 +25487,9 @@ } }, "@balancer-labs/sdk": { - "version": "1.1.2-beta.1", - "resolved": "https://registry.npmjs.org/@balancer-labs/sdk/-/sdk-1.1.2-beta.1.tgz", - "integrity": "sha512-8FI/usnlqracnvqOI04lvJQyZlHaX24k9LNR4Bt7XZWuX4wgbcHf1aUhwCM9ebvKf5RVqiV+5ZOFTXB/kqh2NQ==", + "version": "1.1.3-beta.0", + "resolved": "https://registry.npmjs.org/@balancer-labs/sdk/-/sdk-1.1.3-beta.0.tgz", + "integrity": "sha512-7QZbD1kB75x8Q30YOVhpVDDpwbKrpTdi/kQIZUQW9Z6jLSetsfVDrz+NTEBQguyO2dwLOTSwxfFBaU/2qs9L5Q==", "dev": true, "requires": { "@balancer-labs/sor": "4.1.1-beta.9", diff --git a/package.json b/package.json index eca9e2cb39..81baa32d52 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "devDependencies": { "@aave/protocol-js": "^4.3.0", "@balancer-labs/assets": "github:balancer-labs/assets#master", - "@balancer-labs/sdk": "^1.1.2-beta.1", + "@balancer-labs/sdk": "^1.1.3-beta.0", "@balancer-labs/typechain": "^1.0.0", "@balancer-labs/v2-deployments": "^3.2.0", "@cowprotocol/contracts": "^1.3.1", From fe7e7c6a4f694371c0d233d0419e9e776fa20912 Mon Sep 17 00:00:00 2001 From: Gareth Fuller Date: Sat, 1 Jul 2023 13:42:58 +0100 Subject: [PATCH 07/11] 1.109.5 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ae94f2b756..34e7e3281c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.109.4", + "version": "1.109.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.109.4", + "version": "1.109.5", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index 81baa32d52..7ecefe935c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.109.4", + "version": "1.109.5", "engines": { "node": "=16", "npm": ">=8" From 37c5d94ed79fba593adaea97a472fa4b8668afd7 Mon Sep 17 00:00:00 2001 From: Gareth Fuller Date: Sat, 1 Jul 2023 13:43:55 +0100 Subject: [PATCH 08/11] 1.109.6 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 34e7e3281c..727157de10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.109.5", + "version": "1.109.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.109.5", + "version": "1.109.6", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index 7ecefe935c..29aa532d0a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.109.5", + "version": "1.109.6", "engines": { "node": "=16", "npm": ">=8" From 7b254e64ca53ee095a063ad9a7ed8c71ff0e92e2 Mon Sep 17 00:00:00 2001 From: Gareth Fuller Date: Sat, 1 Jul 2023 13:47:47 +0100 Subject: [PATCH 09/11] 1.109.5 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 727157de10..34e7e3281c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.109.6", + "version": "1.109.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.109.6", + "version": "1.109.5", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index 29aa532d0a..7ecefe935c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.109.6", + "version": "1.109.5", "engines": { "node": "=16", "npm": ">=8" From f4640af98db877ee132ba4733dd86f2aae77877c Mon Sep 17 00:00:00 2001 From: Gareth Fuller Date: Sat, 1 Jul 2023 13:53:58 +0100 Subject: [PATCH 10/11] chore: Fix typecheck --- src/lib/config/index.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/lib/config/index.ts b/src/lib/config/index.ts index fc964b3f3c..01d2538782 100644 --- a/src/lib/config/index.ts +++ b/src/lib/config/index.ts @@ -13,12 +13,9 @@ import test from './test'; // We don't import Network from sdk to avoid extra bundle size when loading app (while the SDK is not tree-shakable) export enum Network { MAINNET = 1, - ROPSTEN = 3, - RINKEBY = 4, GOERLI = 5, GÖRLI = 5, OPTIMISM = 10, - KOVAN = 42, GNOSIS = 100, POLYGON = 137, FANTOM = 250, From 7d9226712e045a2e07355f12174533b0719b7b3e Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Mon, 3 Jul 2023 20:40:10 +1000 Subject: [PATCH 11/11] 1.110.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2e2e882c4d..b71b92fdf9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@balancer/frontend-v2", - "version": "1.109.11", + "version": "1.110.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@balancer/frontend-v2", - "version": "1.109.11", + "version": "1.110.0", "license": "MIT", "devDependencies": { "@aave/protocol-js": "^4.3.0", diff --git a/package.json b/package.json index 6994814af4..3e729cbe77 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@balancer/frontend-v2", - "version": "1.109.11", + "version": "1.110.0", "engines": { "node": "=16", "npm": ">=8"