status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@desktop/communities): Computing fees in ETH and USD for Sign Transaction dialog 

Issue #10007
This commit is contained in:
Michal Iskierko 2023-03-24 13:34:10 +01:00 committed by Michał Iskierko
parent 2142a6bf9c
commit d759bda81d
11 changed files with 87 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/boot/app_controller.nim
View File

@ -216,7 +216,7 @@ proc newAppController*(statusFoundation: StatusFoundation): AppController =
result.settingsService, result.walletAccountService, result.transactionService,
result.networkService, result.tokenService)
result.tokensService = tokens_service.newService(statusFoundation.events, statusFoundation.threadpool,
result.transactionService)
result.transactionService, result.tokenService, result.settingsService)
result.providerService = provider_service.newService(statusFoundation.events, statusFoundation.threadpool, result.ensService)
result.networkConnectionService = network_connection_service.newService(statusFoundation.events, result.walletAccountService, result.networkService, result.collectibleService, result.nodeService)

6
src/app/modules/main/communities/module.nim
View File

@ -22,6 +22,7 @@ import ../../../../app_service/common/types
import ../../../../app_service/service/community/service as community_service
import ../../../../app_service/service/contacts/service as contacts_service
import ../../../../app_service/service/network/service as networks_service
import ../../../../app_service/service/transaction/service as transaction_service
import ../../../../app_service/service/community_tokens/service as community_tokens_service
import ../../../../app_service/service/chat/dto/chat
import ./tokens/models/token_item
@ -56,7 +57,8 @@ proc newModule*(
communityService: community_service.Service,
contactsService: contacts_service.Service,
communityTokensService: community_tokens_service.Service,
networksService: networks_service.Service): Module =
networksService: networks_service.Service,
transactionService: transaction_service.Service): Module =
result = Module()
result.delegate = delegate
result.view = newView(result)
@ -69,7 +71,7 @@ proc newModule*(
communityTokensService,
networksService,
)
result.communityTokensModule = community_tokens_module.newCommunityTokensModule(result, events, communityTokensService)
result.communityTokensModule = community_tokens_module.newCommunityTokensModule(result, events, communityTokensService, transactionService)
result.moduleLoaded = false
result.curatedCommunitiesLoaded = false

12
src/app/modules/main/communities/tokens/controller.nim
View File

@ -1,6 +1,7 @@
import ./io_interface as community_tokens_module_interface
import ../../../../../app_service/service/community_tokens/service as community_tokens_service
import ../../../../../app_service/service/transaction/service as transaction_service
import ../../../../../app_service/service/community/dto/community
import ../../../../core/signals/types
import ../../../../core/eventemitter
@ -14,16 +15,19 @@ type
communityTokensModule: community_tokens_module_interface.AccessInterface
events: EventEmitter
communityTokensService: community_tokens_service.Service
transactionService: transaction_service.Service
proc newCommunityTokensController*(
communityTokensModule: community_tokens_module_interface.AccessInterface,
events: EventEmitter,
communityTokensService: community_tokens_service.Service
communityTokensService: community_tokens_service.Service,
transactionService: transaction_service.Service
): Controller =
result = Controller()
result.communityTokensModule = communityTokensModule
result.events = events
result.communityTokensService = communityTokensService
result.transactionService = transactionService
proc delete*(self: Controller) =
discard
@ -44,3 +48,9 @@ proc authenticateUser*(self: Controller, keyUid = "") =
proc getCommunityTokens*(self: Controller, communityId: string): seq[CommunityTokenDto] =
return self.communityTokensService.getCommunityTokens(communityId)
proc getSuggestedFees*(self: Controller, chainId: int): SuggestedFeesDto =
return self.transactionService.suggestedFees(chainId)
proc getFiatValue*(self: Controller, cryptoBalance: string, cryptoSymbol: string): string =
return self.communityTokensService.getFiatValue(cryptoBalance, cryptoSymbol)

3
src/app/modules/main/communities/tokens/io_interface.nim
View File

@ -17,4 +17,7 @@ method onUserAuthenticated*(self: AccessInterface, password: string) {.base.} =
raise newException(ValueError, "No implementation available")
method resetTempValues*(self: AccessInterface) {.base.} =
raise newException(ValueError, "No implementation available")
method computeDeployFee*(self: AccessInterface, chainId: int): string {.base.} =
raise newException(ValueError, "No implementation available")

