diff --git a/Sources/BraveWallet/Crypto/Stores/AssetDetailStore.swift b/Sources/BraveWallet/Crypto/Stores/AssetDetailStore.swift index e7a3036c4ae..c78954e29f1 100644 --- a/Sources/BraveWallet/Crypto/Stores/AssetDetailStore.swift +++ b/Sources/BraveWallet/Crypto/Stores/AssetDetailStore.swift @@ -292,7 +292,7 @@ class AssetDetailStore: ObservableObject { await self.txService.allTransactionInfo( network.coin, chainId: network.chainId, - from: account.address + from: account.accountId ) } } diff --git a/Sources/BraveWallet/Crypto/Stores/CryptoStore.swift b/Sources/BraveWallet/Crypto/Stores/CryptoStore.swift index cfe73bf338d..dc213159b26 100644 --- a/Sources/BraveWallet/Crypto/Stores/CryptoStore.swift +++ b/Sources/BraveWallet/Crypto/Stores/CryptoStore.swift @@ -24,15 +24,24 @@ enum PendingRequest: Equatable { extension PendingRequest: Identifiable { var id: String { switch self { - case let .transactions(transactions): return "transactions-\(transactions.map(\.id))" - case let .addChain(request): return "addChain-\(request.networkInfo.chainId)" - case let .switchChain(chainRequest): return "switchChain-\(chainRequest.chainId)" - case let .addSuggestedToken(tokenRequest): return "addSuggestedToken-\(tokenRequest.token.id)" - case let .signMessage(signRequests): return "signMessage-\(signRequests.map(\.id))" - case let .getEncryptionPublicKey(request): return "getEncryptionPublicKey-\(request.address)-\(request.requestId)" - case let .decrypt(request): return "decrypt-\(request.address)-\(request.requestId)" - case let .signTransaction(requests): return "signTransaction-\(requests.map(\.id))" - case let .signAllTransactions(requests): return "signAllTransactions-\(requests.map(\.id))" + case let .transactions(transactions): + return "transactions-\(transactions.map(\.id))" + case let .addChain(request): + return "addChain-\(request.networkInfo.chainId)" + case let .switchChain(chainRequest): + return "switchChain-\(chainRequest.chainId)" + case let .addSuggestedToken(tokenRequest): + return "addSuggestedToken-\(tokenRequest.token.id)" + case let .signMessage(signRequests): + return "signMessage-\(signRequests.map(\.id))" + case let .getEncryptionPublicKey(request): + return "getEncryptionPublicKey-\(request.accountId.uniqueKey)-\(request.requestId)" + case let .decrypt(request): + return "decrypt-\(request.accountId.uniqueKey)-\(request.requestId)" + case let .signTransaction(requests): + return "signTransaction-\(requests.map(\.id))" + case let .signAllTransactions(requests): + return "signAllTransactions-\(requests.map(\.id))" } } } diff --git a/Sources/BraveWallet/Crypto/Stores/SendTokenStore.swift b/Sources/BraveWallet/Crypto/Stores/SendTokenStore.swift index 83cec0224e5..15dead85534 100644 --- a/Sources/BraveWallet/Crypto/Stores/SendTokenStore.swift +++ b/Sources/BraveWallet/Crypto/Stores/SendTokenStore.swift @@ -290,12 +290,12 @@ public class SendTokenStore: ObservableObject { private func makeEIP1559Tx( chainId: String, baseData: BraveWallet.TxData, - from address: String, + from accountId: BraveWallet.AccountId, completion: @escaping (_ success: Bool, _ errMsg: String?) -> Void ) { let eip1559Data = BraveWallet.TxData1559(baseData: baseData, chainId: chainId, maxPriorityFeePerGas: "", maxFeePerGas: "", gasEstimation: nil) let txDataUnion = BraveWallet.TxDataUnion(ethTxData1559: eip1559Data) - self.txService.addUnapprovedTransaction(txDataUnion, from: address, origin: nil, groupId: nil) { success, txMetaId, errorMessage in + self.txService.addUnapprovedTransaction(txDataUnion, from: accountId, origin: nil, groupId: nil) { success, txMetaId, errorMessage in completion(success, errorMessage) } } @@ -494,11 +494,11 @@ public class SendTokenStore: ObservableObject { } switch selectedAccount.coin { case .eth: - self.sendTokenOnEth(amount: amount, token: token, fromAddress: selectedAccount.address, completion: completion) + self.sendTokenOnEth(amount: amount, token: token, from: selectedAccount.accountId, completion: completion) case .sol: - self.sendTokenOnSol(amount: amount, token: token, fromAddress: selectedAccount.address, completion: completion) + self.sendTokenOnSol(amount: amount, token: token, from: selectedAccount.accountId, completion: completion) case .fil: - self.sendTokenOnFil(amount: amount, token: token, fromAddress: selectedAccount.address, completion: completion) + self.sendTokenOnFil(amount: amount, token: token, from: selectedAccount.accountId, completion: completion) default: completion(false, Strings.Wallet.internalErrorMessage) } @@ -508,7 +508,7 @@ public class SendTokenStore: ObservableObject { func sendTokenOnEth( amount: String, token: BraveWallet.BlockchainToken, - fromAddress: String, + from fromAccountId: BraveWallet.AccountId, completion: @escaping (_ success: Bool, _ errMsg: String?) -> Void ) { let weiFormatter = WeiFormatter(decimalFormatStyle: .decimals(precision: 18)) @@ -525,26 +525,26 @@ public class SendTokenStore: ObservableObject { if network.isNativeAsset(token) { let baseData = BraveWallet.TxData(nonce: "", gasPrice: "", gasLimit: "", to: sendToAddress, value: "0x\(weiHexString)", data: .init(), signOnly: false, signedTransaction: nil) if network.isEip1559 { - self.makeEIP1559Tx(chainId: network.chainId, baseData: baseData, from: fromAddress) { success, errorMessage in + self.makeEIP1559Tx(chainId: network.chainId, baseData: baseData, from: fromAccountId) { success, errorMessage in self.isMakingTx = false completion(success, errorMessage) } } else { let txDataUnion = BraveWallet.TxDataUnion(ethTxData: baseData) - self.txService.addUnapprovedTransaction(txDataUnion, from: fromAddress, origin: nil, groupId: nil) { success, txMetaId, errorMessage in + self.txService.addUnapprovedTransaction(txDataUnion, from: fromAccountId, origin: nil, groupId: nil) { success, txMetaId, errorMessage in self.isMakingTx = false completion(success, errorMessage) } } } else if token.isErc721 { - self.ethTxManagerProxy.makeErc721Transfer(fromData: fromAddress, to: sendToAddress, tokenId: token.tokenId, contractAddress: token.contractAddress) { success, data in + self.ethTxManagerProxy.makeErc721Transfer(fromData: fromAccountId.address, to: sendToAddress, tokenId: token.tokenId, contractAddress: token.contractAddress) { success, data in guard success else { completion(false, nil) return } let baseData = BraveWallet.TxData(nonce: "", gasPrice: "", gasLimit: "", to: token.contractAddress, value: "0x0", data: data, signOnly: false, signedTransaction: nil) let txDataUnion = BraveWallet.TxDataUnion(ethTxData: baseData) - self.txService.addUnapprovedTransaction(txDataUnion, from: fromAddress, origin: nil, groupId: nil) { success, txMetaId, errorMessage in + self.txService.addUnapprovedTransaction(txDataUnion, from: fromAccountId, origin: nil, groupId: nil) { success, txMetaId, errorMessage in self.isMakingTx = false completion(success, errorMessage) } @@ -557,13 +557,13 @@ public class SendTokenStore: ObservableObject { } let baseData = BraveWallet.TxData(nonce: "", gasPrice: "", gasLimit: "", to: token.contractAddress, value: "0x0", data: data, signOnly: false, signedTransaction: nil) if network.isEip1559 { - self.makeEIP1559Tx(chainId: network.chainId, baseData: baseData, from: fromAddress) { success, errorMessage in + self.makeEIP1559Tx(chainId: network.chainId, baseData: baseData, from: fromAccountId) { success, errorMessage in self.isMakingTx = false completion(success, errorMessage) } } else { let txDataUnion = BraveWallet.TxDataUnion(ethTxData: baseData) - self.txService.addUnapprovedTransaction(txDataUnion, from: fromAddress, origin: nil, groupId: nil) { success, txMetaId, errorMessage in + self.txService.addUnapprovedTransaction(txDataUnion, from: fromAccountId, origin: nil, groupId: nil) { success, txMetaId, errorMessage in self.isMakingTx = false completion(success, errorMessage) } @@ -576,7 +576,7 @@ public class SendTokenStore: ObservableObject { private func sendTokenOnSol( amount: String, token: BraveWallet.BlockchainToken, - fromAddress: String, + from fromAccountId: BraveWallet.AccountId, completion: @escaping (_ success: Bool, _ errMsg: String?) -> Void ) { guard let amount = WeiFormatter.decimalToAmount(amount.normalizedDecimals, tokenDecimals: Int(token.decimals)) else { @@ -590,7 +590,7 @@ public class SendTokenStore: ObservableObject { guard let self = self else { return } if network.isNativeAsset(token) { self.solTxManagerProxy.makeSystemProgramTransferTxData( - fromAddress, + fromAccountId.address, to: sendToAddress, lamports: amount ) { solTxData, error, errMsg in @@ -599,7 +599,7 @@ public class SendTokenStore: ObservableObject { return } let txDataUnion = BraveWallet.TxDataUnion(solanaTxData: solanaTxData) - self.txService.addUnapprovedTransaction(txDataUnion, from: fromAddress, origin: nil, groupId: nil) { success, txMetaId, errMsg in + self.txService.addUnapprovedTransaction(txDataUnion, from: fromAccountId, origin: nil, groupId: nil) { success, txMetaId, errMsg in completion(success, errMsg) } } @@ -607,7 +607,7 @@ public class SendTokenStore: ObservableObject { self.solTxManagerProxy.makeTokenProgramTransferTxData( network.chainId, splTokenMintAddress: token.contractAddress, - fromWalletAddress: fromAddress, + fromWalletAddress: fromAccountId.address, toWalletAddress: sendToAddress, amount: amount ) { solTxData, error, errMsg in @@ -616,7 +616,7 @@ public class SendTokenStore: ObservableObject { return } let txDataUnion = BraveWallet.TxDataUnion(solanaTxData: solanaTxData) - self.txService.addUnapprovedTransaction(txDataUnion, from: fromAddress, origin: nil, groupId: nil) { success, txMetaId, errorMessage in + self.txService.addUnapprovedTransaction(txDataUnion, from: fromAccountId, origin: nil, groupId: nil) { success, txMetaId, errorMessage in completion(success, errorMessage) } } @@ -627,7 +627,7 @@ public class SendTokenStore: ObservableObject { private func sendTokenOnFil( amount: String, token: BraveWallet.BlockchainToken, - fromAddress: String, + from fromAccountId: BraveWallet.AccountId, completion: @escaping (_ success: Bool, _ errMsg: String?) -> Void ) { let weiFormatter = WeiFormatter(decimalFormatStyle: .decimals(precision: Int(token.decimals))) @@ -646,7 +646,7 @@ public class SendTokenStore: ObservableObject { to: sendAddress, value: weiString ) - self.txService.addUnapprovedTransaction(BraveWallet.TxDataUnion(filTxData: filTxData), from: fromAddress, origin: nil, groupId: nil) { success, txMetaId, errorMessage in + self.txService.addUnapprovedTransaction(BraveWallet.TxDataUnion(filTxData: filTxData), from: fromAccountId, origin: nil, groupId: nil) { success, txMetaId, errorMessage in self.isMakingTx = false completion(success, errorMessage) } diff --git a/Sources/BraveWallet/Crypto/Stores/SwapTokenStore.swift b/Sources/BraveWallet/Crypto/Stores/SwapTokenStore.swift index 613b3f5dc22..51f3084a999 100644 --- a/Sources/BraveWallet/Crypto/Stores/SwapTokenStore.swift +++ b/Sources/BraveWallet/Crypto/Stores/SwapTokenStore.swift @@ -299,7 +299,7 @@ public class SwapTokenStore: ObservableObject { signedTransaction: nil ) let txDataUnion = BraveWallet.TxDataUnion(ethTxData: baseData) - let (success, _, _) = await txService.addUnapprovedTransaction(txDataUnion, from: accountInfo.address, origin: nil, groupId: nil) + let (success, _, _) = await txService.addUnapprovedTransaction(txDataUnion, from: accountInfo.accountId, origin: nil, groupId: nil) if !success { self.state = .error(Strings.Wallet.unknownError) self.clearAllAmount() @@ -401,7 +401,7 @@ public class SwapTokenStore: ObservableObject { return success } else { let txDataUnion = BraveWallet.TxDataUnion(ethTxData: baseData) - let (success, _, _) = await txService.addUnapprovedTransaction(txDataUnion, from: accountInfo.address, origin: nil, groupId: nil) + let (success, _, _) = await txService.addUnapprovedTransaction(txDataUnion, from: accountInfo.accountId, origin: nil, groupId: nil) if !success { self.state = .error(Strings.Wallet.unknownError) self.clearAllAmount() @@ -431,7 +431,7 @@ public class SwapTokenStore: ObservableObject { } let eip1559Data = BraveWallet.TxData1559(baseData: baseData, chainId: chainId, maxPriorityFeePerGas: maxPriorityFeePerGas, maxFeePerGas: maxFeePerGas, gasEstimation: gasEstimation) let txDataUnion = BraveWallet.TxDataUnion(ethTxData1559: eip1559Data) - let (success, _, _) = await txService.addUnapprovedTransaction(txDataUnion, from: account.address, origin: nil, groupId: nil) + let (success, _, _) = await txService.addUnapprovedTransaction(txDataUnion, from: account.accountId, origin: nil, groupId: nil) if !success { self.state = .error(Strings.Wallet.unknownError) self.clearAllAmount() @@ -601,13 +601,15 @@ public class SwapTokenStore: ObservableObject { guard let jupiterQuote, let route = jupiterQuote.routes.first, let accountInfo = self.accountInfo, - let selectedToToken else { + let selectedToToken, + let selectedFromToken else { return false } let network = await rpcService.network(.sol, origin: nil) let jupiterSwapParams: BraveWallet.JupiterSwapParams = .init( route: route, userPublicKey: accountInfo.address, + inputMint: selectedFromToken.contractAddress(in: network), outputMint: selectedToToken.contractAddress(in: network) ) let (swapTransactions, errorResponse, _) = await swapService.jupiterSwapTransactions(jupiterSwapParams) @@ -651,7 +653,7 @@ public class SwapTokenStore: ObservableObject { } let (success, _, _) = await txService.addUnapprovedTransaction( .init(solanaTxData: solTxData), - from: accountInfo.address, + from: accountInfo.accountId, origin: nil, groupId: nil ) diff --git a/Sources/BraveWallet/Crypto/Transaction Confirmations/EditPermissionsView.swift b/Sources/BraveWallet/Crypto/Transaction Confirmations/EditPermissionsView.swift index 68568edf292..6c37658ca4f 100644 --- a/Sources/BraveWallet/Crypto/Transaction Confirmations/EditPermissionsView.swift +++ b/Sources/BraveWallet/Crypto/Transaction Confirmations/EditPermissionsView.swift @@ -41,7 +41,7 @@ struct EditPermissionsView: View { } private var accountName: String { - NamedAddresses.name(for: activeTransaction.fromAddress, accounts: keyringStore.allAccounts) + NamedAddresses.name(for: activeTransaction.fromAccountId.address, accounts: keyringStore.allAccounts) } init( diff --git a/Sources/BraveWallet/Crypto/Transactions/TransactionParser+TransactionSummary.swift b/Sources/BraveWallet/Crypto/Transactions/TransactionParser+TransactionSummary.swift index 746572b5430..8fae38e3d46 100644 --- a/Sources/BraveWallet/Crypto/Transactions/TransactionParser+TransactionSummary.swift +++ b/Sources/BraveWallet/Crypto/Transactions/TransactionParser+TransactionSummary.swift @@ -10,7 +10,7 @@ struct TransactionSummary: Equatable, Identifiable { /// The transaction let txInfo: BraveWallet.TransactionInfo /// From address of the transaction - var fromAddress: String { txInfo.fromAddress } + var fromAddress: String { txInfo.fromAccountId.address } /// Account name for the from address of the transaction let namedFromAddress: String /// To address of the transaction @@ -69,7 +69,7 @@ extension TransactionParser { } return .init( txInfo: transaction, - namedFromAddress: NamedAddresses.name(for: transaction.fromAddress, accounts: accountInfos), + namedFromAddress: NamedAddresses.name(for: transaction.fromAccountId.address, accounts: accountInfos), toAddress: toAddress, namedToAddress: NamedAddresses.name(for: transaction.ethTxToAddress, accounts: accountInfos), title: "", diff --git a/Sources/BraveWallet/Crypto/Transactions/TransactionParser.swift b/Sources/BraveWallet/Crypto/Transactions/TransactionParser.swift index 915ff5ac4be..85c92bbfc23 100644 --- a/Sources/BraveWallet/Crypto/Transactions/TransactionParser.swift +++ b/Sources/BraveWallet/Crypto/Transactions/TransactionParser.swift @@ -136,8 +136,8 @@ enum TransactionParser { */ return .init( transaction: transaction, - namedFromAddress: NamedAddresses.name(for: transaction.fromAddress, accounts: accountInfos), - fromAddress: transaction.fromAddress, + namedFromAddress: NamedAddresses.name(for: transaction.fromAccountId.address, accounts: accountInfos), + fromAddress: transaction.fromAccountId.address, namedToAddress: NamedAddresses.name(for: filTxData.to, accounts: accountInfos), toAddress: filTxData.to, networkSymbol: network.symbol, @@ -174,8 +174,8 @@ enum TransactionParser { */ return .init( transaction: transaction, - namedFromAddress: NamedAddresses.name(for: transaction.fromAddress, accounts: accountInfos), - fromAddress: transaction.fromAddress, + namedFromAddress: NamedAddresses.name(for: transaction.fromAccountId.address, accounts: accountInfos), + fromAddress: transaction.fromAccountId.address, namedToAddress: NamedAddresses.name(for: transaction.ethTxToAddress, accounts: accountInfos), toAddress: transaction.ethTxToAddress, networkSymbol: network.symbol, @@ -219,8 +219,8 @@ enum TransactionParser { */ return .init( transaction: transaction, - namedFromAddress: NamedAddresses.name(for: transaction.fromAddress, accounts: accountInfos), - fromAddress: transaction.fromAddress, + namedFromAddress: NamedAddresses.name(for: transaction.fromAccountId.address, accounts: accountInfos), + fromAddress: transaction.fromAccountId.address, namedToAddress: NamedAddresses.name(for: toAddress, accounts: accountInfos), toAddress: toAddress, networkSymbol: network.symbol, @@ -274,8 +274,8 @@ enum TransactionParser { */ return .init( transaction: transaction, - namedFromAddress: NamedAddresses.name(for: transaction.fromAddress, accounts: accountInfos), - fromAddress: transaction.fromAddress, + namedFromAddress: NamedAddresses.name(for: transaction.fromAccountId.address, accounts: accountInfos), + fromAddress: transaction.fromAccountId.address, namedToAddress: NamedAddresses.name(for: transaction.ethTxToAddress, accounts: accountInfos), toAddress: transaction.ethTxToAddress, networkSymbol: network.symbol, @@ -325,8 +325,8 @@ enum TransactionParser { */ return .init( transaction: transaction, - namedFromAddress: NamedAddresses.name(for: transaction.fromAddress, accounts: accountInfos), - fromAddress: transaction.fromAddress, + namedFromAddress: NamedAddresses.name(for: transaction.fromAccountId.address, accounts: accountInfos), + fromAddress: transaction.fromAccountId.address, namedToAddress: NamedAddresses.name(for: transaction.ethTxToAddress, accounts: accountInfos), toAddress: transaction.ethTxToAddress, networkSymbol: network.symbol, @@ -358,8 +358,8 @@ enum TransactionParser { return .init( transaction: transaction, - namedFromAddress: NamedAddresses.name(for: transaction.fromAddress, accounts: accountInfos), - fromAddress: transaction.fromAddress, // The caller, which may not be the owner + namedFromAddress: NamedAddresses.name(for: transaction.fromAccountId.address, accounts: accountInfos), + fromAddress: transaction.fromAccountId.address, // The caller, which may not be the owner namedToAddress: NamedAddresses.name(for: toAddress, accounts: accountInfos), toAddress: toAddress, networkSymbol: network.symbol, @@ -398,8 +398,8 @@ enum TransactionParser { */ return .init( transaction: transaction, - namedFromAddress: NamedAddresses.name(for: transaction.fromAddress, accounts: accountInfos), - fromAddress: transaction.fromAddress, + namedFromAddress: NamedAddresses.name(for: transaction.fromAccountId.address, accounts: accountInfos), + fromAddress: transaction.fromAccountId.address, namedToAddress: NamedAddresses.name(for: toAddress, accounts: accountInfos), toAddress: toAddress, networkSymbol: network.symbol, @@ -449,8 +449,8 @@ enum TransactionParser { */ return .init( transaction: transaction, - namedFromAddress: NamedAddresses.name(for: transaction.fromAddress, accounts: accountInfos), - fromAddress: transaction.fromAddress, + namedFromAddress: NamedAddresses.name(for: transaction.fromAccountId.address, accounts: accountInfos), + fromAddress: transaction.fromAccountId.address, namedToAddress: NamedAddresses.name(for: toAddress, accounts: accountInfos), toAddress: toAddress, networkSymbol: network.symbol, @@ -560,8 +560,8 @@ enum TransactionParser { } return .init( transaction: transaction, - namedFromAddress: NamedAddresses.name(for: transaction.fromAddress, accounts: accountInfos), - fromAddress: transaction.fromAddress, + namedFromAddress: NamedAddresses.name(for: transaction.fromAccountId.address, accounts: accountInfos), + fromAddress: transaction.fromAccountId.address, namedToAddress: NamedAddresses.name(for: toAddress ?? "", accounts: accountInfos), toAddress: toAddress ?? "", networkSymbol: network.symbol, diff --git a/Sources/BraveWallet/Extensions/BraveWalletSwiftUIExtensions.swift b/Sources/BraveWallet/Extensions/BraveWalletSwiftUIExtensions.swift index 565ea10c6d7..a5eee4ea240 100644 --- a/Sources/BraveWallet/Extensions/BraveWalletSwiftUIExtensions.swift +++ b/Sources/BraveWallet/Extensions/BraveWalletSwiftUIExtensions.swift @@ -146,7 +146,7 @@ extension BraveWallet.SignMessageRequest { .init( originInfo: .init(originSpec: "https://app.uniswap.org", eTldPlusOne: "uniswap.org"), id: 1, - address: "", + accountId: BraveWallet.AccountInfo.previewAccount.accountId, domain: "example.com", message: "To avoid digital cat burglars, sign below to authenticate with CryptoKitties.", isEip712: false, diff --git a/Sources/BraveWallet/Extensions/WalletTxServiceExtensions.swift b/Sources/BraveWallet/Extensions/WalletTxServiceExtensions.swift index 7fb8f82344d..36a1dc692fa 100644 --- a/Sources/BraveWallet/Extensions/WalletTxServiceExtensions.swift +++ b/Sources/BraveWallet/Extensions/WalletTxServiceExtensions.swift @@ -33,7 +33,7 @@ extension BraveWalletTxService { for info in keyring.accountInfos { for network in networksForKeyringCoin where network.supportedKeyrings.contains(keyring.id.rawValue as NSNumber) { group.addTask { @MainActor in - await self.allTransactionInfo(info.coin, chainId: network.chainId, from: info.address) + await self.allTransactionInfo(info.coin, chainId: network.chainId, from: info.accountId) } } } @@ -57,7 +57,7 @@ extension BraveWalletTxService { body: { @MainActor group in for network in networks where network.supportedKeyrings.contains(accountInfo.accountId.keyringId.rawValue as NSNumber) { group.addTask { @MainActor in - await self.allTransactionInfo(accountInfo.coin, chainId: network.chainId, from: accountInfo.address) + await self.allTransactionInfo(accountInfo.coin, chainId: network.chainId, from: accountInfo.accountId) } } var allTx: [BraveWallet.TransactionInfo] = [] diff --git a/Sources/BraveWallet/Panels/Encryption/EncryptionView.swift b/Sources/BraveWallet/Panels/Encryption/EncryptionView.swift index 2e6195570e1..1a9804793b7 100644 --- a/Sources/BraveWallet/Panels/Encryption/EncryptionView.swift +++ b/Sources/BraveWallet/Panels/Encryption/EncryptionView.swift @@ -16,9 +16,9 @@ struct EncryptionView: View { var address: String { switch self { case let .getEncryptionPublicKey(request): - return request.address + return request.accountId.address case let .decrypt(request): - return request.address + return request.accountId.address } } @@ -233,7 +233,7 @@ struct EncryptionView: View { #if DEBUG struct EncryptionView_Previews: PreviewProvider { static var previews: some View { - let address = BraveWallet.AccountInfo.previewAccount.address + let account = BraveWallet.AccountInfo.previewAccount let originInfo = BraveWallet.OriginInfo( originSpec: WalletConstants.braveWalletOriginSpec, eTldPlusOne: "" @@ -243,14 +243,14 @@ struct EncryptionView_Previews: PreviewProvider { .init( requestId: UUID().uuidString, originInfo: originInfo, - address: address + accountId: account.accountId ) ), .decrypt( .init( requestId: UUID().uuidString, originInfo: originInfo, - address: address, + accountId: account.accountId, unsafeMessage: "Secret message" ) ) diff --git a/Sources/BraveWallet/Panels/Sign Transaction/SignTransactionView.swift b/Sources/BraveWallet/Panels/Sign Transaction/SignTransactionView.swift index 7962817399c..0df37d33a05 100644 --- a/Sources/BraveWallet/Panels/Sign Transaction/SignTransactionView.swift +++ b/Sources/BraveWallet/Panels/Sign Transaction/SignTransactionView.swift @@ -326,6 +326,7 @@ struct SignTransaction_Previews: PreviewProvider { request: .signTransaction([BraveWallet.SignTransactionRequest( originInfo: .init(), id: 0, + from: BraveWallet.AccountInfo.previewAccount.accountId, fromAddress: BraveWallet.AccountInfo.previewAccount.address, txData: .init(), rawMessage: .init(), diff --git a/Sources/BraveWallet/Panels/Signature Request/SignatureRequestView.swift b/Sources/BraveWallet/Panels/Signature Request/SignatureRequestView.swift index eb5d9b4ed50..cfda4dc843d 100644 --- a/Sources/BraveWallet/Panels/Signature Request/SignatureRequestView.swift +++ b/Sources/BraveWallet/Panels/Signature Request/SignatureRequestView.swift @@ -34,7 +34,7 @@ struct SignatureRequestView: View { } private var account: BraveWallet.AccountInfo { - keyringStore.allAccounts.first(where: { $0.address == currentRequest.address }) ?? keyringStore.selectedAccount + keyringStore.allAccounts.first(where: { $0.address == currentRequest.accountId.address }) ?? keyringStore.selectedAccount } private var network: BraveWallet.NetworkInfo? { diff --git a/Sources/BraveWallet/Preview Content/MockEthTxService.swift b/Sources/BraveWallet/Preview Content/MockEthTxService.swift index 9d3f8122a9a..e04004a9610 100644 --- a/Sources/BraveWallet/Preview Content/MockEthTxService.swift +++ b/Sources/BraveWallet/Preview Content/MockEthTxService.swift @@ -19,14 +19,14 @@ class MockTxService: BraveWalletTxService { completion(txs.first(where: { $0.id == txMetaId })) } - func addUnapprovedTransaction(_ txDataUnion: BraveWallet.TxDataUnion, from: String, origin: URLOrigin?, groupId: String?, completion: @escaping (Bool, String, String) -> Void) { + func addUnapprovedTransaction(_ txDataUnion: BraveWallet.TxDataUnion, from: BraveWallet.AccountId, origin: URLOrigin?, groupId: String?, completion: @escaping (Bool, String, String) -> Void) { completion(true, "txMetaId", "") } func rejectTransaction(_ coinType: BraveWallet.CoinType, chainId: String, txMetaId: String, completion: @escaping (Bool) -> Void) { } - func allTransactionInfo(_ coinType: BraveWallet.CoinType, chainId: String?, from: String?, completion: @escaping ([BraveWallet.TransactionInfo]) -> Void) { + func allTransactionInfo(_ coinType: BraveWallet.CoinType, chainId: String?, from: BraveWallet.AccountId?, completion: @escaping ([BraveWallet.TransactionInfo]) -> Void) { completion(txs.map { tx in tx.txStatus = .unapproved return tx diff --git a/Sources/BraveWallet/Preview Content/MockSwapService.swift b/Sources/BraveWallet/Preview Content/MockSwapService.swift index 93e3d9fd39b..29d258ea3cf 100644 --- a/Sources/BraveWallet/Preview Content/MockSwapService.swift +++ b/Sources/BraveWallet/Preview Content/MockSwapService.swift @@ -14,11 +14,11 @@ class MockSwapService: BraveWalletSwapService { } func transactionPayload(_ params: BraveWallet.SwapParams, completion: @escaping (BraveWallet.SwapResponse?, BraveWallet.SwapErrorResponse?, String) -> Void) { - completion(.init(price: "", guaranteedPrice: "", to: "", data: "", value: "", gas: "", estimatedGas: "", gasPrice: "", protocolFee: "", minimumProtocolFee: "", buyTokenAddress: "", sellTokenAddress: "", buyAmount: "", sellAmount: "", allowanceTarget: "", sellTokenToEthRate: "", buyTokenToEthRate: "", estimatedPriceImpact: "", sources: []), nil, "") + completion(.init(price: "", guaranteedPrice: "", to: "", data: "", value: "", gas: "", estimatedGas: "", gasPrice: "", protocolFee: "", minimumProtocolFee: "", buyTokenAddress: "", sellTokenAddress: "", buyAmount: "", sellAmount: "", allowanceTarget: "", sellTokenToEthRate: "", buyTokenToEthRate: "", estimatedPriceImpact: "", sources: [], fees: .init(zeroExFee: nil)), nil, "") } func priceQuote(_ params: BraveWallet.SwapParams, completion: @escaping (BraveWallet.SwapResponse?, BraveWallet.SwapErrorResponse?, String) -> Void) { - completion(.init(price: "", guaranteedPrice: "", to: "", data: "", value: "", gas: "", estimatedGas: "", gasPrice: "", protocolFee: "", minimumProtocolFee: "", buyTokenAddress: "", sellTokenAddress: "", buyAmount: "", sellAmount: "", allowanceTarget: "", sellTokenToEthRate: "", buyTokenToEthRate: "", estimatedPriceImpact: "", sources: []), nil, "") + completion(.init(price: "", guaranteedPrice: "", to: "", data: "", value: "", gas: "", estimatedGas: "", gasPrice: "", protocolFee: "", minimumProtocolFee: "", buyTokenAddress: "", sellTokenAddress: "", buyAmount: "", sellAmount: "", allowanceTarget: "", sellTokenToEthRate: "", buyTokenToEthRate: "", estimatedPriceImpact: "", sources: [], fees: .init(zeroExFee: nil)), nil, "") } func jupiterQuote(_ params: BraveWallet.JupiterQuoteParams, completion: @escaping (BraveWallet.JupiterQuote?, BraveWallet.JupiterErrorResponse?, String) -> Void) { @@ -36,6 +36,10 @@ class MockSwapService: BraveWalletSwapService { func jupiterSwapTransactions(_ params: BraveWallet.JupiterSwapParams, completion: @escaping (BraveWallet.JupiterSwapTransactions?, BraveWallet.JupiterErrorResponse?, String) -> Void) { completion(nil, .init(statusCode: "0", error: "Error", message: "Error Message", isInsufficientLiquidity: false), "") } + + func braveFee(_ params: BraveWallet.BraveSwapFeeParams, completion: @escaping (BraveWallet.BraveSwapFeeResponse?, String) -> Void) { + completion(nil, "Error Message") + } } #endif diff --git a/Tests/BraveWalletTests/TransactionParserTests.swift b/Tests/BraveWalletTests/TransactionParserTests.swift index 6ed2bd182ff..cedf4ce95e7 100644 --- a/Tests/BraveWalletTests/TransactionParserTests.swift +++ b/Tests/BraveWalletTests/TransactionParserTests.swift @@ -1104,14 +1104,6 @@ class TransactionParserTests: XCTestCase { func testFilecoinSendTransfer() { let network: BraveWallet.NetworkInfo = .mockFilecoinTestnet - let fromAccount: BraveWallet.AccountInfo = (BraveWallet.AccountInfo.mockFilTestnetAccount.copy() as! BraveWallet.AccountInfo).then { - $0.address = "fil_testnet_address_1" - $0.name = "Filecoin Testnet 1" - } - let toAccount = (BraveWallet.AccountInfo.mockFilTestnetAccount.copy() as! BraveWallet.AccountInfo).then { - $0.address = "fil_testnet_address_2" - $0.name = "Filecoin Testnet 2" - } let transactionData: BraveWallet.FilTxData = .init( nonce: "", @@ -1119,13 +1111,13 @@ class TransactionParserTests: XCTestCase { gasFeeCap: "101965", gasLimit: "1527953", maxFee: "0", - to: toAccount.address, + to: accountInfos[5].address, value: "1000000000000000000" ) let transaction = BraveWallet.TransactionInfo( id: "8", - fromAddress: fromAccount.address, - from: fromAccount.accountId, + fromAddress: accountInfos[4].address, + from: accountInfos[4].accountId, txHash: "0xaaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffffggggg1234", txDataUnion: .init(filTxData: transactionData), txStatus: .unapproved, @@ -1141,12 +1133,13 @@ class TransactionParserTests: XCTestCase { chainId: BraveWallet.FilecoinTestnet, effectiveRecipient: nil ) + let expectedParsedTransaction = ParsedTransaction( transaction: transaction, - namedFromAddress: fromAccount.name, - fromAddress: fromAccount.address, - namedToAddress: toAccount.name, - toAddress: toAccount.address, + namedFromAddress: accountInfos[4].name, + fromAddress: accountInfos[4].address, + namedToAddress: accountInfos[5].name, + toAddress: accountInfos[5].address, networkSymbol: "FIL", details: .filSend( .init( @@ -1185,7 +1178,7 @@ class TransactionParserTests: XCTestCase { XCTAssertEqual(expectedParsedTransaction.networkSymbol, parsedTransaction.networkSymbol) guard case let .filSend(expectedDetails) = expectedParsedTransaction.details, case let .filSend(parsedDetails) = parsedTransaction.details else { - XCTFail("Incorrectly parsed solanaSystemTransfer transaction") + XCTFail("Incorrectly parsed filecoinSendTransfer transaction") return } diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 202b07b387a..1834d0246fd 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -52,6 +52,7 @@ platform :ios do "ClientTests/HttpCookieExtensionTest/testSaveAndLoadCookie", "ClientTests/UserAgentTests", "ClientTests/AdBlockEngineManagerTests/testPerformance", + "ClientTests/AdBlockEngineManagerTests/testCompilationofResources", "DataTests", "BraveWalletTests/ManageSiteConnectionsStoreTests/testRemoveAllPermissions", "BraveWalletTests/ManageSiteConnectionsStoreTests/testRemovePermissions", diff --git a/package-lock.json b/package-lock.json index a98f1d1b80a..be87c06fc22 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "MPL-2.0", "dependencies": { "@mozilla/readability": "^0.4.2", - "brave-core-ios": "https://github.com/brave/brave-browser/releases/download/v1.58.124/brave-core-ios-1.58.124.tgz", + "brave-core-ios": "https://github.com/brave/brave-browser/releases/download/v1.59.84/brave-core-ios-1.59.84.tgz", "leo": "github:brave/leo#7f2dfddb70aff1501ef5a2f3c640a8c74a7343ee", "leo-sf-symbols": "github:brave/leo-sf-symbols#d6056328b8d6ef06e68996ff02a22e06f52590c3", "page-metadata-parser": "^1.1.3", @@ -493,9 +493,9 @@ } }, "node_modules/brave-core-ios": { - "version": "1.58.124", - "resolved": "https://github.com/brave/brave-browser/releases/download/v1.58.124/brave-core-ios-1.58.124.tgz", - "integrity": "sha512-5AVLDYkbda+0w9RMtfQWwfulz0jYaSnxFjXCHXfatbwlSdlSNE4VNZkS2FGyDs+JhlEM8jboCTiVmxCvBWmhlw==", + "version": "1.59.84", + "resolved": "https://github.com/brave/brave-browser/releases/download/v1.59.84/brave-core-ios-1.59.84.tgz", + "integrity": "sha512-DmhGMo6+diZNYs8EZyIog0ZlHANdVmHPHNHQtce2WK6V1XGwStVQQ0E+GpMq4S7SUmrC/v2F4iqMW8x8Ed44/w==", "license": "ISC" }, "node_modules/browserslist": { @@ -3171,8 +3171,8 @@ } }, "brave-core-ios": { - "version": "https://github.com/brave/brave-browser/releases/download/v1.58.124/brave-core-ios-1.58.124.tgz", - "integrity": "sha512-5AVLDYkbda+0w9RMtfQWwfulz0jYaSnxFjXCHXfatbwlSdlSNE4VNZkS2FGyDs+JhlEM8jboCTiVmxCvBWmhlw==" + "version": "https://github.com/brave/brave-browser/releases/download/v1.59.84/brave-core-ios-1.59.84.tgz", + "integrity": "sha512-DmhGMo6+diZNYs8EZyIog0ZlHANdVmHPHNHQtce2WK6V1XGwStVQQ0E+GpMq4S7SUmrC/v2F4iqMW8x8Ed44/w==" }, "browserslist": { "version": "4.17.1", diff --git a/package.json b/package.json index 70d7eb6a7af..2226510111d 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "license": "MPL-2.0", "dependencies": { "@mozilla/readability": "^0.4.2", - "brave-core-ios": "https://github.com/brave/brave-browser/releases/download/v1.58.124/brave-core-ios-1.58.124.tgz", + "brave-core-ios": "https://github.com/brave/brave-browser/releases/download/v1.59.84/brave-core-ios-1.59.84.tgz", "leo": "github:brave/leo#7f2dfddb70aff1501ef5a2f3c640a8c74a7343ee", "leo-sf-symbols": "github:brave/leo-sf-symbols#d6056328b8d6ef06e68996ff02a22e06f52590c3", "page-metadata-parser": "^1.1.3",