Merge pull request #259 from Adamant-im/dev/trello.com/c/dt01fPcy

[trello.com/c/dt01fPcy] Fixed gas limit for eth & erc20
Adamant-im · Jun 5, 2023 · 6ec4234 · 6ec4234
2 parents 1360ff5 + 3ca5fed
commit 6ec4234
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/Adamant/Wallets/ERC20/ERC20WalletService+Send.swift b/Adamant/Wallets/ERC20/ERC20WalletService+Send.swift
@@ -55,6 +55,8 @@ extension ERC20WalletService: WalletServiceTwoStepSend {
                 amount: "\(amount)"
             ).transaction
 
+            await calculateFee(for: ethRecipient)
+
             let policies: Policies = Policies(
                 gasLimitPolicy: .manual(gasLimit),
                 gasPricePolicy: .manual(gasPrice)

diff --git a/Adamant/Wallets/ERC20/ERC20WalletService.swift b/Adamant/Wallets/ERC20/ERC20WalletService.swift
@@ -289,11 +289,11 @@ class ERC20WalletService: WalletService {
         await calculateFee()
     }
 
-    private func calculateFee() async {
+    func calculateFee(for address: EthereumAddress? = nil) async {
         guard let token = token else { return }
 
         let priceRaw = try? await getGasPrices()
-        let gasLimitRaw = try? await getGasLimit()
+        let gasLimitRaw = try? await getGasLimit(to: address)
 
         var price = priceRaw ?? BigUInt(token.defaultGasPriceGwei).toWei()
         var gasLimit = gasLimitRaw ?? BigUInt(token.defaultGasLimit)
@@ -349,7 +349,7 @@ class ERC20WalletService: WalletService {
         }
     }
 
-    func getGasLimit() async throws -> BigUInt {
+    func getGasLimit(to address: EthereumAddress?) async throws -> BigUInt {
         guard let web3 = await self.web3,
               let ethWallet = ethWallet,
               let erc20 = erc20
@@ -360,7 +360,7 @@ class ERC20WalletService: WalletService {
         do {
             let transaction = try await erc20.transfer(
                 from: ethWallet.ethAddress,
-                to: ethWallet.ethAddress,
+                to: address ?? ethWallet.ethAddress,
                 amount: "\(ethWallet.balance)"
             ).transaction
 

diff --git a/Adamant/Wallets/Ethereum/EthWalletService+Send.swift b/Adamant/Wallets/Ethereum/EthWalletService+Send.swift
@@ -57,6 +57,8 @@ extension EthWalletService: WalletServiceTwoStepSend {
         tx.to = ethRecipient
         tx.value = bigUIntAmount
 
+        await calculateFee(for: ethRecipient)
+
         let resolver = PolicyResolver(provider: provider)
         let policies: Policies = Policies(
             gasLimitPolicy: .manual(gasLimit),

diff --git a/Adamant/Wallets/Ethereum/EthWalletService.swift b/Adamant/Wallets/Ethereum/EthWalletService.swift
@@ -310,9 +310,9 @@ class EthWalletService: WalletService {
         await calculateFee()
 	}
 
-    private func calculateFee() async {
+    func calculateFee(for address: EthereumAddress? = nil) async {
         let priceRaw = try? await getGasPrices()
-        let gasLimitRaw = try? await getGasLimit()
+        let gasLimitRaw = try? await getGasLimit(to: address)
 
         var price = priceRaw ?? defaultGasPriceGwei.toWei()
         var gasLimit = gasLimitRaw ?? defaultGasLimit
@@ -370,7 +370,7 @@ class EthWalletService: WalletService {
         }
 	}
 
-    func getGasLimit() async throws -> BigUInt {
+    func getGasLimit(to address: EthereumAddress?) async throws -> BigUInt {
         guard let web3 = await self.web3,
               let ethWallet = ethWallet
         else {
@@ -380,7 +380,7 @@ class EthWalletService: WalletService {
         do {
             var transaction: CodableTransaction = .emptyTransaction
             transaction.from = ethWallet.ethAddress
-            transaction.to = ethWallet.ethAddress
+            transaction.to = address ?? ethWallet.ethAddress
 
             let price = try await web3.eth.estimateGas(for: transaction)
             return price