26
src/app/modules/main/communities/tokens/module.nim
View File

@ -1,7 +1,9 @@
import NimQml, json
import NimQml, json, stint, strformat, strutils
import ../../../../../app_service/service/community_tokens/service as community_tokens_service
import ../../../../../app_service/service/transaction/service as transaction_service
import ../../../../../app_service/service/community/dto/community
import ../../../../../app_service/common/conversion
import ../../../../core/eventemitter
import ../../../../global/global_singleton
import ../io_interface as parent_interface
@ -24,12 +26,13 @@ type
proc newCommunityTokensModule*(
parent: parent_interface.AccessInterface,
events: EventEmitter,
communityTokensService: community_tokens_service.Service): Module =
communityTokensService: community_tokens_service.Service,
transactionService: transaction_service.Service): Module =
result = Module()
result.parent = parent
result.view = newView(result)
result.viewVariant = newQVariant(result.view)
result.controller = controller.newCommunityTokensController(result, events, communityTokensService)
result.controller = controller.newCommunityTokensController(result, events, communityTokensService, transactionService)
method delete*(self: Module) =
self.view.delete
@ -74,3 +77,20 @@ method onUserAuthenticated*(self: Module, password: string) =
#TODO signalize somehow
else:
self.controller.deployCollectibles(self.tempCommunityId, self.tempAddressFrom, password, self.tempDeploymentParams, self.tempTokenMetadata, self.tempChainId)
method computeDeployFee*(self: Module, chainId: int): string =
let suggestedFees = self.controller.getSuggestedFees(chainId)
if suggestedFees == nil:
return "-"
let contractGasUnits = 3702411 # this should go from status-go
let maxFees = suggestedFees.maxFeePerGasM
let gasPrice = if suggestedFees.eip1559Enabled: maxFees else: suggestedFees.gasPrice
let weiValue = gwei2Wei(gasPrice) * contractGasUnits.u256
let ethValueStr = wei2Eth(weiValue)
let ethValue = parseFloat(ethValueStr)
let fiatValue = self.controller.getFiatValue(ethValueStr, "ETH")
return fmt"{ethValue:.4f}ETH (${fiatValue})"

10
src/app/modules/main/communities/tokens/view.nim
View File

@ -6,6 +6,7 @@ QtObject:
type
View* = ref object of QObject
communityTokensModule: community_tokens_module_interface.AccessInterface
deployFee: string
proc load*(self: View) =
discard
@ -21,7 +22,16 @@ QtObject:
proc deployCollectible*(self: View, communityId: string, fromAddress: string, name: string, symbol: string, description: string, supply: int, infiniteSupply: bool, transferable: bool, selfDestruct: bool, chainId: int, image: string) {.slot.} =
self.communityTokensModule.deployCollectible(communityId, fromAddress, name, symbol, description, supply, infiniteSupply, transferable, selfDestruct, chainId, image)
proc deployFeeUpdated*(self: View) {.signal.}
proc computeDeployFee*(self: View, chainId: int) {.slot.} =
self.deployFee = self.communityTokensModule.computeDeployFee(chainId)
self.deployFeeUpdated()
proc getDeployFee(self: View): QVariant {.slot.} =
return newQVariant(self.deployFee)
QtProperty[QVariant] deployFee:
read = getDeployFee
notify = deployFeeUpdated

2
src/app/modules/main/module.nim
View File

