diff --git a/Podfile b/Podfile index 74d40bb..99672aa 100644 --- a/Podfile +++ b/Podfile @@ -34,5 +34,6 @@ target 'WavesSDK' do pod 'RxSwift' pod 'Moya' pod 'Moya/RxSwift' + end diff --git a/Podfile.lock b/Podfile.lock index 5fb90df..63171ae 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,17 +1,15 @@ PODS: - - Alamofire (4.8.2) - - Fakery (4.0.0) - - Moya (12.0.1): - - Moya/Core (= 12.0.1) - - Moya/Core (12.0.1): - - Alamofire (~> 4.1) - - Result (~> 4.0) - - Moya/RxSwift (12.0.1): + - Alamofire (5.4.3) + - Fakery (5.1.0) + - Moya (14.0.0): + - Moya/Core (= 14.0.0) + - Moya/Core (14.0.0): + - Alamofire (~> 5.0) + - Moya/RxSwift (14.0.0): - Moya/Core - - RxSwift (~> 4.0) - - Nimble (8.0.2) - - Result (4.1.0) - - RxSwift (4.5.0) + - RxSwift (~> 5.0) + - Nimble (9.2.1) + - RxSwift (5.1.3) DEPENDENCIES: - Fakery @@ -21,22 +19,20 @@ DEPENDENCIES: - RxSwift SPEC REPOS: - https://github.com/cocoapods/specs.git: + trunk: - Alamofire - Fakery - Moya - Nimble - - Result - RxSwift SPEC CHECKSUMS: - Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3 - Fakery: 476f6d947de432f84703acc830a1e7166330299b - Moya: cf730b3cd9e005401ef37a85143aa141a12fd38f - Nimble: 622629381bda1dd5678162f21f1368cec7cbba60 - Result: bd966fac789cc6c1563440b348ab2598cc24d5c7 - RxSwift: f172070dfd1a93d70a9ab97a5a01166206e1c575 + Alamofire: e447a2774a40c996748296fa2c55112fdbbc42f9 + Fakery: a90caff00ca5cacde6c161c3eafc72314a03d34d + Moya: 5b45dacb75adb009f97fde91c204c1e565d31916 + Nimble: e7e615c0335ee4bf5b0d786685451e62746117d5 + RxSwift: 915abbdfb62214aa89ccd0b194d44fb478019b27 -PODFILE CHECKSUM: e63fbc46526e9f529679af7668827c4f512f9df4 +PODFILE CHECKSUM: 889c675331401fcf7467171ea714cb5e1d153be7 -COCOAPODS: 1.7.4 +COCOAPODS: 1.11.0.rc.1 diff --git a/WavesSDK.podspec b/WavesSDK.podspec index b04e0fe..cb72a8c 100644 --- a/WavesSDK.podspec +++ b/WavesSDK.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |spec| spec.name = 'WavesSDK' - spec.version = '0.1.9' + spec.version = '0.2.1' spec.ios.deployment_target = '11.0' spec.requires_arc = true spec.swift_version = '5.0' @@ -12,15 +12,16 @@ Pod::Spec.new do |spec| spec.summary = 'Extensions are helping for developer fast write code' spec.source_files = 'WavesSDK/Sources/**/*.{swift}' - spec.source = { :git => 'https://github.com/wavesplatform/WavesSDK-iOS.git', :tag => 'v' + spec.version.to_s} + spec.source = { :git => 'https://github.com/adenuga558/WavesSDK-iOS.git', :tag => 'v' + spec.version.to_s} spec.ios.framework = 'Foundation' spec.ios.framework = 'UIKit' - spec.dependency 'RxSwift', '~> 4.0' - spec.dependency 'Moya', '~> 12.0.1' - spec.dependency 'Moya/RxSwift', '~> 12.0.1' - spec.dependency 'WavesSDKExtensions' - spec.dependency 'WavesSDKCrypto' + spec.dependency 'RxSwift', '~> 5.1.3' + spec.dependency 'Moya', '~> 14.0.0' + spec.dependency 'Moya/RxSwift', '~> 14.0.0' + spec.dependency 'WavesSDKExtensionsUpdate' + spec.dependency 'WavesSDKCryptoUpdate' + end diff --git a/WavesSDK.xcodeproj/project.pbxproj b/WavesSDK.xcodeproj/project.pbxproj index 60a6ad8..2a899f9 100644 --- a/WavesSDK.xcodeproj/project.pbxproj +++ b/WavesSDK.xcodeproj/project.pbxproj @@ -7,10 +7,10 @@ objects = { /* Begin PBXBuildFile section */ - 1AB37B7C3C1EB90AC19BAA6D /* Pods_Waves_Exchange_SDK_WavesSDKCrypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8625E48FA90E048D091F4B9E /* Pods_Waves_Exchange_SDK_WavesSDKCrypto.framework */; }; - 3B0E8FCF7759CD4F8A4FF27C /* Pods_Waves_Exchange_SDK_WavesSDKExtensions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E7AA1F5018E52FD7CFB2112 /* Pods_Waves_Exchange_SDK_WavesSDKExtensions.framework */; }; + 1F5AEFA457C3224EF92BF724 /* Pods_StubTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 324A44BAFFBF40A7D10C6868 /* Pods_StubTest.framework */; }; 42BB3EF72594C60C00A0142A /* NumberFormatter+Once.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42BB3EF62594C60C00A0142A /* NumberFormatter+Once.swift */; }; 4AF1EEBA1DC2288A5799015A /* Pods_WavesSDKTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EBC6763F0CBF8C4EB1DA4C1 /* Pods_WavesSDKTests.framework */; }; + 4ECB588C435E083845BCCCAE /* Pods_WavesSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E0EAA7DF4D2489EAC837C25F /* Pods_WavesSDK.framework */; }; 7B0B6F9B231E6DC800CC5DCB /* DictionaryEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0B6F9A231E6DC800CC5DCB /* DictionaryEncoder.swift */; }; 7B3681A323152E13000D5592 /* WavesKeeper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B3681A223152E13000D5592 /* WavesKeeper.swift */; }; 7B3DCA2922CFC37600FC973D /* keccak.c in Sources */ = {isa = PBXBuildFile; fileRef = 7B3DC9B622CFC37500FC973D /* keccak.c */; settings = {COMPILER_FLAGS = " -w -Xanalyzer -analyzer-disable-all-checks"; }; }; @@ -275,8 +275,7 @@ 872C36A8241A38100050250B /* MassTransferTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872C36A7241A38100050250B /* MassTransferTransaction.swift */; }; 87409DB02417B06000726C12 /* MassTransferDataQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87409DAF2417B06000726C12 /* MassTransferDataQuery.swift */; }; 8756669B242BBDD200E9F177 /* AddressData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8756669A242BBDD200E9F177 /* AddressData.swift */; }; - A75CDC2E7D018C77F6038A77 /* Pods_Waves_Exchange_SDK_StubTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A604E380777BE7E3B63B49F5 /* Pods_Waves_Exchange_SDK_StubTest.framework */; }; - D0DFEC95196ECE27B7B0A8A0 /* Pods_Waves_Exchange_SDK_WavesSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 781290C6655578036CDA2D08 /* Pods_Waves_Exchange_SDK_WavesSDK.framework */; }; + A1AAC57D2CEC110070E035F1 /* Pods_WavesSDKExtensions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 873B497F7B791EA227D3EBF1 /* Pods_WavesSDKExtensions.framework */; }; E9399076231FD41D00302490 /* WavesKeeper+Decodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9399075231FD41D00302490 /* WavesKeeper+Decodable.swift */; }; E9496F5923D7D93500FBF78F /* PairsRateDataTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9496F5823D7D93500FBF78F /* PairsRateDataTarget.swift */; }; E9496F5B23D7DBF300FBF78F /* PairsRateData.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9496F5A23D7DBF300FBF78F /* PairsRateData.swift */; }; @@ -353,29 +352,32 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 013D5161715A0235BAEA13AF /* Pods-StubTest.release-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StubTest.release-dev.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-StubTest/Pods-StubTest.release-dev.xcconfig"; sourceTree = ""; }; 0508072621377B4536DE03E7 /* Pods-Waves-Exchange-SDK-StubTest.release-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-StubTest.release-adhoc.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-StubTest/Pods-Waves-Exchange-SDK-StubTest.release-adhoc.xcconfig"; sourceTree = ""; }; + 05C35D856056396195A8BC94 /* Pods-WavesSDK.test-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDK.test-prod.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDK/Pods-WavesSDK.test-prod.xcconfig"; sourceTree = ""; }; 119CE632AC148FBB7B881235 /* Pods-Waves-Exchange-SDK-WavesSDKExtensions.release-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDKExtensions.release-prod.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDKExtensions/Pods-Waves-Exchange-SDK-WavesSDKExtensions.release-prod.xcconfig"; sourceTree = ""; }; - 14C7D0D8FC695A614F1600AA /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.test-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDKCrypto.test-prod.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDKCrypto/Pods-Waves-Exchange-SDK-WavesSDKCrypto.test-prod.xcconfig"; sourceTree = ""; }; - 1E76639DE833759D4302531C /* Pods-WavesSDKTests.release-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKTests.release-prod.xcconfig"; path = "Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests.release-prod.xcconfig"; sourceTree = ""; }; + 1219FE50DF90BA06FD63B9CF /* Pods-WavesSDKExtensions.test-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKExtensions.test-prod.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDKExtensions/Pods-WavesSDKExtensions.test-prod.xcconfig"; sourceTree = ""; }; + 1E76639DE833759D4302531C /* Pods-WavesSDKTests.release-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKTests.release-prod.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests.release-prod.xcconfig"; sourceTree = ""; }; 21786F8FC9A0EB30759912E3 /* Pods-Waves-Exchange-SDK-WavesSDK.dev-debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDK.dev-debug.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDK/Pods-Waves-Exchange-SDK-WavesSDK.dev-debug.xcconfig"; sourceTree = ""; }; 224CA0C24794921AB03072FE /* Pods-Waves-Exchange-SDK-WavesSDK.release-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDK.release-adhoc.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDK/Pods-Waves-Exchange-SDK-WavesSDK.release-adhoc.xcconfig"; sourceTree = ""; }; - 28D3C243802CEFE0ED716031 /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.release-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDKCrypto.release-dev.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDKCrypto/Pods-Waves-Exchange-SDK-WavesSDKCrypto.release-dev.xcconfig"; sourceTree = ""; }; - 2947576B28F5E4E8904B5301 /* Pods-WavesSDKTests.release-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKTests.release-adhoc.xcconfig"; path = "Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests.release-adhoc.xcconfig"; sourceTree = ""; }; + 2947576B28F5E4E8904B5301 /* Pods-WavesSDKTests.release-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKTests.release-adhoc.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests.release-adhoc.xcconfig"; sourceTree = ""; }; + 2F17F89F9408527C0B4BC5D2 /* Pods-WavesSDKExtensions.test-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKExtensions.test-dev.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDKExtensions/Pods-WavesSDKExtensions.test-dev.xcconfig"; sourceTree = ""; }; + 324A44BAFFBF40A7D10C6868 /* Pods_StubTest.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_StubTest.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 33545518E8D8E7A384164425 /* Pods-StubTest.dev-debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StubTest.dev-debug.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-StubTest/Pods-StubTest.dev-debug.xcconfig"; sourceTree = ""; }; 36FCA4E83FFD9076A9C08FE7 /* Pods-Waves-Exchange-SDK-WavesSDKExtensions.test-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDKExtensions.test-prod.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDKExtensions/Pods-Waves-Exchange-SDK-WavesSDKExtensions.test-prod.xcconfig"; sourceTree = ""; }; + 3BBD1FE7E4005E6969505C4C /* Pods-WavesSDKExtensions.release-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKExtensions.release-adhoc.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDKExtensions/Pods-WavesSDKExtensions.release-adhoc.xcconfig"; sourceTree = ""; }; + 3D37E5424C48D844E0FACE04 /* Pods-WavesSDK.release-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDK.release-prod.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDK/Pods-WavesSDK.release-prod.xcconfig"; sourceTree = ""; }; 400C8FCA907BB961EF91A346 /* Pods-Waves-Exchange-SDK-WavesSDKExtensions.dev-debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDKExtensions.dev-debug.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDKExtensions/Pods-Waves-Exchange-SDK-WavesSDKExtensions.dev-debug.xcconfig"; sourceTree = ""; }; 42BB3EF62594C60C00A0142A /* NumberFormatter+Once.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NumberFormatter+Once.swift"; sourceTree = ""; }; 42D7DDC3AFBDDE9DEF887387 /* Pods-Waves-Exchange-SDK-WavesSDK.release-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDK.release-prod.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDK/Pods-Waves-Exchange-SDK-WavesSDK.release-prod.xcconfig"; sourceTree = ""; }; - 47D4ADFC1CA7318E60FB0AC4 /* Pods-WavesSDKTests.dev-debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKTests.dev-debug.xcconfig"; path = "Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests.dev-debug.xcconfig"; sourceTree = ""; }; + 47D4ADFC1CA7318E60FB0AC4 /* Pods-WavesSDKTests.dev-debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKTests.dev-debug.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests.dev-debug.xcconfig"; sourceTree = ""; }; 4D9AFCBE2E229B7214B2B634 /* Pods-Waves-Exchange-SDK-StubTest.dev-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-StubTest.dev-adhoc.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-StubTest/Pods-Waves-Exchange-SDK-StubTest.dev-adhoc.xcconfig"; sourceTree = ""; }; 4E1426FAF92B2F37F92E43F1 /* Pods-Waves-Exchange-SDK-StubTest.test-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-StubTest.test-dev.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-StubTest/Pods-Waves-Exchange-SDK-StubTest.test-dev.xcconfig"; sourceTree = ""; }; - 4E84F7D094272DFDB954D1ED /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.dev-debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDKCrypto.dev-debug.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDKCrypto/Pods-Waves-Exchange-SDK-WavesSDKCrypto.dev-debug.xcconfig"; sourceTree = ""; }; - 5DE775DBF7C3635CD644B77D /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.test-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDKCrypto.test-dev.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDKCrypto/Pods-Waves-Exchange-SDK-WavesSDKCrypto.test-dev.xcconfig"; sourceTree = ""; }; + 522D197BC6CAE252B817A0DB /* Pods-WavesSDK.release-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDK.release-dev.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDK/Pods-WavesSDK.release-dev.xcconfig"; sourceTree = ""; }; 639D0A1922E6D1A28107B0C3 /* Pods-Waves-Exchange-SDK-WavesSDKExtensions.dev-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDKExtensions.dev-adhoc.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDKExtensions/Pods-Waves-Exchange-SDK-WavesSDKExtensions.dev-adhoc.xcconfig"; sourceTree = ""; }; 653FBBA552926C9DAA70984C /* Pods-Waves-Exchange-SDK-WavesSDKExtensions.release-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDKExtensions.release-adhoc.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDKExtensions/Pods-Waves-Exchange-SDK-WavesSDKExtensions.release-adhoc.xcconfig"; sourceTree = ""; }; - 6E7AA1F5018E52FD7CFB2112 /* Pods_Waves_Exchange_SDK_WavesSDKExtensions.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Waves_Exchange_SDK_WavesSDKExtensions.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 71CEB8FB7CB35D81DC095886 /* Pods-Waves-Exchange-SDK-WavesSDKExtensions.test-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDKExtensions.test-dev.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDKExtensions/Pods-Waves-Exchange-SDK-WavesSDKExtensions.test-dev.xcconfig"; sourceTree = ""; }; 731BD0FC3F3C3FC1AC9B5D8C /* Pods-Waves-Exchange-SDK-WavesSDK.test-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDK.test-dev.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDK/Pods-Waves-Exchange-SDK-WavesSDK.test-dev.xcconfig"; sourceTree = ""; }; - 781290C6655578036CDA2D08 /* Pods_Waves_Exchange_SDK_WavesSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Waves_Exchange_SDK_WavesSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7B0B6F9A231E6DC800CC5DCB /* DictionaryEncoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DictionaryEncoder.swift; sourceTree = ""; }; 7B3681A223152E13000D5592 /* WavesKeeper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WavesKeeper.swift; sourceTree = ""; }; 7B3DC9B622CFC37500FC973D /* keccak.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = keccak.c; sourceTree = ""; }; @@ -636,32 +638,42 @@ 7BBB233122CA2C600057095D /* TransactionType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionType.swift; sourceTree = ""; }; 7BBB233422CE13080057095D /* BaseTransactionQueryProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseTransactionQueryProtocol.swift; sourceTree = ""; }; 7BE1930E243CFD5B00916E15 /* CachePolicyPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CachePolicyPlugin.swift; sourceTree = ""; }; - 8039432D4DA5FFEF3B2FC429 /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.dev-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDKCrypto.dev-adhoc.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDKCrypto/Pods-Waves-Exchange-SDK-WavesSDKCrypto.dev-adhoc.xcconfig"; sourceTree = ""; }; 83C71800404F1CBBB4010A27 /* Pods-Waves-Exchange-SDK-StubTest.dev-debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-StubTest.dev-debug.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-StubTest/Pods-Waves-Exchange-SDK-StubTest.dev-debug.xcconfig"; sourceTree = ""; }; - 8625E48FA90E048D091F4B9E /* Pods_Waves_Exchange_SDK_WavesSDKCrypto.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Waves_Exchange_SDK_WavesSDKCrypto.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 872C36A7241A38100050250B /* MassTransferTransaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MassTransferTransaction.swift; sourceTree = ""; }; + 873B497F7B791EA227D3EBF1 /* Pods_WavesSDKExtensions.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WavesSDKExtensions.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 87409DAF2417B06000726C12 /* MassTransferDataQuery.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MassTransferDataQuery.swift; sourceTree = ""; }; 8756669A242BBDD200E9F177 /* AddressData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressData.swift; sourceTree = ""; }; + 8BD74B0E845CF6B072D165D1 /* Pods-WavesSDKExtensions.dev-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKExtensions.dev-adhoc.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDKExtensions/Pods-WavesSDKExtensions.dev-adhoc.xcconfig"; sourceTree = ""; }; 8CF99F81F79EE66857AB9578 /* Pods-Waves-Exchange-SDK-StubTest.release-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-StubTest.release-dev.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-StubTest/Pods-Waves-Exchange-SDK-StubTest.release-dev.xcconfig"; sourceTree = ""; }; 8EBC6763F0CBF8C4EB1DA4C1 /* Pods_WavesSDKTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WavesSDKTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 9176754E663E961F449F7F69 /* Pods-WavesSDK.dev-debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDK.dev-debug.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDK/Pods-WavesSDK.dev-debug.xcconfig"; sourceTree = ""; }; 93D148640FCEF1307E11D19A /* Pods-Waves-Exchange-SDK-WavesSDK.test-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDK.test-prod.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDK/Pods-Waves-Exchange-SDK-WavesSDK.test-prod.xcconfig"; sourceTree = ""; }; - 94DE5383B7B45D8F3E3939ED /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.release-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDKCrypto.release-adhoc.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDKCrypto/Pods-Waves-Exchange-SDK-WavesSDKCrypto.release-adhoc.xcconfig"; sourceTree = ""; }; - 9549BBF2CCBEFDC7B473053F /* Pods-WavesSDKTests.test-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKTests.test-dev.xcconfig"; path = "Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests.test-dev.xcconfig"; sourceTree = ""; }; - A604E380777BE7E3B63B49F5 /* Pods_Waves_Exchange_SDK_StubTest.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Waves_Exchange_SDK_StubTest.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 9453F0C1A2A5945F6D78D307 /* Pods-WavesSDK.release-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDK.release-adhoc.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDK/Pods-WavesSDK.release-adhoc.xcconfig"; sourceTree = ""; }; + 9549BBF2CCBEFDC7B473053F /* Pods-WavesSDKTests.test-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKTests.test-dev.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests.test-dev.xcconfig"; sourceTree = ""; }; + A040E97B4E3DC91E8E4578C4 /* Pods-WavesSDKExtensions.release-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKExtensions.release-dev.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDKExtensions/Pods-WavesSDKExtensions.release-dev.xcconfig"; sourceTree = ""; }; A708203E910852CDAFD7324F /* Pods-Waves-Exchange-SDK-StubTest.release-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-StubTest.release-prod.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-StubTest/Pods-Waves-Exchange-SDK-StubTest.release-prod.xcconfig"; sourceTree = ""; }; - CBDF4DE45C519904E9D9AE9D /* Pods-WavesSDKTests.test-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKTests.test-prod.xcconfig"; path = "Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests.test-prod.xcconfig"; sourceTree = ""; }; + B5CE7C512ECC47A623E84F28 /* Pods-StubTest.release-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StubTest.release-adhoc.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-StubTest/Pods-StubTest.release-adhoc.xcconfig"; sourceTree = ""; }; + CBDF4DE45C519904E9D9AE9D /* Pods-WavesSDKTests.test-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKTests.test-prod.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests.test-prod.xcconfig"; sourceTree = ""; }; D1A31A1CEF4CC917A52A381B /* Pods-Waves-Exchange-SDK-WavesSDK.dev-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDK.dev-adhoc.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDK/Pods-Waves-Exchange-SDK-WavesSDK.dev-adhoc.xcconfig"; sourceTree = ""; }; - E168F5E712310F8810B0DBF8 /* Pods-WavesSDKTests.release-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKTests.release-dev.xcconfig"; path = "Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests.release-dev.xcconfig"; sourceTree = ""; }; + D5B0A24CA603D1B7399F3686 /* Pods-StubTest.test-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StubTest.test-prod.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-StubTest/Pods-StubTest.test-prod.xcconfig"; sourceTree = ""; }; + D5DF90869218761574C24E84 /* Pods-WavesSDK.dev-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDK.dev-adhoc.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDK/Pods-WavesSDK.dev-adhoc.xcconfig"; sourceTree = ""; }; + DD44A154C1BE4628646F8DB3 /* Pods-WavesSDKExtensions.release-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKExtensions.release-prod.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDKExtensions/Pods-WavesSDKExtensions.release-prod.xcconfig"; sourceTree = ""; }; + E0EAA7DF4D2489EAC837C25F /* Pods_WavesSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WavesSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + E168F5E712310F8810B0DBF8 /* Pods-WavesSDKTests.release-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKTests.release-dev.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests.release-dev.xcconfig"; sourceTree = ""; }; E9399075231FD41D00302490 /* WavesKeeper+Decodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WavesKeeper+Decodable.swift"; sourceTree = ""; }; E9496F5823D7D93500FBF78F /* PairsRateDataTarget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PairsRateDataTarget.swift; sourceTree = ""; }; E9496F5A23D7DBF300FBF78F /* PairsRateData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PairsRateData.swift; sourceTree = ""; }; E96DE18E231805A7005E1FD9 /* JSONDecoder+TimestampDiff.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "JSONDecoder+TimestampDiff.swift"; sourceTree = ""; }; E97A74A822D4B26200777C39 /* String+Bytes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Bytes.swift"; sourceTree = ""; }; E9D96B0052641822892343E1 /* Pods-Waves-Exchange-SDK-WavesSDKExtensions.release-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDKExtensions.release-dev.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDKExtensions/Pods-Waves-Exchange-SDK-WavesSDKExtensions.release-dev.xcconfig"; sourceTree = ""; }; - ED59D88E378730ED09B48754 /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.release-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDKCrypto.release-prod.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDKCrypto/Pods-Waves-Exchange-SDK-WavesSDKCrypto.release-prod.xcconfig"; sourceTree = ""; }; - EF4D580D88C328814A241A46 /* Pods-WavesSDKTests.dev-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKTests.dev-adhoc.xcconfig"; path = "Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests.dev-adhoc.xcconfig"; sourceTree = ""; }; + EA9836EED57909A2726D66F7 /* Pods-WavesSDK.test-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDK.test-dev.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDK/Pods-WavesSDK.test-dev.xcconfig"; sourceTree = ""; }; + EAAC1FA7AE5D6D380F1BEC01 /* Pods-StubTest.dev-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StubTest.dev-adhoc.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-StubTest/Pods-StubTest.dev-adhoc.xcconfig"; sourceTree = ""; }; + EF4D580D88C328814A241A46 /* Pods-WavesSDKTests.dev-adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKTests.dev-adhoc.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests.dev-adhoc.xcconfig"; sourceTree = ""; }; + EFD998F370B04CB0BEE22C49 /* Pods-StubTest.test-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StubTest.test-dev.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-StubTest/Pods-StubTest.test-dev.xcconfig"; sourceTree = ""; }; F0C46FA173C628278F23AF16 /* Pods-Waves-Exchange-SDK-WavesSDK.release-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-WavesSDK.release-dev.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-WavesSDK/Pods-Waves-Exchange-SDK-WavesSDK.release-dev.xcconfig"; sourceTree = ""; }; F0CDA7D4E7228A436EF42B7B /* Pods-Waves-Exchange-SDK-StubTest.test-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Waves-Exchange-SDK-StubTest.test-prod.xcconfig"; path = "Target Support Files/Pods-Waves-Exchange-SDK-StubTest/Pods-Waves-Exchange-SDK-StubTest.test-prod.xcconfig"; sourceTree = ""; }; + F320ED69624727C9B5AA2B1A /* Pods-StubTest.release-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StubTest.release-prod.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-StubTest/Pods-StubTest.release-prod.xcconfig"; sourceTree = ""; }; + FCD6276C2DC67DF4DC5E013E /* Pods-WavesSDKExtensions.dev-debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WavesSDKExtensions.dev-debug.xcconfig"; path = "../Xcode/WavesSDK-iOS-develop/Pods/Target Support Files/Pods-WavesSDKExtensions/Pods-WavesSDKExtensions.dev-debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -671,7 +683,7 @@ files = ( 7B3DCBFA22D366AB00FC973D /* WavesSDKCrypto.framework in Frameworks */, 7B3DCBFB22D366AB00FC973D /* WavesSDKExtensions.framework in Frameworks */, - D0DFEC95196ECE27B7B0A8A0 /* Pods_Waves_Exchange_SDK_WavesSDK.framework in Frameworks */, + 4ECB588C435E083845BCCCAE /* Pods_WavesSDK.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -682,7 +694,6 @@ 7B3DCBF922D3647D00FC973D /* WavesSDKExtensions.framework in Frameworks */, 7B3DCA8522CFC9C700FC973D /* Foundation.framework in Frameworks */, 7B3DCA8322CFC68C00FC973D /* Security.framework in Frameworks */, - 1AB37B7C3C1EB90AC19BAA6D /* Pods_Waves_Exchange_SDK_WavesSDKCrypto.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -690,7 +701,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3B0E8FCF7759CD4F8A4FF27C /* Pods_Waves_Exchange_SDK_WavesSDKExtensions.framework in Frameworks */, + A1AAC57D2CEC110070E035F1 /* Pods_WavesSDKExtensions.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -701,7 +712,7 @@ 7B4E1DFC22C4DC2800854BAB /* WavesSDKCrypto.framework in Frameworks */, 7B4E1E0D22C4DC3400854BAB /* WavesSDKExtensions.framework in Frameworks */, 7B4E1DEA22C4DBDA00854BAB /* WavesSDK.framework in Frameworks */, - A75CDC2E7D018C77F6038A77 /* Pods_Waves_Exchange_SDK_StubTest.framework in Frameworks */, + 1F5AEFA457C3224EF92BF724 /* Pods_StubTest.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1464,10 +1475,9 @@ 7B42335622563A3200E82730 /* Security.framework */, 7B42335422563A2100E82730 /* CoreTelephony.framework */, 8EBC6763F0CBF8C4EB1DA4C1 /* Pods_WavesSDKTests.framework */, - A604E380777BE7E3B63B49F5 /* Pods_Waves_Exchange_SDK_StubTest.framework */, - 781290C6655578036CDA2D08 /* Pods_Waves_Exchange_SDK_WavesSDK.framework */, - 8625E48FA90E048D091F4B9E /* Pods_Waves_Exchange_SDK_WavesSDKCrypto.framework */, - 6E7AA1F5018E52FD7CFB2112 /* Pods_Waves_Exchange_SDK_WavesSDKExtensions.framework */, + 324A44BAFFBF40A7D10C6868 /* Pods_StubTest.framework */, + E0EAA7DF4D2489EAC837C25F /* Pods_WavesSDK.framework */, + 873B497F7B791EA227D3EBF1 /* Pods_WavesSDKExtensions.framework */, ); name = Frameworks; sourceTree = ""; @@ -1489,13 +1499,6 @@ 42D7DDC3AFBDDE9DEF887387 /* Pods-Waves-Exchange-SDK-WavesSDK.release-prod.xcconfig */, 224CA0C24794921AB03072FE /* Pods-Waves-Exchange-SDK-WavesSDK.release-adhoc.xcconfig */, 93D148640FCEF1307E11D19A /* Pods-Waves-Exchange-SDK-WavesSDK.test-prod.xcconfig */, - 4E84F7D094272DFDB954D1ED /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.dev-debug.xcconfig */, - 5DE775DBF7C3635CD644B77D /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.test-dev.xcconfig */, - 28D3C243802CEFE0ED716031 /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.release-dev.xcconfig */, - 8039432D4DA5FFEF3B2FC429 /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.dev-adhoc.xcconfig */, - ED59D88E378730ED09B48754 /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.release-prod.xcconfig */, - 94DE5383B7B45D8F3E3939ED /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.release-adhoc.xcconfig */, - 14C7D0D8FC695A614F1600AA /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.test-prod.xcconfig */, 400C8FCA907BB961EF91A346 /* Pods-Waves-Exchange-SDK-WavesSDKExtensions.dev-debug.xcconfig */, 71CEB8FB7CB35D81DC095886 /* Pods-Waves-Exchange-SDK-WavesSDKExtensions.test-dev.xcconfig */, E9D96B0052641822892343E1 /* Pods-Waves-Exchange-SDK-WavesSDKExtensions.release-dev.xcconfig */, @@ -1510,6 +1513,27 @@ 1E76639DE833759D4302531C /* Pods-WavesSDKTests.release-prod.xcconfig */, 2947576B28F5E4E8904B5301 /* Pods-WavesSDKTests.release-adhoc.xcconfig */, CBDF4DE45C519904E9D9AE9D /* Pods-WavesSDKTests.test-prod.xcconfig */, + 33545518E8D8E7A384164425 /* Pods-StubTest.dev-debug.xcconfig */, + EFD998F370B04CB0BEE22C49 /* Pods-StubTest.test-dev.xcconfig */, + 013D5161715A0235BAEA13AF /* Pods-StubTest.release-dev.xcconfig */, + EAAC1FA7AE5D6D380F1BEC01 /* Pods-StubTest.dev-adhoc.xcconfig */, + F320ED69624727C9B5AA2B1A /* Pods-StubTest.release-prod.xcconfig */, + B5CE7C512ECC47A623E84F28 /* Pods-StubTest.release-adhoc.xcconfig */, + D5B0A24CA603D1B7399F3686 /* Pods-StubTest.test-prod.xcconfig */, + 9176754E663E961F449F7F69 /* Pods-WavesSDK.dev-debug.xcconfig */, + EA9836EED57909A2726D66F7 /* Pods-WavesSDK.test-dev.xcconfig */, + 522D197BC6CAE252B817A0DB /* Pods-WavesSDK.release-dev.xcconfig */, + D5DF90869218761574C24E84 /* Pods-WavesSDK.dev-adhoc.xcconfig */, + 3D37E5424C48D844E0FACE04 /* Pods-WavesSDK.release-prod.xcconfig */, + 9453F0C1A2A5945F6D78D307 /* Pods-WavesSDK.release-adhoc.xcconfig */, + 05C35D856056396195A8BC94 /* Pods-WavesSDK.test-prod.xcconfig */, + FCD6276C2DC67DF4DC5E013E /* Pods-WavesSDKExtensions.dev-debug.xcconfig */, + 2F17F89F9408527C0B4BC5D2 /* Pods-WavesSDKExtensions.test-dev.xcconfig */, + A040E97B4E3DC91E8E4578C4 /* Pods-WavesSDKExtensions.release-dev.xcconfig */, + 8BD74B0E845CF6B072D165D1 /* Pods-WavesSDKExtensions.dev-adhoc.xcconfig */, + DD44A154C1BE4628646F8DB3 /* Pods-WavesSDKExtensions.release-prod.xcconfig */, + 3BBD1FE7E4005E6969505C4C /* Pods-WavesSDKExtensions.release-adhoc.xcconfig */, + 1219FE50DF90BA06FD63B9CF /* Pods-WavesSDKExtensions.test-prod.xcconfig */, ); name = Pods; path = ../../Pods; @@ -1608,7 +1632,6 @@ isa = PBXNativeTarget; buildConfigurationList = 7B4E1DFE22C4DC2800854BAB /* Build configuration list for PBXNativeTarget "WavesSDKCrypto" */; buildPhases = ( - B4461CC8C6B975F2BE55041B /* [CP] Check Pods Manifest.lock */, 7B4E1DF022C4DC2800854BAB /* Headers */, 7B4E1DF122C4DC2800854BAB /* Sources */, 7B4E1DF222C4DC2800854BAB /* Frameworks */, @@ -1818,7 +1841,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Waves-Exchange-SDK-WavesSDK-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-WavesSDK-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -1840,7 +1863,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Waves-Exchange-SDK-StubTest-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-StubTest-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -1853,37 +1876,17 @@ files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WavesSDKTests/Pods-WavesSDKTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - B4461CC8C6B975F2BE55041B /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Waves-Exchange-SDK-WavesSDKCrypto-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; BED4FFA8B9CD908AFCB612F2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1899,7 +1902,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Waves-Exchange-SDK-WavesSDKExtensions-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-WavesSDKExtensions-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -1912,13 +1915,15 @@ files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-StubTest/Pods-StubTest-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-StubTest/Pods-StubTest-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Waves-Exchange-SDK-StubTest/Pods-Waves-Exchange-SDK-StubTest-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-StubTest/Pods-StubTest-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -2308,7 +2313,6 @@ }; 7B4E1DFF22C4DC2800854BAB /* Dev-Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4E84F7D094272DFDB954D1ED /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.dev-debug.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; @@ -2352,7 +2356,6 @@ }; 7B4E1E0022C4DC2800854BAB /* Release-Prod */ = { isa = XCBuildConfiguration; - baseConfigurationReference = ED59D88E378730ED09B48754 /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.release-prod.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; @@ -2789,7 +2792,6 @@ }; 7B9393E322DF7CC7006634A6 /* Test-Prod */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 14C7D0D8FC695A614F1600AA /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.test-prod.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; @@ -3026,7 +3028,6 @@ }; 7B9393E922DF7CD1006634A6 /* Dev-Adhoc */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8039432D4DA5FFEF3B2FC429 /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.dev-adhoc.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; @@ -3262,7 +3263,6 @@ }; 7B9393EF22DF7D74006634A6 /* Release-Dev */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 28D3C243802CEFE0ED716031 /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.release-dev.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; @@ -3499,7 +3499,6 @@ }; 7B9393F522DF7D8A006634A6 /* Test-Dev */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5DE775DBF7C3635CD644B77D /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.test-dev.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; @@ -3779,7 +3778,6 @@ }; 7BF337712436202100F88306 /* Release-Adhoc */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 94DE5383B7B45D8F3E3939ED /* Pods-Waves-Exchange-SDK-WavesSDKCrypto.release-adhoc.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; diff --git a/WavesSDK/Sources/Assisstants/NetworkError.swift b/WavesSDK/Sources/Assisstants/NetworkError.swift index a50d85b..6d77add 100644 --- a/WavesSDK/Sources/Assisstants/NetworkError.swift +++ b/WavesSDK/Sources/Assisstants/NetworkError.swift @@ -5,8 +5,6 @@ // Created by mefilt on 23/11/2018. // Copyright © 2018 Waves Platform. All rights reserved. // - -import Alamofire import Foundation import Moya @@ -14,215 +12,178 @@ private enum Constants { static let scriptErrorCode: Int = 307 static let assetScriptErrorCode: Int = 308 static let notFound: Int = 404 - static let imTeaPot: Int = 418 } -@frozen public enum NetworkError: Error, Equatable { +public enum NetworkError: Error, Equatable { + case none case message(String) case notFound case internetNotWorking case serverError case scriptError - case canceled - + public var isInternetNotWorking: Bool { switch self { case .internetNotWorking: return true - + default: return false } } - + public var isServerError: Bool { switch self { case .serverError: return true - + default: return false } } + +// TODO: Library +// public var text: String { +// switch self { +// case .message(let message): +// return message +// +// case .internetNotWorking: +// return Localizable.Waves.General.Error.Title.noconnectiontotheinternet +// +// default: +// return Localizable.Waves.General.Error.Title.notfound +// } +// } } extension MoyaError { + var error: Error? { switch self { - case let .underlying(error, _): + case .underlying(let error, _): return error - - case let .objectMapping(error, _): + + case .objectMapping(let error, _): return error - - case let .encodableMapping(error): + + case .encodableMapping(let error): return error - - case let .parameterEncoding(error): + + case .parameterEncoding(let error): return error - + default: return nil } } } -private extension NetworkError { - static func message(code: Int, message: String? = nil) -> NetworkError { - if let message = message { - return NetworkError.message("Oh… It's all broken! \(code) \(message)") - } else { - return NetworkError.message("Oh… It's all broken! \(code)") - } - } -} - public extension NetworkError { + static func error(by error: Error) -> NetworkError { + switch error { case let error as NetworkError: return error - + case let moyaError as MoyaError: guard let response = moyaError.response else { + if let error = moyaError.error { return NetworkError.error(by: error) } else { - return NetworkError.message(code: 9000) + return NetworkError.notFound } } - + return NetworkError.error(response: response) - - case let afError as AFError: - switch afError { - case let .createUploadableFailed(error: error): - return NetworkError.error(by: error) - case let .createURLRequestFailed(error: error): - return NetworkError.error(by: error) - case let .downloadedFileMoveFailed(error: error, source: source, destination: destination): - return NetworkError.error(by: error) - case .explicitlyCancelled: - return NetworkError.canceled - case let .invalidURL(url: url): - return NetworkError.message(code: 9001) - case let .multipartEncodingFailed(reason: reason): - return NetworkError.message(code: 9002) - case let .parameterEncodingFailed(reason: reason): - return NetworkError.message(code: 9003) - case let .parameterEncoderFailed(reason: reason): - return NetworkError.message(code: 9004) - case let .requestAdaptationFailed(error: error): - return NetworkError.message(code: 9005) - case let .requestRetryFailed(retryError: retryError, originalError: originalError): - return NetworkError.message(code: 9006) - case let .responseValidationFailed(reason: reason): - return NetworkError.message(code: 9007) - case let .responseSerializationFailed(reason: reason): - return NetworkError.message(code: 9008) - case let .serverTrustEvaluationFailed(reason: reason): - return NetworkError.message(code: 9009) - case .sessionDeinitialized: - return NetworkError.internetNotWorking - case let .sessionInvalidated(error: error): - if let error = error { - return NetworkError.error(by: error) - } else { - return NetworkError.internetNotWorking - } - case let .sessionTaskFailed(error: error): - return NetworkError.error(by: error) - case let .urlRequestValidationFailed(reason: reason): - return NetworkError.message(code: 9010) - @unknown default: - return NetworkError.message(code: 9011) - } - + case let urlError as NSError where urlError.domain == NSURLErrorDomain: - + switch urlError.code { case NSURLErrorBadURL: - return NetworkError.message(code: 9012) - + return NetworkError.serverError + case NSURLErrorTimedOut: return NetworkError.internetNotWorking - + case NSURLErrorUnsupportedURL: - return NetworkError.message(code: 9013) - + return NetworkError.serverError + case NSURLErrorCannotFindHost: - return NetworkError.message(code: 9014) - + return NetworkError.serverError + case NSURLErrorCannotConnectToHost: - return NetworkError.internetNotWorking - + return NetworkError.serverError + case NSURLErrorNetworkConnectionLost: - return NetworkError.internetNotWorking - + return NetworkError.serverError + case NSURLErrorDNSLookupFailed: - return NetworkError.message(code: 9015) - + return NetworkError.serverError + case NSURLErrorHTTPTooManyRedirects: - return NetworkError.message(code: 9016) - + return NetworkError.serverError + case NSURLErrorResourceUnavailable: - return NetworkError.message(code: 9017) - + return NetworkError.serverError + case NSURLErrorNotConnectedToInternet: return NetworkError.internetNotWorking - + case NSURLErrorBadServerResponse: - return NetworkError.message(code: 9018) - - case NSURLErrorCancelled: - return NetworkError.canceled + return NetworkError.serverError default: - return NetworkError.internetNotWorking + return NetworkError.none } - + default: - return NetworkError.message(code: 9020) + return NetworkError.none } } - + static func error(response: Moya.Response) -> NetworkError { - if response.statusCode == Constants.notFound { - return NetworkError.notFound - } - - if response.statusCode == Constants.imTeaPot { - return NetworkError.internetNotWorking - } - + if let error = error(data: response.data) { return error } - - return NetworkError.message(code: 9021, message: "MoyaResponse \(response.statusCode)") + + switch response.statusCode { + case Constants.notFound: + return NetworkError.notFound + + default: + return NetworkError.none + } } - + + static func error(data: Data) -> NetworkError? { - var message: String? + + var message: String? = nil let anyObject = try? JSONSerialization.jsonObject(with: data, options: []) - + if let anyObject = anyObject as? [String: Any] { + if anyObject["error"] as? Int == Constants.scriptErrorCode { return NetworkError.scriptError } - + message = anyObject["message"] as? String - + if message == nil { message = anyObject["error"] as? String } } - + if let message = message { return NetworkError.message(message) } - + return nil } + } diff --git a/WavesSDK/Sources/Assisstants/String+Waves.swift b/WavesSDK/Sources/Assisstants/String+Waves.swift index d23df89..eac425b 100644 --- a/WavesSDK/Sources/Assisstants/String+Waves.swift +++ b/WavesSDK/Sources/Assisstants/String+Waves.swift @@ -6,7 +6,7 @@ // import Foundation -import WavesSDKExtensions +import WavesSDKExtensionsUpdate public extension String { diff --git a/WavesSDK/Sources/Assisstants/WavesEnvironment.swift b/WavesSDK/Sources/Assisstants/WavesEnvironment.swift index d1306a8..5c897e5 100644 --- a/WavesSDK/Sources/Assisstants/WavesEnvironment.swift +++ b/WavesSDK/Sources/Assisstants/WavesEnvironment.swift @@ -12,12 +12,12 @@ private struct Constants { static let dataUrlMainnet: URL = URL(string: "https://api.wavesplatform.com")! static let nodeUrlMainnet: URL = URL(string: "https://nodes.wavesnodes.com")! static let matcherUrlMainnet: URL = URL(string: "https://matcher.wavesplatform.com")! - static let schemeMainnet: UInt8 = "W".utf8.first ?? 0 + static let schemeMainnet: UInt8 = 87 static let dataUrlTestnet: URL = URL(string: "https://api.testnet.wavesplatform.com")! static let nodeUrlTestnet: URL = URL(string: "https://nodes-testnet.wavesnodes.com")! static let matcherUrlTestnet: URL = URL(string: "https://matcher-testnet.wavesnodes.com")! - static let schemeTestnet: UInt8 = "T".utf8.first ?? 0 + static let schemeTestnet: UInt8 = 84 } public struct WavesEnvironment { @@ -55,7 +55,7 @@ public struct WavesEnvironment { public var timestampServerDiff: Int64 - public var chainId: UInt8! + public var chainId: UInt8 public var nodeUrl: URL public var matcherUrl: URL public var dataUrl: URL diff --git a/WavesSDK/Sources/Assisstants/WavesKeeper.swift b/WavesSDK/Sources/Assisstants/WavesKeeper.swift index b05e802..f7bc1b5 100644 --- a/WavesSDK/Sources/Assisstants/WavesKeeper.swift +++ b/WavesSDK/Sources/Assisstants/WavesKeeper.swift @@ -7,7 +7,7 @@ // import Foundation -import WavesSDKCrypto +import WavesSDKCryptoUpdate import RxSwift extension WavesKeeper { diff --git a/WavesSDK/Sources/Assisstants/WavesSDK.swift b/WavesSDK/Sources/Assisstants/WavesSDK.swift index 4b0a626..5dc76da 100644 --- a/WavesSDK/Sources/Assisstants/WavesSDK.swift +++ b/WavesSDK/Sources/Assisstants/WavesSDK.swift @@ -17,8 +17,8 @@ import Foundation import Moya -import WavesSDKCrypto -import WavesSDKExtensions +import WavesSDKCryptoUpdate +import WavesSDKExtensionsUpdate import WebKit /** @@ -91,8 +91,11 @@ public final class WavesSDK { var matcherPlugins = servicesPlugins.matcher dataPlugins.append(DebugServicePlugin()) + dataPlugins.append(NetworkLoggerPlugin(configuration: NetworkLoggerPlugin.Configuration(logOptions: .verbose))) nodePlugins.append(DebugServicePlugin()) + nodePlugins.append(NetworkLoggerPlugin(configuration: NetworkLoggerPlugin.Configuration(logOptions: .verbose))) matcherPlugins.append(DebugServicePlugin()) + matcherPlugins.append(NetworkLoggerPlugin(configuration: NetworkLoggerPlugin.Configuration(logOptions: .verbose))) let services = WavesServices(enviroment: enviroment, dataServicePlugins: dataPlugins, diff --git a/WavesSDK/Sources/Services/Data/Targets/AssetsDataTarget.swift b/WavesSDK/Sources/Services/Data/Targets/AssetsDataTarget.swift index 9a6ea16..fc747d8 100644 --- a/WavesSDK/Sources/Services/Data/Targets/AssetsDataTarget.swift +++ b/WavesSDK/Sources/Services/Data/Targets/AssetsDataTarget.swift @@ -8,7 +8,7 @@ import Foundation import Moya -import WavesSDKExtensions +import WavesSDKExtensionsUpdate extension DataService.Target { diff --git a/WavesSDK/Sources/Services/Data/Targets/CandlesDataTarget.swift b/WavesSDK/Sources/Services/Data/Targets/CandlesDataTarget.swift index 00fe845..9b15b3c 100644 --- a/WavesSDK/Sources/Services/Data/Targets/CandlesDataTarget.swift +++ b/WavesSDK/Sources/Services/Data/Targets/CandlesDataTarget.swift @@ -8,7 +8,7 @@ import Foundation import Moya -import WavesSDKExtensions +import WavesSDKExtensionsUpdate extension DataService.Target { diff --git a/WavesSDK/Sources/Services/Matcher/Queries/BalanceMatcherQuery.swift b/WavesSDK/Sources/Services/Matcher/Queries/BalanceMatcherQuery.swift index 5108aa7..f2fea1d 100644 --- a/WavesSDK/Sources/Services/Matcher/Queries/BalanceMatcherQuery.swift +++ b/WavesSDK/Sources/Services/Matcher/Queries/BalanceMatcherQuery.swift @@ -6,7 +6,7 @@ // import Foundation -import WavesSDKExtensions +import WavesSDKExtensionsUpdate public extension MatcherService.Query { diff --git a/WavesSDK/Sources/Services/Matcher/Targets/BalanceMatcherTarget.swift b/WavesSDK/Sources/Services/Matcher/Targets/BalanceMatcherTarget.swift index 2c4982a..3454a1a 100644 --- a/WavesSDK/Sources/Services/Matcher/Targets/BalanceMatcherTarget.swift +++ b/WavesSDK/Sources/Services/Matcher/Targets/BalanceMatcherTarget.swift @@ -8,7 +8,7 @@ import Foundation import Moya -import WavesSDKExtensions +import WavesSDKExtensionsUpdate public extension MatcherService.Query { diff --git a/WavesSDK/Sources/Services/Matcher/Targets/OrderBookMatcherTarget.swift b/WavesSDK/Sources/Services/Matcher/Targets/OrderBookMatcherTarget.swift index 056e7bd..ef4a49d 100644 --- a/WavesSDK/Sources/Services/Matcher/Targets/OrderBookMatcherTarget.swift +++ b/WavesSDK/Sources/Services/Matcher/Targets/OrderBookMatcherTarget.swift @@ -8,7 +8,7 @@ import Foundation import Moya -import WavesSDKExtensions +import WavesSDKExtensionsUpdate extension MatcherService.Target { diff --git a/WavesSDK/Sources/Services/Node/Models/AddressData.swift b/WavesSDK/Sources/Services/Node/Models/AddressData.swift index 7b78785..8989df8 100644 --- a/WavesSDK/Sources/Services/Node/Models/AddressData.swift +++ b/WavesSDK/Sources/Services/Node/Models/AddressData.swift @@ -11,13 +11,36 @@ import Foundation extension NodeService.DTO { public struct AddressesData: Decodable { public let type: String - public let value: Int64 + public let value: AnyDecodable public let key: String - public init(type: String, value: Int64, key: String) { + public init(type: String, value: AnyDecodable, key: String) { self.type = type self.value = value self.key = key } } + + + public struct AnyDecodable : Decodable { + + public let value :Any + + public init(_ value :T?) { + self.value = value ?? () + } + + public init(from decoder :Decoder) throws { + let container = try decoder.singleValueContainer() + + if let string = try? container.decode(String.self) { + self.init(string) + } else if let int = try? container.decode(Int64.self) { + self.init(int) + } else { + self.init(()) + } + // handle all the different types including bool, array, dictionary, double etc + } + } } diff --git a/WavesSDK/Sources/Services/Node/Models/Transactions/InvokeScriptTransactionNode.swift b/WavesSDK/Sources/Services/Node/Models/Transactions/InvokeScriptTransactionNode.swift index f81ad10..df0cd3c 100644 --- a/WavesSDK/Sources/Services/Node/Models/Transactions/InvokeScriptTransactionNode.swift +++ b/WavesSDK/Sources/Services/Node/Models/Transactions/InvokeScriptTransactionNode.swift @@ -73,6 +73,44 @@ extension NodeService.DTO { self.assetId = assetId } } + + /** + StateChanges of dApp + */ + public struct StateChanges: Codable { + /** + Transfers list + */ + public let transfers: [StateChangesTransfers] + + public init(transfers: [StateChangesTransfers]) { + self.transfers = transfers + } + } + + /** + StateChanges Transfers + */ + public struct StateChangesTransfers: Codable { + /** + Transfers address + */ + public let address: String + /** + Transfers asset + */ + public let asset: String + /** + Transfers amount + */ + public let amount: Int64 + + public init(address: String, asset: String, amount: Int64) { + self.address = address + self.asset = asset + self.amount = amount + } + } public let type: Int public let id: String @@ -108,6 +146,8 @@ extension NodeService.DTO { public let payment: [Payment] public let applicationStatus: String? + + public let stateChanges: StateChanges? public init( type: Int, @@ -124,7 +164,8 @@ extension NodeService.DTO { dApp: String, call: Call?, payment: [Payment], - applicationStatus: String?) { + applicationStatus: String?, + stateChanges: StateChanges?) { self.type = type self.id = id self.chainId = chainId @@ -140,6 +181,7 @@ extension NodeService.DTO { self.call = call self.payment = payment self.applicationStatus = applicationStatus + self.stateChanges = stateChanges } } } diff --git a/WavesSDK/Sources/Services/Node/Models/Transactions/TransactionContainersNode.swift b/WavesSDK/Sources/Services/Node/Models/Transactions/TransactionContainersNode.swift index ede361d..ee6ec49 100644 --- a/WavesSDK/Sources/Services/Node/Models/Transactions/TransactionContainersNode.swift +++ b/WavesSDK/Sources/Services/Node/Models/Transactions/TransactionContainersNode.swift @@ -7,7 +7,7 @@ // import Foundation -import WavesSDKExtensions +import WavesSDKExtensionsUpdate extension NodeService.DTO { enum TransactionType: Int, Decodable { diff --git a/WavesSDK/Sources/Services/Node/Models/Transactions/TransferTransactionNode.swift b/WavesSDK/Sources/Services/Node/Models/Transactions/TransferTransactionNode.swift index 986d141..4d9d7d5 100644 --- a/WavesSDK/Sources/Services/Node/Models/Transactions/TransferTransactionNode.swift +++ b/WavesSDK/Sources/Services/Node/Models/Transactions/TransferTransactionNode.swift @@ -14,7 +14,7 @@ public extension NodeService.DTO { It is used to transfer a specific amount of an asset (WAVES by default) to the recipient (by address or alias). */ - struct TransferTransaction: Codable { + struct TransferTransaction: Identifiable, Codable { public let type: Int public let id: String public let sender: String diff --git a/WavesSDK/Sources/Services/Node/Models/ValidateAddress.swift b/WavesSDK/Sources/Services/Node/Models/ValidateAddress.swift new file mode 100644 index 0000000..1e3d365 --- /dev/null +++ b/WavesSDK/Sources/Services/Node/Models/ValidateAddress.swift @@ -0,0 +1,18 @@ +// +// BlockNode.swift +// WavesWallet-iOS +// +// Created by mefilt on 10.09.2018. +// Copyright © 2018 Waves Platform. All rights reserved. +// + +import Foundation + +public extension NodeService.DTO { + + struct ValidateAddress: Decodable { + public let address: String + public let valid: Bool + } + +} diff --git a/WavesSDK/Sources/Services/Node/Queries/TransactionNodeQuery.swift b/WavesSDK/Sources/Services/Node/Queries/TransactionNodeQuery.swift index 310b109..e093491 100644 --- a/WavesSDK/Sources/Services/Node/Queries/TransactionNodeQuery.swift +++ b/WavesSDK/Sources/Services/Node/Queries/TransactionNodeQuery.swift @@ -6,7 +6,7 @@ // import Foundation -import WavesSDKExtensions +import WavesSDKExtensionsUpdate public enum TransactionVersion: Int { case version_1 = 1 diff --git a/WavesSDK/Sources/Services/Node/Services/AddressesNodeService.swift b/WavesSDK/Sources/Services/Node/Services/AddressesNodeService.swift index 548d750..c7871bd 100644 --- a/WavesSDK/Sources/Services/Node/Services/AddressesNodeService.swift +++ b/WavesSDK/Sources/Services/Node/Services/AddressesNodeService.swift @@ -52,6 +52,19 @@ final class AddressesNodeService: InternalWavesService, AddressesNodeServiceProt .map(NodeService.DTO.AddressesData.self) .asObservable() } + + func getAddressDataRegExp(address: String, regexp: String) -> Observable<[NodeService.DTO.AddressesData]> { + let target: NodeService.Target.Addresses = .init(kind: .getDataRegExp(address: address, regexp: regexp), + nodeUrl: enviroment.nodeUrl) + + return addressesProvider + .rx + .request(target) + .filterSuccessfulStatusAndRedirectCodes() + .catchError { error -> Single in Single.error(error) } + .map([NodeService.DTO.AddressesData].self) + .asObservable() + } func addressesBalance(addresses: [String]) -> Observable<[NodeService.DTO.WavesBalance]> { let target: NodeService.Target.Addresses = .init( @@ -66,4 +79,16 @@ final class AddressesNodeService: InternalWavesService, AddressesNodeServiceProt .map([NodeService.DTO.WavesBalance].self) .asObservable() } + + public func validateAddress(address: String) -> Observable { + let target: NodeService.Target.Addresses = .init(kind: .getValidateAddress(address: address), nodeUrl: enviroment.nodeUrl) + + return addressesProvider + .rx + .request(target) + .filterSuccessfulStatusAndRedirectCodes() + .catchError { error -> Single in Single.error(NetworkError.error(by: error)) } + .map(NodeService.DTO.ValidateAddress.self) + .asObservable() + } } diff --git a/WavesSDK/Sources/Services/Node/Services/Protocols/AddressesNodeServiceProtocol.swift b/WavesSDK/Sources/Services/Node/Services/Protocols/AddressesNodeServiceProtocol.swift index 1c6d583..f07cae6 100644 --- a/WavesSDK/Sources/Services/Node/Services/Protocols/AddressesNodeServiceProtocol.swift +++ b/WavesSDK/Sources/Services/Node/Services/Protocols/AddressesNodeServiceProtocol.swift @@ -35,6 +35,10 @@ public protocol AddressesNodeServiceProtocol { func scriptInfo(address: String) -> Observable func getAddressData(address: String, key: String) -> Observable + + func getAddressDataRegExp(address: String, regexp: String) -> Observable<[NodeService.DTO.AddressesData]> func addressesBalance(addresses: [String]) -> Observable<[NodeService.DTO.WavesBalance]> + + func validateAddress(address: String) -> Observable } diff --git a/WavesSDK/Sources/Services/Node/Targets/AddressesNodeTarget.swift b/WavesSDK/Sources/Services/Node/Targets/AddressesNodeTarget.swift index a736d60..bcb7ba9 100644 --- a/WavesSDK/Sources/Services/Node/Targets/AddressesNodeTarget.swift +++ b/WavesSDK/Sources/Services/Node/Targets/AddressesNodeTarget.swift @@ -8,7 +8,7 @@ import Foundation import Moya -import WavesSDKExtensions +import WavesSDKExtensionsUpdate extension NodeService.Target { struct Addresses { @@ -26,8 +26,12 @@ extension NodeService.Target { case scriptInfo(id: String) case getData(address: String, key: String) + + case getDataRegExp(address: String, regexp: String) case getAddressesBalance(addresses: [String]) + + case getValidateAddress(address: String) } var kind: Kind @@ -40,6 +44,7 @@ extension NodeService.Target.Addresses: NodeTargetType { static let addresses = "addresses" static let balance = "balance" static let scriptInfo = "scriptInfo" + static let validate = "validate" } var path: String { @@ -52,15 +57,22 @@ extension NodeService.Target.Addresses: NodeTargetType { case let .getData(address, key): return Constants.addresses + "/" + "data" + "/" + address.urlEscaped + "/" + "\(key)".urlEscaped + + case let .getDataRegExp(address, _): + return Constants.addresses + "/" + "data" + "/" + address.urlEscaped case .getAddressesBalance: return Constants.addresses + "/" + Constants.balance + + case let .getValidateAddress(address): + return Constants.addresses + "/" + Constants.validate + "/" + "\(address)".urlEscaped + } } var method: Moya.Method { switch kind { - case .getAddressBalance, .scriptInfo, .getData: + case .getAddressBalance, .scriptInfo, .getData, .getDataRegExp, .getValidateAddress: return .get case .getAddressesBalance: return .post @@ -69,9 +81,14 @@ extension NodeService.Target.Addresses: NodeTargetType { var task: Task { switch kind { - case .getAddressBalance, .scriptInfo, .getData: + case .getAddressBalance, .scriptInfo, .getData, .getValidateAddress: return .requestParameters(parameters: ["r": "\(Date().timeIntervalSince1970)"], encoding: URLEncoding.default) + + case let .getDataRegExp(_, regexp): + return .requestParameters( + parameters: [ "matches": regexp], encoding: URLEncoding.queryString) + case let .getAddressesBalance(address): return .requestParameters(parameters: ["addresses": address], encoding: JSONEncoding.default) diff --git a/WavesSDK/Sources/Services/Node/Targets/AssetsNodeTarget.swift b/WavesSDK/Sources/Services/Node/Targets/AssetsNodeTarget.swift index 288f93d..a9d6ff8 100644 --- a/WavesSDK/Sources/Services/Node/Targets/AssetsNodeTarget.swift +++ b/WavesSDK/Sources/Services/Node/Targets/AssetsNodeTarget.swift @@ -7,7 +7,7 @@ // import Foundation -import WavesSDKExtensions +import WavesSDKExtensionsUpdate import Moya extension NodeService.Target { diff --git a/WavesSDK/Sources/Services/Node/Targets/BlocksNodeTarget.swift b/WavesSDK/Sources/Services/Node/Targets/BlocksNodeTarget.swift index 31c1d68..f272065 100644 --- a/WavesSDK/Sources/Services/Node/Targets/BlocksNodeTarget.swift +++ b/WavesSDK/Sources/Services/Node/Targets/BlocksNodeTarget.swift @@ -7,7 +7,7 @@ // import Foundation -import WavesSDKExtensions +import WavesSDKExtensionsUpdate import Moya extension NodeService.Target { diff --git a/WavesSDK/Sources/Services/Node/Targets/LeasingNodeTarget.swift b/WavesSDK/Sources/Services/Node/Targets/LeasingNodeTarget.swift index 7a87940..d4d68a7 100644 --- a/WavesSDK/Sources/Services/Node/Targets/LeasingNodeTarget.swift +++ b/WavesSDK/Sources/Services/Node/Targets/LeasingNodeTarget.swift @@ -6,7 +6,7 @@ // import Foundation -import WavesSDKExtensions +import WavesSDKExtensionsUpdate import Moya extension NodeService.Target { diff --git a/WavesSDK/Sources/Services/Node/Targets/TransactionNodeTarget.swift b/WavesSDK/Sources/Services/Node/Targets/TransactionNodeTarget.swift index 28d9456..a4c16e9 100644 --- a/WavesSDK/Sources/Services/Node/Targets/TransactionNodeTarget.swift +++ b/WavesSDK/Sources/Services/Node/Targets/TransactionNodeTarget.swift @@ -7,7 +7,7 @@ // import Foundation -import WavesSDKExtensions +import WavesSDKExtensionsUpdate import Moya fileprivate enum Constants { diff --git a/WavesSDK/Sources/Services/Node/Targets/UtilsNodeTarget.swift b/WavesSDK/Sources/Services/Node/Targets/UtilsNodeTarget.swift index 11b2d18..7084ac6 100644 --- a/WavesSDK/Sources/Services/Node/Targets/UtilsNodeTarget.swift +++ b/WavesSDK/Sources/Services/Node/Targets/UtilsNodeTarget.swift @@ -6,7 +6,7 @@ // import Foundation -import WavesSDKExtensions +import WavesSDKExtensionsUpdate import Moya extension NodeService.Target { diff --git a/WavesSDK/Sources/Signature/SignatureProtocol.swift b/WavesSDK/Sources/Signature/SignatureProtocol.swift index 33ba261..cf43f82 100644 --- a/WavesSDK/Sources/Signature/SignatureProtocol.swift +++ b/WavesSDK/Sources/Signature/SignatureProtocol.swift @@ -7,23 +7,23 @@ // import Foundation -import WavesSDKCrypto -import WavesSDKExtensions +import WavesSDKCryptoUpdate +import WavesSDKExtensionsUpdate public protocol SignatureProtocol { - var bytesStructure: WavesSDKCrypto.Bytes { get } + var bytesStructure: WavesSDKCryptoUpdate.Bytes { get } - func signature(privateKey: WavesSDKCrypto.PrivateKey) -> WavesSDKCrypto.Bytes? + func signature(privateKey: WavesSDKCryptoUpdate.PrivateKey) -> WavesSDKCryptoUpdate.Bytes? - func signature(privateKey: WavesSDKCrypto.PrivateKey) -> String? + func signature(privateKey: WavesSDKCryptoUpdate.PrivateKey) -> String? var id: String { get } } public extension SignatureProtocol { - func signature(seed: Seed) -> WavesSDKCrypto.Bytes? { + func signature(seed: Seed) -> WavesSDKCryptoUpdate.Bytes? { return WavesCrypto.shared.signBytes(bytes: bytesStructure, seed: seed) } @@ -32,11 +32,11 @@ public extension SignatureProtocol { return WavesCrypto.shared.base58encode(input: bytes) } - func signature(privateKey: WavesSDKCrypto.PrivateKey) -> WavesSDKCrypto.Bytes? { + func signature(privateKey: WavesSDKCryptoUpdate.PrivateKey) -> WavesSDKCryptoUpdate.Bytes? { return WavesCrypto.shared.signBytes(bytes: bytesStructure, privateKey: privateKey) } - func signature(privateKey: WavesSDKCrypto.PrivateKey) -> String? { + func signature(privateKey: WavesSDKCryptoUpdate.PrivateKey) -> String? { guard let bytes: Bytes = signature(privateKey: privateKey) else { return nil } return WavesCrypto.shared.base58encode(input: bytes) } diff --git a/WavesSDK/Sources/Signature/TransactionSign.swift b/WavesSDK/Sources/Signature/TransactionSign.swift index 50527bd..8dd5e73 100644 --- a/WavesSDK/Sources/Signature/TransactionSign.swift +++ b/WavesSDK/Sources/Signature/TransactionSign.swift @@ -7,23 +7,23 @@ // import Foundation -import WavesSDKCrypto -import WavesSDKExtensions +import WavesSDKCryptoUpdate +import WavesSDKExtensionsUpdate public protocol TransactionSign { - mutating func sign(seed: WavesSDKCrypto.Seed) + mutating func sign(seed: WavesSDKCryptoUpdate.Seed) - mutating func sign(privateKey: WavesSDKCrypto.PrivateKey) + mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey) - mutating func sign(privateKey: WavesSDKCrypto.PrivateKey?, seed: WavesSDKCrypto.Seed?) + mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey?, seed: WavesSDKCryptoUpdate.Seed?) } extension TransactionSign { - public mutating func sign(seed: WavesSDKCrypto.Seed) { + public mutating func sign(seed: WavesSDKCryptoUpdate.Seed) { sign(privateKey: nil, seed: seed) } - public mutating func sign(privateKey: WavesSDKCrypto.PrivateKey) { + public mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey) { sign(privateKey: privateKey, seed: nil) } } @@ -31,7 +31,7 @@ extension TransactionSign { // MARK: Transfer extension NodeService.Query.Transaction.Transfer: TransactionSign { - public mutating func sign(privateKey: WavesSDKCrypto.PrivateKey?, seed: WavesSDKCrypto.Seed?) { + public mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey?, seed: WavesSDKCryptoUpdate.Seed?) { let signature = TransactionSignatureV2.transfer(.init(senderPublicKey: senderPublicKey, recipient: recipient, assetId: assetId, @@ -58,7 +58,7 @@ extension NodeService.Query.Transaction.Data: TransactionSign { private static var DATA_TX_SIZE_WITHOUT_ENTRIES: Int = 52 private static var DATA_ENTRIES_BYTE_LIMIT = 100 * 1024 - DATA_TX_SIZE_WITHOUT_ENTRIES - public mutating func sign(privateKey: WavesSDKCrypto.PrivateKey?, seed: WavesSDKCrypto.Seed?) { + public mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey?, seed: WavesSDKCryptoUpdate.Seed?) { let signature = TransactionSignatureV1.data(.init(fee: fee, data: data .map { TransactionSignatureV1.Structure.Data.Value(key: $0.key, @@ -102,7 +102,7 @@ extension NodeService.Query.Transaction.Data.Value { // MARK: InvokeScript extension NodeService.Query.Transaction.InvokeScript: TransactionSign { - public mutating func sign(privateKey: WavesSDKCrypto.PrivateKey?, seed: WavesSDKCrypto.Seed?) { + public mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey?, seed: WavesSDKCryptoUpdate.Seed?) { let signature = TransactionSignatureV1 .invokeScript(TransactionSignatureV1.Structure.InvokeScript(senderPublicKey: senderPublicKey, fee: fee, @@ -155,7 +155,7 @@ extension NodeService.Query.Transaction.InvokeScript.Call { // MARK: Burn extension NodeService.Query.Transaction.Burn: TransactionSign { - public mutating func sign(privateKey: WavesSDKCrypto.PrivateKey?, seed: WavesSDKCrypto.Seed?) { + public mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey?, seed: WavesSDKCryptoUpdate.Seed?) { let signature = TransactionSignatureV2 .burn(.init(assetID: assetId, quantity: quantity, fee: fee, chainId: chainId, senderPublicKey: senderPublicKey, timestamp: timestamp)) @@ -173,7 +173,7 @@ extension NodeService.Query.Transaction.Burn: TransactionSign { // MARK: Reissue extension NodeService.Query.Transaction.Reissue: TransactionSign { - public mutating func sign(privateKey: WavesSDKCrypto.PrivateKey?, seed: WavesSDKCrypto.Seed?) { + public mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey?, seed: WavesSDKCryptoUpdate.Seed?) { let signature = TransactionSignatureV2 .reissue(.init(assetId: assetId, fee: fee, chainId: chainId, senderPublicKey: senderPublicKey, timestamp: timestamp, quantity: quantity, isReissuable: isReissuable)) @@ -191,7 +191,7 @@ extension NodeService.Query.Transaction.Reissue: TransactionSign { // MARK: Issue extension NodeService.Query.Transaction.Issue: TransactionSign { - public mutating func sign(privateKey: WavesSDKCrypto.PrivateKey?, seed: WavesSDKCrypto.Seed?) { + public mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey?, seed: WavesSDKCryptoUpdate.Seed?) { let signature = TransactionSignatureV2 .issue(.init(script: script, fee: fee, chainId: chainId, senderPublicKey: senderPublicKey, timestamp: timestamp, quantity: quantity, isReissuable: isReissuable, name: name, description: description, @@ -210,7 +210,7 @@ extension NodeService.Query.Transaction.Issue: TransactionSign { // MARK: MassTransfer extension NodeService.Query.Transaction.MassTransfer: TransactionSign { - public mutating func sign(privateKey: WavesSDKCrypto.PrivateKey?, seed: WavesSDKCrypto.Seed?) { + public mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey?, seed: WavesSDKCryptoUpdate.Seed?) { let signature = TransactionSignatureV1.massTransfer(.init(fee: fee, chainId: chainId, senderPublicKey: senderPublicKey, @@ -233,7 +233,7 @@ extension NodeService.Query.Transaction.MassTransfer: TransactionSign { // MARK: Lease extension NodeService.Query.Transaction.Lease: TransactionSign { - public mutating func sign(privateKey: WavesSDKCrypto.PrivateKey?, seed: WavesSDKCrypto.Seed?) { + public mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey?, seed: WavesSDKCryptoUpdate.Seed?) { let signature = TransactionSignatureV2.startLease(.init(recipient: recipient, amount: amount, fee: fee, @@ -254,7 +254,7 @@ extension NodeService.Query.Transaction.Lease: TransactionSign { // MARK: LeaseCancel extension NodeService.Query.Transaction.LeaseCancel: TransactionSign { - public mutating func sign(privateKey: WavesSDKCrypto.PrivateKey?, seed: WavesSDKCrypto.Seed?) { + public mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey?, seed: WavesSDKCryptoUpdate.Seed?) { let signature = TransactionSignatureV2.cancelLease(.init(leaseId: leaseId, fee: fee, chainId: chainId, @@ -274,7 +274,7 @@ extension NodeService.Query.Transaction.LeaseCancel: TransactionSign { // MARK: Alias extension NodeService.Query.Transaction.Alias: TransactionSign { - public mutating func sign(privateKey: WavesSDKCrypto.PrivateKey?, seed: WavesSDKCrypto.Seed?) { + public mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey?, seed: WavesSDKCryptoUpdate.Seed?) { let signature = TransactionSignatureV2.createAlias(.init(alias: name, fee: fee, chainId: chainId, @@ -294,7 +294,7 @@ extension NodeService.Query.Transaction.Alias: TransactionSign { // MARK: SetScript extension NodeService.Query.Transaction.SetScript: TransactionSign { - public mutating func sign(privateKey: WavesSDKCrypto.PrivateKey?, seed: WavesSDKCrypto.Seed?) { + public mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey?, seed: WavesSDKCryptoUpdate.Seed?) { let signature = TransactionSignatureV1.setScript(.init(fee: fee, chainId: chainId, senderPublicKey: senderPublicKey, @@ -314,7 +314,7 @@ extension NodeService.Query.Transaction.SetScript: TransactionSign { // MARK: SetScript extension NodeService.Query.Transaction.SetAssetScript: TransactionSign { - public mutating func sign(privateKey: WavesSDKCrypto.PrivateKey?, seed: WavesSDKCrypto.Seed?) { + public mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey?, seed: WavesSDKCryptoUpdate.Seed?) { let signature = TransactionSignatureV1.setAssetScript(.init(fee: fee, chainId: chainId, senderPublicKey: senderPublicKey, @@ -335,7 +335,7 @@ extension NodeService.Query.Transaction.SetAssetScript: TransactionSign { // MARK: Sponsorship extension NodeService.Query.Transaction.Sponsorship: TransactionSign { - public mutating func sign(privateKey: WavesSDKCrypto.PrivateKey?, seed: WavesSDKCrypto.Seed?) { + public mutating func sign(privateKey: WavesSDKCryptoUpdate.PrivateKey?, seed: WavesSDKCryptoUpdate.Seed?) { let signature = TransactionSignatureV1.sponsorship(.init(fee: fee, chainId: chainId, senderPublicKey: senderPublicKey, diff --git a/WavesSDK/Sources/Signature/TransactionSignatureV1.swift b/WavesSDK/Sources/Signature/TransactionSignatureV1.swift index 4a26269..9f7350d 100644 --- a/WavesSDK/Sources/Signature/TransactionSignatureV1.swift +++ b/WavesSDK/Sources/Signature/TransactionSignatureV1.swift @@ -7,8 +7,8 @@ // import Foundation -import WavesSDKCrypto -import WavesSDKExtensions +import WavesSDKCryptoUpdate +import WavesSDKExtensionsUpdate public extension TransactionSignatureV1 { @@ -172,7 +172,7 @@ public extension TransactionSignatureV1 { } } - public let senderPublicKey: WavesSDKCrypto.PublicKey + public let senderPublicKey: WavesSDKCryptoUpdate.PublicKey public let fee: Int64 public let chainId: UInt8 public let timestamp: Int64 @@ -181,7 +181,7 @@ public extension TransactionSignatureV1 { public let call: Call? public let payment: [Payment] - public init(senderPublicKey: WavesSDKCrypto.PublicKey, fee: Int64, chainId: UInt8, timestamp: Int64, feeAssetId: String, dApp: String, call: Call?, payment: [Payment]) { + public init(senderPublicKey: WavesSDKCryptoUpdate.PublicKey, fee: Int64, chainId: UInt8, timestamp: Int64, feeAssetId: String, dApp: String, call: Call?, payment: [Payment]) { self.senderPublicKey = senderPublicKey self.fee = fee self.chainId = chainId @@ -234,7 +234,7 @@ public enum TransactionSignatureV1: TransactionSignatureProtocol { public extension TransactionSignatureV1 { - var bytesStructure: WavesSDKCrypto.Bytes { + var bytesStructure: WavesSDKCryptoUpdate.Bytes { switch self { diff --git a/WavesSDK/Sources/Signature/TransactionSignatureV2.swift b/WavesSDK/Sources/Signature/TransactionSignatureV2.swift index 3833d22..4a812b8 100644 --- a/WavesSDK/Sources/Signature/TransactionSignatureV2.swift +++ b/WavesSDK/Sources/Signature/TransactionSignatureV2.swift @@ -7,8 +7,8 @@ // import Foundation -import WavesSDKCrypto -import WavesSDKExtensions +import WavesSDKCryptoUpdate +import WavesSDKExtensionsUpdate public extension TransactionSignatureV2 { @@ -132,7 +132,7 @@ public extension TransactionSignatureV2 { } public struct Transfer { - public let senderPublicKey: WavesSDKCrypto.PublicKey + public let senderPublicKey: WavesSDKCryptoUpdate.PublicKey public let recipient: String public let assetId: String public let amount: Int64 @@ -199,7 +199,7 @@ public enum TransactionSignatureV2: TransactionSignatureProtocol { public extension TransactionSignatureV2 { - var bytesStructure: WavesSDKCrypto.Bytes { + var bytesStructure: WavesSDKCryptoUpdate.Bytes { switch self { case .createAlias(let model): diff --git a/WavesSDK/Sources/WavesSDKConstants.swift b/WavesSDK/Sources/WavesSDKConstants.swift index 9174780..7231ec0 100644 --- a/WavesSDK/Sources/WavesSDKConstants.swift +++ b/WavesSDK/Sources/WavesSDKConstants.swift @@ -7,7 +7,7 @@ // import Foundation -import WavesSDKExtensions +import WavesSDKExtensionsUpdate public enum WavesSDKConstants { public static let aliasNameMinLimitSymbols: Int = 4 diff --git a/WavesSDKCrypto.podspec b/WavesSDKCryptoUpdate.podspec similarity index 86% rename from WavesSDKCrypto.podspec rename to WavesSDKCryptoUpdate.podspec index d12fb79..5d05e87 100644 --- a/WavesSDKCrypto.podspec +++ b/WavesSDKCryptoUpdate.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |spec| - spec.name = 'WavesSDKCrypto' - spec.version = '0.1.9' + spec.name = 'WavesSDKCryptoUpdate' + spec.version = '0.2.1' spec.ios.deployment_target = '11.0' spec.requires_arc = true spec.swift_version = '5.0' @@ -12,7 +12,7 @@ Pod::Spec.new do |spec| spec.summary = 'WavesSDK – it is mobile libraries for easy and simple co-working Waves blockchain platform and any mobile app' - spec.source = { 'git' => 'https://github.com/wavesplatform/WavesSDK-iOS.git', :tag => 'v' + spec.version.to_s } + spec.source = { 'git' => 'https://github.com/adenuga558/WavesSDK-iOS.git', :tag => 'v' + spec.version.to_s } @@ -39,6 +39,6 @@ Pod::Spec.new do |spec| spec.ios.framework = 'Foundation' spec.ios.framework = 'UIKit' spec.ios.framework = 'Security' - spec.dependency 'WavesSDKExtensions' + spec.dependency 'WavesSDKExtensionsUpdate' end diff --git a/WavesSDKExtensions.podspec b/WavesSDKExtensionsUpdate.podspec similarity index 71% rename from WavesSDKExtensions.podspec rename to WavesSDKExtensionsUpdate.podspec index 29d0625..624e94a 100644 --- a/WavesSDKExtensions.podspec +++ b/WavesSDKExtensionsUpdate.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |spec| - spec.name = 'WavesSDKExtensions' - spec.version = '0.1.9' + spec.name = 'WavesSDKExtensionsUpdate' + spec.version = '0.2.1' spec.ios.deployment_target = '11.0' spec.requires_arc = true spec.swift_version = '5.0' @@ -12,11 +12,11 @@ Pod::Spec.new do |spec| spec.summary = 'WavesSDK – it is mobile libraries for easy and simple co-working Waves blockchain platform and any mobile app' spec.source_files = 'WavesSDKExtensions/Sources/**/*.{swift}' - spec.source = { :git => 'https://github.com/wavesplatform/WavesSDK-iOS.git', :tag => 'v' + spec.version.to_s} + spec.source = { :git => 'https://github.com/adenuga558/WavesSDK-iOS.git', :tag => 'v' + spec.version.to_s} spec.ios.framework = 'Foundation' spec.ios.framework = 'UIKit' - spec.dependency 'RxSwift', '~> 4.0' + spec.dependency 'RxSwift', '~> 5.1.3' end