diff --git a/Package.swift b/Package.swift index 00eb12c5a..96a315782 100755 --- a/Package.swift +++ b/Package.swift @@ -18,12 +18,12 @@ let package = Package( targets: [ .target(name: "secp256k1"), .target( - name: "Core", + name: "Web3Core", dependencies: ["BigInt", "secp256k1", "CryptoSwift"] ), .target( name: "web3swift", - dependencies: ["Core", "BigInt", "secp256k1"], + dependencies: ["Web3Core", "BigInt", "secp256k1"], resources: [ .copy("./Browser/browser.js"), .copy("./Browser/browser.min.js"), diff --git a/README.md b/README.md index e80a2b53c..1628c4125 100755 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ In the imports section: ```swift import web3swift -import Core +import Web3Core ``` ### Send Ether diff --git a/Sources/Core/Contract/ContractProtocol.swift b/Sources/Web3Core/Contract/ContractProtocol.swift similarity index 100% rename from Sources/Core/Contract/ContractProtocol.swift rename to Sources/Web3Core/Contract/ContractProtocol.swift diff --git a/Sources/Core/Contract/EthereumContract.swift b/Sources/Web3Core/Contract/EthereumContract.swift similarity index 100% rename from Sources/Core/Contract/EthereumContract.swift rename to Sources/Web3Core/Contract/EthereumContract.swift diff --git a/Sources/Core/EthereumABI/ABI.swift b/Sources/Web3Core/EthereumABI/ABI.swift similarity index 100% rename from Sources/Core/EthereumABI/ABI.swift rename to Sources/Web3Core/EthereumABI/ABI.swift diff --git a/Sources/Core/EthereumABI/ABIDecoding.swift b/Sources/Web3Core/EthereumABI/ABIDecoding.swift similarity index 100% rename from Sources/Core/EthereumABI/ABIDecoding.swift rename to Sources/Web3Core/EthereumABI/ABIDecoding.swift diff --git a/Sources/Core/EthereumABI/ABIElements.swift b/Sources/Web3Core/EthereumABI/ABIElements.swift similarity index 99% rename from Sources/Core/EthereumABI/ABIElements.swift rename to Sources/Web3Core/EthereumABI/ABIElements.swift index 21217af3d..aadf61b9a 100755 --- a/Sources/Core/EthereumABI/ABIElements.swift +++ b/Sources/Web3Core/EthereumABI/ABIElements.swift @@ -262,7 +262,7 @@ extension ABI.Element { extension ABI.Element.Function { public func decodeInputData(_ rawData: Data) -> [String: Any]? { - return Core.decodeInputData(rawData, methodEncoding: methodEncoding, inputs: inputs) + return Web3Core.decodeInputData(rawData, methodEncoding: methodEncoding, inputs: inputs) } /// Decodes data returned by a function call. Able to decode `revert(string)`, `revert CustomError(...)` and `require(expression, string)` calls. @@ -432,7 +432,7 @@ extension ABI.Element.Function { extension ABI.Element.Constructor { public func decodeInputData(_ rawData: Data) -> [String: Any]? { - return Core.decodeInputData(rawData, inputs: inputs) + return Web3Core.decodeInputData(rawData, inputs: inputs) } } diff --git a/Sources/Core/EthereumABI/ABIEncoding.swift b/Sources/Web3Core/EthereumABI/ABIEncoding.swift similarity index 100% rename from Sources/Core/EthereumABI/ABIEncoding.swift rename to Sources/Web3Core/EthereumABI/ABIEncoding.swift diff --git a/Sources/Core/EthereumABI/ABIError.swift b/Sources/Web3Core/EthereumABI/ABIError.swift similarity index 100% rename from Sources/Core/EthereumABI/ABIError.swift rename to Sources/Web3Core/EthereumABI/ABIError.swift diff --git a/Sources/Core/EthereumABI/ABIParameterTypes.swift b/Sources/Web3Core/EthereumABI/ABIParameterTypes.swift similarity index 100% rename from Sources/Core/EthereumABI/ABIParameterTypes.swift rename to Sources/Web3Core/EthereumABI/ABIParameterTypes.swift diff --git a/Sources/Core/EthereumABI/ABIParsing.swift b/Sources/Web3Core/EthereumABI/ABIParsing.swift similarity index 100% rename from Sources/Core/EthereumABI/ABIParsing.swift rename to Sources/Web3Core/EthereumABI/ABIParsing.swift diff --git a/Sources/Core/EthereumABI/ABITypeParser.swift b/Sources/Web3Core/EthereumABI/ABITypeParser.swift similarity index 100% rename from Sources/Core/EthereumABI/ABITypeParser.swift rename to Sources/Web3Core/EthereumABI/ABITypeParser.swift diff --git a/Sources/Core/EthereumABI/Sequence+ABIExtension.swift b/Sources/Web3Core/EthereumABI/Sequence+ABIExtension.swift similarity index 100% rename from Sources/Core/EthereumABI/Sequence+ABIExtension.swift rename to Sources/Web3Core/EthereumABI/Sequence+ABIExtension.swift diff --git a/Sources/Core/EthereumAddress/EthereumAddress.swift b/Sources/Web3Core/EthereumAddress/EthereumAddress.swift similarity index 100% rename from Sources/Core/EthereumAddress/EthereumAddress.swift rename to Sources/Web3Core/EthereumAddress/EthereumAddress.swift diff --git a/Sources/Core/EthereumNetwork/Request/APIRequest+ComputedProperties.swift b/Sources/Web3Core/EthereumNetwork/Request/APIRequest+ComputedProperties.swift similarity index 100% rename from Sources/Core/EthereumNetwork/Request/APIRequest+ComputedProperties.swift rename to Sources/Web3Core/EthereumNetwork/Request/APIRequest+ComputedProperties.swift diff --git a/Sources/Core/EthereumNetwork/Request/APIRequest+Methods.swift b/Sources/Web3Core/EthereumNetwork/Request/APIRequest+Methods.swift similarity index 100% rename from Sources/Core/EthereumNetwork/Request/APIRequest+Methods.swift rename to Sources/Web3Core/EthereumNetwork/Request/APIRequest+Methods.swift diff --git a/Sources/Core/EthereumNetwork/Request/APIRequest+UtilityTypes.swift b/Sources/Web3Core/EthereumNetwork/Request/APIRequest+UtilityTypes.swift similarity index 100% rename from Sources/Core/EthereumNetwork/Request/APIRequest+UtilityTypes.swift rename to Sources/Web3Core/EthereumNetwork/Request/APIRequest+UtilityTypes.swift diff --git a/Sources/Core/EthereumNetwork/Request/APIRequest.swift b/Sources/Web3Core/EthereumNetwork/Request/APIRequest.swift similarity index 100% rename from Sources/Core/EthereumNetwork/Request/APIRequest.swift rename to Sources/Web3Core/EthereumNetwork/Request/APIRequest.swift diff --git a/Sources/Core/EthereumNetwork/RequestParameter/APIRequestParameterType.swift b/Sources/Web3Core/EthereumNetwork/RequestParameter/APIRequestParameterType.swift similarity index 100% rename from Sources/Core/EthereumNetwork/RequestParameter/APIRequestParameterType.swift rename to Sources/Web3Core/EthereumNetwork/RequestParameter/APIRequestParameterType.swift diff --git a/Sources/Core/EthereumNetwork/RequestParameter/RequestParameter+Encodable.swift b/Sources/Web3Core/EthereumNetwork/RequestParameter/RequestParameter+Encodable.swift similarity index 100% rename from Sources/Core/EthereumNetwork/RequestParameter/RequestParameter+Encodable.swift rename to Sources/Web3Core/EthereumNetwork/RequestParameter/RequestParameter+Encodable.swift diff --git a/Sources/Core/EthereumNetwork/RequestParameter/RequestParameter+RawRepresentable.swift b/Sources/Web3Core/EthereumNetwork/RequestParameter/RequestParameter+RawRepresentable.swift similarity index 100% rename from Sources/Core/EthereumNetwork/RequestParameter/RequestParameter+RawRepresentable.swift rename to Sources/Web3Core/EthereumNetwork/RequestParameter/RequestParameter+RawRepresentable.swift diff --git a/Sources/Core/EthereumNetwork/RequestParameter/RequestParameter.swift b/Sources/Web3Core/EthereumNetwork/RequestParameter/RequestParameter.swift similarity index 100% rename from Sources/Core/EthereumNetwork/RequestParameter/RequestParameter.swift rename to Sources/Web3Core/EthereumNetwork/RequestParameter/RequestParameter.swift diff --git a/Sources/Core/EthereumNetwork/Utility/Async+BackwardCapability.swift b/Sources/Web3Core/EthereumNetwork/Utility/Async+BackwardCapability.swift similarity index 100% rename from Sources/Core/EthereumNetwork/Utility/Async+BackwardCapability.swift rename to Sources/Web3Core/EthereumNetwork/Utility/Async+BackwardCapability.swift diff --git a/Sources/Core/EthereumNetwork/Utility/HexDecodable+Extensions.swift b/Sources/Web3Core/EthereumNetwork/Utility/HexDecodable+Extensions.swift similarity index 100% rename from Sources/Core/EthereumNetwork/Utility/HexDecodable+Extensions.swift rename to Sources/Web3Core/EthereumNetwork/Utility/HexDecodable+Extensions.swift diff --git a/Sources/Core/EthereumNetwork/Utility/HexDecodableProtocols.swift b/Sources/Web3Core/EthereumNetwork/Utility/HexDecodableProtocols.swift similarity index 100% rename from Sources/Core/EthereumNetwork/Utility/HexDecodableProtocols.swift rename to Sources/Web3Core/EthereumNetwork/Utility/HexDecodableProtocols.swift diff --git a/Sources/Core/EthereumNetwork/Utility/IntegerInitableWithRadix.swift b/Sources/Web3Core/EthereumNetwork/Utility/IntegerInitableWithRadix.swift similarity index 100% rename from Sources/Core/EthereumNetwork/Utility/IntegerInitableWithRadix.swift rename to Sources/Web3Core/EthereumNetwork/Utility/IntegerInitableWithRadix.swift diff --git a/Sources/Core/KeystoreManager/AbstractKeystore.swift b/Sources/Web3Core/KeystoreManager/AbstractKeystore.swift similarity index 100% rename from Sources/Core/KeystoreManager/AbstractKeystore.swift rename to Sources/Web3Core/KeystoreManager/AbstractKeystore.swift diff --git a/Sources/Core/KeystoreManager/BIP32HDNode.swift b/Sources/Web3Core/KeystoreManager/BIP32HDNode.swift similarity index 100% rename from Sources/Core/KeystoreManager/BIP32HDNode.swift rename to Sources/Web3Core/KeystoreManager/BIP32HDNode.swift diff --git a/Sources/Core/KeystoreManager/BIP32Keystore.swift b/Sources/Web3Core/KeystoreManager/BIP32Keystore.swift similarity index 100% rename from Sources/Core/KeystoreManager/BIP32Keystore.swift rename to Sources/Web3Core/KeystoreManager/BIP32Keystore.swift diff --git a/Sources/Core/KeystoreManager/BIP39+WordLists.swift b/Sources/Web3Core/KeystoreManager/BIP39+WordLists.swift similarity index 100% rename from Sources/Core/KeystoreManager/BIP39+WordLists.swift rename to Sources/Web3Core/KeystoreManager/BIP39+WordLists.swift diff --git a/Sources/Core/KeystoreManager/BIP39.swift b/Sources/Web3Core/KeystoreManager/BIP39.swift similarity index 100% rename from Sources/Core/KeystoreManager/BIP39.swift rename to Sources/Web3Core/KeystoreManager/BIP39.swift diff --git a/Sources/Core/KeystoreManager/EthereumKeystoreV3.swift b/Sources/Web3Core/KeystoreManager/EthereumKeystoreV3.swift similarity index 100% rename from Sources/Core/KeystoreManager/EthereumKeystoreV3.swift rename to Sources/Web3Core/KeystoreManager/EthereumKeystoreV3.swift diff --git a/Sources/Core/KeystoreManager/IBAN.swift b/Sources/Web3Core/KeystoreManager/IBAN.swift similarity index 100% rename from Sources/Core/KeystoreManager/IBAN.swift rename to Sources/Web3Core/KeystoreManager/IBAN.swift diff --git a/Sources/Core/KeystoreManager/KeystoreManager.swift b/Sources/Web3Core/KeystoreManager/KeystoreManager.swift similarity index 100% rename from Sources/Core/KeystoreManager/KeystoreManager.swift rename to Sources/Web3Core/KeystoreManager/KeystoreManager.swift diff --git a/Sources/Core/KeystoreManager/KeystoreParams.swift b/Sources/Web3Core/KeystoreManager/KeystoreParams.swift similarity index 100% rename from Sources/Core/KeystoreManager/KeystoreParams.swift rename to Sources/Web3Core/KeystoreManager/KeystoreParams.swift diff --git a/Sources/Core/KeystoreManager/PathAddressStorage.swift b/Sources/Web3Core/KeystoreManager/PathAddressStorage.swift similarity index 100% rename from Sources/Core/KeystoreManager/PathAddressStorage.swift rename to Sources/Web3Core/KeystoreManager/PathAddressStorage.swift diff --git a/Sources/Core/KeystoreManager/PlainKeystore.swift b/Sources/Web3Core/KeystoreManager/PlainKeystore.swift similarity index 100% rename from Sources/Core/KeystoreManager/PlainKeystore.swift rename to Sources/Web3Core/KeystoreManager/PlainKeystore.swift diff --git a/Sources/Core/Oracle/GasOracle.swift b/Sources/Web3Core/Oracle/GasOracle.swift similarity index 100% rename from Sources/Core/Oracle/GasOracle.swift rename to Sources/Web3Core/Oracle/GasOracle.swift diff --git a/Sources/Core/RLP/RLP.swift b/Sources/Web3Core/RLP/RLP.swift similarity index 100% rename from Sources/Core/RLP/RLP.swift rename to Sources/Web3Core/RLP/RLP.swift diff --git a/Sources/Core/Structure/Base58.swift b/Sources/Web3Core/Structure/Base58.swift similarity index 100% rename from Sources/Core/Structure/Base58.swift rename to Sources/Web3Core/Structure/Base58.swift diff --git a/Sources/Core/Structure/Block/Block.swift b/Sources/Web3Core/Structure/Block/Block.swift similarity index 100% rename from Sources/Core/Structure/Block/Block.swift rename to Sources/Web3Core/Structure/Block/Block.swift diff --git a/Sources/Core/Structure/Block/BlockNumber.swift b/Sources/Web3Core/Structure/Block/BlockNumber.swift similarity index 100% rename from Sources/Core/Structure/Block/BlockNumber.swift rename to Sources/Web3Core/Structure/Block/BlockNumber.swift diff --git a/Sources/Core/Structure/Event+Protocol.swift b/Sources/Web3Core/Structure/Event+Protocol.swift similarity index 100% rename from Sources/Core/Structure/Event+Protocol.swift rename to Sources/Web3Core/Structure/Event+Protocol.swift diff --git a/Sources/Core/Structure/EventLog/EventLog.swift b/Sources/Web3Core/Structure/EventLog/EventLog.swift similarity index 100% rename from Sources/Core/Structure/EventLog/EventLog.swift rename to Sources/Web3Core/Structure/EventLog/EventLog.swift diff --git a/Sources/Core/Structure/SECP256k1.swift b/Sources/Web3Core/Structure/SECP256k1.swift similarity index 100% rename from Sources/Core/Structure/SECP256k1.swift rename to Sources/Web3Core/Structure/SECP256k1.swift diff --git a/Sources/Core/Structure/Transaction/TransactionDetails.swift b/Sources/Web3Core/Structure/Transaction/TransactionDetails.swift similarity index 100% rename from Sources/Core/Structure/Transaction/TransactionDetails.swift rename to Sources/Web3Core/Structure/Transaction/TransactionDetails.swift diff --git a/Sources/Core/Structure/Transaction/TransactionInBlock.swift b/Sources/Web3Core/Structure/Transaction/TransactionInBlock.swift similarity index 100% rename from Sources/Core/Structure/Transaction/TransactionInBlock.swift rename to Sources/Web3Core/Structure/Transaction/TransactionInBlock.swift diff --git a/Sources/Core/Structure/Transaction/TransactionReceipt.swift b/Sources/Web3Core/Structure/Transaction/TransactionReceipt.swift similarity index 100% rename from Sources/Core/Structure/Transaction/TransactionReceipt.swift rename to Sources/Web3Core/Structure/Transaction/TransactionReceipt.swift diff --git a/Sources/Core/Structure/TxPool/TxPoolContent.swift b/Sources/Web3Core/Structure/TxPool/TxPoolContent.swift similarity index 100% rename from Sources/Core/Structure/TxPool/TxPoolContent.swift rename to Sources/Web3Core/Structure/TxPool/TxPoolContent.swift diff --git a/Sources/Core/Structure/TxPool/TxPoolStatus.swift b/Sources/Web3Core/Structure/TxPool/TxPoolStatus.swift similarity index 100% rename from Sources/Core/Structure/TxPool/TxPoolStatus.swift rename to Sources/Web3Core/Structure/TxPool/TxPoolStatus.swift diff --git a/Sources/Core/Structure/Web3ProviderProtocol.swift b/Sources/Web3Core/Structure/Web3ProviderProtocol.swift similarity index 100% rename from Sources/Core/Structure/Web3ProviderProtocol.swift rename to Sources/Web3Core/Structure/Web3ProviderProtocol.swift diff --git a/Sources/Core/Transaction/CodableTransaction.swift b/Sources/Web3Core/Transaction/CodableTransaction.swift similarity index 100% rename from Sources/Core/Transaction/CodableTransaction.swift rename to Sources/Web3Core/Transaction/CodableTransaction.swift diff --git a/Sources/Core/Transaction/Envelope/AbstractEnvelope.swift b/Sources/Web3Core/Transaction/Envelope/AbstractEnvelope.swift similarity index 100% rename from Sources/Core/Transaction/Envelope/AbstractEnvelope.swift rename to Sources/Web3Core/Transaction/Envelope/AbstractEnvelope.swift diff --git a/Sources/Core/Transaction/Envelope/EIP1559Envelope.swift b/Sources/Web3Core/Transaction/Envelope/EIP1559Envelope.swift similarity index 100% rename from Sources/Core/Transaction/Envelope/EIP1559Envelope.swift rename to Sources/Web3Core/Transaction/Envelope/EIP1559Envelope.swift diff --git a/Sources/Core/Transaction/Envelope/EIP2718Envelope.swift b/Sources/Web3Core/Transaction/Envelope/EIP2718Envelope.swift similarity index 100% rename from Sources/Core/Transaction/Envelope/EIP2718Envelope.swift rename to Sources/Web3Core/Transaction/Envelope/EIP2718Envelope.swift diff --git a/Sources/Core/Transaction/Envelope/EIP2930Envelope.swift b/Sources/Web3Core/Transaction/Envelope/EIP2930Envelope.swift similarity index 100% rename from Sources/Core/Transaction/Envelope/EIP2930Envelope.swift rename to Sources/Web3Core/Transaction/Envelope/EIP2930Envelope.swift diff --git a/Sources/Core/Transaction/Envelope/EnvelopeFactory.swift b/Sources/Web3Core/Transaction/Envelope/EnvelopeFactory.swift similarity index 100% rename from Sources/Core/Transaction/Envelope/EnvelopeFactory.swift rename to Sources/Web3Core/Transaction/Envelope/EnvelopeFactory.swift diff --git a/Sources/Core/Transaction/Envelope/LegacyEnvelope.swift b/Sources/Web3Core/Transaction/Envelope/LegacyEnvelope.swift similarity index 100% rename from Sources/Core/Transaction/Envelope/LegacyEnvelope.swift rename to Sources/Web3Core/Transaction/Envelope/LegacyEnvelope.swift diff --git a/Sources/Core/Transaction/Envelope/Protocols/EIP2930Compatible.swift b/Sources/Web3Core/Transaction/Envelope/Protocols/EIP2930Compatible.swift similarity index 100% rename from Sources/Core/Transaction/Envelope/Protocols/EIP2930Compatible.swift rename to Sources/Web3Core/Transaction/Envelope/Protocols/EIP2930Compatible.swift diff --git a/Sources/Core/Transaction/EthereumBloomFilter.swift b/Sources/Web3Core/Transaction/EthereumBloomFilter.swift similarity index 100% rename from Sources/Core/Transaction/EthereumBloomFilter.swift rename to Sources/Web3Core/Transaction/EthereumBloomFilter.swift diff --git a/Sources/Core/Transaction/EventfilterParameters.swift b/Sources/Web3Core/Transaction/EventfilterParameters.swift similarity index 100% rename from Sources/Core/Transaction/EventfilterParameters.swift rename to Sources/Web3Core/Transaction/EventfilterParameters.swift diff --git a/Sources/Core/Transaction/Policies.swift b/Sources/Web3Core/Transaction/Policies.swift similarity index 100% rename from Sources/Core/Transaction/Policies.swift rename to Sources/Web3Core/Transaction/Policies.swift diff --git a/Sources/Core/Transaction/TransactionMetadata.swift b/Sources/Web3Core/Transaction/TransactionMetadata.swift similarity index 100% rename from Sources/Core/Transaction/TransactionMetadata.swift rename to Sources/Web3Core/Transaction/TransactionMetadata.swift diff --git a/Sources/Core/Utility/Array+Extension.swift b/Sources/Web3Core/Utility/Array+Extension.swift similarity index 100% rename from Sources/Core/Utility/Array+Extension.swift rename to Sources/Web3Core/Utility/Array+Extension.swift diff --git a/Sources/Core/Utility/BigUInt+Extension.swift b/Sources/Web3Core/Utility/BigUInt+Extension.swift similarity index 100% rename from Sources/Core/Utility/BigUInt+Extension.swift rename to Sources/Web3Core/Utility/BigUInt+Extension.swift diff --git a/Sources/Core/Utility/CryptoExtension.swift b/Sources/Web3Core/Utility/CryptoExtension.swift similarity index 100% rename from Sources/Core/Utility/CryptoExtension.swift rename to Sources/Web3Core/Utility/CryptoExtension.swift diff --git a/Sources/Core/Utility/Data+Extension.swift b/Sources/Web3Core/Utility/Data+Extension.swift similarity index 100% rename from Sources/Core/Utility/Data+Extension.swift rename to Sources/Web3Core/Utility/Data+Extension.swift diff --git a/Sources/Core/Utility/Decodable+Extensions.swift b/Sources/Web3Core/Utility/Decodable+Extensions.swift similarity index 100% rename from Sources/Core/Utility/Decodable+Extensions.swift rename to Sources/Web3Core/Utility/Decodable+Extensions.swift diff --git a/Sources/Core/Utility/Dictionary+Extension.swift b/Sources/Web3Core/Utility/Dictionary+Extension.swift similarity index 100% rename from Sources/Core/Utility/Dictionary+Extension.swift rename to Sources/Web3Core/Utility/Dictionary+Extension.swift diff --git a/Sources/Core/Utility/Encodable+Extensions.swift b/Sources/Web3Core/Utility/Encodable+Extensions.swift similarity index 100% rename from Sources/Core/Utility/Encodable+Extensions.swift rename to Sources/Web3Core/Utility/Encodable+Extensions.swift diff --git a/Sources/Core/Utility/NSRegularExpression+Extension.swift b/Sources/Web3Core/Utility/NSRegularExpression+Extension.swift similarity index 100% rename from Sources/Core/Utility/NSRegularExpression+Extension.swift rename to Sources/Web3Core/Utility/NSRegularExpression+Extension.swift diff --git a/Sources/Core/Utility/NativeTypesEncoding+Extension.swift b/Sources/Web3Core/Utility/NativeTypesEncoding+Extension.swift similarity index 100% rename from Sources/Core/Utility/NativeTypesEncoding+Extension.swift rename to Sources/Web3Core/Utility/NativeTypesEncoding+Extension.swift diff --git a/Sources/Core/Utility/RIPEMD160+StackOveflow.swift b/Sources/Web3Core/Utility/RIPEMD160+StackOveflow.swift similarity index 100% rename from Sources/Core/Utility/RIPEMD160+StackOveflow.swift rename to Sources/Web3Core/Utility/RIPEMD160+StackOveflow.swift diff --git a/Sources/Core/Utility/String+Extension.swift b/Sources/Web3Core/Utility/String+Extension.swift similarity index 100% rename from Sources/Core/Utility/String+Extension.swift rename to Sources/Web3Core/Utility/String+Extension.swift diff --git a/Sources/Core/Utility/Utilities.swift b/Sources/Web3Core/Utility/Utilities.swift similarity index 100% rename from Sources/Core/Utility/Utilities.swift rename to Sources/Web3Core/Utility/Utilities.swift diff --git a/Sources/Core/Web3Error/Web3Error.swift b/Sources/Web3Core/Web3Error/Web3Error.swift similarity index 100% rename from Sources/Core/Web3Error/Web3Error.swift rename to Sources/Web3Core/Web3Error/Web3Error.swift diff --git a/Sources/web3swift/EthereumAPICalls/Ethereum/IEth+Defaults.swift b/Sources/web3swift/EthereumAPICalls/Ethereum/IEth+Defaults.swift index 3dcade8c0..6c5424689 100644 --- a/Sources/web3swift/EthereumAPICalls/Ethereum/IEth+Defaults.swift +++ b/Sources/web3swift/EthereumAPICalls/Ethereum/IEth+Defaults.swift @@ -6,7 +6,7 @@ import Foundation import BigInt -import Core +import Web3Core public extension IEth { func callTransaction(_ transaction: CodableTransaction) async throws -> Data { diff --git a/Sources/web3swift/EthereumAPICalls/Ethereum/IEth.swift b/Sources/web3swift/EthereumAPICalls/Ethereum/IEth.swift index 69bbc3e5a..ddade0c00 100755 --- a/Sources/web3swift/EthereumAPICalls/Ethereum/IEth.swift +++ b/Sources/web3swift/EthereumAPICalls/Ethereum/IEth.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core public protocol IEth { var provider: Web3Provider { get } diff --git a/Sources/web3swift/EthereumAPICalls/Personal/Personal+CreateAccount.swift b/Sources/web3swift/EthereumAPICalls/Personal/Personal+CreateAccount.swift index c0dc89bf6..746db1789 100755 --- a/Sources/web3swift/EthereumAPICalls/Personal/Personal+CreateAccount.swift +++ b/Sources/web3swift/EthereumAPICalls/Personal/Personal+CreateAccount.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core extension Web3.Personal { public func createAccount(password: String ) async throws -> EthereumAddress { diff --git a/Sources/web3swift/EthereumAPICalls/Personal/Personal+Sign.swift b/Sources/web3swift/EthereumAPICalls/Personal/Personal+Sign.swift index 24002e28e..c410b4381 100755 --- a/Sources/web3swift/EthereumAPICalls/Personal/Personal+Sign.swift +++ b/Sources/web3swift/EthereumAPICalls/Personal/Personal+Sign.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core extension Web3.Personal { diff --git a/Sources/web3swift/EthereumAPICalls/Personal/Personal+UnlockAccount.swift b/Sources/web3swift/EthereumAPICalls/Personal/Personal+UnlockAccount.swift index a01267242..d1ffe5444 100755 --- a/Sources/web3swift/EthereumAPICalls/Personal/Personal+UnlockAccount.swift +++ b/Sources/web3swift/EthereumAPICalls/Personal/Personal+UnlockAccount.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core extension Web3.Personal { public func unlock(account: EthereumAddress, password: String, seconds: UInt = 300) async throws -> Bool { diff --git a/Sources/web3swift/EthereumAPICalls/TxPool.swift b/Sources/web3swift/EthereumAPICalls/TxPool.swift index 221a9905c..eafdb9954 100755 --- a/Sources/web3swift/EthereumAPICalls/TxPool.swift +++ b/Sources/web3swift/EthereumAPICalls/TxPool.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core extension Web3.TxPool { public func txPoolStatus() async throws -> TxPoolStatus { diff --git a/Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift b/Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift index 86023a186..46b64c006 100755 --- a/Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift +++ b/Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core extension Web3.BrowserFunctions { diff --git a/Sources/web3swift/HookedFunctions/Web3+Wallet.swift b/Sources/web3swift/HookedFunctions/Web3+Wallet.swift index 0995c0172..7623f698f 100755 --- a/Sources/web3swift/HookedFunctions/Web3+Wallet.swift +++ b/Sources/web3swift/HookedFunctions/Web3+Wallet.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core extension Web3.Web3Wallet { diff --git a/Sources/web3swift/Operations/ReadOperation.swift b/Sources/web3swift/Operations/ReadOperation.swift index 144aee9ea..937ab2b14 100755 --- a/Sources/web3swift/Operations/ReadOperation.swift +++ b/Sources/web3swift/Operations/ReadOperation.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core // FIXME: Rewrite this to CodableTransaction diff --git a/Sources/web3swift/Operations/WriteOperation.swift b/Sources/web3swift/Operations/WriteOperation.swift index 6458ba6ff..f1fa366aa 100755 --- a/Sources/web3swift/Operations/WriteOperation.swift +++ b/Sources/web3swift/Operations/WriteOperation.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core /// Wrapper for `EthererumTransaction.data` property appropriate encoding. public class WriteOperation: ReadOperation { diff --git a/Sources/web3swift/Tokens/ERC1155/Web3+ERC1155.swift b/Sources/web3swift/Tokens/ERC1155/Web3+ERC1155.swift index 706e3eb9e..2ddb502a3 100644 --- a/Sources/web3swift/Tokens/ERC1155/Web3+ERC1155.swift +++ b/Sources/web3swift/Tokens/ERC1155/Web3+ERC1155.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core // Multi Token Standard // FIXME: Rewrite this to CodableTransaction diff --git a/Sources/web3swift/Tokens/ERC1376/Web3+ERC1376.swift b/Sources/web3swift/Tokens/ERC1376/Web3+ERC1376.swift index a4b7314a0..f3570578b 100644 --- a/Sources/web3swift/Tokens/ERC1376/Web3+ERC1376.swift +++ b/Sources/web3swift/Tokens/ERC1376/Web3+ERC1376.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core public enum IERC1376DelegateMode: UInt { case PublicMsgSender = 0 diff --git a/Sources/web3swift/Tokens/ERC1400/Web3+ERC1400.swift b/Sources/web3swift/Tokens/ERC1400/Web3+ERC1400.swift index 036d94c0c..98d98360f 100644 --- a/Sources/web3swift/Tokens/ERC1400/Web3+ERC1400.swift +++ b/Sources/web3swift/Tokens/ERC1400/Web3+ERC1400.swift @@ -6,7 +6,7 @@ // import Foundation import BigInt -import Core +import Web3Core // Security Token Standard protocol IERC1400: IERC20 { diff --git a/Sources/web3swift/Tokens/ERC1410/Web3+ERC1410.swift b/Sources/web3swift/Tokens/ERC1410/Web3+ERC1410.swift index 463f14974..4551cd793 100644 --- a/Sources/web3swift/Tokens/ERC1410/Web3+ERC1410.swift +++ b/Sources/web3swift/Tokens/ERC1410/Web3+ERC1410.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core // Partially Fungible Token Standard protocol IERC1410: IERC20 { diff --git a/Sources/web3swift/Tokens/ERC1594/Web3+ERC1594.swift b/Sources/web3swift/Tokens/ERC1594/Web3+ERC1594.swift index 0ccc0b9f9..de3bb5b41 100644 --- a/Sources/web3swift/Tokens/ERC1594/Web3+ERC1594.swift +++ b/Sources/web3swift/Tokens/ERC1594/Web3+ERC1594.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core // Core Security Token Standard protocol IERC1594: IERC20 { diff --git a/Sources/web3swift/Tokens/ERC1633/Web3+ERC1633.swift b/Sources/web3swift/Tokens/ERC1633/Web3+ERC1633.swift index 981b08aab..7aae7e727 100644 --- a/Sources/web3swift/Tokens/ERC1633/Web3+ERC1633.swift +++ b/Sources/web3swift/Tokens/ERC1633/Web3+ERC1633.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core // Re-Fungible Token Standard (RFT) // FIXME: Rewrite this to CodableTransaction diff --git a/Sources/web3swift/Tokens/ERC1643/Web3+ERC1643.swift b/Sources/web3swift/Tokens/ERC1643/Web3+ERC1643.swift index 23c4075d5..be5cce528 100644 --- a/Sources/web3swift/Tokens/ERC1643/Web3+ERC1643.swift +++ b/Sources/web3swift/Tokens/ERC1643/Web3+ERC1643.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core // Document Management Standard protocol IERC1643: IERC20 { diff --git a/Sources/web3swift/Tokens/ERC1644/Web3+ERC1644.swift b/Sources/web3swift/Tokens/ERC1644/Web3+ERC1644.swift index 8249d4816..98d3f60f4 100644 --- a/Sources/web3swift/Tokens/ERC1644/Web3+ERC1644.swift +++ b/Sources/web3swift/Tokens/ERC1644/Web3+ERC1644.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core // Controller Token Operation Standard protocol IERC1644: IERC20 { diff --git a/Sources/web3swift/Tokens/ERC20/Web3+ERC20.swift b/Sources/web3swift/Tokens/ERC20/Web3+ERC20.swift index 54bbaa681..d1aeba7ea 100644 --- a/Sources/web3swift/Tokens/ERC20/Web3+ERC20.swift +++ b/Sources/web3swift/Tokens/ERC20/Web3+ERC20.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core // Token Standard protocol IERC20 { diff --git a/Sources/web3swift/Tokens/ERC721/Web3+ERC721.swift b/Sources/web3swift/Tokens/ERC721/Web3+ERC721.swift index 765001104..9a5887eab 100644 --- a/Sources/web3swift/Tokens/ERC721/Web3+ERC721.swift +++ b/Sources/web3swift/Tokens/ERC721/Web3+ERC721.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core // Non-Fungible Token Standard protocol IERC721: IERC165 { diff --git a/Sources/web3swift/Tokens/ERC721x/Web3+ERC721x.swift b/Sources/web3swift/Tokens/ERC721x/Web3+ERC721x.swift index 56fe450c8..7285b48c9 100644 --- a/Sources/web3swift/Tokens/ERC721x/Web3+ERC721x.swift +++ b/Sources/web3swift/Tokens/ERC721x/Web3+ERC721x.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core // A Smarter Token for the Future of Crypto Collectibles // ERC721x is an extension of ERC721 that adds support for multi-fungible tokens and batch transfers, while being fully backward-compatible. diff --git a/Sources/web3swift/Tokens/ERC777/Web3+ERC777.swift b/Sources/web3swift/Tokens/ERC777/Web3+ERC777.swift index f7ca5baf4..4ef3be52f 100644 --- a/Sources/web3swift/Tokens/ERC777/Web3+ERC777.swift +++ b/Sources/web3swift/Tokens/ERC777/Web3+ERC777.swift @@ -6,7 +6,7 @@ // import Foundation import BigInt -import Core +import Web3Core // A New Advanced Token Standard protocol IERC777: IERC20, IERC820 { diff --git a/Sources/web3swift/Tokens/ERC820/Web3+ERC820.swift b/Sources/web3swift/Tokens/ERC820/Web3+ERC820.swift index a3e3ac0e1..060f2eb02 100644 --- a/Sources/web3swift/Tokens/ERC820/Web3+ERC820.swift +++ b/Sources/web3swift/Tokens/ERC820/Web3+ERC820.swift @@ -6,7 +6,7 @@ // import Foundation -import Core +import Web3Core // Pseudo-introspection using a registry contract protocol IERC820: IERC165 { diff --git a/Sources/web3swift/Tokens/ERC888/Web3+ERC888.swift b/Sources/web3swift/Tokens/ERC888/Web3+ERC888.swift index d3b53f61e..46a0dc8f0 100644 --- a/Sources/web3swift/Tokens/ERC888/Web3+ERC888.swift +++ b/Sources/web3swift/Tokens/ERC888/Web3+ERC888.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core // MultiDimensional Token Standard protocol IERC888 { diff --git a/Sources/web3swift/Tokens/ST20/Web3+ST20.swift b/Sources/web3swift/Tokens/ST20/Web3+ST20.swift index b410d6422..71097eb27 100644 --- a/Sources/web3swift/Tokens/ST20/Web3+ST20.swift +++ b/Sources/web3swift/Tokens/ST20/Web3+ST20.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core // NPolymath Token Standard protocol IST20: IERC20 { diff --git a/Sources/web3swift/Tokens/ST20/Web3+SecurityToken.swift b/Sources/web3swift/Tokens/ST20/Web3+SecurityToken.swift index 0ea9cd72d..a7670f124 100644 --- a/Sources/web3swift/Tokens/ST20/Web3+SecurityToken.swift +++ b/Sources/web3swift/Tokens/ST20/Web3+SecurityToken.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core /// The Ownable contract has an owner address, and provides basic authorization control functions, this simplifies the implementation of "user permissions". protocol IOwnable { diff --git a/Sources/web3swift/Utils/EIP/EIP4361.swift b/Sources/web3swift/Utils/EIP/EIP4361.swift index d076f2e2c..5e445d5eb 100644 --- a/Sources/web3swift/Utils/EIP/EIP4361.swift +++ b/Sources/web3swift/Utils/EIP/EIP4361.swift @@ -6,7 +6,7 @@ import Foundation import BigInt -import Core +import Web3Core public typealias SIWE = EIP4361 diff --git a/Sources/web3swift/Utils/EIP/EIP67Code.swift b/Sources/web3swift/Utils/EIP/EIP67Code.swift index 307684dd4..49f4e887c 100755 --- a/Sources/web3swift/Utils/EIP/EIP67Code.swift +++ b/Sources/web3swift/Utils/EIP/EIP67Code.swift @@ -6,7 +6,7 @@ import Foundation import CoreImage import BigInt -import Core +import Web3Core extension Web3 { diff --git a/Sources/web3swift/Utils/EIP/EIP681.swift b/Sources/web3swift/Utils/EIP/EIP681.swift index 765c4626a..e272967cd 100755 --- a/Sources/web3swift/Utils/EIP/EIP681.swift +++ b/Sources/web3swift/Utils/EIP/EIP681.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core extension Web3 { diff --git a/Sources/web3swift/Utils/EIP/EIP712.swift b/Sources/web3swift/Utils/EIP/EIP712.swift index c5ca654be..4cb913ffd 100644 --- a/Sources/web3swift/Utils/EIP/EIP712.swift +++ b/Sources/web3swift/Utils/EIP/EIP712.swift @@ -1,7 +1,7 @@ import CryptoSwift import Foundation import BigInt -import Core +import Web3Core /// Protocol defines EIP712 struct encoding public protocol EIP712Hashable { diff --git a/Sources/web3swift/Utils/ENS/ENS.swift b/Sources/web3swift/Utils/ENS/ENS.swift index a19874f33..171488649 100755 --- a/Sources/web3swift/Utils/ENS/ENS.swift +++ b/Sources/web3swift/Utils/ENS/ENS.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core public class ENS { diff --git a/Sources/web3swift/Utils/ENS/ENSBaseRegistrar.swift b/Sources/web3swift/Utils/ENS/ENSBaseRegistrar.swift index a02a15ad5..744ffa61b 100644 --- a/Sources/web3swift/Utils/ENS/ENSBaseRegistrar.swift +++ b/Sources/web3swift/Utils/ENS/ENSBaseRegistrar.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core // FIXME: Rewrite this to CodableTransaction public extension ENS { diff --git a/Sources/web3swift/Utils/ENS/ENSRegistry.swift b/Sources/web3swift/Utils/ENS/ENSRegistry.swift index 3cc1f5c4e..587684eb8 100644 --- a/Sources/web3swift/Utils/ENS/ENSRegistry.swift +++ b/Sources/web3swift/Utils/ENS/ENSRegistry.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core public extension ENS { class Registry { diff --git a/Sources/web3swift/Utils/ENS/ENSResolver.swift b/Sources/web3swift/Utils/ENS/ENSResolver.swift index a0996be7c..5147ab4e4 100755 --- a/Sources/web3swift/Utils/ENS/ENSResolver.swift +++ b/Sources/web3swift/Utils/ENS/ENSResolver.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core public extension ENS { class Resolver { diff --git a/Sources/web3swift/Utils/ENS/ENSReverseRegistrar.swift b/Sources/web3swift/Utils/ENS/ENSReverseRegistrar.swift index c3c882bf7..1ba0baa24 100644 --- a/Sources/web3swift/Utils/ENS/ENSReverseRegistrar.swift +++ b/Sources/web3swift/Utils/ENS/ENSReverseRegistrar.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core public extension ENS { class ReverseRegistrar { diff --git a/Sources/web3swift/Utils/ENS/ETHRegistrarController.swift b/Sources/web3swift/Utils/ENS/ETHRegistrarController.swift index ec1af88a5..f684e3692 100644 --- a/Sources/web3swift/Utils/ENS/ETHRegistrarController.swift +++ b/Sources/web3swift/Utils/ENS/ETHRegistrarController.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core public extension ENS { class ETHRegistrarController { diff --git a/Sources/web3swift/Web3/Web3+Contract.swift b/Sources/web3swift/Web3/Web3+Contract.swift index ba09cfb81..e15aaae38 100755 --- a/Sources/web3swift/Web3/Web3+Contract.swift +++ b/Sources/web3swift/Web3/Web3+Contract.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core extension Web3 { diff --git a/Sources/web3swift/Web3/Web3+EIP1559.swift b/Sources/web3swift/Web3/Web3+EIP1559.swift index 7eb5732de..9e0e9de8b 100644 --- a/Sources/web3swift/Web3/Web3+EIP1559.swift +++ b/Sources/web3swift/Web3/Web3+EIP1559.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core /// EIP-1559 Base fee extension /// diff --git a/Sources/web3swift/Web3/Web3+EventParser.swift b/Sources/web3swift/Web3/Web3+EventParser.swift index d6bc21640..cc4eaa285 100755 --- a/Sources/web3swift/Web3/Web3+EventParser.swift +++ b/Sources/web3swift/Web3/Web3+EventParser.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core // extension web3.web3contract { // /// An event parser to fetch events produced by smart-contract related transactions. Should not be constructed manually, but rather by calling the corresponding function on the web3contract object. diff --git a/Sources/web3swift/Web3/Web3+HttpProvider.swift b/Sources/web3swift/Web3/Web3+HttpProvider.swift index 94fbd809d..3f271a3e2 100755 --- a/Sources/web3swift/Web3/Web3+HttpProvider.swift +++ b/Sources/web3swift/Web3/Web3+HttpProvider.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core /// The default http provider. public class Web3HttpProvider: Web3Provider { diff --git a/Sources/web3swift/Web3/Web3+InfuraProviders.swift b/Sources/web3swift/Web3/Web3+InfuraProviders.swift index eb1c18f2a..493d6bc65 100755 --- a/Sources/web3swift/Web3/Web3+InfuraProviders.swift +++ b/Sources/web3swift/Web3/Web3+InfuraProviders.swift @@ -4,7 +4,7 @@ // import Foundation import BigInt -import Core +import Web3Core /// Custom Web3 HTTP provider of Infura nodes. public final class InfuraProvider: Web3HttpProvider { diff --git a/Sources/web3swift/Web3/Web3+Instance.swift b/Sources/web3swift/Web3/Web3+Instance.swift index a9b439a56..5fdd99217 100755 --- a/Sources/web3swift/Web3/Web3+Instance.swift +++ b/Sources/web3swift/Web3/Web3+Instance.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core // FIXME: Rewrite this to CodableTransaction /// A web3 instance bound to provider. All further functionality is provided under web.*. namespaces. diff --git a/Sources/web3swift/Web3/Web3+Personal.swift b/Sources/web3swift/Web3/Web3+Personal.swift index c9950e24c..3949fcd7f 100755 --- a/Sources/web3swift/Web3/Web3+Personal.swift +++ b/Sources/web3swift/Web3/Web3+Personal.swift @@ -5,7 +5,7 @@ import Foundation import BigInt -import Core +import Web3Core extension Web3.Personal { diff --git a/Sources/web3swift/Web3/Web3+Resolver.swift b/Sources/web3swift/Web3/Web3+Resolver.swift index 9cdcbf5b0..c2eb0b481 100644 --- a/Sources/web3swift/Web3/Web3+Resolver.swift +++ b/Sources/web3swift/Web3/Web3+Resolver.swift @@ -7,7 +7,7 @@ import Foundation import BigInt -import Core +import Web3Core public class PolicyResolver { private let provider: Web3Provider diff --git a/Sources/web3swift/Web3/Web3+Signing.swift b/Sources/web3swift/Web3/Web3+Signing.swift index ff55bf03e..2e135c6c0 100755 --- a/Sources/web3swift/Web3/Web3+Signing.swift +++ b/Sources/web3swift/Web3/Web3+Signing.swift @@ -6,7 +6,7 @@ import Foundation import BigInt -import Core +import Web3Core public struct Web3Signer { public static func signTX(transaction: inout CodableTransaction, diff --git a/Sources/web3swift/Web3/Web3+Utils.swift b/Sources/web3swift/Web3/Web3+Utils.swift index 39a33631e..e58005fd1 100755 --- a/Sources/web3swift/Web3/Web3+Utils.swift +++ b/Sources/web3swift/Web3/Web3+Utils.swift @@ -6,7 +6,7 @@ import Foundation import BigInt import CryptoSwift -import Core +import Web3Core public typealias Web3Utils = Web3.Utils diff --git a/Sources/web3swift/Web3/Web3.swift b/Sources/web3swift/Web3/Web3.swift index 0ea151d23..29c881130 100755 --- a/Sources/web3swift/Web3/Web3.swift +++ b/Sources/web3swift/Web3/Web3.swift @@ -4,7 +4,7 @@ // import Foundation -import Core +import Web3Core /// An arbitary Web3 object. Is used only to construct provider bound fully functional object by either supplying provider URL /// or using pre-coded Infura nodes diff --git a/Tests/web3swiftTests/localTests/ABIElementErrorDecodingTest.swift b/Tests/web3swiftTests/localTests/ABIElementErrorDecodingTest.swift index 9b4308151..9c7d238f9 100644 --- a/Tests/web3swiftTests/localTests/ABIElementErrorDecodingTest.swift +++ b/Tests/web3swiftTests/localTests/ABIElementErrorDecodingTest.swift @@ -6,7 +6,7 @@ import Foundation import XCTest -import Core +import Web3Core class ABIElementErrorDecodingTest: XCTestCase { typealias EthError = ABI.Element.EthError diff --git a/Tests/web3swiftTests/localTests/ABIEncoderTest.swift b/Tests/web3swiftTests/localTests/ABIEncoderTest.swift index 5bb74de73..4b50fdecd 100644 --- a/Tests/web3swiftTests/localTests/ABIEncoderTest.swift +++ b/Tests/web3swiftTests/localTests/ABIEncoderTest.swift @@ -7,9 +7,9 @@ // import Foundation +import Web3Core import XCTest import BigInt -import Core @testable import web3swift class ABIEncoderTest: XCTestCase { diff --git a/Tests/web3swiftTests/localTests/AdvancedABIv2Tests.swift b/Tests/web3swiftTests/localTests/AdvancedABIv2Tests.swift index e34aed0f8..b5d836e84 100755 --- a/Tests/web3swiftTests/localTests/AdvancedABIv2Tests.swift +++ b/Tests/web3swiftTests/localTests/AdvancedABIv2Tests.swift @@ -6,7 +6,7 @@ import XCTest import CryptoSwift import BigInt -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/BasicLocalNodeTests.swift b/Tests/web3swiftTests/localTests/BasicLocalNodeTests.swift index c099f330d..f75224ae1 100755 --- a/Tests/web3swiftTests/localTests/BasicLocalNodeTests.swift +++ b/Tests/web3swiftTests/localTests/BasicLocalNodeTests.swift @@ -6,7 +6,7 @@ import XCTest import CryptoSwift import BigInt -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/DataConversionTests.swift b/Tests/web3swiftTests/localTests/DataConversionTests.swift index a13f207d3..5829a0712 100644 --- a/Tests/web3swiftTests/localTests/DataConversionTests.swift +++ b/Tests/web3swiftTests/localTests/DataConversionTests.swift @@ -6,7 +6,7 @@ // import XCTest -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/DecodeSolidityErrorType.swift b/Tests/web3swiftTests/localTests/DecodeSolidityErrorType.swift index e86c29458..4ec691d8a 100644 --- a/Tests/web3swiftTests/localTests/DecodeSolidityErrorType.swift +++ b/Tests/web3swiftTests/localTests/DecodeSolidityErrorType.swift @@ -8,7 +8,7 @@ import XCTest import web3swift -import Core +import Web3Core /// Since solidity 0.8.4 a new type was introduced called `error`. /// Contracts' ABI with this type were not decodable. diff --git a/Tests/web3swiftTests/localTests/EIP1559BlockTests.swift b/Tests/web3swiftTests/localTests/EIP1559BlockTests.swift index 86a4fe15e..e41c55e3f 100644 --- a/Tests/web3swiftTests/localTests/EIP1559BlockTests.swift +++ b/Tests/web3swiftTests/localTests/EIP1559BlockTests.swift @@ -5,7 +5,7 @@ import BigInt import web3swift @testable -import Core +import Web3Core class EIP1559BlockTests: LocalTestCase { let uselessBlockPart = ( diff --git a/Tests/web3swiftTests/localTests/EIP4361Test.swift b/Tests/web3swiftTests/localTests/EIP4361Test.swift index e2be75145..8e750e222 100644 --- a/Tests/web3swiftTests/localTests/EIP4361Test.swift +++ b/Tests/web3swiftTests/localTests/EIP4361Test.swift @@ -6,7 +6,7 @@ import Foundation import XCTest -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/EIP67Tests.swift b/Tests/web3swiftTests/localTests/EIP67Tests.swift index 420919286..b99b8b275 100755 --- a/Tests/web3swiftTests/localTests/EIP67Tests.swift +++ b/Tests/web3swiftTests/localTests/EIP67Tests.swift @@ -6,7 +6,7 @@ import XCTest import CryptoSwift import BigInt -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/EIP681Tests.swift b/Tests/web3swiftTests/localTests/EIP681Tests.swift index 14480c59a..2f347bf59 100755 --- a/Tests/web3swiftTests/localTests/EIP681Tests.swift +++ b/Tests/web3swiftTests/localTests/EIP681Tests.swift @@ -5,7 +5,7 @@ import XCTest import BigInt -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/EIP712Tests.swift b/Tests/web3swiftTests/localTests/EIP712Tests.swift index 50d554759..538c651cf 100644 --- a/Tests/web3swiftTests/localTests/EIP712Tests.swift +++ b/Tests/web3swiftTests/localTests/EIP712Tests.swift @@ -1,5 +1,5 @@ import XCTest -import Core +import Web3Core @testable import web3swift class EIP712Tests: LocalTestCase { diff --git a/Tests/web3swiftTests/localTests/ERC20ClassTests.swift b/Tests/web3swiftTests/localTests/ERC20ClassTests.swift index 2bda587d8..c9ba5b75e 100755 --- a/Tests/web3swiftTests/localTests/ERC20ClassTests.swift +++ b/Tests/web3swiftTests/localTests/ERC20ClassTests.swift @@ -4,7 +4,7 @@ // import XCTest -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/ERC20Tests.swift b/Tests/web3swiftTests/localTests/ERC20Tests.swift index 8387fae2b..5b3d0967b 100755 --- a/Tests/web3swiftTests/localTests/ERC20Tests.swift +++ b/Tests/web3swiftTests/localTests/ERC20Tests.swift @@ -4,7 +4,7 @@ // import XCTest import BigInt -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/EthereumContractTest.swift b/Tests/web3swiftTests/localTests/EthereumContractTest.swift index c0801131c..6031e0e84 100644 --- a/Tests/web3swiftTests/localTests/EthereumContractTest.swift +++ b/Tests/web3swiftTests/localTests/EthereumContractTest.swift @@ -8,7 +8,7 @@ import XCTest -@testable import Core +@testable import Web3Core @testable import web3swift class EthereumContractTest: LocalTestCase { diff --git a/Tests/web3swiftTests/localTests/EventloopTests.swift b/Tests/web3swiftTests/localTests/EventloopTests.swift index 5cccff9e7..5c3bc912f 100755 --- a/Tests/web3swiftTests/localTests/EventloopTests.swift +++ b/Tests/web3swiftTests/localTests/EventloopTests.swift @@ -4,7 +4,7 @@ // import XCTest -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/KeystoresTests.swift b/Tests/web3swiftTests/localTests/KeystoresTests.swift index 3bce14c33..4f7a5e6b7 100755 --- a/Tests/web3swiftTests/localTests/KeystoresTests.swift +++ b/Tests/web3swiftTests/localTests/KeystoresTests.swift @@ -5,7 +5,7 @@ import XCTest import CryptoSwift -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/LocalTestCase.swift b/Tests/web3swiftTests/localTests/LocalTestCase.swift index c44dab412..3fbb98f85 100644 --- a/Tests/web3swiftTests/localTests/LocalTestCase.swift +++ b/Tests/web3swiftTests/localTests/LocalTestCase.swift @@ -1,7 +1,7 @@ import Foundation import XCTest import BigInt -import Core +import Web3Core import web3swift diff --git a/Tests/web3swiftTests/localTests/Mocks.swift b/Tests/web3swiftTests/localTests/Mocks.swift index de284dd2b..699dc6c27 100644 --- a/Tests/web3swiftTests/localTests/Mocks.swift +++ b/Tests/web3swiftTests/localTests/Mocks.swift @@ -6,7 +6,7 @@ import Foundation @testable import web3swift -@testable import Core +@testable import Web3Core class Web3EthMock: IEth { let provider: Web3Provider diff --git a/Tests/web3swiftTests/localTests/NSRegularExpressionTest.swift b/Tests/web3swiftTests/localTests/NSRegularExpressionTest.swift index 29ac561fe..693177c0f 100644 --- a/Tests/web3swiftTests/localTests/NSRegularExpressionTest.swift +++ b/Tests/web3swiftTests/localTests/NSRegularExpressionTest.swift @@ -7,7 +7,7 @@ import Foundation import XCTest -@testable import Core +@testable import Web3Core class NSRegularExpressionTest: XCTestCase { diff --git a/Tests/web3swiftTests/localTests/NumberFormattingUtilTests.swift b/Tests/web3swiftTests/localTests/NumberFormattingUtilTests.swift index be380185d..1aae89b42 100755 --- a/Tests/web3swiftTests/localTests/NumberFormattingUtilTests.swift +++ b/Tests/web3swiftTests/localTests/NumberFormattingUtilTests.swift @@ -6,7 +6,7 @@ import XCTest import CryptoSwift import BigInt -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/PersonalSignatureTests.swift b/Tests/web3swiftTests/localTests/PersonalSignatureTests.swift index 418ff7a22..a896d3e42 100755 --- a/Tests/web3swiftTests/localTests/PersonalSignatureTests.swift +++ b/Tests/web3swiftTests/localTests/PersonalSignatureTests.swift @@ -6,7 +6,7 @@ import XCTest import CryptoSwift import BigInt -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/PromisesTests.swift b/Tests/web3swiftTests/localTests/PromisesTests.swift index 735050ddd..cee6a0468 100755 --- a/Tests/web3swiftTests/localTests/PromisesTests.swift +++ b/Tests/web3swiftTests/localTests/PromisesTests.swift @@ -4,7 +4,7 @@ //// // // import XCTest -// import Core +// import Web3Core // import BigInt // // @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/RLPTests.swift b/Tests/web3swiftTests/localTests/RLPTests.swift index 5981ab5f6..b5bbde91b 100755 --- a/Tests/web3swiftTests/localTests/RLPTests.swift +++ b/Tests/web3swiftTests/localTests/RLPTests.swift @@ -5,7 +5,7 @@ import XCTest import BigInt -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/ST20AndSecurityTokenTests.swift b/Tests/web3swiftTests/localTests/ST20AndSecurityTokenTests.swift index 738648e7e..84782bbeb 100644 --- a/Tests/web3swiftTests/localTests/ST20AndSecurityTokenTests.swift +++ b/Tests/web3swiftTests/localTests/ST20AndSecurityTokenTests.swift @@ -6,7 +6,7 @@ import XCTest import BigInt -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/TestHelpers.swift b/Tests/web3swiftTests/localTests/TestHelpers.swift index c80b4435e..d4d5770c1 100644 --- a/Tests/web3swiftTests/localTests/TestHelpers.swift +++ b/Tests/web3swiftTests/localTests/TestHelpers.swift @@ -8,7 +8,7 @@ import Foundation import BigInt -import Core +import Web3Core import web3swift diff --git a/Tests/web3swiftTests/localTests/TransactionsTests.swift b/Tests/web3swiftTests/localTests/TransactionsTests.swift index b7e1a6886..41389fe3f 100755 --- a/Tests/web3swiftTests/localTests/TransactionsTests.swift +++ b/Tests/web3swiftTests/localTests/TransactionsTests.swift @@ -7,7 +7,7 @@ import Foundation import XCTest import CryptoSwift import BigInt -import Core +import Web3Core // swiftlint:disable file_length // swiftlint:disable type_body_length diff --git a/Tests/web3swiftTests/localTests/UncategorizedTests.swift b/Tests/web3swiftTests/localTests/UncategorizedTests.swift index 8979c580d..f521cfb56 100755 --- a/Tests/web3swiftTests/localTests/UncategorizedTests.swift +++ b/Tests/web3swiftTests/localTests/UncategorizedTests.swift @@ -7,7 +7,7 @@ import XCTest import CryptoSwift import BigInt -@testable import Core +@testable import Web3Core @testable import web3swift class UncategorizedTests: XCTestCase { diff --git a/Tests/web3swiftTests/localTests/UserCases.swift b/Tests/web3swiftTests/localTests/UserCases.swift index 1f930783d..0b86ea190 100755 --- a/Tests/web3swiftTests/localTests/UserCases.swift +++ b/Tests/web3swiftTests/localTests/UserCases.swift @@ -5,7 +5,7 @@ import XCTest import BigInt -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/UtilitiesTests.swift b/Tests/web3swiftTests/localTests/UtilitiesTests.swift index f8c0606aa..53a6761fc 100644 --- a/Tests/web3swiftTests/localTests/UtilitiesTests.swift +++ b/Tests/web3swiftTests/localTests/UtilitiesTests.swift @@ -6,7 +6,7 @@ import XCTest import BigInt -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/localTests/Web3ErrorTests.swift b/Tests/web3swiftTests/localTests/Web3ErrorTests.swift index 7439b96a1..c66ff9012 100644 --- a/Tests/web3swiftTests/localTests/Web3ErrorTests.swift +++ b/Tests/web3swiftTests/localTests/Web3ErrorTests.swift @@ -6,7 +6,7 @@ import XCTest import Foundation -@testable import Core +@testable import Web3Core class Web3ErrorTests: XCTestCase { diff --git a/Tests/web3swiftTests/remoteTests/EIP1559Tests.swift b/Tests/web3swiftTests/remoteTests/EIP1559Tests.swift index 18d01227f..7f2848429 100644 --- a/Tests/web3swiftTests/remoteTests/EIP1559Tests.swift +++ b/Tests/web3swiftTests/remoteTests/EIP1559Tests.swift @@ -6,7 +6,7 @@ // import XCTest -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/remoteTests/ENSTests.swift b/Tests/web3swiftTests/remoteTests/ENSTests.swift index 59bed8ecd..2f62203d8 100755 --- a/Tests/web3swiftTests/remoteTests/ENSTests.swift +++ b/Tests/web3swiftTests/remoteTests/ENSTests.swift @@ -4,7 +4,7 @@ // import XCTest -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/remoteTests/GasOracleTests.swift b/Tests/web3swiftTests/remoteTests/GasOracleTests.swift index 75b1f7ae0..f57a0b4f6 100644 --- a/Tests/web3swiftTests/remoteTests/GasOracleTests.swift +++ b/Tests/web3swiftTests/remoteTests/GasOracleTests.swift @@ -6,7 +6,7 @@ import XCTest import BigInt -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/remoteTests/InfuraTests.swift b/Tests/web3swiftTests/remoteTests/InfuraTests.swift index 12696dce4..7f6d2ec6c 100755 --- a/Tests/web3swiftTests/remoteTests/InfuraTests.swift +++ b/Tests/web3swiftTests/remoteTests/InfuraTests.swift @@ -4,7 +4,7 @@ // import XCTest -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/remoteTests/PolicyResolverTests.swift b/Tests/web3swiftTests/remoteTests/PolicyResolverTests.swift index c6f435d28..4c9266083 100644 --- a/Tests/web3swiftTests/remoteTests/PolicyResolverTests.swift +++ b/Tests/web3swiftTests/remoteTests/PolicyResolverTests.swift @@ -7,7 +7,7 @@ import XCTest import BigInt -import Core +import Web3Core @testable import web3swift diff --git a/Tests/web3swiftTests/remoteTests/RemoteParsingTests.swift b/Tests/web3swiftTests/remoteTests/RemoteParsingTests.swift index f1ec5d46f..bc7ce8857 100755 --- a/Tests/web3swiftTests/remoteTests/RemoteParsingTests.swift +++ b/Tests/web3swiftTests/remoteTests/RemoteParsingTests.swift @@ -6,7 +6,7 @@ import XCTest import CryptoSwift import BigInt -import Core +import Web3Core @testable import web3swift