diff --git a/KinEcosystem/KinEcosystem/Blockchain/Blockchain.swift b/KinEcosystem/KinEcosystem/Blockchain/Blockchain.swift index 6eb7f59..a627a0b 100644 --- a/KinEcosystem/KinEcosystem/Blockchain/Blockchain.swift +++ b/KinEcosystem/KinEcosystem/Blockchain/Blockchain.swift @@ -280,7 +280,7 @@ class Blockchain: NSObject { } func onboard() -> Promise { - + if onboarded { return Promise().signal(()) } @@ -581,6 +581,7 @@ extension KinAccountsProtocol { extension Blockchain: KinMigrationManagerDelegate { public func kinMigrationManagerNeedsVersion(_ kinMigrationManager: KinMigrationManager) -> Promise { guard let query = versionQuery else { + print(kinMigrationManager.version?.rawValue) fatalError("version query closure not set on blockchain object") } return query() @@ -588,9 +589,11 @@ extension Blockchain: KinMigrationManagerDelegate { public func kinMigrationManagerDidStart(_ kinMigrationManager: KinMigrationManager) { logInfo("migration started...") + PaymentManager.resign() } public func kinMigrationManager(_ kinMigrationManager: KinMigrationManager, readyWith client: KinClientProtocol) { +// PaymentManager.resume(blockchain: self) logInfo("migration manager is ready with client, version: \(kinMigrationManager.version?.rawValue ?? 0), number of accounts: \(client.accounts.count)") self.client = client if let address = self.startingAddress, diff --git a/KinEcosystem/KinEcosystem/Core/Core.swift b/KinEcosystem/KinEcosystem/Core/Core.swift index d4fd483..6a42677 100644 --- a/KinEcosystem/KinEcosystem/Core/Core.swift +++ b/KinEcosystem/KinEcosystem/Core/Core.swift @@ -95,6 +95,7 @@ class Core { } }.then { self.isOnboarding = false + PaymentManager.resume(core: self) self.onboardPromise.signal(()) }.error { error in self.isOnboarding = false diff --git a/KinEcosystemSampleApp/EcosystemSampleApp/Info.plist b/KinEcosystemSampleApp/EcosystemSampleApp/Info.plist index c04fa89..173d992 100644 --- a/KinEcosystemSampleApp/EcosystemSampleApp/Info.plist +++ b/KinEcosystemSampleApp/EcosystemSampleApp/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.2.6.98 + 1.2.6.99 CFBundleURLTypes @@ -32,7 +32,7 @@ CFBundleVersion - 1.2.6.98 + 1.2.6.99 LSApplicationCategoryType LSRequiresIPhoneOS diff --git a/Podfile.lock b/Podfile.lock index 2b75153..4f9ff6a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -9,7 +9,7 @@ PODS: - KinCoreSDK (0.8.0): - Sodium (= 0.8.0) - StellarKit (= 0.4.0) - - KinEcosystem (1.2.6): + - KinEcosystem (1.2.7): - KinAppreciationModuleOptionsMenu (= 0.0.4) - KinMigrationModule (= 0.1.0) - KinMigrationModule (0.1.0): @@ -57,7 +57,7 @@ SPEC CHECKSUMS: JWT: 05028b9624591bba9681bb57df2c5f95fa258bad KinAppreciationModuleOptionsMenu: 6d52396b8d1eb16a56a4f3b51f135b2835ed91ed KinCoreSDK: 419f6736c8aefcc0aef8ad45fa9032890ae6672e - KinEcosystem: a4c1aa21ec99357cdb3e4c444823df404585a9a8 + KinEcosystem: 3c39d0aae40cfd81a992e5fdce9a9718c49d8f4a KinMigrationModule: 0f14c64bfb6e1046bd137ab829264223c20905ec KinSDK: 24cbb5cf8b560c6025eacabc1b5aebbe5938c141 KinUtil: 5ba64858ba2f24156d6e229c963b37f8d808bd4c