Skip to content

Commit

Permalink
Merge pull request #3858 from balancer/release/1.117.0
Browse files Browse the repository at this point in the history
Release 1.117.0
  • Loading branch information
timjrobinson authored Aug 3, 2023
2 parents 1eaa1e5 + 8cc6318 commit 3d8fb09
Show file tree
Hide file tree
Showing 13 changed files with 314 additions and 14 deletions.
18 changes: 9 additions & 9 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@balancer/frontend-v2",
"version": "1.116.22",
"version": "1.117.0",
"engines": {
"node": "=16",
"npm": ">=8"
Expand Down Expand Up @@ -42,7 +42,7 @@
"devDependencies": {
"@aave/protocol-js": "^4.3.0",
"@balancer-labs/assets": "github:balancer-labs/assets#master",
"@balancer-labs/sdk": "^1.1.4-beta.7",
"@balancer-labs/sdk": "^1.1.4-beta.8",
"@balancer-labs/typechain": "^1.0.0",
"@balancer-labs/v2-deployments": "^3.2.0",
"@cowprotocol/contracts": "^1.3.1",
Expand Down
70 changes: 70 additions & 0 deletions src/assets/data/contracts/base.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"AaveLinearPoolFactory": "0x687b8C9b41E01Be8B591725fac5d5f52D0564d79",
"Authorizer": "0x809B79b53F18E9bc08A961ED4678B901aC93213a",
"AuthorizerAdaptor": "0x6CaD2ea22BFA7F4C14Aae92E47F510Cd5C509bc7",
"AuthorizerAdaptorEntrypoint": "0x9129E834e15eA19b6069e8f08a8EcFc13686B8dC",
"AuthorizerWithAdaptorValidation": "0xA69E0Ccf150a29369D8Bbc0B3f510849dB7E8EEE",
"BalancerHelpers": "0x8E9aa87E45e92bad84D5F8DD1bff34Fb92637dE9",
"BalancerQueries": "0x300Ab2038EAc391f26D9F895dc61F8F66a548833",
"BalancerRelayer": "0x76f7204B62f554b79d444588EDac9dfA7032c71a",
"BalancerPoolDataQueries": "0x6B1Da720Be2D11d95177ccFc40A917c2688f396c",
"BatchRelayerLibrary": "0xDF9B5B00Ef9bca66e9902Bd813dB14e4343Be025",
"ChainlinkRateProviderFactory": "0x0A973B6DB16C2ded41dC91691Cc347BEb0e2442B",
"ChildChainGauge": "0x59562f93c447656F6E4799fC1FC7c3d977C3324F",
"ChildChainGaugeFactory": "0x2498A2B0d6462d2260EAC50aE1C3e03F4829BA95",
"ChildChainGaugeRewardHelper": "",
"ChildChainGaugeWorkingBalanceHelper": "",
"ChildChainGaugeTokenAdder": "",
"ChildChainLiquidityGaugeFactory": "",
"ChildChainStreamer": "",
"CircuitBreakerLib": "0xEF454a7B3f965D3f6723E462405246f8Cd865425",
"ComposableStablePoolFactory": "0x8df317a729fcaA260306d7de28888932cb579b88",
"DoubleEntrypointFixRelayer": "",
"ERC4626LinearPoolFactory": "0x161f4014C27773840ccb4EC1957113e6DD028846",
"ExternalWeightedMath": "0x7920BFa1b2041911b354747CA7A6cDD2dfC50Cfd",
"GaugeWorkingBalanceHelper": "0xa7d524046ef89de9F8e4f2d7B029f66cCB738d48",
"GearboxLinearPoolFactory": "0x9Dd32684176638D977883448A4c914311c07bd62",
"InvestmentPoolFactory": "",
"L2BalancerPseudoMinter": "0xc7E5ED1054A24Ef31D827E6F86caA58B3Bc168d7",
"L2LayerZeroBridgeForwarder": "0x8eA89804145c007e7D226001A96955ad53836087",
"LiquidityBootstrappingPoolFactory": "",
"ManagedPoolAddRemoveTokenLib": "0xb19382073c7A0aDdbb56Ac6AF1808Fa49e377B75",
"ManagedPoolAmmLib": "0x7d2248F194755DCa9A1887099394F39476d28C9a",
"ManagedPoolFactory": "0x9a62C91626d39D0216b3959112f9D4678E20134d",
"MerkleOrchard": "",
"MerkleRedeem": "",
"MetaStablePoolFactory": "",
"MockAaveLendingPool": "0x88ED12A90142fDBFe2a28f7d5b48927254C7e760",
"MockAaveLinearPool": "0x712e23a9B91Aa30EE7997d1c7a1a285d4C7912D1",
"MockComposableStablePool": "0x7F6E9d6a4093Af9d09bAE92d24bfE42Fc5369aE6",
"MockERC4626LinearPool": "0x1CC2E10C486Ffb7228810B9c7C183d0CD92cdF44",
"MockLiquidityBootstrappingPool": "0x71528afe250438e184b2deAF7947f0f45931DF3b",
"MockERC4626Token": "0x4638ab64022927C9bD5947607459D13f57f1551C",
"MockGearboxDieselToken": "0xb521dD5C8e13fE202626CaC98873FEA2b7760cE4",
"MockGearboxLinearPool": "0x3c28a59356B473847AAa5e0b6F561636079213A6",
"MockGearboxVault": "0x79e435875cCee3Cd9e8da23fE34F9A011d05EA6C",
"MockManagedPool": "0xE50AD96Af9370D05D3C1cE85F17C31557B29C4Ee",
"MockStaticAToken": "0x698CaED853bE9cEA96C268f565e2b61D3b2BcDA4",
"MockWeightedPool": "0xd9dbbfAA703f3C33838365aE00fE4EB22CdF8d46",
"MockYearnLinearPool": "0x369877467FC3B6774DE4E11E0c0AbBdE70Eb40FD",
"MockYearnTokenVault": "0xDBf7B9F1d2Bfba14e42709f84dda3187eE410e38",
"NoProtocolFeeLiquidityBootstrappingPoolFactory": "0x0c6052254551EAe3ECac77B01DFcf1025418828f",
"NullVotingEscrow": "0x475D18169BE8a89357A9ee3Ab00ca386d20fA229",
"PoolRecoveryHelper": "0x03F3Fb107e74F2EAC9358862E91ad3c692712054",
"ProtocolFeePercentagesProvider": "0xDEd7Fef7D8eCdcB74F22f0169e1A9EC696e6695d",
"ProtocolFeesCollector": "0xce88686553686DA562CE7Cea497CE749DA109f9F",
"ProtocolFeesWithdrawer": "0xAcf05BE5134d64d150d153818F8C67EE36996650",
"ProtocolIdRegistry": "0x682f0dDBFd41D1272982f64a499Fb62d80e27589",
"QueryProcessor": "",
"RecoveryModeHelper": "0x313a8D36b1d90a4cba3A505fDc3480C3870bE053",
"RewardsOnlyGauge": "",
"StablePhantomPoolFactory": "",
"StablePoolFactory": "",
"TestBalancerToken": "0xA1Fa945425eD2e08Acb932E000bCc2f21B21588A",
"UnbuttonAaveLinearPoolFactory": "",
"Vault": "0xBA12222222228d8Ba445958a75a0704d566BF2C8",
"VotingEscrowDelegationProxy": "0xD87F44Df0159DC78029AB9CA7D7e57E7249F5ACD",
"WeightedPool2TokensFactory": "",
"WeightedPoolFactory": "0x4C32a8a8fDa4E24139B51b456B42290f51d6A1c4",
"YearnLinearPoolFactory": "0x44d33798dddCdAbc93Fe6a40C80588033Dc502d3"
}
4 changes: 2 additions & 2 deletions src/components/contextual/pages/pool/staking/StakePreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const { isMismatchedNetwork } = useWeb3();
const {
isActionConfirmed,
confirmationReceipt,
isLoadingApprovalsForGauge,
isLoading,
currentShares,
stakeActions,
totalUserPoolSharePct,
Expand Down Expand Up @@ -84,7 +84,7 @@ const assetRowWidth = computed(
v-if="!isActionConfirmed"
:actions="stakeActions"
:primaryActionType="action"
:isLoading="isLoadingApprovalsForGauge"
:isLoading="isLoading"
:disabled="isStakeAndZero || isMismatchedNetwork"
@success="handleSuccess"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export function useStakePreview(props: StakePreviewProps, emit) {
const { addTransaction } = useTransactions();
const { getTokenApprovalActions } = useTokenApprovalActions();
const {
isLoading: isPoolStakingLoading,
stake,
unstake,
stakedShares,
Expand Down Expand Up @@ -98,6 +99,10 @@ export function useStakePreview(props: StakePreviewProps, emit) {
},
]);

const isLoading = computed(
() => isLoadingApprovalsForGauge.value || isPoolStakingLoading.value
);

/**
* METHODS
*/
Expand Down Expand Up @@ -190,7 +195,7 @@ export function useStakePreview(props: StakePreviewProps, emit) {
//state
isActionConfirmed,
confirmationReceipt,
isLoadingApprovalsForGauge,
isLoading,
currentShares,
stakeActions,
totalUserPoolSharePct,
Expand Down
30 changes: 30 additions & 0 deletions src/lib/config/base/contracts.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { Contracts } from '../types';
import * as base from '@/assets/data/contracts/base.json';

const contracts: Contracts = {
merkleRedeem: '',
merkleOrchard: '',
merkleOrchardV2: base.MerkleOrchard,
multicall: '0xca11bde05977b3631167028862be2a173976ca11',
authorizer: '',
vault: base.Vault,
weightedPoolFactory: base.WeightedPoolFactory,
stablePoolFactory: '',
lidoRelayer: '',
balancerHelpers: base.BalancerHelpers,
batchRelayer: base.BalancerRelayer,
gaugeFactory: base.ChildChainLiquidityGaugeFactory,
balancerMinter: base.L2BalancerPseudoMinter,
gaugeController: '',
tokenAdmin: '',
veBAL: '',
veDelegationProxy: '',
veBALHelpers: '',
feeDistributor: '',
feeDistributorDeprecated: '',
faucet: '',
gaugeRewardsHelper: base.ChildChainGaugeRewardHelper,
gaugeWorkingBalanceHelper: base.ChildChainGaugeWorkingBalanceHelper,
};

export default contracts;
75 changes: 75 additions & 0 deletions src/lib/config/base/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import { Config } from '../types';
import keys from './keys';
import contracts from './contracts';
import pools from './pools';
import tokenlists from './tokenlists';
import tokens from './tokens';
import rateProviders from './rateProviders';

const config: Config = {
key: '8453',
chainId: 8453,
chainName: 'Base',
name: 'Base',
shortName: 'Base',
monorepoName: 'base',
slug: 'base',
network: 'base',
trustWalletNetwork: 'base',
unknown: false,
visibleInUI: false,
testNetwork: false,
rpc: `https://developer-access-mainnet.base.org`,
ws: ``,
publicRpc: 'https://developer-access-mainnet.base.org',
explorer: 'https://basescan.org/',
explorerName: 'BaseScan',
subgraph:
'https://api.studio.thegraph.com/query/24660/balancer-base-v2/version/latest',
balancerApi: 'https://api.balancer.fi',
poolsUrlV2: '',
subgraphs: {
main: [
'https://api.studio.thegraph.com/query/24660/balancer-base-v2/version/latest',
],
aave: '',
gauge:
'https://api.studio.thegraph.com/query/24660/balancer-gauges-base/version/latest',
blocks:
'https://api.studio.thegraph.com/query/48427/bleu-base-blocks/version/latest',
},
bridgeUrl: 'bridge.base.org',
supportsEIP1559: false,
supportsElementPools: false,
supportsVeBalSync: false,
blockTime: 2,
nativeAsset: {
name: 'Ether',
address: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
symbol: 'ETH',
decimals: 18,
deeplinkId: 'ether',
logoURI: 'tokens/eth.png',
minTransactionBuffer: '0.05',
},
thirdParty: {
coingecko: {
nativeAssetId: 'ethereum',
platformId: 'base',
},
},
addresses: {
...contracts,
},
pools,
tokens,
keys,
gauges: {
type: 3,
weight: 0,
},
tokenlists,
rateProviders,
};

export default config;
5 changes: 5 additions & 0 deletions src/lib/config/base/keys.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { Keys } from '../types';

const keys: Keys = {};

export default keys;
71 changes: 71 additions & 0 deletions src/lib/config/base/pools.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import { Pools } from '@/types/pools';

const pools: Pools = {
IdsMap: {},
Pagination: {
PerPage: 10,
PerPool: 10,
PerPoolInitial: 5,
},
BoostsEnabled: true,
DelegateOwner: '0xba1ba1ba1ba1ba1ba1ba1ba1ba1ba1ba1ba1ba1b',
ZeroAddress: '0x0000000000000000000000000000000000000000',
DynamicFees: {
Gauntlet: [],
},
BlockList: [''],
IncludedPoolTypes: [
'Weighted',
'Stable',
'MetaStable',
'LiquidityBootstrapping',
'Investment',
'StablePhantom',
'ComposableStable',
],
Stable: {
AllowList: [
'0x6fbfcf88db1aada31f34215b2a1df7fafb4883e900000000000000000000000c', // stabal3
],
},
Investment: {
AllowList: [],
},
Weighted: {
// Only effective after given timestamp here: usePool.ts#createdAfterTimestamp
// see useDisabledJoinPool.ts#nonAllowedWeightedPoolAfterTimestamp for logic.
AllowList: [
'0xcde67b70e8144d7d2772de59845b3a67266c2ca7000200000000000000000009', // BAL/DAI
'0x868f0efc81a6c1df16298dcc82f7926b9099946b00020000000000000000000b', // Bald/weth
'0x2db50a0e0310723ef0c2a165cb9a9f80d772ba2f00020000000000000000000d', // Weth/stabal3
],
},
Factories: {
'0x4C32a8a8fDa4E24139B51b456B42290f51d6A1c4': 'weightedPool', // Weighted V5
'0x8df317a729fcaA260306d7de28888932cb579b88': 'composableStablePool', // ComposableStable V5
},
Stakable: {
VotingGaugePools: [],
AllowList: [],
},
Metadata: {
'0x6fbfcf88db1aada31f34215b2a1df7fafb4883e900000000000000000000000c': {
name: 'Balancer Stable USD',
hasIcon: false,
},
'0x2db50a0e0310723ef0c2a165cb9a9f80d772ba2f00020000000000000000000d': {
name: 'WETH/Balancer Stable USD',
hasIcon: false,
},
},
Deep: [
'0x2db50a0e0310723ef0c2a165cb9a9f80d772ba2f00020000000000000000000d', // Weth/stabal
],
Deprecated: {},
GaugeMigration: {},
BoostedApr: [],
DisabledJoins: [],
Issues: {},
};

export default pools;
9 changes: 9 additions & 0 deletions src/lib/config/base/rateProviders.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { RateProviders } from '../types';

const rateProviders: RateProviders = {
'*': {
'0x0000000000000000000000000000000000000000': true,
},
};

export default rateProviders;
11 changes: 11 additions & 0 deletions src/lib/config/base/tokenlists.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { TokenListURLMap } from '@/types/TokenList';

const tokenlists: TokenListURLMap = {
Balancer: {
Allowlisted:
'https://raw.githubusercontent.com/balancer/tokenlists/main/generated/balancer.tokenlist.json',
},
External: [],
};

export default tokenlists;
Loading

1 comment on commit 3d8fb09

@vercel
Copy link

@vercel vercel bot commented on 3d8fb09 Aug 3, 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.