[ABW-3827] Resource view Pre-Authorization states #1377
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,13 +25,10 @@ extension OnLedgerEntitiesClient { | |
| resourceAssociatedDapps: InteractionReview.Sections.ResourceAssociatedDapps? = nil, | ||
| networkID: NetworkID, | ||
| defaultDepositGuarantee: Decimal192 = 1 | ||
| ) async throws -> KnownResourceBalance { | ||
| let amount = resourceQuantifier.amount | ||
| let resourceAddress = resource.resourceAddress | ||
|
|
||
| let guarantee: TransactionGuarantee? = { () -> TransactionGuarantee? in | ||
| guard case let .predicted(predictedAmount) = resourceQuantifier else { return nil } | ||
| let guaranteedAmount = defaultDepositGuarantee * predictedAmount.value | ||
|
|
@@ -44,11 +41,35 @@ extension OnLedgerEntitiesClient { | |
| ) | ||
| }() | ||
|
|
||
| return try await fungibleResourceBalance( | ||
| resource, | ||
| resourceAmount: .exact(.init(nominalAmount: amount)), | ||
| guarantee: guarantee, | ||
| networkID: networkID | ||
| ) | ||
| } | ||
|
|
||
| func fungibleResourceBalance( | ||
| _ resource: OnLedgerEntity.Resource, | ||
| resourceAmount: ResourceAmount, | ||
| guarantee: TransactionGuarantee? = nil, | ||
| poolContributions: [some TrackedPoolInteraction] = [] as [TrackedPoolContribution], | ||
| validatorStakes: [TrackedValidatorStake] = [], | ||
| entities: InteractionReview.Sections.ResourcesInfo = [:], | ||
| resourceAssociatedDapps: InteractionReview.Sections.ResourceAssociatedDapps? = nil, | ||
| networkID: NetworkID, | ||
| defaultDepositGuarantee: Decimal192 = 1 | ||
| ) async throws -> KnownResourceBalance { | ||
| let resourceAddress = resource.resourceAddress | ||
|
|
||
| @Dependency(\.resourcesVisibilityClient) var resourcesVisibilityClient | ||
| let hiddenResources = try await resourcesVisibilityClient.getHidden() | ||
GhenadieVP marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| // Check if the fungible resource is a pool unit resource | ||
| if await isPoolUnitResource(resource) { | ||
| return try await poolUnit( | ||
| resource, | ||
| amount: resourceAmount, | ||
| poolContributions: poolContributions, | ||
| entities: entities, | ||
| resourceAssociatedDapps: resourceAssociatedDapps, | ||
|
|
@@ -62,7 +83,7 @@ extension OnLedgerEntitiesClient { | |
| if let validator = await isLiquidStakeUnit(resource) { | ||
| return try await liquidStakeUnit( | ||
| resource, | ||
| amount: resourceAmount, | ||
| validator: validator, | ||
| validatorStakes: validatorStakes, | ||
| guarantee: guarantee | ||
|
|
@@ -72,24 +93,27 @@ extension OnLedgerEntitiesClient { | |
| // Normal fungible resource | ||
| let isXRD = resourceAddress.isXRD(on: networkID) | ||
| let isHidden = hiddenResources.contains(.fungible(resourceAddress)) | ||
| let details: KnownResourceBalance.Fungible = .init(isXRD: isXRD, amount: resourceAmount, guarantee: guarantee) | ||
|
|
||
| return .init(resource: resource, details: .fungible(details), isHidden: isHidden) | ||
| } | ||
|
|
||
| private func poolUnit( | ||
| _ resource: OnLedgerEntity.Resource, | ||
| amount: ResourceAmount, | ||
| poolContributions: [some TrackedPoolInteraction] = [], | ||
| entities: InteractionReview.Sections.ResourcesInfo = [:], | ||
| resourceAssociatedDapps: InteractionReview.Sections.ResourceAssociatedDapps? = nil, | ||
| networkID: NetworkID, | ||
| guarantee: TransactionGuarantee?, | ||
| hiddenResources: [ResourceIdentifier] | ||
| ) async throws -> KnownResourceBalance { | ||
| let resourceAddress = resource.resourceAddress | ||
|
|
||
| if let poolContribution = poolContributions.first(where: { $0.poolUnitsResourceAddress == resourceAddress }) { | ||
| guard let amount = amount.exactAmount?.nominalAmount else { | ||
| fatalError("Not possible") | ||
|
There was a problem hiding this comment. Add a better message as to why this is not possible. Still, it may be worth investigating if we could have separate functions that are called when resolving the sections for manifestSummary or from executionSummary. There was a problem hiding this comment. Did the separation here |
||
| } | ||
| // If this transfer does not contain all the pool units, scale the resource amounts pro rata | ||
| let adjustmentFactor = amount != poolContribution.poolUnitsAmount ? (amount / poolContribution.poolUnitsAmount) : 1 | ||
| var xrdResource: OwnedResourcePoolDetails.ResourceWithRedemptionValue? | ||
|
|
@@ -101,7 +125,7 @@ extension OnLedgerEntitiesClient { | |
|
|
||
| let resource = OwnedResourcePoolDetails.ResourceWithRedemptionValue( | ||
| resource: .init(resourceAddress: address, metadata: entity.metadata), | ||
| redemptionValue: .exact(.init(nominalAmount: resourceAmount * adjustmentFactor)) | ||
| ) | ||
|
|
||
| if address.isXRD(on: networkID) { | ||
|
|
@@ -119,7 +143,11 @@ extension OnLedgerEntitiesClient { | |
| details: .init( | ||
| address: poolContribution.poolAddress, | ||
| dAppName: resourceAssociatedDapps?[resourceAddress]?.name, | ||
| poolUnitResource: .init( | ||
| resource: resource, | ||
| amount: .exact(.init(nominalAmount: amount)), | ||
|
There was a problem hiding this comment. seeing this multiple times, maybe worth declaring a function on ResourceAmount like: static func exact(_ nominalAmount: Decimal) -> Self |
||
| guarantee: guarantee?.amount | ||
| ), | ||
| xrdResource: xrdResource, | ||
| nonXrdResources: nonXrdResources | ||
| ), | ||
|
|
@@ -128,7 +156,7 @@ extension OnLedgerEntitiesClient { | |
| isHidden: isHidden | ||
| ) | ||
| } else { | ||
| guard let details = try await getPoolUnitDetails(resource, forAmount: amount, guarantee: guarantee?.amount) else { | ||
| throw FailedToGetPoolUnitDetails() | ||
| } | ||
|
|
||
|
|
@@ -147,38 +175,41 @@ extension OnLedgerEntitiesClient { | |
|
|
||
| private func liquidStakeUnit( | ||
| _ resource: OnLedgerEntity.Resource, | ||
| amount: ResourceAmount, | ||
| validator: OnLedgerEntity.Validator, | ||
| validatorStakes: [TrackedValidatorStake] = [], | ||
| guarantee: TransactionGuarantee? | ||
| ) async throws -> KnownResourceBalance { | ||
| let worth: ResourceAmount | ||
| if validatorStakes.isEmpty { | ||
| guard let totalSupply = resource.totalSupply, totalSupply.isPositive else { | ||
| throw MissingPositiveTotalSupply() | ||
| } | ||
|
|
||
| worth = amount.adjustedNominalAmount { $0 * validator.xrdVaultBalance / totalSupply } | ||
|
There was a problem hiding this comment. token arithmetic ought best be done in Sargon, would that makes sense? And with unit tests... |
||
| } else { | ||
| guard let exactAmount = amount.exactAmount else { | ||
|
|
||
| fatalError("Not possible") | ||
| } | ||
| if let stake = validatorStakes.first(where: { $0.validatorAddress == validator.address }) { | ||
| guard stake.liquidStakeUnitAddress == validator.stakeUnitResourceAddress else { | ||
| throw StakeUnitAddressMismatch() | ||
| } | ||
| // Distribute the worth in proportion to the amounts, if needed | ||
| if stake.liquidStakeUnitAmount == exactAmount.nominalAmount { | ||
| worth = .exact(.init(nominalAmount: stake.xrdAmount)) | ||
| } else { | ||
| worth = .exact(.init(nominalAmount: (exactAmount.nominalAmount / stake.liquidStakeUnitAmount) * stake.xrdAmount)) | ||
|
There was a problem hiding this comment. possible to move token amount arithmetic to Sargon? |
||
| } | ||
| } else { | ||
| throw MissingTrackedValidatorStake() | ||
| } | ||
| } | ||
|
|
||
| let details = KnownResourceBalance.LiquidStakeUnit( | ||
| resource: resource, | ||
| amount: amount, | ||
| worth: worth, | ||
| validator: validator, | ||
| guarantee: guarantee | ||
| ) | ||
|
|
@@ -191,12 +222,11 @@ extension OnLedgerEntitiesClient { | |
| func nonFungibleResourceBalances( | ||
| _ resourceInfo: InteractionReview.Sections.ResourceInfo, | ||
| resourceAddress: ResourceAddress, | ||
| ids: [NonFungibleLocalId], | ||
| unstakeData: [NonFungibleGlobalId: UnstakeData] = [:], | ||
| newlyCreatedNonFungibles: [NonFungibleGlobalId] = [] | ||
| ) async throws -> [KnownResourceBalance] { | ||
| let result: [KnownResourceBalance] | ||
|
|
||
| switch resourceInfo { | ||
| case let .left(resource): | ||
|
|
@@ -237,7 +267,7 @@ extension OnLedgerEntitiesClient { | |
| } else { | ||
| result = tokens.map { token in | ||
| let isHidden = hiddenResources.contains(.nonFungible(token.id.resourceAddress)) | ||
| return KnownResourceBalance(resource: resource, details: .nonFungible(.token(token)), isHidden: isHidden) | ||
| } | ||
|
|
||
| guard result.count == ids.count else { | ||
|
|
@@ -258,7 +288,7 @@ extension OnLedgerEntitiesClient { | |
| ) | ||
| } | ||
| .map { id in | ||
| KnownResourceBalance(resource: resource, details: .nonFungible(.token(.init(id: id, data: nil))), isHidden: false) | ||
|
|
||
| } | ||
|
|
||
| guard result.count == ids.count else { | ||
|
|
@@ -274,7 +304,7 @@ extension OnLedgerEntitiesClient { | |
| stakeClaimValidator: OnLedgerEntity.Validator, | ||
| unstakeData: [NonFungibleGlobalId: UnstakeData], | ||
| tokens: [OnLedgerEntity.NonFungibleToken] | ||
| ) throws -> KnownResourceBalance { | ||
| let stakeClaimTokens: [OnLedgerEntitiesClient.StakeClaim] = if unstakeData.isEmpty { | ||
| try tokens.map { token in | ||
| guard let data = token.data else { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer line breaks for long signatures - try
CTRL + Min Xcode :)