@ -207,7 +207,7 @@ proc newModule*[T](
result.stickersModule = stickers_module.newModule(result, events, stickersService, settingsService, walletAccountService, networkService, tokenService)
result.activityCenterModule = activity_center_module.newModule(result, events, activityCenterService, contactsService,
messageService, chatService, communityService)
result.communitiesModule = communities_module.newModule(result, events, communityService, contactsService, communityTokensService, networkService)
result.communitiesModule = communities_module.newModule(result, events, communityService, contactsService, communityTokensService, networkService, transactionService)
result.appSearchModule = app_search_module.newModule(result, events, contactsService, chatService, communityService,
messageService)
result.nodeSectionModule = node_section_module.newModule(result, events, settingsService, nodeService, nodeConfigurationService)

21
src/app_service/service/community_tokens/service.nim
View File

@ -1,9 +1,11 @@
import NimQml, Tables, chronicles, json, stint
import NimQml, Tables, chronicles, json, stint, strutils, strformat
import ../../../app/core/eventemitter
import ../../../app/core/tasks/[qt, threadpool]
import ../../../backend/community_tokens as tokens_backend
import ../transaction/service as transaction_service
import ../token/service as token_service
import ../settings/service as settings_service
import ../ens/utils as ens_utils
import ../eth/dto/transaction
@ -41,6 +43,8 @@ QtObject:
events: EventEmitter
threadpool: ThreadPool
transactionService: transaction_service.Service
tokenService: token_service.Service
settingsService: settings_service.Service
proc delete*(self: Service) =
self.QObject.delete
@ -48,13 +52,17 @@ QtObject:
proc newService*(
events: EventEmitter,
threadpool: ThreadPool,
transactionService: transaction_service.Service
transactionService: transaction_service.Service,
tokenService: token_service.Service,
settingsService: settings_service.Service
): Service =
result = Service()
result.QObject.setup
result.events = events
result.threadpool = threadpool
result.transactionService = transactionService
result.tokenService = tokenService
result.settingsService = settingsService
proc init*(self: Service) =
self.events.on(PendingTransactionTypeDto.CollectibleDeployment.event) do(e: Args):
@ -139,3 +147,12 @@ QtObject:
if token.symbol == symbol:
return token
proc getFiatValue*(self: Service, cryptoBalance: string, cryptoSymbol: string): string =
if (cryptoBalance == "" or cryptoSymbol == ""):
return "0.00"
let currentCurrency = self.settingsService.getCurrency()
let price = self.tokenService.getTokenPrice(cryptoSymbol, currentCurrency)
let value = parseFloat(cryptoBalance) * price
return fmt"{value:.2f}"

4
ui/app/AppLayouts/Chat/panels/communities/CommunityMintTokensSettingsPanel.qml
View File

@ -47,7 +47,7 @@ SettingsPageLayout {
string accountName,
string accountAddress)
signal signMintTransactionOpened
signal signMintTransactionOpened(int chainId)
function navigateBack() {
stackManager.pop(StackView.Immediate)
@ -223,7 +223,7 @@ SettingsPageLayout {
feeText: root.feeText
isFeeLoading: root.isFeeLoading
onOpened: root.signMintTransactionOpened()
onOpened: root.signMintTransactionOpened(parent.chainId)
onCancelClicked: close()
onSignTransactionClicked: parent.signMintTransaction()
}

9
ui/app/AppLayouts/Chat/stores/CommunityTokensStore.qml
View File

@ -5,7 +5,7 @@ QtObject {
id: root
property var communityTokensModuleInst: communityTokensModule ?? null
property string deployFee: "0.0015 ETH ($75.34)"//communityTokensModuleInst.computeFee // TODO: Backend
property string deployFee: communityTokensModuleInst.deployFee
// Network selection properties:
property var layer1Networks: networksModule.layer1
@ -60,9 +60,10 @@ QtObject {
infiniteSupply, transferable, selfDestruct, chainId, artworkSource)
}
function computeDeployFee() {
// TODO: Backend compute minitng fee
root.deployFeeUpdated(root.deployFee) // TO BE REMOVED
function computeDeployFee(chainId) {
// TODO this call will be async
communityTokensModuleInst.computeDeployFee(chainId)
root.deployFeeUpdated(root.deployFee)
}
// Airdrop tokens:

11
ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml
View File

@ -300,7 +300,7 @@ StatusSectionLayout {
accounts: root.rootStore.accounts
onPreviousPageNameChanged: root.backButtonName = previousPageName
onSignMintTransactionOpened: communityTokensStore.computeDeployFee()
onSignMintTransactionOpened: communityTokensStore.computeDeployFee(chainId)
onMintCollectible: {
communityTokensStore.deployCollectible(root.community.id,
accountAddress,
@ -326,8 +326,13 @@ StatusSectionLayout {
Connections {
target: rootStore.communityTokensStore
function onDeployFeeUpdated(value) {
mintPanel.isFeeLoading = false
mintPanel.feeText = value
// TODO better error handling
if (value === "-") {
mintPanel.isFeeLoading = true
} else {
mintPanel.isFeeLoading = false
mintPanel.feeText = value
}
}
}
}