complate 3step signing

reown-com · Nov 15, 2024 · ecbfe26 · ecbfe26
1 parent c69e782
commit ecbfe26
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/Example/Shared/Signer/Signer.swift b/Example/Shared/Signer/Signer.swift
@@ -103,7 +103,13 @@ final class Signer {
             let messageHash = messageToSign.sha3(.keccak256).toHexString()
 
             // Step 1
-            let prepareSignMessage = try await WalletKit.instance.prepareSignMessage(messageHash, ownerAccount: ownerAccount)
+            let prepareSignMessage: PreparedSignMessage
+            do {
+                prepareSignMessage = try await WalletKit.instance.prepareSignMessage(messageHash, ownerAccount: ownerAccount)
+            } catch {
+                print(error)
+                throw error
+            }
 
             // Sign prepared message
             let dataToSign = prepareSignMessage.hash.data(using: .utf8)!
@@ -112,25 +118,34 @@ final class Signer {
             let result: String = "0x" + r.toHexString() + s.toHexString() + String(v + 27, radix: 16)
 
             // Step 2
-            let prepareSign = try await WalletKit.instance.doSignMessage([result], ownerAccount: ownerAccount)
+            let prepareSign: PreparedSign
+            do {
+                prepareSign = try await WalletKit.instance.doSignMessage([result], ownerAccount: ownerAccount)
+            } catch {
+                print(error)
+                throw error
+            }
 
             switch prepareSign {
             case .signature(let signature):
                 return AnyCodable(signature)
             case .signStep3(let preparedSignStep3):
                 // Step 3
-
                 let dataToSign = preparedSignStep3.hash.data(using: .utf8)!
                 let privateKey = try! EthereumPrivateKey(hexPrivateKey: importAccount.privateKey)
                 let (v, r, s) = try! privateKey.sign(message: .init(Data(dataToSign)))
                 let result: String = "0x" + r.toHexString() + s.toHexString() + String(v + 27, radix: 16)
 
-                let signature = try await WalletKit.instance.finalizeSignMessage([result], signStep3Params: preparedSignStep3.signStep3Params, ownerAccount: ownerAccount)
-
+                let signature: String
+                do {
+                    signature = try await WalletKit.instance.finalizeSignMessage([result], signStep3Params: preparedSignStep3.signStep3Params, ownerAccount: ownerAccount)
+                } catch {
+                    print(error)
+                    throw error
+                }
                 return AnyCodable(signature)
             }
 
-
         case "eth_signTypedData":
             let params = try request.params.get([String].self)
             let message = params[0]

diff --git a/Sources/ReownWalletKit/SmartAccount/SafesManager.swift b/Sources/ReownWalletKit/SmartAccount/SafesManager.swift
@@ -42,6 +42,7 @@ class SafesManager {
             safe: true
         )
         // TODO remove registration
+
         x.register(privateKey: "ff89825a799afce0d5deaa079cdde227072ec3f62973951683ac8cc033092156")
         return x
     }

diff --git a/Sources/WalletConnectSigner/Verifier/MessageVerifier.swift b/Sources/WalletConnectSigner/Verifier/MessageVerifier.swift
@@ -94,7 +94,7 @@ public struct MessageVerifier {
                 message: prefixedMessage,
                 address: address
             )
-            return  // If 6492 verification succeeds, we’re done
+            return  // If 191 verification succeeds, we’re done
         } catch {
             // If eip191 verification fails, we’ll attempt 6492 verification
         }