Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix scheme & add token #73

Merged
merged 1 commit into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/graphql/subgraph/vault/vaultQuery.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ query Vault($address: ID!) {
vault(id: $address) {
address: id
performance: score
apy
admin
isErc20
imageUrl
Expand All @@ -21,9 +22,8 @@ query Vault($address: ID!) {
tokenSymbol
feeRecipient
validatorsRoot
blocklistManager
weeklyApy
blocklistCount
whitelistCount
blocklistManager
}
}
2 changes: 1 addition & 1 deletion src/methods/vault/requests/getVault/modifyVault.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('modifyVault', () => {
tokenName: 'mockToken',
createdAt: '1693395816',
displayName: 'Mock Vault',
weeklyApy: '2.80',
apy: '2.80',
blocklistCount: '0',
whitelistCount: '0',
totalAssets: '150000000000',
Expand Down
4 changes: 2 additions & 2 deletions src/methods/vault/requests/getVault/modifyVault.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const modifyVault = (input: ModifyVaultInput): ModifiedVault => {
feeRecipient,
blocklistCount,
whitelistCount,
weeklyApy,
apy,
...rest
} = vault

Expand All @@ -41,7 +41,7 @@ const modifyVault = (input: ModifyVaultInput): ModifiedVault => {
totalAssets: formatEther(totalAssets),
feeRecipient: getAddress(feeRecipient),
vaultKeysManager: getAddress(keysManager),
apy: Number(weeklyApy),
apy: Number(apy),
blocklistCount: Number(blocklistCount),
whitelistCount: Number(whitelistCount),
whitelister: vault.whitelister ? getAddress(vault.whitelister) : '',
Expand Down
2 changes: 1 addition & 1 deletion src/methods/vault/requests/getVault/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { VaultQueryPayload } from '../../../../graphql/subgraph/vault'

export type ModifiedVault = Omit<
VaultQueryPayload['vault'],
'admin' | 'address' | 'mevEscrow' | 'keysManager' | 'weeklyApy' | 'performance' | 'createdAt' | 'blocklistCount' | 'whitelistCount'
'admin' | 'address' | 'mevEscrow' | 'keysManager' | 'apy' | 'performance' | 'createdAt' | 'blocklistCount' | 'whitelistCount'
> & {
apy: number
createdAt: number
Expand Down
1 change: 1 addition & 0 deletions src/utils/configs/gnosis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export default {
mintToken: ZeroAddress,
v2RewardToken: '0x6aC78efae880282396a335CA2F79863A1e6831D4',
v2StakedToken: '0xA4eF9Da5BA71Cc0D2e5E877a910A37eC43420445',
strk: ZeroAddress,
},
base: {
keeper: ZeroAddress,
Expand Down
3 changes: 3 additions & 0 deletions src/utils/configs/goerli.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { ZeroAddress } from 'ethers'

import tokens from '../constants/tokens'


Expand Down Expand Up @@ -29,6 +31,7 @@ export default {
mintToken: '0xBcF097a3d3D846934694C47058A3cc9D5A6f7457',
v2RewardToken: '0x826f88d423440c305D9096cC1581Ae751eFCAfB0',
v2StakedToken: '0x221D9812823DBAb0F1fB40b0D294D9875980Ac19',
strk: ZeroAddress,
},
base: {
keeper: '0x893ceb1cF23475defE3747670EbE4b40e629c6fD',
Expand Down
1 change: 1 addition & 0 deletions src/utils/configs/holesky.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export default {
mintToken: '0xF603c5A3F774F05d4D848A9bB139809790890864',
v2RewardToken: ZeroAddress,
v2StakedToken: ZeroAddress,
strk: '0xe8a222D887b468a71Ee8a27df4fa3b886A4B7BA1',
},
base: {
keeper: '0xB580799Bf7d62721D1a523f0FDF2f5Ed7BA4e259',
Expand Down
3 changes: 3 additions & 0 deletions src/utils/configs/mainnet.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { ZeroAddress } from 'ethers'

import tokens from '../constants/tokens'


Expand Down Expand Up @@ -29,6 +31,7 @@ export default {
mintToken: '0xf1C9acDc66974dFB6dEcB12aA385b9cD01190E38',
v2RewardToken: '0x20BC832ca081b91433ff6c17f85701B6e92486c5',
v2StakedToken: '0xFe2e637202056d30016725477c5da089Ab0A043A',
strk: ZeroAddress,
},
base: {
keeper: '0x6B5815467da09DaA7DC83Db21c9239d98Bb487b5',
Expand Down
Loading