From 1bb6ca6db7654b3b2e83fd161d16f6568ab6dc15 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Tue, 14 Nov 2023 23:35:37 +0900 Subject: [PATCH 01/22] feat: package --- 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 c57fc7c02..7f028ec3b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,7 @@ "stream-browserify": "^3.0.0", "stream-http": "^3.2.0", "tslib": "^2.3.0", - "ununifi-client": "^4.0.0-rc6", + "ununifi-client": "^4.0.0-rc7", "zone.js": "~0.11.4" }, "devDependencies": { @@ -30119,9 +30119,9 @@ } }, "node_modules/ununifi-client": { - "version": "4.0.0-rc6", - "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-4.0.0-rc6.tgz", - "integrity": "sha512-Vj0LIFtYlP2oR43P3ZJpcHp0UTYdOuypcj7UVEBQVztJiLj9+hKlZ/ZVRzaq5AN4xRbItA/VROGTBmheJkOr5A==", + "version": "4.0.0-rc7", + "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-4.0.0-rc7.tgz", + "integrity": "sha512-blgkXJdSPx+v1kmUTr8PjvlwAD5zla74eCLuNupvWwbb4+A/Q7EP0z38VxUF5J69L9ygpHqj3w05/33UTTpPLg==", "dependencies": { "axios": "^0.21.1", "protobufjs": "^6.11.2" @@ -50659,9 +50659,9 @@ "dev": true }, "ununifi-client": { - "version": "4.0.0-rc6", - "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-4.0.0-rc6.tgz", - "integrity": "sha512-Vj0LIFtYlP2oR43P3ZJpcHp0UTYdOuypcj7UVEBQVztJiLj9+hKlZ/ZVRzaq5AN4xRbItA/VROGTBmheJkOr5A==", + "version": "4.0.0-rc7", + "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-4.0.0-rc7.tgz", + "integrity": "sha512-blgkXJdSPx+v1kmUTr8PjvlwAD5zla74eCLuNupvWwbb4+A/Q7EP0z38VxUF5J69L9ygpHqj3w05/33UTTpPLg==", "requires": { "axios": "^0.21.1", "protobufjs": "^6.11.2" diff --git a/package.json b/package.json index 19a67a499..d4f568bd7 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "stream-browserify": "^3.0.0", "stream-http": "^3.2.0", "tslib": "^2.3.0", - "ununifi-client": "^4.0.0-rc6", + "ununifi-client": "^4.0.0-rc7", "zone.js": "~0.11.4" }, "devDependencies": { From ac7744b14536d2ae5e4cef99dde400d467bdcef8 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Tue, 14 Nov 2023 23:36:10 +0900 Subject: [PATCH 02/22] feat: vault creation --- .../yield-aggregator.application.service.ts | 4 +-- .../yield-aggregator.model.ts | 2 +- .../yield-aggregator.service.ts | 14 +++++----- .../vaults/create/create.component.html | 4 +-- .../vaults/create/create.component.ts | 15 ++++++----- .../vaults/create/create.component.html | 26 +++++++------------ .../vaults/create/create.component.ts | 25 +++++++++--------- 7 files changed, 44 insertions(+), 46 deletions(-) diff --git a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts index f7f3bc14d..f5d0fb561 100644 --- a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts +++ b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts @@ -125,7 +125,7 @@ export class YieldAggregatorApplicationService { async createVault( name: string, - denom: string, + symbol: string, description: string, strategies: { id: string; weight: number }[], commissionRate: number, @@ -142,7 +142,7 @@ export class YieldAggregatorApplicationService { const msg = this.yieldAggregatorService.buildMsgCreateVault( address, - denom, + symbol, name, description, strategies, diff --git a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts index 7058d68d6..44f26f70e 100644 --- a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts +++ b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts @@ -12,7 +12,7 @@ export type WithdrawFromVaultRequest = { export type CreateVaultRequest = { name: string; - denom: string; + symbol: string; description: string; strategies: { id: string; weight: number }[]; commissionRate: number; diff --git a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.service.ts b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.service.ts index 1367ae735..ba7ab366e 100644 --- a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.service.ts +++ b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.service.ts @@ -62,7 +62,7 @@ export class YieldAggregatorService { buildMsgCreateVault( senderAddress: string, - denom: string, + symbol: string, name: string, description: string, strategies: { id: string; weight: number }[], @@ -82,7 +82,7 @@ export class YieldAggregatorService { const decReserve = this.txCommonService.numberToDecString(reserveRate / 100); const msg = new ununificlient.proto.ununifi.yieldaggregator.MsgCreateVault({ sender: senderAddress, - denom: denom, + symbol: symbol, name: name, description: description, commission_rate: decCommission, @@ -119,7 +119,7 @@ export class YieldAggregatorService { mintAmount: number, ): Observable { const lpDenom = 'yieldaggregator/vaults/' + vault?.vault?.id; - const exponent = getDenomExponent(vault.vault?.denom); + const exponent = getDenomExponent(vault.vault?.symbol); const mintDenomAmount = mintAmount * Math.pow(10, exponent); const totalAmountInVault = Number(vault.total_bonded_amount) + @@ -142,7 +142,7 @@ export class YieldAggregatorService { vault: Vault200Response, burnAmount: number, ): Observable { - const denom = vault.vault?.denom; + const denom = vault.vault?.symbol; const lpDenom = 'yieldaggregator/vaults/' + vault?.vault?.id; const exponent = getDenomExponent(lpDenom); const burnDenomAmount = burnAmount * Math.pow(10, exponent); @@ -223,7 +223,7 @@ export class YieldAggregatorService { if (!vault.vault?.strategy_weights) { return { id: vault.vault?.id || '', - denom: vault.vault?.denom || '', + denom: vault.vault?.symbol || '', name: vault.vault?.name || '', description: vault.vault?.description || '', gitURL: '', @@ -240,7 +240,7 @@ export class YieldAggregatorService { const strategyInfo = config?.strategiesInfo?.find( (strategyInfo) => strategyInfo.id === strategyWeight.strategy_id && - strategyInfo.denom === vault.vault?.denom, + strategyInfo.denom === vault.vault?.symbol, ); if (!strategyInfo || !strategyInfo.poolInfo) { continue; @@ -265,7 +265,7 @@ export class YieldAggregatorService { return { id: vault.vault?.id || '', - denom: vault.vault?.denom || '', + denom: vault.vault?.symbol || '', name: vault.vault?.name || '', description: vault.vault?.description || '', gitURL: '', diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/create/create.component.html b/projects/portal/src/app/pages/yieldaggregator/vaults/create/create.component.html index b09604c62..9327f0089 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/create/create.component.html +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/create/create.component.html @@ -1,6 +1,6 @@ diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/create/create.component.ts b/projects/portal/src/app/pages/yieldaggregator/vaults/create/create.component.ts index 09c3e1eec..3c79adf24 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/create/create.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/create/create.component.ts @@ -18,7 +18,7 @@ import { StrategyAll200ResponseStrategiesInner } from 'ununifi-client/esm/openap }) export class CreateComponent implements OnInit { address$: Observable; - denom$: Observable; + symbol$: Observable; availableTokens$: Observable; strategies$: Observable; denomBalancesMap$: Observable<{ [symbol: string]: cosmosclient.proto.cosmos.base.v1beta1.ICoin }>; @@ -41,8 +41,11 @@ export class CreateComponent implements OnInit { filter((wallet): wallet is StoredWallet => wallet !== undefined && wallet !== null), map((wallet) => wallet.address), ); - this.denom$ = this.route.queryParams.pipe(map((params) => params.denom)); - this.strategies$ = this.denom$.pipe(mergeMap((denom) => this.iyaQuery.listStrategies$(denom))); + + this.symbol$ = this.route.queryParams.pipe(map((params) => params.symbol)); + // todo fix query + // this.strategies$ = this.denom$.pipe(mergeMap((denom) => this.iyaQuery.listStrategies$(denom))); + this.strategies$ = this.iyaQuery.listStrategies$(); const allStrategies$ = this.iyaQuery.listStrategies$(); this.denomBalancesMap$ = this.address$.pipe( mergeMap((address) => this.bankQuery.getDenomBalanceMap$(address)), @@ -64,11 +67,11 @@ export class CreateComponent implements OnInit { ngOnInit(): void {} - onChangeDenom(denom: string): void { + onChangeSymbol(symbol: string): void { this.router.navigate([], { relativeTo: this.route, queryParams: { - denom: denom, + symbol: symbol, }, queryParamsHandling: 'merge', }); @@ -77,7 +80,7 @@ export class CreateComponent implements OnInit { onCreate(data: CreateVaultRequest) { this.iyaApp.createVault( data.name, - data.denom, + data.symbol, data.description, data.strategies, data.commissionRate, diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.html b/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.html index 061cb1470..2049d193c 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.html +++ b/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.html @@ -30,9 +30,9 @@ [class]="{ 'select-error': assetNgModelRef.errors }" - [(ngModel)]="denom" + [(ngModel)]="symbol" name="symbol" - (change)="onChangeDenom()" + (change)="onChangeSymbol()" [disabled]="!availableTokens?.length" > - - + + @@ -309,25 +309,19 @@

What is the strategies?

-

- Strategies for {{ denomMetadataMap?.[denom || '']?.display }} -

- +

Strategies for {{ symbol }}

+

Select an asset first

 - -

- No strategy for {{ denomMetadataMap?.[denom || '']?.display }} -

+ +

No strategy for {{ symbol }}

 -
    +
    • - {{ - s.strategy?.name - }} + {{ s.strategy?.name }}
      • diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.ts b/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.ts index 03f8a4e0d..984e99c5c 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.ts +++ b/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.ts @@ -12,7 +12,7 @@ export class CreateComponent implements OnInit { @Input() address?: string | null; @Input() - denom?: string | null; + symbol?: string | null; @Input() availableTokens?: cosmosclient.proto.cosmos.bank.v1beta1.IMetadata[] | null; @Input() @@ -28,18 +28,19 @@ export class CreateComponent implements OnInit { @Input() denomMetadataMap?: { [denom: string]: cosmosclient.proto.cosmos.bank.v1beta1.IMetadata } | null; @Output() - changeDenom: EventEmitter; + changeSymbol: EventEmitter; @Output() appCreate: EventEmitter; reserveRate?: number; name?: string; + description?: string; selectedStrategies: { id?: string; name?: string; denom?: string; weight: number }[] = []; constructor() { this.reserveRate = 10; - this.changeDenom = new EventEmitter(); + this.changeSymbol = new EventEmitter(); this.appCreate = new EventEmitter(); } @@ -49,17 +50,17 @@ export class CreateComponent implements OnInit { return this.selectedStrategies.some((s) => s.id === strategyId); } - onAddStrategy(strategyId: string, strategyDenom: string) { + onAddStrategy(strategyId: string) { if (!strategyId) { return; } - if (!this.denom) { - this.changeDenom.emit(strategyDenom); - } + // if (!this.denom) { + // this.changeSymbol.emit(strategyDenom); + // } this.selectedStrategies.push({ id: strategyId, name: this.strategies?.find((s) => s.strategy?.id === strategyId)?.strategy?.name, - denom: strategyDenom, + // denom: strategyDenom, weight: this.selectedStrategies.length ? 0 : 100, }); this.selectedStrategies.sort((a, b) => a.id!.localeCompare(b.id!)); @@ -71,12 +72,12 @@ export class CreateComponent implements OnInit { this.selectedStrategies.splice(index, 1); } - onChangeDenom() { + onChangeSymbol() { this.selectedStrategies = []; - if (!this.denom) { + if (!this.symbol) { return; } - this.changeDenom.emit(this.denom); + this.changeSymbol.emit(this.symbol); } onSubmitCreate() { @@ -100,7 +101,7 @@ export class CreateComponent implements OnInit { } this.appCreate.emit({ name: this.name || '', - denom: this.denom || '', + symbol: this.symbol || '', description: this.description || '', strategies: filteredStrategies, commissionRate: Number(this.commissionRate), From 13b8c41d8efaca95a610049141a23e92a7b82249 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Tue, 14 Nov 2023 23:41:49 +0900 Subject: [PATCH 03/22] fix: strategy filter --- .../yieldaggregator/strategies/strategy/strategy.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/portal/src/app/pages/yieldaggregator/strategies/strategy/strategy.component.ts b/projects/portal/src/app/pages/yieldaggregator/strategies/strategy/strategy.component.ts index 710f7713e..33df4d403 100644 --- a/projects/portal/src/app/pages/yieldaggregator/strategies/strategy/strategy.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/strategies/strategy/strategy.component.ts @@ -51,7 +51,7 @@ export class StrategyComponent implements OnInit { map(([vaults, id, denom]) => vaults.filter((vault) => vault.vault?.strategy_weights?.find( - (strategy) => vault.vault?.denom === denom && strategy.strategy_id === id, + (strategy) => strategy.denom === denom && strategy.strategy_id === id, ), ), ), From 1a7d695152e3d4605ee783b343e970f27fd81cf6 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 15 Nov 2023 00:29:18 +0900 Subject: [PATCH 04/22] feat: vault --- .../vaults/vaults.component.ts | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/vaults.component.ts b/projects/portal/src/app/pages/yieldaggregator/vaults/vaults.component.ts index 8379cdcbf..25b1f2727 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/vaults.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/vaults.component.ts @@ -44,6 +44,7 @@ export class VaultsComponent implements OnInit { const config$ = this.configService.config$; this.keyword$ = this.route.queryParams.pipe(map((params) => params.keyword)); const denomMetadataMap$ = this.bankQuery.getDenomMetadataMap$(); + const symbolMetadataMap$ = this.bankQuery.getSymbolMetadataMap$(); const osmoPools$ = from(this.iyaService.getAllOsmoPool()); const vaultYieldMap$ = combineLatest([vaults$, config$, osmoPools$]).pipe( map(([vaults, config, pools]) => { @@ -57,12 +58,11 @@ export class VaultsComponent implements OnInit { }), ); - const availableSymbols$ = combineLatest([vaults$, denomMetadataMap$]).pipe( - map(([vaults, denomMetadataMap]) => { - const denoms = vaults - .map((vault) => vault.vault?.denom) - .filter((denom): denom is string => !!denom); - const symbols = denoms.map((denom) => denomMetadataMap[denom]?.symbol || ''); + const availableSymbols$ = vaults$.pipe( + map((vaults) => { + const symbols = vaults + .map((vault) => vault.vault?.symbol) + .filter((symbol): symbol is string => !!symbol); return [...new Set(symbols)]; }), ); @@ -91,21 +91,14 @@ export class VaultsComponent implements OnInit { } }), ); - const searchedVaults$ = combineLatest([ - certifiedVaults$, - this.keyword$, - denomMetadataMap$, - ]).pipe( - map(([vaults, keyword, denomMetadata]) => { + const searchedVaults$ = combineLatest([certifiedVaults$, this.keyword$]).pipe( + map(([vaults, keyword]) => { if (keyword) { return vaults.filter((vault) => { const hasIdMatch = vault.vault?.id && vault.vault?.id.includes(keyword); const hasOwnerMatch = vault.vault?.owner?.includes(keyword); - const hasDenomMatch = vault.vault?.denom?.includes(keyword); - const hasSymbolMatch = vault.vault?.denom - ? denomMetadata?.[vault.vault?.denom].symbol?.includes(keyword) - : false; - return hasIdMatch || hasOwnerMatch || hasDenomMatch || hasSymbolMatch; + const hasSymbolMatch = vault.vault?.symbol?.includes(keyword); + return hasIdMatch || hasOwnerMatch || hasSymbolMatch; }); } else { return vaults; @@ -118,8 +111,9 @@ export class VaultsComponent implements OnInit { vaultYieldMap$, symbolPriceMap$, denomMetadataMap$, + symbolMetadataMap$, ]).pipe( - map(([vaults, sort, yieldMap, symbolPriceMap, denomMetadataMap]) => { + map(([vaults, sort, yieldMap, symbolPriceMap, denomMetadataMap, symbolMetadataMap]) => { if (sort === 'id') { return vaults.sort((a, b) => Number(a.vault?.id) - Number(b.vault?.id)); } @@ -156,13 +150,13 @@ export class VaultsComponent implements OnInit { if (sort === 'deposit') { return vaults.sort((a, b) => { const aDeposit = this.bandProtocolService.calcDepositUSDAmount( - a.vault?.denom || '', + symbolMetadataMap[a.vault?.symbol || ''].base || '', this.depositAmount(a), symbolPriceMap, denomMetadataMap, ); const bDeposit = this.bandProtocolService.calcDepositUSDAmount( - b.vault?.denom || '', + symbolMetadataMap[a.vault?.symbol || ''].base || '', this.depositAmount(b), symbolPriceMap, denomMetadataMap, @@ -186,21 +180,27 @@ export class VaultsComponent implements OnInit { ), ), ); - this.symbols$ = combineLatest([this.vaults$, denomMetadataMap$]).pipe( - map(([vaults, denomMetadataMap]) => + this.symbols$ = combineLatest([this.vaults$, symbolMetadataMap$]).pipe( + map(([vaults, symbolMetadataMap]) => vaults.map((vault) => { - const symbol = denomMetadataMap?.[vault.vault?.denom!]?.symbol || ''; - const display = denomMetadataMap?.[vault.vault?.denom!]?.display || vault.vault?.denom!; + const symbol = vault.vault?.symbol || ''; + const display = + symbolMetadataMap?.[vault.vault?.symbol!]?.display || vault.vault?.symbol!; const img = this.bankQuery.getSymbolImageMap()[symbol] || ''; return { symbol: symbol, display: display, img: img }; }), ), ); - this.totalDeposits$ = combineLatest([this.vaults$, symbolPriceMap$, denomMetadataMap$]).pipe( - map(([vaults, symbolPriceMap, denomMetadataMap]) => + this.totalDeposits$ = combineLatest([ + this.vaults$, + symbolPriceMap$, + denomMetadataMap$, + symbolMetadataMap$, + ]).pipe( + map(([vaults, symbolPriceMap, denomMetadataMap, symbolMetadataMap]) => vaults.map((vault) => this.bandProtocolService.calcDepositUSDAmount( - vault.vault?.denom || '', + symbolMetadataMap[vault.vault?.symbol || ''].base || '', this.depositAmount(vault), symbolPriceMap, denomMetadataMap, From b64cb4c372fba7ec64ae75c3499a91215c8fe3bd Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 15 Nov 2023 00:45:19 +0900 Subject: [PATCH 05/22] feat: vault detail --- .../vaults/vault/vault.component.ts | 80 ++++++++++++------- .../vaults/vault/vault.component.html | 28 +++---- .../vaults/vault/vault.component.ts | 10 +-- 3 files changed, 66 insertions(+), 52 deletions(-) diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts b/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts index d48af631a..03bf0ebc1 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts @@ -32,7 +32,8 @@ import { export class VaultComponent implements OnInit { address$: Observable; vault$: Observable; - denom$: Observable; + denom$: Observable; + symbol$: Observable; denomBalancesMap$: Observable<{ [symbol: string]: cosmosclient.proto.cosmos.base.v1beta1.ICoin }>; denomMetadataMap$: Observable<{ [denom: string]: cosmosclient.proto.cosmos.bank.v1beta1.IMetadata; @@ -65,7 +66,7 @@ export class VaultComponent implements OnInit { ) { const vaultId$ = this.route.params.pipe(map((params) => params.vault_id)); this.vault$ = vaultId$.pipe(mergeMap((id) => this.iyaQuery.getVault$(id))); - this.denom$ = this.vault$.pipe(map((vault) => vault.vault?.denom)); + this.symbol$ = this.vault$.pipe(map((vault) => vault.vault?.symbol)); this.address$ = this.walletService.currentStoredWallet$.pipe( filter((wallet): wallet is StoredWallet => wallet !== undefined && wallet !== null), map((wallet) => wallet.address), @@ -74,12 +75,21 @@ export class VaultComponent implements OnInit { mergeMap((address) => this.bankQuery.getDenomBalanceMap$(address)), ); this.denomMetadataMap$ = this.bankQuery.getDenomMetadataMap$(); + const symbolMetadataMap$ = this.bankQuery.getSymbolMetadataMap$(); + this.denom$ = combineLatest([this.symbol$, symbolMetadataMap$]).pipe( + map(([symbol, symbolMetadataMap]) => symbolMetadataMap?.[symbol || '']?.base), + ); const timer$ = timer(0, 1000 * 60); - this.totalDepositAmount$ = combineLatest([timer$, this.vault$, this.denomMetadataMap$]).pipe( - mergeMap(([_, vault, denomMetadataMap]) => + this.totalDepositAmount$ = combineLatest([ + timer$, + this.vault$, + this.denomMetadataMap$, + this.denom$, + ]).pipe( + mergeMap(([_, vault, denomMetadataMap, denom]) => this.bandProtocolService.convertToUSDAmount( - vault.vault?.denom!, + denom || '', ( Number(vault.total_bonded_amount) + Number(vault.total_unbonding_amount) + @@ -89,50 +99,66 @@ export class VaultComponent implements OnInit { ), ), ); - this.totalBondedAmount$ = combineLatest([timer$, this.vault$, this.denomMetadataMap$]).pipe( - mergeMap(([_, vault, denomMetadataMap]) => + this.totalBondedAmount$ = combineLatest([ + timer$, + this.vault$, + this.denomMetadataMap$, + this.denom$, + ]).pipe( + mergeMap(([_, vault, denomMetadataMap, denom]) => this.bandProtocolService.convertToUSDAmount( - vault.vault?.denom!, + denom || '', vault.total_bonded_amount!, denomMetadataMap, ), ), ); - this.totalUnbondingAmount$ = combineLatest([timer$, this.vault$, this.denomMetadataMap$]).pipe( - mergeMap(([_, vault, denomMetadataMap]) => + this.totalUnbondingAmount$ = combineLatest([ + timer$, + this.vault$, + this.denomMetadataMap$, + this.denom$, + ]).pipe( + mergeMap(([_, vault, denomMetadataMap, denom]) => this.bandProtocolService.convertToUSDAmount( - vault.vault?.denom!, + denom || '', vault.total_unbonding_amount!, denomMetadataMap, ), ), ); - this.withdrawReserve$ = combineLatest([timer$, this.vault$, this.denomMetadataMap$]).pipe( - mergeMap(([_, vault, denomMetadataMap]) => + this.withdrawReserve$ = combineLatest([ + timer$, + this.vault$, + this.denomMetadataMap$, + this.denom$, + ]).pipe( + mergeMap(([_, vault, denomMetadataMap, denom]) => this.bandProtocolService.convertToUSDAmount( - vault.vault?.denom!, + denom || '', vault.withdraw_reserve!, denomMetadataMap, ), ), ); - const symbol$ = combineLatest([this.vault$, this.denomMetadataMap$]).pipe( - map(([vault, denomMetadataMap]) => denomMetadataMap?.[vault.vault?.denom!].symbol || ''), - ); - this.symbolImage$ = symbol$.pipe( + this.symbolImage$ = this.symbol$.pipe( map((symbol) => (symbol ? this.bankQuery.getSymbolImageMap()[symbol] || '' : null)), ); this.mintAmount$ = new BehaviorSubject(0); this.burnAmount$ = new BehaviorSubject(0); - this.estimatedMintAmount$ = combineLatest([this.vault$, this.mintAmount$.asObservable()]).pipe( - mergeMap(([vault, deposit]) => { + this.estimatedMintAmount$ = combineLatest([ + this.vault$, + this.mintAmount$.asObservable(), + this.denom$, + ]).pipe( + mergeMap(([vault, deposit, denom]) => { // return this.iyaService.estimateMintAmount$(vault, deposit); const id = vault.vault?.id; if (!id) { return of({ mint_amount: { amount: '0', denom: '' } }); } - const exponent = getDenomExponent(vault.vault?.denom); + const exponent = getDenomExponent(denom || ''); return this.iyaQuery.getEstimatedMintAmount$(id, (deposit * 10 ** exponent).toString()); }), ); @@ -142,10 +168,7 @@ export class VaultComponent implements OnInit { ]).pipe( mergeMap(([vault, burn]) => { // return this.iyaService.estimateRedeemAmount$(vault, burn); - const id = vault.vault?.id; - if (!id) { - return of({ redeem_amount: { amount: '0', denom: '' } }); - } + const id = vault.vault?.id || ''; const exponent = getDenomExponent('yieldaggregator/vaults/' + id); return this.iyaQuery.getEstimatedRedeemAmount$(id, (burn * 10 ** exponent).toString()); }), @@ -175,13 +198,14 @@ export class VaultComponent implements OnInit { ), ); this.usdDepositAmount$ = combineLatest([ + this.denom$, this.estimatedDepositedAmount$, this.denomMetadataMap$, ]).pipe( - mergeMap(([depositedAmount, denomMetadataMap]) => + mergeMap(([denom, depositedAmount, denomMetadataMap]) => this.bandProtocolService.convertToUSDAmount( - depositedAmount.total_amount?.denom!, - depositedAmount.total_amount?.amount!, + denom || '', + depositedAmount.total_amount || '0', denomMetadataMap, ), ), diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html index 937eae453..745603f78 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html +++ b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html @@ -178,7 +178,7 @@

      What is the bonus APY?

      $ Unknown
      - {{ estimatedDepositedAmount?.total_amount?.amount | coinAmount }} + {{ estimatedDepositedAmount?.total_amount | coinAmount }} {{ denom | coinDenom | async }}
      @@ -312,7 +312,7 @@

      Chain that you deposit from

      'input-error': depositAmountNgModelRef.errors && depositAmountNgModelRef.touched }" [min]="0" - [max]="denomBalancesMap?.[vault?.vault?.denom || '']?.amount | coinAmount: vault?.vault?.denom" + [max]="denomBalancesMap?.[denom || '']?.amount | coinAmount: vault?.vault?.symbol" pattern="^[0-9]*\.?[0-9]{0,6}$" [(ngModel)]="mintAmount" name="mintAmount" @@ -320,15 +320,13 @@

      Chain that you deposit from

      /> {{ denom | coinDenom | async }} {{ denomMetadataMap?.[vault?.vault?.denom || '']?.symbol }}.{{ - selectedChain.id - }}{{ denomMetadataMap?.[denom || '']?.symbol }}.{{ selectedChain.id }} Available balance: @@ -437,7 +435,7 @@

      What is the unbonding period?

      'input-error': withdrawAmountNgModelRef.errors && withdrawAmountNgModelRef.touched }" [min]="0" - [max]="denomBalancesMap?.['yieldaggregator/vaults/'+ vault?.vault?.id || '']?.amount | coinAmount: vault?.vault?.denom" + [max]="denomBalancesMap?.['yieldaggregator/vaults/'+ vault?.vault?.id || '']?.amount | coinAmount: denom" pattern="^[0-9]*\.?[0-9]{0,6}$" [(ngModel)]="burnAmount" name="burnAmount" @@ -462,14 +460,14 @@

      What is the unbonding period?

      {{ denom | coinDenom | async }} - Total {{ estimatedRedeemAmount?.total_amount?.amount | coinAmount }} - Fee - {{ estimatedRedeemAmount?.fee?.amount | coinAmount }} + Total {{ estimatedRedeemAmount?.total_amount | coinAmount }} - Fee + {{ estimatedRedeemAmount?.fee | coinAmount }} @@ -477,9 +475,7 @@

      What is the unbonding period?

      @@ -521,11 +517,7 @@

      diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts index 0a62a9a09..f2e4e7742 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts +++ b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts @@ -190,7 +190,8 @@ export class VaultComponent implements OnInit, OnChanges { this.appDeposit.emit({ vaultId: this.vault?.vault?.id!, readableAmount: this.mintAmount, - denom: this.vault?.vault?.denom!, + // todo select multiple denoms + denom: this.denom!, }); } @@ -205,7 +206,7 @@ export class VaultComponent implements OnInit, OnChanges { this.appWithdraw.emit({ vaultId: this.vault?.vault?.id!, readableAmount: this.burnAmount, - denom: this.vault?.vault?.denom!, + denom: this.denom!, }); } @@ -217,10 +218,7 @@ export class VaultComponent implements OnInit, OnChanges { setMintAmount(rate: number) { this.mintAmount = Number( - this.coinAmountPipe.transform( - this.denomBalancesMap?.[this.vault?.vault?.denom || ''].amount, - this.vault?.vault?.denom, - ), + this.coinAmountPipe.transform(this.denomBalancesMap?.[this.denom || ''].amount, this.denom), ) * rate; this.mintAmount = Math.floor(this.mintAmount * Math.pow(10, 6)) / Math.pow(10, 6); this.onDepositAmountChange(); From 2465d462aea7757d4531cefa742360f5d60e433b Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 15 Nov 2023 00:53:44 +0900 Subject: [PATCH 06/22] feat: deposit --- .../vaults/deposit/deposit.component.ts | 14 ++++++++------ .../vaults/deposit/deposit.component.html | 5 +---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts b/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts index cae790e38..0dd995355 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts @@ -63,11 +63,13 @@ export class DepositComponent implements OnInit { ), ); const denomMetadataMap$ = this.bankQuery.getDenomMetadataMap$(); - this.symbols$ = combineLatest([this.vaults$, denomMetadataMap$]).pipe( - map(([vaults, denomMetadataMap]) => + const symbolMetadataMap$ = this.bankQuery.getSymbolMetadataMap$(); + this.symbols$ = combineLatest([this.vaults$, symbolMetadataMap$]).pipe( + map(([vaults, symbolMetadataMap]) => vaults.map((vault) => { - const symbol = denomMetadataMap?.[vault.vault?.denom!]?.symbol || ''; - const display = denomMetadataMap?.[vault.vault?.denom!]?.display || vault.vault?.denom!; + const symbol = vault.vault?.symbol || ''; + const display = + symbolMetadataMap?.[vault.vault?.symbol!]?.display || vault.vault?.symbol!; const img = this.bankQuery.getSymbolImageMap()[symbol] || ''; return { symbol: symbol, display: display, img: img }; }), @@ -91,8 +93,8 @@ export class DepositComponent implements OnInit { Promise.all( redeemAmounts.map(async (redeemAmount) => { return this.bandProtocolService.convertToUSDAmount( - redeemAmount.total_amount?.denom || '', - redeemAmount.total_amount?.amount || '', + redeemAmount.share_amount?.denom || '', + redeemAmount.total_amount || '', denomMetadataMap, ); }), diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/deposit/deposit.component.html b/projects/portal/src/app/views/yieldaggregator/vaults/deposit/deposit.component.html index 6b14a7ed4..afc213898 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/deposit/deposit.component.html +++ b/projects/portal/src/app/views/yieldaggregator/vaults/deposit/deposit.component.html @@ -57,10 +57,7 @@

      Deposited Vaults

      {{ balance.amount | coinAmount }} - {{ - estimatedRedeemAmounts?.[i]?.total_amount?.amount - | coinAmount : estimatedRedeemAmounts?.[i]?.total_amount?.denom - }} + {{ estimatedRedeemAmounts?.[i]?.total_amount | coinAmount: estimatedRedeemAmounts?.[i]?.share_amount?.denom }} {{ symbols?.[i]?.display }} {{ usdDepositAmount?.[i] | currency }} From 6efeb53948d04ac554f9e388da4a8ff2d71a690c Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 15 Nov 2023 01:05:27 +0900 Subject: [PATCH 07/22] fix: display symbol --- .../vaults/deposit/deposit.component.ts | 5 ++--- .../yieldaggregator/vaults/owner/owner.component.ts | 12 ++++++------ .../pages/yieldaggregator/vaults/vaults.component.ts | 5 ++--- .../vaults/owner/owner.component.html | 6 +++--- .../vaults/vault/vault.component.html | 2 +- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts b/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts index 0dd995355..38dcaf65e 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts @@ -68,9 +68,8 @@ export class DepositComponent implements OnInit { map(([vaults, symbolMetadataMap]) => vaults.map((vault) => { const symbol = vault.vault?.symbol || ''; - const display = - symbolMetadataMap?.[vault.vault?.symbol!]?.display || vault.vault?.symbol!; - const img = this.bankQuery.getSymbolImageMap()[symbol] || ''; + const display = symbolMetadataMap?.[symbol]?.display || symbol; + const img = this.bankQuery.getSymbolImageMap()[symbol]; return { symbol: symbol, display: display, img: img }; }), ), diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/owner/owner.component.ts b/projects/portal/src/app/pages/yieldaggregator/vaults/owner/owner.component.ts index d6d53f729..e3163bcba 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/owner/owner.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/owner/owner.component.ts @@ -40,13 +40,13 @@ export class OwnerComponent implements OnInit { this.vaults$ = combineLatest([this.iyaQuery.listVaults$(), this.owner$]).pipe( map(([vaults, owner]) => vaults.filter((vault) => vault.vault?.owner === owner)), ); - const denomMetadataMap$ = this.bankQuery.getDenomMetadataMap$(); - this.symbols$ = combineLatest([this.vaults$, denomMetadataMap$]).pipe( - map(([vaults, denomMetadataMap]) => + const symbolMetadataMap$ = this.bankQuery.getSymbolMetadataMap$(); + this.symbols$ = combineLatest([this.vaults$, symbolMetadataMap$]).pipe( + map(([vaults, symbolMetadataMap]) => vaults.map((vault) => { - const symbol = denomMetadataMap?.[vault.vault?.denom!]?.symbol || ''; - const display = denomMetadataMap?.[vault.vault?.denom!]?.display || vault.vault?.denom!; - const img = this.bankQuery.getSymbolImageMap()[symbol] || ''; + const symbol = vault.vault?.symbol || ''; + const display = symbolMetadataMap?.[symbol]?.display || symbol; + const img = this.bankQuery.getSymbolImageMap()[symbol]; return { symbol: symbol, display: display, img: img }; }), ), diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/vaults.component.ts b/projects/portal/src/app/pages/yieldaggregator/vaults/vaults.component.ts index 25b1f2727..36fed7bd2 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/vaults.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/vaults.component.ts @@ -184,9 +184,8 @@ export class VaultsComponent implements OnInit { map(([vaults, symbolMetadataMap]) => vaults.map((vault) => { const symbol = vault.vault?.symbol || ''; - const display = - symbolMetadataMap?.[vault.vault?.symbol!]?.display || vault.vault?.symbol!; - const img = this.bankQuery.getSymbolImageMap()[symbol] || ''; + const display = symbolMetadataMap?.[symbol]?.display || symbol; + const img = this.bankQuery.getSymbolImageMap()[symbol]; return { symbol: symbol, display: display, img: img }; }), ), diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/owner/owner.component.html b/projects/portal/src/app/views/yieldaggregator/vaults/owner/owner.component.html index 5f66932ef..fc4896e88 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/owner/owner.component.html +++ b/projects/portal/src/app/views/yieldaggregator/vaults/owner/owner.component.html @@ -27,7 +27,7 @@

      Vault #{{ vault?.vault?.id }}

      -
      {{ vault.vault?.denom | coinDenom | async }}
      +
      {{ vault.vault?.symbol }}
      NO KYC
      @@ -133,12 +133,12 @@

      What is the withdrawal reserve rate?

      diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html index 745603f78..56439fb6b 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html +++ b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html @@ -24,7 +24,7 @@

      Vault #{{ vault?.vault?.id }}

      -
      {{ denom | coinDenom | async }}
      +
      {{ vault?.vault?.symbol }}
      NO KYC
      From 488b2afdd6725e151608a93623c92beeda7493f9 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 15 Nov 2023 01:05:33 +0900 Subject: [PATCH 08/22] fix: logic --- .../portal/src/app/models/cosmos/bank.model.ts | 4 ++-- .../yield-aggregator.application.service.ts | 16 ++++------------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/projects/portal/src/app/models/cosmos/bank.model.ts b/projects/portal/src/app/models/cosmos/bank.model.ts index b4d971f60..3ffe808d4 100644 --- a/projects/portal/src/app/models/cosmos/bank.model.ts +++ b/projects/portal/src/app/models/cosmos/bank.model.ts @@ -11,7 +11,7 @@ export const denomExponentMap: { [denom: string]: number } = { uusd: 6, uusdc: 6, udlp: 6, - '': 0, + '': 6, }; const ibcPattern = /^ibc\//; @@ -19,7 +19,7 @@ const iyaPattern = /^yieldaggregator\/vaults\//; export function getDenomExponent(denom?: string): number { if (!denom) { - return 0; + return 6; } if (ibcPattern.test(denom) || iyaPattern.test(denom)) { return 6; diff --git a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts index f5d0fb561..d021f8d57 100644 --- a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts +++ b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts @@ -2,14 +2,12 @@ import { TxConfirmDialogComponent, TxConfirmDialogData, } from '../../views/dialogs/txs/tx-confirm/tx-confirm-dialog.component'; -import { BankQueryService } from '../cosmos/bank.query.service'; import { TxCommonApplicationService } from '../cosmos/tx-common.application.service'; import { YieldAggregatorService } from './yield-aggregator.service'; import { Dialog } from '@angular/cdk/dialog'; import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; import cosmosclient from '@cosmos-client/core'; -import { take } from 'rxjs/operators'; @Injectable({ providedIn: 'root', @@ -17,25 +15,19 @@ import { take } from 'rxjs/operators'; export class YieldAggregatorApplicationService { constructor( private readonly router: Router, - private readonly bankQueryService: BankQueryService, private readonly yieldAggregatorService: YieldAggregatorService, private readonly txCommonApplication: TxCommonApplicationService, private readonly dialog: Dialog, ) {} - async depositToVault(vaultId: string, symbol: string, amount: number) { + async depositToVault(vaultId: string, denom: string, amount: number) { const prerequisiteData = await this.txCommonApplication.getPrerequisiteData(); if (!prerequisiteData) { return; } const { address, publicKey, account, currentCosmosWallet, minimumGasPrice } = prerequisiteData; - const msg = this.yieldAggregatorService.buildMsgDepositToVault( - address, - vaultId, - symbol, - amount, - ); + const msg = this.yieldAggregatorService.buildMsgDepositToVault(address, vaultId, denom, amount); const simulationResult = await this.txCommonApplication.simulate( msg, @@ -72,7 +64,7 @@ export class YieldAggregatorApplicationService { location.reload(); } - async withdrawFromVault(vaultId: string, symbol: string, amount: number) { + async withdrawFromVault(vaultId: string, denom: string, amount: number) { const prerequisiteData = await this.txCommonApplication.getPrerequisiteData(); if (!prerequisiteData) { return; @@ -82,7 +74,7 @@ export class YieldAggregatorApplicationService { const msg = this.yieldAggregatorService.buildMsgWithdrawFromVault( address, vaultId, - symbol, + denom, amount, ); From b03d922ec73816fc69ad8173156eb5239c22e337 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 15 Nov 2023 01:20:01 +0900 Subject: [PATCH 09/22] fix: explorer ci --- .../accounts/yieldaggregator/address/address.component.ts | 4 ++-- .../accounts/yieldaggregator/yieldaggregator.component.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/explorer/src/app/pages/accounts/yieldaggregator/address/address.component.ts b/projects/explorer/src/app/pages/accounts/yieldaggregator/address/address.component.ts index 3118cd390..f8970de3e 100644 --- a/projects/explorer/src/app/pages/accounts/yieldaggregator/address/address.component.ts +++ b/projects/explorer/src/app/pages/accounts/yieldaggregator/address/address.component.ts @@ -166,8 +166,8 @@ export class AddressComponent implements OnInit { const values = await Promise.all( amounts.map(async (redeemAmount) => { return this.bandProtocolService.convertToUSDAmount( - redeemAmount.total_amount?.denom || '', - redeemAmount.total_amount?.amount || '', + redeemAmount.share_amount?.denom || '', + redeemAmount.total_amount || '', denomMetadataMap, ); }), diff --git a/projects/explorer/src/app/pages/accounts/yieldaggregator/yieldaggregator.component.ts b/projects/explorer/src/app/pages/accounts/yieldaggregator/yieldaggregator.component.ts index 49ba62836..1a4a20efc 100644 --- a/projects/explorer/src/app/pages/accounts/yieldaggregator/yieldaggregator.component.ts +++ b/projects/explorer/src/app/pages/accounts/yieldaggregator/yieldaggregator.component.ts @@ -216,8 +216,8 @@ export class YieldaggregatorComponent implements OnInit { const values = await Promise.all( amounts.map(async (redeemAmount) => { return this.bandProtocolService.convertToUSDAmount( - redeemAmount.total_amount?.denom || '', - redeemAmount.total_amount?.amount || '', + redeemAmount.share_amount?.denom || '', + redeemAmount.total_amount || '', denomMetadataMap, ); }), From ca6750ccbc521f58ffbdc20dd47b78d4b30e922e Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 15 Nov 2023 20:59:10 +0900 Subject: [PATCH 10/22] fix: error handle --- .../app/models/band-protocols/band-protocol.service.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/portal/src/app/models/band-protocols/band-protocol.service.ts b/projects/portal/src/app/models/band-protocols/band-protocol.service.ts index 3c0c9343d..f4dceb3aa 100644 --- a/projects/portal/src/app/models/band-protocols/band-protocol.service.ts +++ b/projects/portal/src/app/models/band-protocols/band-protocol.service.ts @@ -39,6 +39,10 @@ export class BandProtocolService { amount: string, denomMetadataMap: { [denom: string]: cosmosclient.proto.cosmos.bank.v1beta1.IMetadata }, ): Promise { + if (!denomMetadataMap[denom]) { + console.error(`Denom metadata not found for denom ${denom}`); + return 0; + } const symbol = denomMetadataMap[denom].symbol; const display = denomMetadataMap[denom].display; if (!symbol) { @@ -64,6 +68,10 @@ export class BandProtocolService { symbolPriceMap: { [symbol: string]: number }, denomMetadataMap: { [denom: string]: cosmosclient.proto.cosmos.bank.v1beta1.IMetadata }, ): number { + if (!denomMetadataMap[denom]) { + console.error(`Denom metadata not found for denom ${denom}`); + return 0; + } const symbol = denomMetadataMap[denom].symbol; if (!symbol) { throw new Error(`Symbol not found for denom ${denom}`); From f906e9f3e733aa50ee54f7a36fd6a1caa071a3fc Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 15 Nov 2023 20:59:24 +0900 Subject: [PATCH 11/22] feat: add query --- .../yield-aggregator.query.service.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.query.service.ts b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.query.service.ts index 47edba5fd..efd0d9b28 100644 --- a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.query.service.ts +++ b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.query.service.ts @@ -4,9 +4,11 @@ import { Observable } from 'rxjs'; import { map, mergeMap, pluck } from 'rxjs/operators'; import ununifi from 'ununifi-client'; import { + DenomInfos200ResponseInfoInner, EstimateMintAmount200Response, EstimateRedeemAmount200Response, StrategyAll200ResponseStrategiesInner, + SymbolInfos200ResponseInfoInner, Vault200Response, VaultAll200ResponseVaultsInner, YieldAggregatorParams200ResponseParams, @@ -80,4 +82,18 @@ export class YieldAggregatorQueryService { const res = await ununifi.rest.yieldAggregator.estimateRedeemAmount(sdk, id, amount); return res.data!; } + + listDenomInfos$(): Observable { + return this.restSdk$.pipe( + mergeMap((sdk) => ununifi.rest.yieldAggregator.denomInfos(sdk)), + map((res) => res.data.info!), + ); + } + + listSymbolInfos$(): Observable { + return this.restSdk$.pipe( + mergeMap((sdk) => ununifi.rest.yieldAggregator.symbolInfos(sdk)), + map((res) => res.data.info!), + ); + } } From e4b6bb19657d1ba9b9012789c9c6ab5003355082 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 15 Nov 2023 20:59:45 +0900 Subject: [PATCH 12/22] feat: select multi denom --- .../vaults/vault/vault.component.html | 1 + .../vaults/vault/vault.component.ts | 6 +++++ .../vaults/vault/vault.component.html | 21 ++++++++++++++---- .../vaults/vault/vault.component.ts | 22 ++++++++++++++----- 4 files changed, 40 insertions(+), 10 deletions(-) diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.html b/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.html index 533b4fc6b..8b28854ac 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.html +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.html @@ -1,6 +1,7 @@ ; vault$: Observable; denom$: Observable; + availableDenoms$: Observable; symbol$: Observable; denomBalancesMap$: Observable<{ [symbol: string]: cosmosclient.proto.cosmos.base.v1beta1.ICoin }>; denomMetadataMap$: Observable<{ @@ -79,6 +81,10 @@ export class VaultComponent implements OnInit { this.denom$ = combineLatest([this.symbol$, symbolMetadataMap$]).pipe( map(([symbol, symbolMetadataMap]) => symbolMetadataMap?.[symbol || '']?.base), ); + const denomInfos$ = this.iyaQuery.listDenomInfos$(); + this.availableDenoms$ = combineLatest([this.symbol$, denomInfos$]).pipe( + map(([symbol, infos]) => infos.filter((info) => info.symbol === symbol)), + ); const timer$ = timer(0, 1000 * 60); this.totalDepositAmount$ = combineLatest([ diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html index 56439fb6b..01362c7bb 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html +++ b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html @@ -309,7 +309,7 @@

      Chain that you deposit from

      placeholder="0.000000" class="input input-bordered w-full" [class]="{ - 'input-error': depositAmountNgModelRef.errors && depositAmountNgModelRef.touched + 'input-error': depositAmountNgModelRef.errors }" [min]="0" [max]="denomBalancesMap?.[denom || '']?.amount | coinAmount: vault?.vault?.symbol" @@ -318,10 +318,23 @@

      Chain that you deposit from

      name="mintAmount" (input)="onDepositAmountChange()" /> - {{ denom | coinDenom | async }} - {{ denomMetadataMap?.[denom || '']?.symbol }}.{{ selectedChain.id }} + + + + + Available balance: diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts index f2e4e7742..d3e8bec7b 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts +++ b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts @@ -1,12 +1,14 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'; import cosmosclient from '@cosmos-client/core'; import { YieldInfo } from 'projects/portal/src/app/models/config.service'; +import { getDenomExponent } from 'projects/portal/src/app/models/cosmos/bank.model'; import { DepositToVaultRequest, WithdrawFromVaultRequest, } from 'projects/portal/src/app/models/yield-aggregators/yield-aggregator.model'; import { CoinAmountPipe } from 'projects/portal/src/app/pipes/coin-amount.pipe'; import { + DenomInfos200ResponseInfoInner, EstimateMintAmount200Response, EstimateRedeemAmount200Response, StrategyAll200ResponseStrategiesInnerStrategy, @@ -32,6 +34,8 @@ export class VaultComponent implements OnInit, OnChanges { @Input() denom?: string | null; @Input() + availableDenoms?: DenomInfos200ResponseInfoInner[] | null; + @Input() symbolImage?: string | null; @Input() denomBalancesMap?: { [denom: string]: cosmosclient.proto.cosmos.base.v1beta1.ICoin } | null; @@ -185,13 +189,17 @@ export class VaultComponent implements OnInit, OnChanges { onSubmitDeposit() { if (!this.mintAmount) { + alert('Please input amount'); + return; + } + if (!this.denom) { + alert('Please select denom'); return; } this.appDeposit.emit({ vaultId: this.vault?.vault?.id!, readableAmount: this.mintAmount, - // todo select multiple denoms - denom: this.denom!, + denom: this.denom, }); } @@ -201,12 +209,13 @@ export class VaultComponent implements OnInit, OnChanges { onSubmitWithdraw() { if (!this.burnAmount) { + alert('Please input amount'); return; } this.appWithdraw.emit({ vaultId: this.vault?.vault?.id!, readableAmount: this.burnAmount, - denom: this.denom!, + denom: 'yieldaggregator/vaults/' + this.vault?.vault?.id, }); } @@ -214,13 +223,13 @@ export class VaultComponent implements OnInit, OnChanges { return this.vault?.strategies?.find((strategy) => strategy.id === id); } - // todo: fix use denom exponent setMintAmount(rate: number) { this.mintAmount = Number( this.coinAmountPipe.transform(this.denomBalancesMap?.[this.denom || ''].amount, this.denom), ) * rate; - this.mintAmount = Math.floor(this.mintAmount * Math.pow(10, 6)) / Math.pow(10, 6); + const exponent = getDenomExponent(this.denom || ''); + this.mintAmount = Math.floor(this.mintAmount * Math.pow(10, exponent)) / Math.pow(10, exponent); this.onDepositAmountChange(); } @@ -228,7 +237,8 @@ export class VaultComponent implements OnInit, OnChanges { const denom = 'yieldaggregator/vaults/' + this.vault?.vault?.id; this.burnAmount = Number(this.coinAmountPipe.transform(this.denomBalancesMap?.[denom].amount, denom)) * rate; - this.burnAmount = Math.floor(this.burnAmount * Math.pow(10, 6)) / Math.pow(10, 6); + const exponent = getDenomExponent(denom); + this.burnAmount = Math.floor(this.burnAmount * Math.pow(10, exponent)) / Math.pow(10, exponent); this.onWithdrawAmountChange(); } From e2677713d469b3b855b4adbcea353d937fb19fab Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 15 Nov 2023 23:01:02 +0900 Subject: [PATCH 13/22] feat: withdraw unbonding --- .../yield-aggregator.application.service.ts | 54 +++++++++++++++ .../yield-aggregator.service.ts | 19 ++++++ .../vaults/vault/vault.component.html | 1 + .../vaults/vault/vault.component.ts | 66 ++++++------------- .../vaults/vault/vault.component.html | 47 ++++++++----- .../vaults/vault/vault.component.ts | 41 +++++++++--- 6 files changed, 155 insertions(+), 73 deletions(-) diff --git a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts index d021f8d57..b76db914b 100644 --- a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts +++ b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts @@ -115,6 +115,60 @@ export class YieldAggregatorApplicationService { } } + async withdrawFromVaultWithUnbonding(vaultId: string, denom: string, amount: number) { + const prerequisiteData = await this.txCommonApplication.getPrerequisiteData(); + if (!prerequisiteData) { + return; + } + const { address, publicKey, account, currentCosmosWallet, minimumGasPrice } = prerequisiteData; + + const msg = this.yieldAggregatorService.buildMsgWithdrawFromVaultWithUnbondingTime( + address, + vaultId, + denom, + amount, + ); + + const simulationResult = await this.txCommonApplication.simulate( + msg, + publicKey, + account, + minimumGasPrice, + ); + if (!simulationResult) { + return; + } + const { gas, fee } = simulationResult; + + if (!(await this.txCommonApplication.confirmFeeIfUnUniFiWallet(currentCosmosWallet, fee))) { + return; + } + + const txHash = await this.txCommonApplication.broadcast( + msg, + currentCosmosWallet, + publicKey, + account, + gas, + fee, + ); + if (!txHash) { + return; + } + + if (txHash) { + await this.dialog + .open(TxConfirmDialogComponent, { + data: { + txHash: txHash, + msg: 'Successfully requested withdrawing from the vault. The payment will be made after the unbonding time.', + }, + }) + .closed.toPromise(); + location.reload(); + } + } + async createVault( name: string, symbol: string, diff --git a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.service.ts b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.service.ts index ba7ab366e..61bf4220b 100644 --- a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.service.ts +++ b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.service.ts @@ -60,6 +60,25 @@ export class YieldAggregatorService { return msg; } + buildMsgWithdrawFromVaultWithUnbondingTime( + senderAddress: string, + vaultId: string, + denom: string, + readableAmount: number, + ) { + const coin = this.bankService.convertDenomReadableAmountMapToCoins({ + [denom]: readableAmount, + })[0]; + const msg = + new ununificlient.proto.ununifi.yieldaggregator.MsgWithdrawFromVaultWithUnbondingTime({ + sender: senderAddress, + vault_id: Long.fromString(vaultId), + lp_token_amount: coin.amount, + }); + + return msg; + } + buildMsgCreateVault( senderAddress: string, symbol: string, diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.html b/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.html index 8b28854ac..b149ea3ff 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.html +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.html @@ -20,5 +20,6 @@ (changeWithdraw)="onChangeWithdraw($event)" (appDeposit)="onSubmitDeposit($event)" (appWithdraw)="onSubmitWithdraw($event)" + (appWithdrawWithUnbonding)="onSubmitWithdrawWithUnbonding($event)" (appClickChain)="onClickChain($event)" >       diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts b/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts index b2550f6df..df67b31e1 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts @@ -87,64 +87,37 @@ export class VaultComponent implements OnInit { ); const timer$ = timer(0, 1000 * 60); - this.totalDepositAmount$ = combineLatest([ - timer$, - this.vault$, - this.denomMetadataMap$, - this.denom$, - ]).pipe( - mergeMap(([_, vault, denomMetadataMap, denom]) => + this.totalDepositAmount$ = combineLatest([timer$, this.vault$]).pipe( + mergeMap(([_, vault]) => this.bandProtocolService.convertToUSDAmount( - denom || '', + vault.vault?.symbol!, ( Number(vault.total_bonded_amount) + Number(vault.total_unbonding_amount) + Number(vault.withdraw_reserve) ).toString(), - denomMetadataMap, ), ), ); - this.totalBondedAmount$ = combineLatest([ - timer$, - this.vault$, - this.denomMetadataMap$, - this.denom$, - ]).pipe( - mergeMap(([_, vault, denomMetadataMap, denom]) => + this.totalBondedAmount$ = combineLatest([timer$, this.vault$]).pipe( + mergeMap(([_, vault]) => this.bandProtocolService.convertToUSDAmount( - denom || '', + vault.vault?.symbol!, vault.total_bonded_amount!, - denomMetadataMap, ), ), ); - this.totalUnbondingAmount$ = combineLatest([ - timer$, - this.vault$, - this.denomMetadataMap$, - this.denom$, - ]).pipe( - mergeMap(([_, vault, denomMetadataMap, denom]) => + this.totalUnbondingAmount$ = combineLatest([timer$, this.vault$]).pipe( + mergeMap(([_, vault]) => this.bandProtocolService.convertToUSDAmount( - denom || '', + vault.vault?.symbol!, vault.total_unbonding_amount!, - denomMetadataMap, ), ), ); - this.withdrawReserve$ = combineLatest([ - timer$, - this.vault$, - this.denomMetadataMap$, - this.denom$, - ]).pipe( - mergeMap(([_, vault, denomMetadataMap, denom]) => - this.bandProtocolService.convertToUSDAmount( - denom || '', - vault.withdraw_reserve!, - denomMetadataMap, - ), + this.withdrawReserve$ = combineLatest([timer$, this.vault$]).pipe( + mergeMap(([_, vault]) => + this.bandProtocolService.convertToUSDAmount(vault.vault?.symbol!, vault.withdraw_reserve!), ), ); @@ -203,16 +176,11 @@ export class VaultComponent implements OnInit { this.iyaQuery.getEstimatedRedeemAmount(id, balance?.amount || undefined), ), ); - this.usdDepositAmount$ = combineLatest([ - this.denom$, - this.estimatedDepositedAmount$, - this.denomMetadataMap$, - ]).pipe( - mergeMap(([denom, depositedAmount, denomMetadataMap]) => + this.usdDepositAmount$ = this.estimatedDepositedAmount$.pipe( + mergeMap((depositedAmount) => this.bandProtocolService.convertToUSDAmount( - denom || '', + (depositedAmount as any).symbol || '', depositedAmount.total_amount || '0', - denomMetadataMap, ), ), ); @@ -236,6 +204,10 @@ export class VaultComponent implements OnInit { this.iyaApp.withdrawFromVault(data.vaultId, data.denom, data.readableAmount); } + onSubmitWithdrawWithUnbonding(data: WithdrawFromVaultRequest) { + this.iyaApp.withdrawFromVaultWithUnbonding(data.vaultId, data.denom, data.readableAmount); + } + async onClickChain(chain: ExternalChain) { this.externalWalletAddress = await this.walletApp.getExternalWallet(chain); } diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html index 01362c7bb..71a550123 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html +++ b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html @@ -417,7 +417,7 @@

      What is the unbonding period?

      - {{ denom | coinDenom | async }} - - - - Total {{ estimatedRedeemAmount?.total_amount | coinAmount }} - Fee - {{ estimatedRedeemAmount?.fee | coinAmount }} +
      + + + + {{ estimatedRedeemAmount.total_amount | coinAmount }} - Fee + {{ estimatedRedeemAmount.fee | coinAmount }} + - +
      +
      + +
      diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts index d3e8bec7b..5beb52393 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts +++ b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts @@ -23,6 +23,12 @@ export type ExternalChain = { cosmos: boolean; }; +export type WithdrawOption = { + id: string; + display: string; + disabled: boolean; +}; + @Component({ selector: 'view-vault', templateUrl: './vault.component.html', @@ -73,6 +79,8 @@ export class VaultComponent implements OnInit, OnChanges { @Output() appWithdraw: EventEmitter; @Output() + appWithdrawWithUnbonding: EventEmitter; + @Output() appClickChain: EventEmitter; mintAmount?: number; @@ -85,7 +93,7 @@ export class VaultComponent implements OnInit, OnChanges { external: false, cosmos: true, }; - withdrawOptions = [ + withdrawOptions: WithdrawOption[] = [ { id: 'immediate', display: 'Immediate withdrawal', @@ -93,11 +101,11 @@ export class VaultComponent implements OnInit, OnChanges { }, { id: 'unbonding', - display: 'Withdrawal after the unbonding period (coming soon)', - disabled: true, + display: 'Withdrawal after the unbonding period', + disabled: false, }, ]; - withdrawOption = this.withdrawOptions[0]; + withdrawOptionId: string; chains: ExternalChain[] = [ { id: 'ununifi', @@ -169,8 +177,9 @@ export class VaultComponent implements OnInit, OnChanges { this.appDeposit = new EventEmitter(); this.changeWithdraw = new EventEmitter(); this.appWithdraw = new EventEmitter(); + this.appWithdrawWithUnbonding = new EventEmitter(); this.appClickChain = new EventEmitter(); - this.withdrawOption = this.withdrawOptions[0]; + this.withdrawOptionId = this.withdrawOptions[0].id; } ngOnInit(): void {} @@ -212,11 +221,23 @@ export class VaultComponent implements OnInit, OnChanges { alert('Please input amount'); return; } - this.appWithdraw.emit({ - vaultId: this.vault?.vault?.id!, - readableAmount: this.burnAmount, - denom: 'yieldaggregator/vaults/' + this.vault?.vault?.id, - }); + console.log(this.withdrawOptionId); + if (this.withdrawOptionId === 'immediate') { + console.log('withdraw'); + this.appWithdraw.emit({ + vaultId: this.vault?.vault?.id!, + readableAmount: this.burnAmount, + denom: 'yieldaggregator/vaults/' + this.vault?.vault?.id, + }); + } + if (this.withdrawOptionId === 'unbonding') { + console.log('withdraw with unbonding'); + this.appWithdrawWithUnbonding.emit({ + vaultId: this.vault?.vault?.id!, + readableAmount: this.burnAmount, + denom: 'yieldaggregator/vaults/' + this.vault?.vault?.id, + }); + } } getStrategyInfo(id?: string): StrategyAll200ResponseStrategiesInnerStrategy | undefined { From 6e18f0574dc282c2416d34dcc34caf972c324fda Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 15 Nov 2023 23:02:16 +0900 Subject: [PATCH 14/22] fix: symbol USD Amount --- .../address/address.component.ts | 8 +++---- .../yieldaggregator.component.ts | 7 +++--- .../band-protocols/band-protocol.service.ts | 22 +++---------------- .../src/app/models/cosmos/bank.model.ts | 9 ++++++++ .../vaults/deposit/deposit.component.ts | 7 +++--- 5 files changed, 21 insertions(+), 32 deletions(-) diff --git a/projects/explorer/src/app/pages/accounts/yieldaggregator/address/address.component.ts b/projects/explorer/src/app/pages/accounts/yieldaggregator/address/address.component.ts index f8970de3e..898139f44 100644 --- a/projects/explorer/src/app/pages/accounts/yieldaggregator/address/address.component.ts +++ b/projects/explorer/src/app/pages/accounts/yieldaggregator/address/address.component.ts @@ -144,9 +144,8 @@ export class AddressComponent implements OnInit { ), ); - const denomMetadataMap$ = this.bankQuery.getDenomMetadataMap$(); - this.tvl$ = combineLatest([balances$, denomMetadataMap$]).pipe( - mergeMap(async ([balances, denomMetadataMap]) => { + this.tvl$ = balances$.pipe( + mergeMap(async (balances) => { const vaultBalances = balances ?.filter((balance) => balance.denom?.includes('yieldaggregator/vaults/')) .sort( @@ -166,9 +165,8 @@ export class AddressComponent implements OnInit { const values = await Promise.all( amounts.map(async (redeemAmount) => { return this.bandProtocolService.convertToUSDAmount( - redeemAmount.share_amount?.denom || '', + (redeemAmount as any).symbol || '', redeemAmount.total_amount || '', - denomMetadataMap, ); }), ); diff --git a/projects/explorer/src/app/pages/accounts/yieldaggregator/yieldaggregator.component.ts b/projects/explorer/src/app/pages/accounts/yieldaggregator/yieldaggregator.component.ts index 1a4a20efc..40c70857e 100644 --- a/projects/explorer/src/app/pages/accounts/yieldaggregator/yieldaggregator.component.ts +++ b/projects/explorer/src/app/pages/accounts/yieldaggregator/yieldaggregator.component.ts @@ -197,8 +197,8 @@ export class YieldaggregatorComponent implements OnInit { ), ), ); - this.addressTVLs$ = combineLatest([this.addressBalances$, denomMetadataMap$]).pipe( - mergeMap(([addressBalances, denomMetadataMap]) => + this.addressTVLs$ = this.addressBalances$.pipe( + mergeMap((addressBalances) => Promise.all( addressBalances.map(async (addressBalance) => { const vaultBalances = addressBalance.balances?.filter((balance) => @@ -216,9 +216,8 @@ export class YieldaggregatorComponent implements OnInit { const values = await Promise.all( amounts.map(async (redeemAmount) => { return this.bandProtocolService.convertToUSDAmount( - redeemAmount.share_amount?.denom || '', + (redeemAmount as any).symbol || '', redeemAmount.total_amount || '', - denomMetadataMap, ); }), ); diff --git a/projects/portal/src/app/models/band-protocols/band-protocol.service.ts b/projects/portal/src/app/models/band-protocols/band-protocol.service.ts index f4dceb3aa..62412de8f 100644 --- a/projects/portal/src/app/models/band-protocols/band-protocol.service.ts +++ b/projects/portal/src/app/models/band-protocols/band-protocol.service.ts @@ -1,4 +1,4 @@ -import { getDenomExponent } from '../cosmos/bank.model'; +import { getDenomExponent, getSymbolExponent } from '../cosmos/bank.model'; import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import cosmosclient from '@cosmos-client/core'; @@ -34,24 +34,8 @@ export class BandProtocolService { } } - async convertToUSDAmount( - denom: string, - amount: string, - denomMetadataMap: { [denom: string]: cosmosclient.proto.cosmos.bank.v1beta1.IMetadata }, - ): Promise { - if (!denomMetadataMap[denom]) { - console.error(`Denom metadata not found for denom ${denom}`); - return 0; - } - const symbol = denomMetadataMap[denom].symbol; - const display = denomMetadataMap[denom].display; - if (!symbol) { - throw new Error(`Symbol not found for denom ${denom}`); - } - if (!display) { - throw new Error(`Display not found for denom ${denom}`); - } - const exponent = getDenomExponent(denom); + async convertToUSDAmount(symbol: string, amount: string): Promise { + const exponent = getSymbolExponent(symbol); const symbolAmount = Number(amount) / 10 ** (exponent || 0); const price = await this.getPrice(symbol); if (!price) { diff --git a/projects/portal/src/app/models/cosmos/bank.model.ts b/projects/portal/src/app/models/cosmos/bank.model.ts index 3ffe808d4..a61967e37 100644 --- a/projects/portal/src/app/models/cosmos/bank.model.ts +++ b/projects/portal/src/app/models/cosmos/bank.model.ts @@ -14,6 +14,8 @@ export const denomExponentMap: { [denom: string]: number } = { '': 6, }; +export const symbolExponent: { [symbol: string]: number } = {}; + const ibcPattern = /^ibc\//; const iyaPattern = /^yieldaggregator\/vaults\//; @@ -26,3 +28,10 @@ export function getDenomExponent(denom?: string): number { } return denomExponentMap[denom]; } + +export function getSymbolExponent(symbol?: string): number { + if (!symbol) { + return 6; + } + return symbolExponent[symbol] || 6; +} diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts b/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts index 38dcaf65e..d51bf17f3 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts @@ -87,14 +87,13 @@ export class DepositComponent implements OnInit { ), ), ); - this.usdDepositAmount$ = combineLatest([this.estimatedRedeemAmounts$, denomMetadataMap$]).pipe( - mergeMap(([redeemAmounts, denomMetadataMap]) => + this.usdDepositAmount$ = this.estimatedRedeemAmounts$.pipe( + mergeMap((redeemAmounts) => Promise.all( redeemAmounts.map(async (redeemAmount) => { return this.bandProtocolService.convertToUSDAmount( - redeemAmount.share_amount?.denom || '', + (redeemAmount as any).symbol || '', redeemAmount.total_amount || '', - denomMetadataMap, ); }), ), From 5c0f3ff3e03a7c18034eb16b2003d78e34aa9f66 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 15 Nov 2023 23:35:37 +0900 Subject: [PATCH 15/22] fix: vaults list prices --- .../band-protocols/band-protocol.service.ts | 18 +++--------- .../vaults/vaults.component.ts | 29 ++++++------------- 2 files changed, 13 insertions(+), 34 deletions(-) diff --git a/projects/portal/src/app/models/band-protocols/band-protocol.service.ts b/projects/portal/src/app/models/band-protocols/band-protocol.service.ts index 62412de8f..2a0061119 100644 --- a/projects/portal/src/app/models/band-protocols/band-protocol.service.ts +++ b/projects/portal/src/app/models/band-protocols/band-protocol.service.ts @@ -1,7 +1,6 @@ -import { getDenomExponent, getSymbolExponent } from '../cosmos/bank.model'; +import { getSymbolExponent } from '../cosmos/bank.model'; import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import cosmosclient from '@cosmos-client/core'; export const rest = 'https://laozi1.bandchain.org/api'; export type TokenAmountUSD = { @@ -46,25 +45,16 @@ export class BandProtocolService { return usdAmount; } - calcDepositUSDAmount( - denom: string, + calcUSDAmount( + symbol: string, amount: number, symbolPriceMap: { [symbol: string]: number }, - denomMetadataMap: { [denom: string]: cosmosclient.proto.cosmos.bank.v1beta1.IMetadata }, ): number { - if (!denomMetadataMap[denom]) { - console.error(`Denom metadata not found for denom ${denom}`); - return 0; - } - const symbol = denomMetadataMap[denom].symbol; - if (!symbol) { - throw new Error(`Symbol not found for denom ${denom}`); - } const price = symbolPriceMap[symbol]; if (!price) { throw new Error(`Price not found for symbol ${symbol}`); } - const exponent = getDenomExponent(denom); + const exponent = getSymbolExponent(symbol); const symbolAmount = amount / 10 ** (exponent || 0); const usdAmount = symbolAmount * price; return usdAmount; diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/vaults.component.ts b/projects/portal/src/app/pages/yieldaggregator/vaults/vaults.component.ts index 36fed7bd2..4860f7e93 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/vaults.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/vaults.component.ts @@ -43,7 +43,6 @@ export class VaultsComponent implements OnInit { const vaults$ = this.iyaQuery.listVaults$(); const config$ = this.configService.config$; this.keyword$ = this.route.queryParams.pipe(map((params) => params.keyword)); - const denomMetadataMap$ = this.bankQuery.getDenomMetadataMap$(); const symbolMetadataMap$ = this.bankQuery.getSymbolMetadataMap$(); const osmoPools$ = from(this.iyaService.getAllOsmoPool()); const vaultYieldMap$ = combineLatest([vaults$, config$, osmoPools$]).pipe( @@ -110,10 +109,8 @@ export class VaultsComponent implements OnInit { this.sortType$, vaultYieldMap$, symbolPriceMap$, - denomMetadataMap$, - symbolMetadataMap$, ]).pipe( - map(([vaults, sort, yieldMap, symbolPriceMap, denomMetadataMap, symbolMetadataMap]) => { + map(([vaults, sort, yieldMap, symbolPriceMap]) => { if (sort === 'id') { return vaults.sort((a, b) => Number(a.vault?.id) - Number(b.vault?.id)); } @@ -149,17 +146,15 @@ export class VaultsComponent implements OnInit { } if (sort === 'deposit') { return vaults.sort((a, b) => { - const aDeposit = this.bandProtocolService.calcDepositUSDAmount( - symbolMetadataMap[a.vault?.symbol || ''].base || '', + const aDeposit = this.bandProtocolService.calcUSDAmount( + a.vault?.symbol || '', this.depositAmount(a), symbolPriceMap, - denomMetadataMap, ); - const bDeposit = this.bandProtocolService.calcDepositUSDAmount( - symbolMetadataMap[a.vault?.symbol || ''].base || '', + const bDeposit = this.bandProtocolService.calcUSDAmount( + b.vault?.symbol || '', this.depositAmount(b), symbolPriceMap, - denomMetadataMap, ); return (bDeposit || 0) - (aDeposit || 0); }); @@ -190,19 +185,13 @@ export class VaultsComponent implements OnInit { }), ), ); - this.totalDeposits$ = combineLatest([ - this.vaults$, - symbolPriceMap$, - denomMetadataMap$, - symbolMetadataMap$, - ]).pipe( - map(([vaults, symbolPriceMap, denomMetadataMap, symbolMetadataMap]) => + this.totalDeposits$ = combineLatest([this.vaults$, symbolPriceMap$]).pipe( + map(([vaults, symbolPriceMap]) => vaults.map((vault) => - this.bandProtocolService.calcDepositUSDAmount( - symbolMetadataMap[vault.vault?.symbol || ''].base || '', + this.bandProtocolService.calcUSDAmount( + vault.vault?.symbol || '', this.depositAmount(vault), symbolPriceMap, - denomMetadataMap, ), ), ), From f5d66ba69155884ec9d4442c46eaaaa8a60cd359 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 15 Nov 2023 23:37:24 +0900 Subject: [PATCH 16/22] feat: symbol query --- 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 7f028ec3b..628de6f11 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,7 @@ "stream-browserify": "^3.0.0", "stream-http": "^3.2.0", "tslib": "^2.3.0", - "ununifi-client": "^4.0.0-rc7", + "ununifi-client": "^4.0.0-rc8", "zone.js": "~0.11.4" }, "devDependencies": { @@ -30119,9 +30119,9 @@ } }, "node_modules/ununifi-client": { - "version": "4.0.0-rc7", - "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-4.0.0-rc7.tgz", - "integrity": "sha512-blgkXJdSPx+v1kmUTr8PjvlwAD5zla74eCLuNupvWwbb4+A/Q7EP0z38VxUF5J69L9ygpHqj3w05/33UTTpPLg==", + "version": "4.0.0-rc8", + "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-4.0.0-rc8.tgz", + "integrity": "sha512-L6PMxtUAPP9dWLqp8gO0pNs560fSITB5MjTq+eIm/fDXMlqWQb0h5WyQJnO6K40jhvlS/dGzy3dT7yXf72kSbg==", "dependencies": { "axios": "^0.21.1", "protobufjs": "^6.11.2" @@ -50659,9 +50659,9 @@ "dev": true }, "ununifi-client": { - "version": "4.0.0-rc7", - "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-4.0.0-rc7.tgz", - "integrity": "sha512-blgkXJdSPx+v1kmUTr8PjvlwAD5zla74eCLuNupvWwbb4+A/Q7EP0z38VxUF5J69L9ygpHqj3w05/33UTTpPLg==", + "version": "4.0.0-rc8", + "resolved": "https://registry.npmjs.org/ununifi-client/-/ununifi-client-4.0.0-rc8.tgz", + "integrity": "sha512-L6PMxtUAPP9dWLqp8gO0pNs560fSITB5MjTq+eIm/fDXMlqWQb0h5WyQJnO6K40jhvlS/dGzy3dT7yXf72kSbg==", "requires": { "axios": "^0.21.1", "protobufjs": "^6.11.2" diff --git a/package.json b/package.json index d4f568bd7..92c0a0c3b 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "stream-browserify": "^3.0.0", "stream-http": "^3.2.0", "tslib": "^2.3.0", - "ununifi-client": "^4.0.0-rc7", + "ununifi-client": "^4.0.0-rc8", "zone.js": "~0.11.4" }, "devDependencies": { From f1269b20601f12ed9bd3ec8fe5fb5f9bcb9b0820 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 15 Nov 2023 23:38:35 +0900 Subject: [PATCH 17/22] fix: revert any --- .../pages/accounts/yieldaggregator/address/address.component.ts | 2 +- .../pages/accounts/yieldaggregator/yieldaggregator.component.ts | 2 +- .../pages/yieldaggregator/vaults/deposit/deposit.component.ts | 2 +- .../app/pages/yieldaggregator/vaults/vault/vault.component.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/explorer/src/app/pages/accounts/yieldaggregator/address/address.component.ts b/projects/explorer/src/app/pages/accounts/yieldaggregator/address/address.component.ts index 898139f44..ba6d903f1 100644 --- a/projects/explorer/src/app/pages/accounts/yieldaggregator/address/address.component.ts +++ b/projects/explorer/src/app/pages/accounts/yieldaggregator/address/address.component.ts @@ -165,7 +165,7 @@ export class AddressComponent implements OnInit { const values = await Promise.all( amounts.map(async (redeemAmount) => { return this.bandProtocolService.convertToUSDAmount( - (redeemAmount as any).symbol || '', + redeemAmount.symbol || '', redeemAmount.total_amount || '', ); }), diff --git a/projects/explorer/src/app/pages/accounts/yieldaggregator/yieldaggregator.component.ts b/projects/explorer/src/app/pages/accounts/yieldaggregator/yieldaggregator.component.ts index 40c70857e..8c51db83b 100644 --- a/projects/explorer/src/app/pages/accounts/yieldaggregator/yieldaggregator.component.ts +++ b/projects/explorer/src/app/pages/accounts/yieldaggregator/yieldaggregator.component.ts @@ -216,7 +216,7 @@ export class YieldaggregatorComponent implements OnInit { const values = await Promise.all( amounts.map(async (redeemAmount) => { return this.bandProtocolService.convertToUSDAmount( - (redeemAmount as any).symbol || '', + redeemAmount.symbol || '', redeemAmount.total_amount || '', ); }), diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts b/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts index d51bf17f3..ba9760aea 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/deposit/deposit.component.ts @@ -92,7 +92,7 @@ export class DepositComponent implements OnInit { Promise.all( redeemAmounts.map(async (redeemAmount) => { return this.bandProtocolService.convertToUSDAmount( - (redeemAmount as any).symbol || '', + redeemAmount.symbol || '', redeemAmount.total_amount || '', ); }), diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts b/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts index df67b31e1..bd348a212 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts @@ -179,7 +179,7 @@ export class VaultComponent implements OnInit { this.usdDepositAmount$ = this.estimatedDepositedAmount$.pipe( mergeMap((depositedAmount) => this.bandProtocolService.convertToUSDAmount( - (depositedAmount as any).symbol || '', + depositedAmount.symbol || '', depositedAmount.total_amount || '0', ), ), From f63f0690ef36965b5e404ce8df6499fb6ddf475e Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Thu, 16 Nov 2023 00:03:26 +0900 Subject: [PATCH 18/22] fix: strategy filter --- .../yield-aggregator.application.service.ts | 2 +- .../yield-aggregator.model.ts | 2 +- .../yield-aggregator.service.ts | 3 ++- .../vaults/create/create.component.ts | 11 +++++--- .../vaults/create/create.component.html | 4 +-- .../vaults/create/create.component.ts | 25 +++++++++++-------- 6 files changed, 29 insertions(+), 18 deletions(-) diff --git a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts index b76db914b..8ba1e247f 100644 --- a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts +++ b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts @@ -173,7 +173,7 @@ export class YieldAggregatorApplicationService { name: string, symbol: string, description: string, - strategies: { id: string; weight: number }[], + strategies: { denom: string; id: string; weight: number }[], commissionRate: number, reserveRate: number, fee: cosmosclient.proto.cosmos.base.v1beta1.ICoin, diff --git a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts index 44f26f70e..4022f5aab 100644 --- a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts +++ b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts @@ -14,7 +14,7 @@ export type CreateVaultRequest = { name: string; symbol: string; description: string; - strategies: { id: string; weight: number }[]; + strategies: { denom: string; id: string; weight: number }[]; commissionRate: number; reserveRate: number; fee: { denom: string; amount: string }; diff --git a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.service.ts b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.service.ts index 61bf4220b..8b762a500 100644 --- a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.service.ts +++ b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.service.ts @@ -84,7 +84,7 @@ export class YieldAggregatorService { symbol: string, name: string, description: string, - strategies: { id: string; weight: number }[], + strategies: { denom: string; id: string; weight: number }[], commissionRate: number, reserveRate: number, fee: cosmosclient.proto.cosmos.base.v1beta1.ICoin, @@ -93,6 +93,7 @@ export class YieldAggregatorService { ) { const strategyWeights = strategies.map((strategy) => { return { + denom: strategy.denom, strategy_id: Long.fromString(strategy.id), weight: this.txCommonService.numberToDecString(strategy.weight / 100), }; diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/create/create.component.ts b/projects/portal/src/app/pages/yieldaggregator/vaults/create/create.component.ts index 3c79adf24..fadb41402 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/create/create.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/create/create.component.ts @@ -43,10 +43,15 @@ export class CreateComponent implements OnInit { ); this.symbol$ = this.route.queryParams.pipe(map((params) => params.symbol)); - // todo fix query - // this.strategies$ = this.denom$.pipe(mergeMap((denom) => this.iyaQuery.listStrategies$(denom))); - this.strategies$ = this.iyaQuery.listStrategies$(); const allStrategies$ = this.iyaQuery.listStrategies$(); + this.strategies$ = combineLatest([this.symbol$, allStrategies$]).pipe( + map(([symbol, allStrategies]) => { + if (!symbol) { + return allStrategies; + } + return allStrategies.filter((strategy) => strategy.symbol === symbol); + }), + ); this.denomBalancesMap$ = this.address$.pipe( mergeMap((address) => this.bankQuery.getDenomBalanceMap$(address)), ); diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.html b/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.html index 2049d193c..87289b629 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.html +++ b/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.html @@ -317,11 +317,11 @@

      Strategies for {{ symbol }}

      No strategy for {{ symbol }}

      -
        +
        • - {{ s.strategy?.name }} + {{ s.strategy?.name }}
          • diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.ts b/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.ts index 984e99c5c..037dd458e 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.ts +++ b/projects/portal/src/app/views/yieldaggregator/vaults/create/create.component.ts @@ -50,17 +50,18 @@ export class CreateComponent implements OnInit { return this.selectedStrategies.some((s) => s.id === strategyId); } - onAddStrategy(strategyId: string) { - if (!strategyId) { + onAddStrategy(strategy: StrategyAll200ResponseStrategiesInner) { + if (!strategy.strategy) { + alert('Invalid Strategy.'); return; } - // if (!this.denom) { - // this.changeSymbol.emit(strategyDenom); - // } + if (!this.symbol) { + this.changeSymbol.emit(strategy.symbol); + } this.selectedStrategies.push({ - id: strategyId, - name: this.strategies?.find((s) => s.strategy?.id === strategyId)?.strategy?.name, - // denom: strategyDenom, + id: strategy.strategy?.id, + name: strategy.strategy?.name, + denom: strategy.strategy?.denom, weight: this.selectedStrategies.length ? 0 : 100, }); this.selectedStrategies.sort((a, b) => a.id!.localeCompare(b.id!)); @@ -82,12 +83,16 @@ export class CreateComponent implements OnInit { onSubmitCreate() { const strategies = this.selectedStrategies.slice(); - strategies.filter((s) => s.id && s.weight > 0); + strategies.filter((s) => s.denom && s.id && s.weight > 0); if (strategies.reduce((sum, s) => sum + s.weight, 0) !== 100) { alert('The total of the strategies should be 100%.'); return; } - const filteredStrategies = strategies.map((s) => ({ id: s.id!, weight: s.weight })); + const filteredStrategies = strategies.map((s) => ({ + denom: s.denom!, + id: s.id!, + weight: s.weight, + })); if (!this.fee || !this.deposit) { alert('Invalid Fee or Deposit.'); return; From 25e0776fa24699d98243b0364004b73ab071bc96 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Fri, 17 Nov 2023 01:07:27 +0900 Subject: [PATCH 19/22] fix: symbol --- .../vaults/vault/vault.component.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html index 71a550123..b68102c95 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html +++ b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.html @@ -165,7 +165,7 @@

          What is the bonus APY?

      {{ calcVaultAmount(vault) | coinAmount : denom }} - {{ denom | coinDenom | async }} + {{ vault?.vault?.symbol }}
      @@ -179,7 +179,7 @@

      What is the bonus APY?

      $ Unknown
      {{ estimatedDepositedAmount?.total_amount | coinAmount }} - {{ denom | coinDenom | async }} + {{ vault?.vault?.symbol }}
      @@ -197,7 +197,7 @@

      What is the bonus APY?

      {{ vault?.total_bonded_amount | coinAmount : denom }} - {{ denom | coinDenom | async }} + {{ vault?.vault?.symbol }}
      @@ -213,7 +213,7 @@

      What is the bonus APY?

      {{ vault?.total_unbonding_amount | coinAmount : denom }} - {{ denom | coinDenom | async }} + {{ vault?.vault?.symbol }}
      @@ -226,7 +226,7 @@

      What is the bonus APY?

      $ Unknown
      - {{ vault?.withdraw_reserve | coinAmount : denom }} {{ denom | coinDenom | async }} + {{ vault?.withdraw_reserve | coinAmount : denom }} {{ vault?.vault?.symbol }}
      @@ -351,7 +351,7 @@

      Chain that you deposit from

      @@ -476,7 +476,7 @@

      What is the unbonding period?

      class="input input-bordered w-full" value="{{ estimatedRedeemAmount?.redeem_amount | coinAmount }}" /> - {{ denom | coinDenom | async }} + {{ vault?.vault?.symbol }} @@ -492,7 +492,7 @@

      What is the unbonding period?

      class="input input-bordered w-full" value="{{ estimatedRedeemAmount?.total_amount | coinAmount }}" /> - {{ denom | coinDenom | async }} + {{ vault?.vault?.symbol }} From 721c96c27505761bf9cc0f70396076aa36c59b0f Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Fri, 17 Nov 2023 01:07:46 +0900 Subject: [PATCH 20/22] fix: delete log --- .../app/views/yieldaggregator/vaults/vault/vault.component.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts index 5beb52393..fac13c891 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts +++ b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts @@ -221,9 +221,7 @@ export class VaultComponent implements OnInit, OnChanges { alert('Please input amount'); return; } - console.log(this.withdrawOptionId); if (this.withdrawOptionId === 'immediate') { - console.log('withdraw'); this.appWithdraw.emit({ vaultId: this.vault?.vault?.id!, readableAmount: this.burnAmount, @@ -231,7 +229,6 @@ export class VaultComponent implements OnInit, OnChanges { }); } if (this.withdrawOptionId === 'unbonding') { - console.log('withdraw with unbonding'); this.appWithdrawWithUnbonding.emit({ vaultId: this.vault?.vault?.id!, readableAmount: this.burnAmount, From 046fcd8ec5590ee1d425a097bf7a7aa4b9afa087 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 22 Nov 2023 01:05:14 +0900 Subject: [PATCH 21/22] Merge branch 'develop' of https://github.com/UnUniFi/web-apps into v4.0.0-multi-denom-vault --- .../launch/ununifi/firebase-hosting/config.js | 14 +++++++++ projects/portal/src/app/app.module.ts | 2 ++ .../yield-aggregator.application.service.ts | 23 ++++++++++++-- .../yield-aggregator.model.ts | 2 ++ .../vaults/vault/vault.component.ts | 8 ++++- .../portal/src/app/pipes/coin-amount.pipe.ts | 2 +- .../withdraw-fee-confirm-dialog.component.css | 0 ...withdraw-fee-confirm-dialog.component.html | 14 +++++++++ .../withdraw-fee-confirm-dialog.component.ts | 30 +++++++++++++++++++ .../withdraw-fee-confirm-dialog.module.ts | 11 +++++++ .../vaults/vault/vault.component.ts | 4 ++- 11 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.css create mode 100644 projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.html create mode 100644 projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.ts create mode 100644 projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.module.ts diff --git a/projects/portal/editions/ununifi/launch/ununifi/firebase-hosting/config.js b/projects/portal/editions/ununifi/launch/ununifi/firebase-hosting/config.js index 8c2b7b5c9..4eb2d1981 100644 --- a/projects/portal/editions/ununifi/launch/ununifi/firebase-hosting/config.js +++ b/projects/portal/editions/ununifi/launch/ununifi/firebase-hosting/config.js @@ -215,6 +215,20 @@ const denomMetadata = [ display: 'OSMO.osmosis', symbol: 'OSMO', }, + { + description: 'ATOM from CosmosHub', + denom_units: [ + { + denom: 'ibc/25418646C017D377ADF3202FF1E43590D0DAE3346E594E8D78176A139A928F88', + exponent: 0, + aliases: [], + }, + ], + base: 'ibc/25418646C017D377ADF3202FF1E43590D0DAE3346E594E8D78176A139A928F88', + name: 'ATOM from CosmosHub', + display: 'ATOM.cosmoshub', + symbol: 'ATOM', + }, ]; const certifiedVaults = ['5', '6', '7']; diff --git a/projects/portal/src/app/app.module.ts b/projects/portal/src/app/app.module.ts index 59312da61..f7c8289fb 100644 --- a/projects/portal/src/app/app.module.ts +++ b/projects/portal/src/app/app.module.ts @@ -17,6 +17,7 @@ import { AppVoteFormDialogModule } from './pages/dialogs/vote/vote-form-dialog/v import { TxFeeConfirmDialogModule } from './views/cosmos/tx-fee-confirm-dialog/tx-fee-confirm-dialog.module'; import { InactiveValidatorModule } from './views/dialogs/delegate/invalid-validator-confirm-dialog/inactive-validator-confirm-dialog.module'; import { TxConfirmDialogModule } from './views/dialogs/txs/tx-confirm/tx-confirm-dialog.module'; +import { WithdrawFeeConfirmDialogModule } from './views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.module'; import { ConnectExternalWalletDialogModule } from './views/dialogs/wallets/connect-external-cosmos-dialog/connect-external-wallet-dialog.module'; import { ConnectWalletCompletedDialogModule } from './views/dialogs/wallets/connect-wallet-completed-dialog/connect-wallet-completed-dialog.module'; import { ConnectWalletStartDialogModule } from './views/dialogs/wallets/connect-wallet-start-dialog/connect-wallet-start-dialog.module'; @@ -71,6 +72,7 @@ import { LoadingDialogModule } from 'projects/shared/src/lib/components/loading- UnunifiKeyFormDialogModule, InactiveValidatorModule, TxConfirmDialogModule, + WithdrawFeeConfirmDialogModule, AppDelegateFormDialogModule, AppDelegateMenuDialogModule, AppRedelegateFormDialogModule, diff --git a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts index 8ba1e247f..121fd5dd5 100644 --- a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts +++ b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts @@ -2,6 +2,7 @@ import { TxConfirmDialogComponent, TxConfirmDialogData, } from '../../views/dialogs/txs/tx-confirm/tx-confirm-dialog.component'; +import { WithdrawFeeConfirmDialogComponent } from '../../views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component'; import { TxCommonApplicationService } from '../cosmos/tx-common.application.service'; import { YieldAggregatorService } from './yield-aggregator.service'; import { Dialog } from '@angular/cdk/dialog'; @@ -64,7 +65,25 @@ export class YieldAggregatorApplicationService { location.reload(); } - async withdrawFromVault(vaultId: string, denom: string, amount: number) { + async withdrawFromVault( + vaultId: string, + denom: string, + readableAmount: number, + redeemAmount: number, + feeAmount: number, + ) { + // open confirm dialog if feeAmount > redeemAmount + if (feeAmount > redeemAmount) { + const txFeeConfirmedResult = await this.dialog + .open(WithdrawFeeConfirmDialogComponent, { + data: { redeemAmount, feeAmount, denom }, + }) + .closed.toPromise(); + if (!txFeeConfirmedResult) { + return; + } + } + const prerequisiteData = await this.txCommonApplication.getPrerequisiteData(); if (!prerequisiteData) { return; @@ -75,7 +94,7 @@ export class YieldAggregatorApplicationService { address, vaultId, denom, - amount, + readableAmount, ); const simulationResult = await this.txCommonApplication.simulate( diff --git a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts index 4022f5aab..be88f3f72 100644 --- a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts +++ b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts @@ -8,6 +8,8 @@ export type WithdrawFromVaultRequest = { vaultId: string; denom: string; readableAmount: number; + redeemAmount: number; + feeAmount: number; }; export type CreateVaultRequest = { diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts b/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts index bd348a212..e542a4e79 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts @@ -201,7 +201,13 @@ export class VaultComponent implements OnInit { } onSubmitWithdraw(data: WithdrawFromVaultRequest) { - this.iyaApp.withdrawFromVault(data.vaultId, data.denom, data.readableAmount); + this.iyaApp.withdrawFromVault( + data.vaultId, + data.denom, + data.readableAmount, + data.redeemAmount, + data.feeAmount, + ); } onSubmitWithdrawWithUnbonding(data: WithdrawFromVaultRequest) { diff --git a/projects/portal/src/app/pipes/coin-amount.pipe.ts b/projects/portal/src/app/pipes/coin-amount.pipe.ts index 1cffa628a..10d5f951f 100644 --- a/projects/portal/src/app/pipes/coin-amount.pipe.ts +++ b/projects/portal/src/app/pipes/coin-amount.pipe.ts @@ -5,7 +5,7 @@ import { Pipe, PipeTransform } from '@angular/core'; name: 'coinAmount', }) export class CoinAmountPipe implements PipeTransform { - transform(value: string | undefined | null, denom?: string | null): string { + transform(value: string | number | undefined | null, denom?: string | null): string { if (denom) { const exponent = getDenomExponent(denom); const amount = Number(value) / Math.pow(10, exponent); diff --git a/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.css b/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.css new file mode 100644 index 000000000..e69de29bb diff --git a/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.html b/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.html new file mode 100644 index 000000000..469f349e6 --- /dev/null +++ b/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.html @@ -0,0 +1,14 @@ +
      +
      +

      Withdrawal Fee Warning

      +
      + The Withdrawal Fee is high, in excess of 50 percent. It costs + {{ data.feeAmount | coinAmount }} {{ data.denom | coinDenom | async }}. +
      +
      Are you sure you want to send the tx with the fee?
      +
      + + +
      +
      +
      diff --git a/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.ts b/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.ts new file mode 100644 index 000000000..091e4dc56 --- /dev/null +++ b/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.ts @@ -0,0 +1,30 @@ +import { DialogRef, DIALOG_DATA } from '@angular/cdk/dialog'; +import { Component, Inject, OnInit } from '@angular/core'; + +export interface WithdrawFeeConfirmDialogData { + redeemAmount: number; + feeAmount: number; + denom: string; +} +@Component({ + selector: 'app-view-withdraw-fee-confirm-dialog', + templateUrl: './withdraw-fee-confirm-dialog.component.html', + styleUrls: ['./withdraw-fee-confirm-dialog.component.css'], +}) +export class WithdrawFeeConfirmDialogComponent implements OnInit { + constructor( + @Inject(DIALOG_DATA) + public readonly data: WithdrawFeeConfirmDialogData, + private readonly dialogRef: DialogRef, + ) {} + + ngOnInit(): void {} + + okToSendTx(): void { + this.dialogRef.close(true); + } + + cancelToSendTx(): void { + this.dialogRef.close(false); + } +} diff --git a/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.module.ts b/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.module.ts new file mode 100644 index 000000000..b7a5e4b12 --- /dev/null +++ b/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.module.ts @@ -0,0 +1,11 @@ +import { WithdrawFeeConfirmDialogComponent } from './withdraw-fee-confirm-dialog.component'; +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { PipesModule } from 'projects/portal/src/app/pipes/pipes.module'; + +@NgModule({ + declarations: [WithdrawFeeConfirmDialogComponent], + imports: [CommonModule, PipesModule], + exports: [WithdrawFeeConfirmDialogComponent], +}) +export class WithdrawFeeConfirmDialogModule {} diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts index fac13c891..c838e9142 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts +++ b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts @@ -96,7 +96,7 @@ export class VaultComponent implements OnInit, OnChanges { withdrawOptions: WithdrawOption[] = [ { id: 'immediate', - display: 'Immediate withdrawal', + display: 'Immediate withdrawal with extra fee', disabled: false, }, { @@ -226,6 +226,8 @@ export class VaultComponent implements OnInit, OnChanges { vaultId: this.vault?.vault?.id!, readableAmount: this.burnAmount, denom: 'yieldaggregator/vaults/' + this.vault?.vault?.id, + redeemAmount: Number(this.estimatedRedeemAmount?.redeem_amount), + feeAmount: Number(this.estimatedRedeemAmount?.fee), }); } if (this.withdrawOptionId === 'unbonding') { From 32151c02b1b1dd1b309603f8c573ad2e7fff46b4 Mon Sep 17 00:00:00 2001 From: Senna46 <29295263+Senna46@users.noreply.github.com> Date: Wed, 22 Nov 2023 01:10:04 +0900 Subject: [PATCH 22/22] fix: vault denom v4.0.0 --- .../yield-aggregator.application.service.ts | 11 ++++++----- .../yield-aggregators/yield-aggregator.model.ts | 9 ++++++++- .../yieldaggregator/vaults/vault/vault.component.ts | 8 +++++--- .../withdraw-fee-confirm-dialog.component.html | 2 +- .../withdraw-fee-confirm-dialog.component.ts | 2 +- .../yieldaggregator/vaults/vault/vault.component.ts | 8 +++++--- 6 files changed, 26 insertions(+), 14 deletions(-) diff --git a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts index 121fd5dd5..480285566 100644 --- a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts +++ b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.application.service.ts @@ -67,16 +67,17 @@ export class YieldAggregatorApplicationService { async withdrawFromVault( vaultId: string, - denom: string, + lp_denom: string, readableAmount: number, redeemAmount: number, feeAmount: number, + symbol: string, ) { // open confirm dialog if feeAmount > redeemAmount if (feeAmount > redeemAmount) { const txFeeConfirmedResult = await this.dialog .open(WithdrawFeeConfirmDialogComponent, { - data: { redeemAmount, feeAmount, denom }, + data: { redeemAmount, feeAmount, symbol }, }) .closed.toPromise(); if (!txFeeConfirmedResult) { @@ -93,7 +94,7 @@ export class YieldAggregatorApplicationService { const msg = this.yieldAggregatorService.buildMsgWithdrawFromVault( address, vaultId, - denom, + lp_denom, readableAmount, ); @@ -134,7 +135,7 @@ export class YieldAggregatorApplicationService { } } - async withdrawFromVaultWithUnbonding(vaultId: string, denom: string, amount: number) { + async withdrawFromVaultWithUnbonding(vaultId: string, lp_denom: string, amount: number) { const prerequisiteData = await this.txCommonApplication.getPrerequisiteData(); if (!prerequisiteData) { return; @@ -144,7 +145,7 @@ export class YieldAggregatorApplicationService { const msg = this.yieldAggregatorService.buildMsgWithdrawFromVaultWithUnbondingTime( address, vaultId, - denom, + lp_denom, amount, ); diff --git a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts index be88f3f72..6d1f69200 100644 --- a/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts +++ b/projects/portal/src/app/models/yield-aggregators/yield-aggregator.model.ts @@ -6,10 +6,17 @@ export type DepositToVaultRequest = { export type WithdrawFromVaultRequest = { vaultId: string; - denom: string; + lp_denom: string; readableAmount: number; redeemAmount: number; feeAmount: number; + symbol: string; +}; + +export type WithdrawFromVaultWithUnbondingRequest = { + vaultId: string; + lp_denom: string; + readableAmount: number; }; export type CreateVaultRequest = { diff --git a/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts b/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts index e542a4e79..80eee72c4 100644 --- a/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts +++ b/projects/portal/src/app/pages/yieldaggregator/vaults/vault/vault.component.ts @@ -12,6 +12,7 @@ import { YieldAggregatorApplicationService } from 'projects/portal/src/app/model import { DepositToVaultRequest, WithdrawFromVaultRequest, + WithdrawFromVaultWithUnbondingRequest, } from 'projects/portal/src/app/models/yield-aggregators/yield-aggregator.model'; import { YieldAggregatorQueryService } from 'projects/portal/src/app/models/yield-aggregators/yield-aggregator.query.service'; import { YieldAggregatorService } from 'projects/portal/src/app/models/yield-aggregators/yield-aggregator.service'; @@ -203,15 +204,16 @@ export class VaultComponent implements OnInit { onSubmitWithdraw(data: WithdrawFromVaultRequest) { this.iyaApp.withdrawFromVault( data.vaultId, - data.denom, + data.lp_denom, data.readableAmount, data.redeemAmount, data.feeAmount, + data.symbol, ); } - onSubmitWithdrawWithUnbonding(data: WithdrawFromVaultRequest) { - this.iyaApp.withdrawFromVaultWithUnbonding(data.vaultId, data.denom, data.readableAmount); + onSubmitWithdrawWithUnbonding(data: WithdrawFromVaultWithUnbondingRequest) { + this.iyaApp.withdrawFromVaultWithUnbonding(data.vaultId, data.lp_denom, data.readableAmount); } async onClickChain(chain: ExternalChain) { diff --git a/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.html b/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.html index 469f349e6..ecf48959f 100644 --- a/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.html +++ b/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.html @@ -3,7 +3,7 @@

      Withdrawal Fee Warning

      The Withdrawal Fee is high, in excess of 50 percent. It costs - {{ data.feeAmount | coinAmount }} {{ data.denom | coinDenom | async }}. + {{ data.feeAmount | coinAmount }} {{ data.symbol }}.
      Are you sure you want to send the tx with the fee?
      diff --git a/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.ts b/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.ts index 091e4dc56..ea04e8fdb 100644 --- a/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.ts +++ b/projects/portal/src/app/views/dialogs/txs/withdraw-fee-confirm/withdraw-fee-confirm-dialog.component.ts @@ -4,7 +4,7 @@ import { Component, Inject, OnInit } from '@angular/core'; export interface WithdrawFeeConfirmDialogData { redeemAmount: number; feeAmount: number; - denom: string; + symbol: string; } @Component({ selector: 'app-view-withdraw-fee-confirm-dialog', diff --git a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts index c838e9142..ecc3f7266 100644 --- a/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts +++ b/projects/portal/src/app/views/yieldaggregator/vaults/vault/vault.component.ts @@ -5,6 +5,7 @@ import { getDenomExponent } from 'projects/portal/src/app/models/cosmos/bank.mod import { DepositToVaultRequest, WithdrawFromVaultRequest, + WithdrawFromVaultWithUnbondingRequest, } from 'projects/portal/src/app/models/yield-aggregators/yield-aggregator.model'; import { CoinAmountPipe } from 'projects/portal/src/app/pipes/coin-amount.pipe'; import { @@ -79,7 +80,7 @@ export class VaultComponent implements OnInit, OnChanges { @Output() appWithdraw: EventEmitter; @Output() - appWithdrawWithUnbonding: EventEmitter; + appWithdrawWithUnbonding: EventEmitter; @Output() appClickChain: EventEmitter; @@ -225,16 +226,17 @@ export class VaultComponent implements OnInit, OnChanges { this.appWithdraw.emit({ vaultId: this.vault?.vault?.id!, readableAmount: this.burnAmount, - denom: 'yieldaggregator/vaults/' + this.vault?.vault?.id, + lp_denom: 'yieldaggregator/vaults/' + this.vault?.vault?.id, redeemAmount: Number(this.estimatedRedeemAmount?.redeem_amount), feeAmount: Number(this.estimatedRedeemAmount?.fee), + symbol: this.vault?.vault?.symbol!, }); } if (this.withdrawOptionId === 'unbonding') { this.appWithdrawWithUnbonding.emit({ vaultId: this.vault?.vault?.id!, readableAmount: this.burnAmount, - denom: 'yieldaggregator/vaults/' + this.vault?.vault?.id, + lp_denom: 'yieldaggregator/vaults/' + this.vault?.vault?.id, }); } }