Skip to content

Commit 16fe36e

Browse files
committed
fix: update codebase to correct head
1 parent d6b788e commit 16fe36e

File tree

5 files changed

+30
-26
lines changed

5 files changed

+30
-26
lines changed

mpc-core-kit-ios/mpc-core-kit-ios-quick-start/mpc-core-kit-ios-quick-start.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@
672672
/* Begin XCRemoteSwiftPackageReference section */
673673
F0EB928C2D27B02B0024D038 /* XCRemoteSwiftPackageReference "mpc-core-kit-swift" */ = {
674674
isa = XCRemoteSwiftPackageReference;
675-
repositoryURL = "https://github.com/tkey/mpc-core-kit-swift";
675+
repositoryURL = "https://github.com/web3auth/mpc-core-kit-swift";
676676
requirement = {
677677
branch = feat/signer;
678678
kind = branch;

mpc-core-kit-ios/mpc-core-kit-ios-quick-start/mpc-core-kit-ios-quick-start.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>SchemeUserState</key>
6+
<dict>
7+
<key>mpc-core-kit-ios-quick-start.xcscheme_^#shared#^_</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>0</integer>
11+
</dict>
12+
</dict>
13+
</dict>
14+
</plist>

mpc-core-kit-ios/mpc-core-kit-ios-quick-start/mpc-core-kit-ios-quick-start/Models/MainViewModel.swift

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ class MainViewModel: ObservableObject {
5050
idToken: "String"
5151
)
5252

53-
DispatchQueue.main.async {
54-
self.isRecoveryRequired = result.requiredFactors > 0
55-
}
53+
self.isRecoveryRequired = result.requiredFactors > 0
5654

5755
try await login()
5856
} catch let error {
@@ -68,9 +66,7 @@ class MainViewModel: ObservableObject {
6866
singleLoginParams: .init(typeOfLogin: .google, verifier: "w3a-sfa-web-google", clientId: "519228911939-cri01h55lsjbsia1k7ll6qpalrus75ps.apps.googleusercontent.com")
6967
)
7068

71-
DispatchQueue.main.async {
72-
self.isRecoveryRequired = result.requiredFactors > 0
73-
}
69+
self.isRecoveryRequired = result.requiredFactors > 0
7470

7571
try await login()
7672

@@ -84,11 +80,9 @@ class MainViewModel: ObservableObject {
8480
func resetAccount() {
8581
Task {
8682
do {
87-
try await mpcCoreKit.resetAccount()
88-
DispatchQueue.main.async {
89-
self.isRecoveryRequired = false
90-
self.isLoggedIn = false
91-
}
83+
try await mpc_core_kit_swift.resetAccount(coreKitInstance: mpcCoreKit)
84+
self.isRecoveryRequired = false
85+
self.isLoggedIn = false
9286
} catch let error {
9387
print(error.localizedDescription)
9488
}
@@ -176,8 +170,8 @@ class MainViewModel: ObservableObject {
176170
factorDescription: .SeedPhrase
177171
)
178172

179-
let seedPhrase = try mpcCoreKit.keyToMnemonic(
180-
factorKey: factor
173+
let seedPhrase = try FactorSerialization.keyToMnemonic(tkey: mpcCoreKit.tkey!,
174+
shareHex: factor
181175
)
182176

183177
print(seedPhrase)
@@ -191,21 +185,19 @@ class MainViewModel: ObservableObject {
191185
func recoverUsingSeedPhrase(seedPhrase: String) {
192186
Task {
193187
do {
194-
let factorKey = try mpcCoreKit.mnemonicToKey(
188+
let factorKey = try FactorSerialization.mnemonicToKey(tkey: mpcCoreKit.tkey!,
195189
shareMnemonic: seedPhrase
196190
)
197191

198192
print(factorKey.count)
199193

200-
try await mpcCoreKit.inputFactor(
194+
try await mpcCoreKit.inputFactorKey(
201195
factorKey: factorKey
202196
)
203197

204198
try await login()
205-
206-
DispatchQueue.main.async {
207-
self.isRecoveryRequired.toggle()
208-
}
199+
200+
self.isRecoveryRequired.toggle()
209201
} catch let error {
210202
print(error.localizedDescription)
211203
}
@@ -242,9 +234,7 @@ class MainViewModel: ObservableObject {
242234

243235
private func refreshFactorPubs() async throws {
244236
let localFactorPubs = try await mpcCoreKit.getAllFactorPubs()
245-
DispatchQueue.main.async {
246-
self.factorPubs = localFactorPubs
247-
}
237+
self.factorPubs = localFactorPubs
248238
}
249239

250240
func toggleIsLoggedIn() {

0 commit comments

Comments
 (0)