Skip to content

Commit

Permalink
feat: add fraxtal and mode networks (dm) (#5872)
Browse files Browse the repository at this point in the history 
* 1.144.28

* 1.144.29

* Update pools.ts (#5660)

* 1.144.30

* chore: Init (#5661)

* 1.144.31

* chore: Add 50USDC-50USDT pool to polygon allowlist

* 1.144.32

* chore: Add 33WMATIC-33WETH-33PORIGON pool to polygon allowlist (#5665)

Co-authored-by: balopco <[email protected]>

* 1.144.33

* chore: Add 33WETH-33$KABOSUCHAN-33DOG pool to base allowlist

* 1.144.34

* chore: Add 50GNO-50GNOBBY pool to gnosis-chain allowlist (#5669)

Co-authored-by: Xeonus <[email protected]>

* 1.144.35

* weekly gauges (#5670)

* weekly gauges

* Update pools.ts

* Update pools.ts

* 1.144.36

* chore: Add 50USDC-50USDT pool to polygon allowlist

* chore: Add 33GOLD-33USDC-33WETH pool to ethereum allowlist

* 1.144.37

* chore: Add 50DOG-50USDbC pool to base allowlist

* 1.144.38

* 1.144.39

* chore: Add 10WMATIC-10WBTC-10GHST-30STARV4-40STAR-L/StarSeeds_Protocol pool to polygon allowlist

* chore: Add 50EAV-50USDT pool to polygon allowlist

* Update pools.ts (#5678)

* Update pools.ts

* Update pools.ts

* 1.144.40

* chore: Add 24WMATIC-8GHST-SS-16USDC-16GHST-8USD-SS-8STARV4-12WETH-8MATIC-SS/StarSeeds_Protocol pool to polygon allowlist

* chore: Add 12WMATIC-10AIMX-10BONSAI-12USD-SS-18STARV4-12WETH-16STAR-L-10OM/StarSeeds_Protocol pool to polygon allowlist

* chore: Add 15WMATIC-15GHST-SS-12AI-15USDC-15STARV4-10BULL-10STAR-L-8SFL/StarSeeds_Protocol pool to polygon allowlist

* chore: Add 51WETH-49USDC pool to base allowlist

* chore: Add 50WETH-50USDC pool to base allowlist

* chore: Add 45DAI-55USDC pool to base allowlist

* chore: Add 45WETH-55USDC pool to base allowlist

* chore: Add 43WETH-57DAI pool to base allowlist

* chore: Add 47WETH-53USDC pool to base allowlist

* 1.144.41

* 1.144.42

* 1.144.43

* 1.144.44

* chore: Add 56WETH-44USDC pool to base allowlist

* 1.144.45

* 1.144.46

* 1.144.47

* 1.144.48

* 1.144.49

* 1.144.50

* 1.144.51

* 1.144.52

* chore: Add 51WETH-49USDC pool to base allowlist

* 1.144.53

* chore: Add 46WETH-54USDC pool to base allowlist

* chore: Add 40WETH-60DAI pool to base allowlist

* 1.144.54

* 1.144.55

* chore: Add 40WMATIC-8GHST-SS-8USD-SS-12STARV4-8STAR-L-8MATIC-SS-8BTC-SS-8ETH-SS/StarSeeds_Protocol pool to polygon allowlist

* chore: Add 8GHST-SS-8USD-SS-12STARV4-8STAR-L-8MATIC-SS-8BTC-SS-8ETH-SS-40SFL/StarSeeds_Protocol pool to polygon allowlist

* chore: Add ETHx/wstETH pool to arbitrum allowlist (#5707)

Co-authored-by: balopco <[email protected]>

* 1.144.56

* 1.144.57

* 1.144.58

* chore: Increase Kelp points (#5720)

* 1.144.59

* chore: Update points (#5721)

* 1.144.60

* chore: update sdk version

* chore: Add 8GHST-SS-40USDC-8USD-SS-12STARV4-8STAR-L-8MATIC-SS-8BTC-SS-8ETH-SS/StarSeeds_Protocol pool to polygon allowlist (#5698)

Co-authored-by: balopco <[email protected]>
Co-authored-by: Alberto Gualis <[email protected]>

* 1.144.61

* chore: Add 8GHST-SS-40AIMX-8USD-SS-12STARV4-8STAR-L-8MATIC-SS-8BTC-SS-8ETH-SS/StarSeeds_Protocol pool to polygon allowlist (#5705)

Co-authored-by: balopco <[email protected]>
Co-authored-by: ZeKraken <[email protected]>

* 1.144.62

* chore: Add 8GHST-SS-8USD-SS-12STARV4-40WETH-8STAR-L-8MATIC-SS-8BTC-SS-8ETH-SS/StarSeeds_Protocol pool to polygon allowlist (#5699)

Co-authored-by: balopco <[email protected]>
Co-authored-by: ZeKraken <[email protected]>

* 1.144.63

* chore: Add 8GHST-SS-40GHST-8USD-SS-12STARV4-8STAR-L-8MATIC-SS-8BTC-SS-8ETH-SS/StarSeeds_Protocol pool to polygon allowlist (#5700)

Co-authored-by: balopco <[email protected]>
Co-authored-by: ZeKraken <[email protected]>

* 1.144.64

* chore: Add 8GHST-SS-40BONSAI-8USD-SS-12STARV4-8STAR-L-8MATIC-SS-8BTC-SS-8ETH-SS/StarSeeds_Protocol pool to polygon allowlist (#5701)

Co-authored-by: balopco <[email protected]>
Co-authored-by: ZeKraken <[email protected]>

* 1.144.65

* chore: Add 8GHST-SS-8USD-SS-12STARV4-8STAR-L-8MATIC-SS-8BTC-SS-40OM-8ETH-SS/StarSeeds_Protocol pool to polygon allowlist (#5702)

Co-authored-by: balopco <[email protected]>
Co-authored-by: ZeKraken <[email protected]>

* 1.144.66

* chore: Add 8GHST-SS-8USD-SS-12STARV4-40BULL-8STAR-L-8MATIC-SS-8BTC-SS-8ETH-SS/StarSeeds_Protocol pool to polygon allowlist (#5704)

Co-authored-by: balopco <[email protected]>
Co-authored-by: ZeKraken <[email protected]>

* 1.144.67

* chore: Add 8GHST-SS-40AI-8USD-SS-12STARV4-8STAR-L-8MATIC-SS-8BTC-SS-8ETH-SS/StarSeeds_Protocol pool to polygon allowlist (#5703)

Co-authored-by: balopco <[email protected]>
Co-authored-by: ZeKraken <[email protected]>

* 1.144.68

* chore: Add Vinu Farm pool to polygon allowlist (#5738)

Co-authored-by: balopco <[email protected]>

* 1.144.69

* chore: Add wBTC/wETH/USDC pool to polygon allowlist (#5739)

Co-authored-by: balopco <[email protected]>
Co-authored-by: ZeKraken <[email protected]>

* 1.144.70

* Update pools.ts

* 1.144.71

* Update to latest version (beta 19)

* 1.144.72

* chore: Add 33USDC-33USDGLO-33SBC pool to polygon allowlist (#5770)

Co-authored-by: balopco <[email protected]>

* 1.144.73

* chore: Add 20WMATIC-10GHST-SS-10USD-SS-15STARV4-15STAR-L-10MATIC-SS-10BTC-SS-10ETH-SS/StarSeeds_Protocol pool to polygon allowlist (#5759)

Co-authored-by: balopco <[email protected]>
Co-authored-by: ZeKraken <[email protected]>

* 1.144.74

* chore: Add 10GHST-SS-20USDC-10USD-SS-15STARV4-15STAR-L-10MATIC-SS-10BTC-SS-10ETH-SS/StarSeeds_Protocol pool to polygon allowlist (#5760)

Co-authored-by: balopco <[email protected]>
Co-authored-by: ZeKraken <[email protected]>

* 1.144.75

* chore: Add 10GHST-SS-20GHST-10USD-SS-15STARV4-15STAR-L-10MATIC-SS-10BTC-SS-10ETH-SS/StarSeeds_Protocol pool to polygon allowlist (#5761)

Co-authored-by: balopco <[email protected]>
Co-authored-by: ZeKraken <[email protected]>

* 1.144.76

* chore: Add 10GHST-SS-10USD-SS-15STARV4-20RAW-15STAR-L-10MATIC-SS-10BTC-SS-10ETH-SS/StarSeeds_Protocol pool to polygon allowlist (#5764)

Co-authored-by: balopco <[email protected]>
Co-authored-by: ZeKraken <[email protected]>

* 1.144.77

* chore: Add 10GHST-SS-20AI-10USD-SS-15STARV4-15STAR-L-10MATIC-SS-10BTC-SS-10ETH-SS/StarSeeds_Protocol pool to polygon allowlist (#5769)

Co-authored-by: balopco <[email protected]>
Co-authored-by: ZeKraken <[email protected]>

* 1.144.78

* chore: Add 20WMATIC-80RAW/StarSeeds_Protocol pool to polygon allowlist (#5765)

Co-authored-by: balopco <[email protected]>
Co-authored-by: ZeKraken <[email protected]>

* 1.144.79

* chore: Add RDNT-WETH pool to base allowlist (#5758)

Co-authored-by: balopco <[email protected]>

* 1.144.80

* Update pools.ts

* 1.144.81

* chore: Update error message (#5782)

* 1.144.82

* chore: Remove pool allowlisting (#5722)

* chore: Init

* chore: Fix tests

* delete: deprecated unit test

---------

Co-authored-by: Alberto Gualis <[email protected]>

* 1.144.83

* chore: Replace TRM with hypernative (#5787)

* 1.144.84

* chore: Add 50WBTC-50USDC pool to polygon allowlist

* chore: Update points meta (#5793)

* 1.144.85

* Polygon-stakable-tripools

Making these stakable for direct wMATIC incentives
https://app.balancer.fi/#/polygon/pool/0x4b7586a4f49841447150d3d92d9e9e000f766c30000000000000000000000e8a
and
https://app.balancer.fi/#/polygon/pool/0x1dcea0bfbbe6848f117640d534c9b60f41b9f2a8000100000000000000000ea1

* 1.144.86

* Update rateProviders.ts

* 1.144.87

* chore: Update multiples (#5806)

* 1.144.88

* 1.144.89

* chore: Add veTHX as ve8020 pool (#5811)

* chore: Add veTHX

* chore: Add to isVe8020 conditional

* chore: Update metadata

* 1.144.90

* feat: add fraxtal and mode networks

* feat: add icons

* arb stakable (#5814)

* 1.144.91

* chore: Update multiple (#5848)

* 1.144.92

* Update pools.ts

* Update pools.ts

* Update pools.ts

* Update pools.ts

* 1.144.93

* feat: add rpc urls

* add csp v6 factory (#5852)

* 1.144.94

* chore: Add multicalls

* fix: Rate providers

* chore: Add pool type labels

* chore: Fix Frax tokens

* chore: Update mode tokens

* update graph keys

* update balancer and gauges subgraphs

* update aave subgraphs

* add blocks subgraphs

* weekly stakable (#5853)

* weekly stakable

* Update pools.ts

* 1.144.95

* fix: unit test snapshot

* 1.144.96

* Update pools.ts

* 1.144.97

* fix: old pools charts

* Make osETH pool stakable

* 1.144.98

* Add weETH/wstETH on Optimsim

* Update src/lib/config/optimism/pools.ts

* 1.144.99

* 1.144.100

* Update pools.ts

* Update pools.ts

* Update pools.ts

* 1.144.101

* Update pools.ts

* Update pools.ts

* 1.144.102

* 1.144.103

* add composable v6 to arb

* 1.144.104

* update lowercase

* fix csp v6 on arbitrum

* 1.144.105

* chore: change fraxtal subgraph urls

* fix: types

* add  composable v6 to mainnet

* 1.144.106

* add pools to stakable

* 1.144.107

* config gyro on gnosis

* 1.144.108

* chore: Update points (#5870)

* chore: Update points meta

* chore: Undo key change

* 1.144.109

* weekly stakable

* Update pools.ts

* Update pools.ts

* Update pools.ts

* Update pools.ts

* 1.144.110

* fix: Tests

---------

Co-authored-by: Automated Version Bump <[email protected]>
Co-authored-by: Alberto Gualis <[email protected]>
Co-authored-by: Xeonus <[email protected]>
Co-authored-by: balopco <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Xeonus <[email protected]>
Co-authored-by: ZeKraken <[email protected]>
Co-authored-by: Tritium <[email protected]>
Co-authored-by: Alberto Gualis <[email protected]>
Co-authored-by: Zen-Maxi <[email protected]>
Co-authored-by: jogeorgeou <[email protected]>
Co-authored-by: Anastasios <[email protected]>
Co-authored-by: Fábio Mendes <[email protected]>
Co-authored-by: mendesfabio <[email protected]>
Co-authored-by: franzns <[email protected]>
Co-authored-by: zekraken-bot <[email protected]>
  • Loading branch information
@garethfuller @agualis
@Xeonus @balopco @github-actions @zekraken-bot @Tritium-VLK @Zen-Maxi @alter-eggo @mendesfabio @franzns
17 people authored Jun 27, 2024
1 parent 4deb0c1 commit 046798e
Show file tree
Hide file tree
Showing 59 changed files with 914 additions and 274 deletions.
36 changes: 19 additions & 17 deletions package-lock.json
View file

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
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@balancer/frontend-v2",
"version": "1.144.0",
"version": "1.144.110",
"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.6-beta.14",
"@balancer-labs/sdk": "^1.1.6-beta.20",
"@balancer-labs/typechain": "^1.0.0",
"@balancer-labs/v2-deployments": "^3.2.0",
"@cowprotocol/contracts": "^1.3.1",
Expand Down
29 changes: 29 additions & 0 deletions src/assets/data/contracts/fraxtal.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"ComposableStablePoolFactory": "0x4bdCc2fb18AEb9e2d281b0278D946445070EAda7",
"ManagedPoolFactory": "0x7A2535f5fB47b8e44c02Ef5D9990588313fe8F05",
"WeightedPoolFactory": "0x9dA18982a33FD0c7051B19F0d7C76F2d5E7e017c",
"BalancerQueries": "0x4132f7AcC9dB7A6cF7BE2Dd3A9DC8b30C7E6E6c8",
"BalancerRelayer": "0xb541765F540447646A9545E0A4800A0Bacf9E13D",
"BatchRelayerLibrary": "0x662112B8CB18889e81459b92CA0f894a2ef2c1B8",
"ProtocolFeePercentagesProvider": "0xf23b4DB826DbA14c0e857029dfF076b1c0264843",
"Vault": "0xBA12222222228d8Ba445958a75a0704d566BF2C8",
"Authorizer": "0xE39B5e3B6D74016b2F6A9673D7d7493B6DF549d5",
"AuthorizerAdaptor": "0x36caC20dd805d128c1a6Dd16eeA845C574b5A17C",
"AuthorizerAdaptorEntrypoint": "0xb9F8AB3ED3F3aCBa64Bc6cd2DcA74B7F38fD7B88",
"AuthorizerWithAdaptorValidation": "0x6817149cb753BF529565B4D023d7507eD2ff4Bc0",
"ChildChainGauge": "0x4fb47126Fa83A8734991E41B942Ac29A3266C968",
"ChildChainGaugeFactory": "0xc3ccacE87f6d3A81724075ADcb5ddd85a8A1bB68",
"L2LayerZeroBridgeForwarder": "0xa523f47A933D5020b23629dDf689695AA94612Dc",
"ProtocolFeesCollector": "0xce88686553686DA562CE7Cea497CE749DA109f9F",
"ProtocolFeesWithdrawer": "0x85a80afee867aDf27B50BdB7b76DA70f1E853062",
"VotingEscrowDelegationProxy": "0xE3881627B8DeeBCCF9c23B291430a549Fc0bE5F7",
"BalancerHelpers": "0x8E9aa87E45e92bad84D5F8DD1bff34Fb92637dE9",
"BatchRelayerQueryLibrary": "0x4DdFc173C8F67808AE8F7913DccFfa6bdBFE5b0e",
"ChainlinkRateProviderFactory": "0x3f170631ed9821Ca51A59D996aB095162438DC10",
"GaugeWorkingBalanceHelper": "0x83E443EF4f9963C77bd860f94500075556668cb8",
"L2BalancerPseudoMinter": "0x9805dcfD25e6De36bad8fe9D3Fe2c9b44B764102",
"MockLiquidityBootstrappingPool": "0xaeace3B34BcA1BFe585e4B0Bb303e60e0771F139",
"NoProtocolFeeLiquidityBootstrappingPoolFactory": "0x956CCab09898C0AF2aCa5e6C229c3aD4E93d9288",
"NullVotingEscrow": "0x5cF4928a3205728bd12830E1840F7DB85c62a4B9",
"ProtocolIdRegistry": "0x9dd5Db2d38b50bEF682cE532bCca5DfD203915E1"
}
27 changes: 27 additions & 0 deletions src/assets/data/contracts/mode.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"ComposableStablePoolFactory": "0x5DbAd78818D4c8958EfF2d5b95b28385A22113Cd",
"ManagedPoolFactory": "0x043A2daD730d585C44FB79D2614F295D2d625412",
"WeightedPoolFactory": "0xc3ccacE87f6d3A81724075ADcb5ddd85a8A1bB68",
"BalancerQueries": "0x36caC20dd805d128c1a6Dd16eeA845C574b5A17C",
"BalancerRelayer": "0xb541765F540447646A9545E0A4800A0Bacf9E13D",
"BatchRelayerLibrary": "0x662112B8CB18889e81459b92CA0f894a2ef2c1B8",
"ProtocolFeePercentagesProvider": "0x85a80afee867aDf27B50BdB7b76DA70f1E853062",
"Vault": "0xBA12222222228d8Ba445958a75a0704d566BF2C8",
"Authorizer": "0xE39B5e3B6D74016b2F6A9673D7d7493B6DF549d5",
"AuthorizerAdaptor": "0xf23b4DB826DbA14c0e857029dfF076b1c0264843",
"AuthorizerAdaptorEntrypoint": "0x76578ecf9a141296Ec657847fb45B0585bCDa3a6",
"AuthorizerWithAdaptorValidation": "0x013D4382F291be5688AFBcc741Ee8A24C66B2C92",
"ChildChainGauge": "0xE3881627B8DeeBCCF9c23B291430a549Fc0bE5F7",
"ChildChainGaugeFactory": "0x4fb47126Fa83A8734991E41B942Ac29A3266C968",
"ProtocolFeesCollector": "0xce88686553686DA562CE7Cea497CE749DA109f9F",
"ProtocolFeesWithdrawer": "0x9Ac3E70dB606659Bf32D4BdFbb687AD193FD1F5B",
"VotingEscrowDelegationProxy": "0x9805dcfD25e6De36bad8fe9D3Fe2c9b44B764102",
"BalancerHelpers": "0x8E9aa87E45e92bad84D5F8DD1bff34Fb92637dE9",
"BatchRelayerQueryLibrary": "0x4DdFc173C8F67808AE8F7913DccFfa6bdBFE5b0e",
"ChainlinkRateProviderFactory": "0x96484f2aBF5e58b15176dbF1A799627B53F13B6d",
"L2BalancerPseudoMinter": "0x5cF4928a3205728bd12830E1840F7DB85c62a4B9",
"MockLiquidityBootstrappingPool": "0x197868C915E50cD7eB34EB2F56009E0BF9aa09EB",
"NoProtocolFeeLiquidityBootstrappingPoolFactory": "0xE42FFA682A26EF8F25891db4882932711D42e467",
"NullVotingEscrow": "0x9dd5Db2d38b50bEF682cE532bCca5DfD203915E1",
"ProtocolIdRegistry": "0xb9F8AB3ED3F3aCBa64Bc6cd2DcA74B7F38fD7B88"
}
1 change: 1 addition & 0 deletions src/assets/images/icons/networks/fraxtal.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/images/icons/networks/mode.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 32 additions & 22 deletions src/components/contextual/pages/pool/PoolChart.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,15 +240,19 @@ function getFeesData(
isAllTimeSelected: boolean,
pariodLastSnapshotIdx: number
) {
const feesValues = periodSnapshots.map(
(snapshot, idx): readonly [string, number] => {
const feesValues = periodSnapshots
.map((snapshot, idx) => {
const value = parseFloat(snapshot.swapFees);
let prevValue: number;
// get value of prev snapshot
// if it is last value among all snapshots, then prev value is 0
if (idx === snapshotValues.value.length - 1) {
prevValue = 0;
if (isAllTimeSelected) {
return;
} else {
prevValue = 0;
}
} // if it is last value among certain period snapshots, then we get prev value from all snapshots
else if (idx === pariodLastSnapshotIdx) {
prevValue = parseFloat(snapshotValues.value[idx + 1].swapFees);
Expand All @@ -261,8 +265,8 @@ function getFeesData(
value - prevValue,
]);
return result;
}
);
})
.filter(Boolean) as (readonly [string, number])[];
// add 0 values in order to show chart properly
if (periodSnapshots.length < 30) {
Expand Down Expand Up @@ -296,23 +300,29 @@ function getVolumeData(
isAllTimeSelected: boolean,
pariodLastSnapshotIdx: number
): PoolChartData {
const volumeData = periodSnapshots.map((snapshot, idx) => {
const value = parseFloat(snapshot.swapVolume);
let prevValue: number;
// get value of prev snapshot
if (idx === snapshotValues.value.length - 1) {
prevValue = 0;
} else if (idx === pariodLastSnapshotIdx) {
prevValue = parseFloat(snapshotValues.value[idx + 1].swapVolume);
} else {
prevValue = parseFloat(periodSnapshots[idx + 1].swapVolume);
}
return Object.freeze<[string, number]>([
timestamps.value[idx],
value - prevValue,
]);
});
const volumeData = periodSnapshots
.map((snapshot, idx) => {
const value = parseFloat(snapshot.swapVolume);
let prevValue: number;
// get value of prev snapshot
if (idx === snapshotValues.value.length - 1) {
if (isAllTimeSelected) {
return;
} else {
prevValue = 0;
}
} else if (idx === pariodLastSnapshotIdx) {
prevValue = parseFloat(snapshotValues.value[idx + 1].swapVolume);
} else {
prevValue = parseFloat(periodSnapshots[idx + 1].swapVolume);
}
return Object.freeze<[string, number]>([
timestamps.value[idx],
value - prevValue,
]);
})
.filter(Boolean) as (readonly [string, number])[];
// add 0 values in order to show chart properly
if (periodSnapshots.length < 30) {
Expand Down
24 changes: 18 additions & 6 deletions src/components/contextual/pages/vebal/LMVoting/GaugesTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,14 @@ function getPickedTokens(tokens: VotingPool['tokens']) {
)
.map(item => item.address);
}
function voteDisabledFor(pool: VotingPool): boolean {
return (
hasUserVotes(pool) ||
isVotingTimeLocked(pool.lastUserVoteTime) ||
props.selectVotesDisabled
);
}
</script>

<template>
Expand All @@ -210,7 +218,9 @@ function getPickedTokens(tokens: VotingPool['tokens']) {
:square="upToLargeBreakpoint"
:isPaginated="isPaginated"
:href="{ getHref: gauge => getPoolExternalUrl(gauge) }"
:onRowClick="redirectToPool"
:onRowClick="
(pool, inNewTab) => !voteDisabledFor(pool) && toggleSelection(pool)
"
:getTableRowClass="getTableRowClass"
:initialState="{
sortColumn: 'nextPeriodVotes',
Expand Down Expand Up @@ -279,6 +289,12 @@ function getPickedTokens(tokens: VotingPool['tokens']) {
v-if="getIsGaugeExpired(pool.gauge.address)"
class="ml-2"
/>
<BalIcon
name="arrow-up-right"
size="sm"
class="ml-2 text-gray-500 hover:text-blue-500 transition-colors"
@click="redirectToPool(pool, true)"
/>
</div>
</template>
<template #nextPeriodVotesCell="pool: VotingPool">
Expand Down Expand Up @@ -327,11 +343,7 @@ function getPickedTokens(tokens: VotingPool['tokens']) {
name="expiredGaugesFilter"
noMargin
:modelValue="isSelected(pool)"
:disabled="
hasUserVotes(pool) ||
isVotingTimeLocked(pool.lastUserVoteTime) ||
selectVotesDisabled
"
:disabled="voteDisabledFor(pool)"
@click.stop
@input="toggleSelection(pool)"
/>
Expand Down
4 changes: 3 additions & 1 deletion src/components/contextual/pages/vebal/LMVoting/composables/useLMVotingFilters.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,5 +101,7 @@ it('calculates networkFilters', async () => {
expiredGauges
);

expect(networkFilters).toEqual([1, 10, 100, 137, 1101, 8453, 42161, 43114]);
expect(networkFilters).toEqual([
1, 10, 100, 137, 252, 1101, 8453, 42161, 43114,
]);
});
20 changes: 4 additions & 16 deletions src/components/pool/PoolPageHeader.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,24 +310,12 @@ function symbolFor(titleTokenIndex: number): string {
</BalAlert>
<BalAlert
v-if="
disableJoinsReason.requiresAllowListing ||
disableJoinsReason.nonAllowedWeightedPoolAfterTimestamp
"
type="warning"
:title="$t('requiresAllowListing1')"
v-if="disableJoinsReason.isBlocked"
type="error"
:title="$t('blockedPool')"
class="mt-2"
block
>
{{ $t('Click') }}
<a
href="https://github.com/balancer/frontend-v2/wiki/How-tos#add-a-new-pool"
target="_blank"
class="underline"
>{{ $t('here') }}</a
>
{{ $t('requiresAllowListing2') }}
</BalAlert>
/>
</template>
<style scoped>
.pool-title {
Expand Down
2 changes: 1 addition & 1 deletion src/components/web3/SanctionedWalletModal.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function onClose() {
>
<p class="pb-3 text-sm">
Your wallet address cannot use this site because it has been flagged as
high risk by our compliance partner, TRM Labs.
high risk by our compliance partner, Hypernative.
</p>
<p class="pb-3 text-sm">
This website is open source and permissionless. Anyone can fork and run
Expand Down
2 changes: 1 addition & 1 deletion src/components/web3/ThirdPartyServicesModal.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const services = [
'the-graph',
'fathom-analytics',
'appzi',
'TRM-labs',
'hypernative',
'sentry',
'amazon-web-services',
];
Expand Down
13 changes: 12 additions & 1 deletion src/composables/queries/usePoolSnapshotsQuery.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { PoolSnapshots } from '@/services/pool/types';

import useNetwork from '../useNetwork';
import usePoolQuery from './usePoolQuery';
import { oneDayInMs } from '../useTime';

type QueryOptions = QueryObserverOptions<PoolSnapshots>;

Expand Down Expand Up @@ -47,10 +48,20 @@ export default function usePoolSnapshotsQuery(
if (!pool.value && !storedPool) throw new Error('No pool');

const createTime = storedPool?.createTime || pool.value?.createTime || 0;

const nowTimestap = new Date().getTime();
const thousandDaysInMs = 1000 * oneDayInMs;

let timestamp = Math.floor((nowTimestap - thousandDaysInMs) / 1000);

if (timestamp < createTime) {
timestamp = createTime;
}

return await balancerSubgraphService.poolSnapshots.get({
where: {
pool: id.toLowerCase(),
timestamp_gt: createTime,
timestamp_gt: timestamp,
},
});
};
Expand Down
Loading

0 comments on commit 046798e

Please sign in to comment.