CipherLabs
/
alpha-wallet-ios
mirror of https://github.com/AlphaWallet/alpha-wallet-ios
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove GasNow references and unnused code

Browse Source
pull/3333/head
Hwee-Boon Yar 3 years ago
parent d103943834
commit a880bde3e1
10 changed files with 42 additions and 64 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      AlphaWallet.xcodeproj/project.pbxproj
  2. 10
      AlphaWallet/EtherClient/TrustClient/AlphaWalletService.swift
  3. 8
      AlphaWallet/Gas/Models/GasPriceEstimates.swift
  4. 14
      AlphaWallet/Gas/Models/GasPriceEstimator.swift
  5. 11
      AlphaWallet/Localization/en.lproj/Localizable.strings
  6. 11
      AlphaWallet/Localization/es.lproj/Localizable.strings
  7. 11
      AlphaWallet/Localization/ja.lproj/Localizable.strings
  8. 11
      AlphaWallet/Localization/ko.lproj/Localizable.strings
  9. 11
      AlphaWallet/Localization/zh-Hans.lproj/Localizable.strings
  10. 1
      AlphaWallet/Settings/Types/Constants.swift

18
AlphaWallet.xcodeproj/project.pbxproj
Unescape View File

@ -485,7 +485,7 @@
5E7C79E9A6A3DFB7FA680752 /* DappViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C793CDFA907BFDFECB6CB /* DappViewCell.swift */; };
5E7C79EB8A6EC89F6F033268 /* CreateInitialWalletViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C74A5B5B9D8AD0BD913C1 /* CreateInitialWalletViewController.swift */; };
5E7C79F32F7054020B2F835A /* ServerDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C77A1F1399FD7EE2812E8 /* ServerDictionary.swift */; };
5E7C79F491F80EDF6E6B9234 /* GasNowGasPriceEstimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C783A83452EF6921095C2 /* GasNowGasPriceEstimator.swift */; };
5E7C79F491F80EDF6E6B9234 /* GasPriceEstimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C783A83452EF6921095C2 /* GasPriceEstimator.swift */; };
5E7C7A0B5FDADC60DC01F060 /* CallSmartContractFunction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C77C2844B3579A59C3F2F /* CallSmartContractFunction.swift */; };
5E7C7A13AB42B38C061D46C6 /* MnemonicLengthRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C700AC0A7FFE95EC960FA /* MnemonicLengthRule.swift */; };
5E7C7A2DBFF7FB3B8B5DEB1B /* EventInstance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C74822F5F71748184F6C1 /* EventInstance.swift */; };
@ -527,7 +527,7 @@
5E7C7B4778FF36371701242E /* BrowserHistoryViewControllerHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C79FA3E6A05845ECFCDCF /* BrowserHistoryViewControllerHeaderView.swift */; };
5E7C7B4C7DECBF4834B1E6A4 /* CreateInitialWalletViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C73BA4FF25754ACB41255 /* CreateInitialWalletViewModel.swift */; };
5E7C7B4E3DEA90147A5A9E0A /* TokensDataStoreTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C71E355BD14E975AF7491 /* TokensDataStoreTest.swift */; };
5E7C7B7FDCF8EFC3083A147E /* GasNowPriceEstimates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C78E0F20F882DD2136E29 /* GasNowPriceEstimates.swift */; };
5E7C7B7FDCF8EFC3083A147E /* GasPriceEstimates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C78E0F20F882DD2136E29 /* GasPriceEstimates.swift */; };
5E7C7B8242E31B4DA0263BE5 /* EthTypedData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7FC30FF22C3EA71451BC /* EthTypedData.swift */; };
5E7C7B89694C62A14CBE8105 /* FakeEventsDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C71A8BE594C1D126AB309 /* FakeEventsDataStore.swift */; };
5E7C7BAF922C3EB4D1B22C46 /* VerifySeedPhraseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C788ADDEA0609433B1FDF /* VerifySeedPhraseViewController.swift */; };
@ -1420,7 +1420,7 @@
5E7C781F82F9E4903C460E33 /* ImportMagicTokenCardRowViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportMagicTokenCardRowViewModel.swift; sourceTree = "<group>"; };
5E7C7828BD821B6F04B71C00 /* SendHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SendHeaderView.swift; sourceTree = "<group>"; };
5E7C78302634885C93D9B6FA /* TokenIdOrEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokenIdOrEvent.swift; sourceTree = "<group>"; };
5E7C783A83452EF6921095C2 /* GasNowGasPriceEstimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GasNowGasPriceEstimator.swift; sourceTree = "<group>"; };
5E7C783A83452EF6921095C2 /* GasPriceEstimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GasPriceEstimator.swift; sourceTree = "<group>"; };
5E7C783E3ADA4CF9554A0E7D /* NonFungibleTokenViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NonFungibleTokenViewCell.swift; sourceTree = "<group>"; };
5E7C78402B975F69A72E8C04 /* TokensViewControllerTableViewHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokensViewControllerTableViewHeader.swift; sourceTree = "<group>"; };
5E7C78454B11E39CF8B5E695 /* EnterPasswordCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnterPasswordCoordinator.swift; sourceTree = "<group>"; };
@ -1441,7 +1441,7 @@
5E7C78C073F380B48D5BE94C /* LayoutConstraintsWrapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LayoutConstraintsWrapper.swift; sourceTree = "<group>"; };
5E7C78CDFEB86A8356EA5818 /* TokenCardRowViewProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TokenCardRowViewProtocol.swift; path = Views/TokenCardRowViewProtocol.swift; sourceTree = "<group>"; };
5E7C78CF45AA54EF8647C44B /* SeedPhraseBackupIntroductionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SeedPhraseBackupIntroductionViewController.swift; sourceTree = "<group>"; };
5E7C78E0F20F882DD2136E29 /* GasNowPriceEstimates.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GasNowPriceEstimates.swift; sourceTree = "<group>"; };
5E7C78E0F20F882DD2136E29 /* GasPriceEstimates.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GasPriceEstimates.swift; sourceTree = "<group>"; };
5E7C78E5C8FAEA752B32626D /* UIActivityViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIActivityViewController.swift; sourceTree = "<group>"; };
5E7C78EBC7D0A09B8EAACBE3 /* NonFungibleFromJsonTokenType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NonFungibleFromJsonTokenType.swift; sourceTree = "<group>"; };
5E7C78EFAF641C41F06C46BF /* ServersCoordinatorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServersCoordinatorTests.swift; sourceTree = "<group>"; };
@ -3711,8 +3711,8 @@
5E7C7912EB06F369ED15F733 /* Models */ = {
isa = PBXGroup;
children = (
5E7C783A83452EF6921095C2 /* GasNowGasPriceEstimator.swift */,
5E7C78E0F20F882DD2136E29 /* GasNowPriceEstimates.swift */,
5E7C783A83452EF6921095C2 /* GasPriceEstimator.swift */,
5E7C78E0F20F882DD2136E29 /* GasPriceEstimates.swift */,
5E7C7B19FDDF5D0535243682 /* GasEstimates.swift */,
);
path = Models;
@ -5031,6 +5031,7 @@
"${BUILT_PRODUCTS_DIR}/AWSSNS/AWSSNS.framework",
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
"${BUILT_PRODUCTS_DIR}/Alamofire-Synchronous/Alamofire_Synchronous.framework",
"${BUILT_PRODUCTS_DIR}/AlphaWalletAddress/AlphaWalletAddress.framework",
"${BUILT_PRODUCTS_DIR}/AssistantKit/AssistantKit.framework",
"${BUILT_PRODUCTS_DIR}/Base58Swift/Base58Swift.framework",
"${BUILT_PRODUCTS_DIR}/BigInt/BigInt.framework",
@ -5079,6 +5080,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AWSSNS.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire_Synchronous.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AlphaWalletAddress.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AssistantKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Base58Swift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BigInt.framework",
@ -6008,8 +6010,8 @@
879E1E46264C072D006CD362 /* TokenInfoHeaderView.swift in Sources */,
5E7C710F30F8EAC43A706500 /* DefaultActivityViewModel.swift in Sources */,
5E7C7270EA33CF6A99701454 /* GetWalletNameCoordinator.swift in Sources */,
5E7C79F491F80EDF6E6B9234 /* GasNowGasPriceEstimator.swift in Sources */,
5E7C7B7FDCF8EFC3083A147E /* GasNowPriceEstimates.swift in Sources */,
5E7C79F491F80EDF6E6B9234 /* GasPriceEstimator.swift in Sources */,
5E7C7B7FDCF8EFC3083A147E /* GasPriceEstimates.swift in Sources */,
5E7C7C16DFF078FE84AB4903 /* TransactionConfigurations.swift in Sources */,
874BD2BB2669F65800E62E02 /* PopularTokensCollection.swift in Sources */,
8757E5DE25DD231600812392 /* SignatureConfirmationConfirmationViewModel.swift in Sources */,

10
AlphaWallet/EtherClient/TrustClient/AlphaWalletService.swift
Unescape View File

@ -10,7 +10,6 @@ enum AlphaWalletService {
case register(config: Config, device: PushDevice)
case unregister(config: Config, device: PushDevice)
case marketplace(config: Config, server: RPCServer)
case gasPriceEstimate
case oneInchTokens(config: Config)
case honeySwapTokens(config: Config)
case rampAssets(config: Config)
@ -40,8 +39,6 @@ extension AlphaWalletService: TargetType {
return config.priceInfoEndpoints
case .marketplace(let config, _):
return config.priceInfoEndpoints
case .gasPriceEstimate:
return URL(string: Constants.gasNowEndpointBaseUrl)!
case .oneInchTokens(let config):
return config.oneInch
case .honeySwapTokens(let config):
@ -66,8 +63,6 @@ extension AlphaWalletService: TargetType {
return "/push/unregister"
case .marketplace:
return "/marketplace"
case .gasPriceEstimate:
return "/api/v3/gas/price"
case .oneInchTokens:
return "/v3.0/1/tokens"
case .honeySwapTokens:
@ -90,7 +85,6 @@ extension AlphaWalletService: TargetType {
case .unregister: return .delete
case .pricesOfTokens: return .get
case .marketplace: return .get
case .gasPriceEstimate: return .get
case .oneInchTokens: return .get
case .honeySwapTokens: return .get
case .rampAssets: return .get
@ -131,8 +125,6 @@ extension AlphaWalletService: TargetType {
], encoding: URLEncoding())
case .marketplace(_, let server):
return .requestParameters(parameters: ["chainID": server.chainID], encoding: URLEncoding())
case .gasPriceEstimate:
return .requestPlain
case .oneInchTokens, .honeySwapTokens, .rampAssets:
return .requestPlain
case .tokensThatHasPrices:
@ -160,7 +152,7 @@ extension AlphaWalletService: TargetType {
"client-build": Bundle.main.buildNumber ?? "",
]
}
case .priceHistoryOfToken, .tokensThatHasPrices, .pricesOfTokens, .register, .unregister, .marketplace, .gasPriceEstimate:
case .priceHistoryOfToken, .tokensThatHasPrices, .pricesOfTokens, .register, .unregister, .marketplace:
return [
"Content-type": "application/json",
"client": Bundle.main.bundleIdentifier ?? "",

8
AlphaWallet/Gas/Models/GasNowPriceEstimates.swift → AlphaWallet/Gas/Models/GasPriceEstimates.swift
Unescape View File

@ -2,7 +2,7 @@
import Foundation
struct GasNowPriceEstimates: Decodable {
struct GasPriceEstimates: Decodable {
struct Data: Decodable {
let slow: Int
let standard: Int
@ -46,14 +46,14 @@ extension EtherscanPriceEstimates {
/// - Fast "FastGasPrice"
/// - Standard/Average "ProposeGasPrice"
/// - Slow "SafeGasPrice"
static func bridgeToGasNowPriceEstimates(for value: EtherscanPriceEstimates) -> GasNowPriceEstimates? {
static func bridgeToGasPriceEstimates(for value: EtherscanPriceEstimates) -> GasPriceEstimates? {
let _slow = EtherNumberFormatter.full.number(from: value.safeGasPrice, units: UnitConfiguration.gasPriceUnit)!
let _standard = EtherNumberFormatter.full.number(from: value.proposeGasPrice, units: UnitConfiguration.gasPriceUnit)!
let _fastGasPrice = EtherNumberFormatter.full.number(from: value.fastGasPrice, units: UnitConfiguration.gasPriceUnit)!
guard let slow = Int(_slow.description), let standard = Int(_standard.description), let fast = Int(_fastGasPrice.description) else { return nil }
let data = GasNowPriceEstimates.Data(slow: slow, standard: standard, fast: fast, rapid: Int((Double(fast) * 1.2).rounded(.down)))
return GasNowPriceEstimates(data: data, code: 1)
let data = GasPriceEstimates.Data(slow: slow, standard: standard, fast: fast, rapid: Int((Double(fast) * 1.2).rounded(.down)))
return GasPriceEstimates(data: data, code: 1)
}
}

14
AlphaWallet/Gas/Models/GasNowGasPriceEstimator.swift → AlphaWallet/Gas/Models/GasPriceEstimator.swift
Unescape View File

@ -4,17 +4,7 @@ import Foundation
import PromiseKit
import Alamofire
class GasNowGasPriceEstimator {
func fetch() -> Promise<GasNowPriceEstimates> {
let alphaWalletProvider = AlphaWalletProviderFactory.makeProvider()
return alphaWalletProvider.request(.gasPriceEstimate).map { response -> GasNowPriceEstimates in
try response.map(GasNowPriceEstimates.self)
}
}
}
class EtherscanGasPriceEstimator {
struct EtherscanPriceEstimatesResponse: Decodable {
let result: EtherscanPriceEstimates
}
@ -23,14 +13,14 @@ class EtherscanGasPriceEstimator {
return server.etherscanGasPriceEstimatesURL != nil
}
func fetch(server: RPCServer) -> Promise<GasNowPriceEstimates> {
func fetch(server: RPCServer) -> Promise<GasPriceEstimates> {
struct AnyError: Error {}
guard let url = server.etherscanGasPriceEstimatesURL else {
return .init(error: AnyError())
}
return Alamofire.request(url, method: .get).responseDecodable(EtherscanPriceEstimatesResponse.self).compactMap { response in
EtherscanPriceEstimates.bridgeToGasNowPriceEstimates(for: response.result)
EtherscanPriceEstimates.bridgeToGasPriceEstimates(for: response.result)
}
}
}

11
AlphaWallet/Localization/en.lproj/Localizable.strings
Unescape View File

@ -509,9 +509,9 @@
"token.transactionConfirmation.error.title.gasLimitTooHigh" = "Gas Limit is too high";
"token.transactionConfirmation.error.description.insufficientFundsError" = "Every transaction requires a small amount of %@ (%@) to pay for the fees. You can receive %@ from a different wallet, crypto exchange, or you can buy %@ using the button below.";
"token.transactionConfirmation.error.description.nonceTooLowError" = "The nonce is the total number of transactions which has been sent from this wallet so far, and is included for security purposes. \nWe recommend to leave the nonce empty. \nWe'll fill it for you.";
"token.transactionConfirmation.error.description.gasPriceTooLow" = "The gas price specified for this transaction is too low. AlphaWallet is using gasnow.org live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooLow" = "The gas limit specified for this transaction is too low. AlphaWallet is using gasnow.org live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooHigh" = "The gas price specified for this transaction is too high. AlphaWallet is using gasnow.org live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasPriceTooLow" = "The gas price specified for this transaction is too low. AlphaWallet is using a live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooLow" = "The gas limit specified for this transaction is too low. AlphaWallet is using a live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooHigh" = "The gas price specified for this transaction is too high. AlphaWallet is using a live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.possibleChainIdMismatchError" = "You might be sending this transaction on the wrong chain.";
"token.transactionConfirmation.error.description.executionRevertedError" = "It looks like you are trying to run a smart contract and the logic of that smart contract returns an error.";
"token.transactionConfirmation.error.rectifyButtonTitle.insufficientFundsError" = "Buy %@";
@ -582,10 +582,9 @@
"transactionConfiguration.gasPrice.tooLow.short" = "Low Price";
"transactionConfiguration.gasPrice.tooHigh.long" = "High Gas Price Warning!";
"transactionConfiguration.gasPrice.tooLow.long" = "Gas Price Might Be Too Low";
"transactionConfiguration.gasPrice.tooHigh.description" = "You set a really high gas price. Please make sure this is not a mistake. AlphaWallet uses gasnow.org";
"transactionConfiguration.gasPrice.tooHigh.description" = "You set a really high gas price. Please make sure this is not a mistake";
"transactionConfiguration.gasPrice.tooLow.description" = "Gas price is set below the 'slow' speed. Your transaction may take a long time to be written or may never be written.";
"transactionConfiguration.gasPrice.congested.description" = "The Ethereum blockchain network is very congested now. Fees might be higher than usual.
You can check the latest gas price on gasnow.org";
"transactionConfiguration.gasPrice.congested.description" = "The Ethereum blockchain network is very congested now. Fees might be higher than usual.";
"transactionConfirmation.Row.title.ens" = "ENS";
"transactionConfirmation.Row.title.wallet" = "Wallet Address";
"transactionConfirmation.Send.Section.Gas.title" = "Gas";

11
AlphaWallet/Localization/es.lproj/Localizable.strings
Unescape View File

@ -509,9 +509,9 @@
"token.transactionConfirmation.error.title.gasLimitTooHigh" = "Gas Limit is too high";
"token.transactionConfirmation.error.description.insufficientFundsError" = "Every transaction requires a small amount of %@ (%@) to pay for the fees. You can receive %@ from a different wallet, crypto exchange, or you can buy %@ using the button below.";
"token.transactionConfirmation.error.description.nonceTooLowError" = "The nonce is the total number of transactions which has been sent from this wallet so far, and is included for security purposes. \nWe recommend to leave the nonce empty. \nWe'll fill it for you.";
"token.transactionConfirmation.error.description.gasPriceTooLow" = "The gas price specified for this transaction is too low. AlphaWallet is using gasnow.org live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooLow" = "The gas limit specified for this transaction is too low. AlphaWallet is using gasnow.org live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooHigh" = "The gas price specified for this transaction is too high. AlphaWallet is using gasnow.org live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasPriceTooLow" = "The gas price specified for this transaction is too low. AlphaWallet is using a live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooLow" = "The gas limit specified for this transaction is too low. AlphaWallet is using a live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooHigh" = "The gas price specified for this transaction is too high. AlphaWallet is using a live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.possibleChainIdMismatchError" = "You might be sending this transaction on the wrong chain.";
"token.transactionConfirmation.error.description.executionRevertedError" = "It looks like you are trying to run a smart contract and the logic of that smart contract returns an error.";
"token.transactionConfirmation.error.rectifyButtonTitle.insufficientFundsError" = "Buy %@";
@ -582,10 +582,9 @@
"transactionConfiguration.gasPrice.tooLow.short" = "Low Price";
"transactionConfiguration.gasPrice.tooHigh.long" = "High Gas Price Warning!";
"transactionConfiguration.gasPrice.tooLow.long" = "Gas Price Might Be Too Low";
"transactionConfiguration.gasPrice.tooHigh.description" = "You set a really high gas price. Please make sure this is not a mistake. AlphaWallet uses gasnow.org";
"transactionConfiguration.gasPrice.tooHigh.description" = "You set a really high gas price. Please make sure this is not a mistake";
"transactionConfiguration.gasPrice.tooLow.description" = "Gas price is set below the 'slow' speed. Your transaction may take a long time to be written or may never be written.";
"transactionConfiguration.gasPrice.congested.description" = "The Ethereum blockchain network is very congested now. Fees might be higher than usual.
You can check the latest gas price on gasnow.org";
"transactionConfiguration.gasPrice.congested.description" = "The Ethereum blockchain network is very congested now. Fees might be higher than usual";
"transactionConfirmation.Row.title.ens" = "ENS";
"transactionConfirmation.Row.title.wallet" = "Wallet Address";
"transactionConfirmation.Send.Section.Gas.title" = "Gas";

11
AlphaWallet/Localization/ja.lproj/Localizable.strings
Unescape View File

@ -509,9 +509,9 @@
"token.transactionConfirmation.error.title.gasLimitTooHigh" = "Gas Limit is too high";
"token.transactionConfirmation.error.description.insufficientFundsError" = "Every transaction requires a small amount of %@ (%@) to pay for the fees. You can receive %@ from a different wallet, crypto exchange, or you can buy %@ using the button below.";
"token.transactionConfirmation.error.description.nonceTooLowError" = "The nonce is the total number of transactions which has been sent from this wallet so far, and is included for security purposes. \nWe recommend to leave the nonce empty. \nWe'll fill it for you.";
"token.transactionConfirmation.error.description.gasPriceTooLow" = "The gas price specified for this transaction is too low. AlphaWallet is using gasnow.org live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooLow" = "The gas limit specified for this transaction is too low. AlphaWallet is using gasnow.org live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooHigh" = "The gas price specified for this transaction is too high. AlphaWallet is using gasnow.org live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasPriceTooLow" = "The gas price specified for this transaction is too low. AlphaWallet is using a live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooLow" = "The gas limit specified for this transaction is too low. AlphaWallet is using a live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooHigh" = "The gas price specified for this transaction is too high. AlphaWallet is using a live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.possibleChainIdMismatchError" = "You might be sending this transaction on the wrong chain.";
"token.transactionConfirmation.error.description.executionRevertedError" = "It looks like you are trying to run a smart contract and the logic of that smart contract returns an error.";
"token.transactionConfirmation.error.rectifyButtonTitle.insufficientFundsError" = "Buy %@";
@ -582,10 +582,9 @@
"transactionConfiguration.gasPrice.tooLow.short" = "Low Price";
"transactionConfiguration.gasPrice.tooHigh.long" = "High Gas Price Warning!";
"transactionConfiguration.gasPrice.tooLow.long" = "Gas Price Might Be Too Low";
"transactionConfiguration.gasPrice.tooHigh.description" = "You set a really high gas price. Please make sure this is not a mistake. AlphaWallet uses gasnow.org";
"transactionConfiguration.gasPrice.tooHigh.description" = "You set a really high gas price. Please make sure this is not a mistake";
"transactionConfiguration.gasPrice.tooLow.description" = "Gas price is set below the 'slow' speed. Your transaction may take a long time to be written or may never be written.";
"transactionConfiguration.gasPrice.congested.description" = "The Ethereum blockchain network is very congested now. Fees might be higher than usual.
You can check the latest gas price on gasnow.org";
"transactionConfiguration.gasPrice.congested.description" = "The Ethereum blockchain network is very congested now. Fees might be higher than usual";
"transactionConfirmation.Row.title.ens" = "ENS";
"transactionConfirmation.Row.title.wallet" = "Wallet Address";
"transactionConfirmation.Send.Section.Gas.title" = "Gas";

11
AlphaWallet/Localization/ko.lproj/Localizable.strings
Unescape View File

@ -509,9 +509,9 @@
"token.transactionConfirmation.error.title.gasLimitTooHigh" = "Gas Limit is too high";
"token.transactionConfirmation.error.description.insufficientFundsError" = "Every transaction requires a small amount of %@ (%@) to pay for the fees. You can receive %@ from a different wallet, crypto exchange, or you can buy %@ using the button below.";
"token.transactionConfirmation.error.description.nonceTooLowError" = "The nonce is the total number of transactions which has been sent from this wallet so far, and is included for security purposes. \nWe recommend to leave the nonce empty. \nWe'll fill it for you.";
"token.transactionConfirmation.error.description.gasPriceTooLow" = "The gas price specified for this transaction is too low. AlphaWallet is using gasnow.org live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooLow" = "The gas limit specified for this transaction is too low. AlphaWallet is using gasnow.org live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooHigh" = "The gas price specified for this transaction is too high. AlphaWallet is using gasnow.org live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasPriceTooLow" = "The gas price specified for this transaction is too low. AlphaWallet is using a live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooLow" = "The gas limit specified for this transaction is too low. AlphaWallet is using a live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooHigh" = "The gas price specified for this transaction is too high. AlphaWallet is using a live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.possibleChainIdMismatchError" = "You might be sending this transaction on the wrong chain.";
"token.transactionConfirmation.error.description.executionRevertedError" = "It looks like you are trying to run a smart contract and the logic of that smart contract returns an error.";
"token.transactionConfirmation.error.rectifyButtonTitle.insufficientFundsError" = "Buy %@";
@ -582,10 +582,9 @@
"transactionConfiguration.gasPrice.tooLow.short" = "Low Price";
"transactionConfiguration.gasPrice.tooHigh.long" = "High Gas Price Warning!";
"transactionConfiguration.gasPrice.tooLow.long" = "Gas Price Might Be Too Low";
"transactionConfiguration.gasPrice.tooHigh.description" = "You set a really high gas price. Please make sure this is not a mistake. AlphaWallet uses gasnow.org";
"transactionConfiguration.gasPrice.tooHigh.description" = "You set a really high gas price. Please make sure this is not a mistake";
"transactionConfiguration.gasPrice.tooLow.description" = "Gas price is set below the 'slow' speed. Your transaction may take a long time to be written or may never be written.";
"transactionConfiguration.gasPrice.congested.description" = "The Ethereum blockchain network is very congested now. Fees might be higher than usual.
You can check the latest gas price on gasnow.org";
"transactionConfiguration.gasPrice.congested.description" = "The Ethereum blockchain network is very congested now. Fees might be higher than usual.";
"transactionConfirmation.Row.title.ens" = "ENS";
"transactionConfirmation.Row.title.wallet" = "Wallet Address";
"transactionConfirmation.Send.Section.Gas.title" = "Gas";

11
AlphaWallet/Localization/zh-Hans.lproj/Localizable.strings
Unescape View File

@ -509,9 +509,9 @@
"token.transactionConfirmation.error.title.gasLimitTooHigh" = "Gas Limit is too high";
"token.transactionConfirmation.error.description.insufficientFundsError" = "Every transaction requires a small amount of %@ (%@) to pay for the fees. You can receive %@ from a different wallet, crypto exchange, or you can buy %@ using the button below.";
"token.transactionConfirmation.error.description.nonceTooLowError" = "The nonce is the total number of transactions which has been sent from this wallet so far, and is included for security purposes. \nWe recommend to leave the nonce empty. \nWe'll fill it for you.";
"token.transactionConfirmation.error.description.gasPriceTooLow" = "The gas price specified for this transaction is too low. AlphaWallet is using gasnow.org live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooLow" = "The gas limit specified for this transaction is too low. AlphaWallet is using gasnow.org live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooHigh" = "The gas price specified for this transaction is too high. AlphaWallet is using gasnow.org live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasPriceTooLow" = "The gas price specified for this transaction is too low. AlphaWallet is using a live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooLow" = "The gas limit specified for this transaction is too low. AlphaWallet is using a live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.gasLimitTooHigh" = "The gas price specified for this transaction is too high. AlphaWallet is using a live oracle and updates the gas price every 15 seconds. We recommend you to choose preselected amount (Slow, Average, Fast).";
"token.transactionConfirmation.error.description.possibleChainIdMismatchError" = "You might be sending this transaction on the wrong chain.";
"token.transactionConfirmation.error.description.executionRevertedError" = "It looks like you are trying to run a smart contract and the logic of that smart contract returns an error.";
"token.transactionConfirmation.error.rectifyButtonTitle.insufficientFundsError" = "Buy %@";
@ -582,10 +582,9 @@
"transactionConfiguration.gasPrice.tooLow.short" = "Low Price";
"transactionConfiguration.gasPrice.tooHigh.long" = "High Gas Price Warning!";
"transactionConfiguration.gasPrice.tooLow.long" = "Gas Price Might Be Too Low";
"transactionConfiguration.gasPrice.tooHigh.description" = "You set a really high gas price. Please make sure this is not a mistake. AlphaWallet uses gasnow.org";
"transactionConfiguration.gasPrice.tooHigh.description" = "You set a really high gas price. Please make sure this is not a mistake";
"transactionConfiguration.gasPrice.tooLow.description" = "Gas price is set below the 'slow' speed. Your transaction may take a long time to be written or may never be written.";
"transactionConfiguration.gasPrice.congested.description" = "The Ethereum blockchain network is very congested now. Fees might be higher than usual.
You can check the latest gas price on gasnow.org";
"transactionConfiguration.gasPrice.congested.description" = "The Ethereum blockchain network is very congested now. Fees might be higher than usual.";
"transactionConfirmation.Row.title.ens" = "ENS";
"transactionConfirmation.Row.title.wallet" = "Wallet Address";
"transactionConfirmation.Send.Section.Gas.title" = "Gas";

1
AlphaWallet/Settings/Types/Constants.swift
Unescape View File

@ -103,7 +103,6 @@ public struct Constants {
static let ENSRegistrarRinkeby = ENSRegistrarAddress
static let ENSRegistrarGoerli = ENSRegistrarAddress
static let gasNowEndpointBaseUrl = "https://www.gasnow.org"
static let highStandardGasThresholdGwei = BigInt(55)
//DAS
static let dasLookupURL = URL(string: "https://indexer.da.systems/")!

Write Preview
Loading…
Cancel
Save