Merge pull request #187 from keefertaylor/wallet-derivation

Fix bug where `signingCurve` wasn't respected

Author: keefertaylor

Tests/UnitTests/TezosKit/SecretKeyTests.swift

@@ -85,16 +85,21 @@ final class SecretKeyTests: XCTestCase {
 
     XCTAssertEqual(
       secretKey.base58CheckRepresentation,
-      "edskS4pbuA7rwMjsZGmHU18aMP96VmjegxBzwMZs3DrcXHcMV7VyfQLkD5pqEE84wAMHzi8oVZF6wbgxv3FKzg7cLqzURjaXUp"
+      "spsk2yoh33fRH4nt95Xf3BySX5pR5Zok2adQxsb9P9koj3A4xAsAfk"
     )
   }
 
   func testInitFromBase58CheckRepresntation_ValidString_secp256k1() {
-    let base58Representation = "spsk2rBDDeUqakQ42nBHDGQTtP3GErb6AahHPwF9bhca3Q5KA5HESE"
-    let secretKeyFromString =
-      SecretKey(base58Representation, signingCurve: .secp256k1)
-    XCTAssertNotNil(secretKeyFromString)
-    XCTAssertEqual(secretKeyFromString?.base58CheckRepresentation, base58Representation)
+    let base58Representation = "spsk1fYtbGsvDEeb4NGanSiYQYcLFNZYNZ9F7jSvmCbT55DHcbtWjL"
+    guard let secretKey = SecretKey(base58Representation, signingCurve: .secp256k1) else {
+      XCTFail("Could not derive a secret key")
+      return
+    }
+    XCTAssertNotNil(secretKey)
+    XCTAssertEqual(secretKey.base58CheckRepresentation, base58Representation)
+
+    let publicKey = PublicKey(secretKey: secretKey)
+    XCTAssertEqual(publicKey?.publicKeyHash, "tz2D3CdkJsR3X5zvvdvsbeGN2NMWoByLs1kM")
   }
 
   func testInitFromBase58CheckRepresentation_InvalidBase58_secp256k1() {

Tests/UnitTests/TezosKit/WalletTests.swift

@@ -156,4 +156,35 @@ class WalletTests: XCTestCase {
       ]
     )
   }
+
+  func testWalletGenerationCurvesWithMnemonic() {
+    let passphrase = "tezoskit"
+    guard
+      let tz1Wallet = Wallet(passphrase: passphrase, signingCurve: .ed25519),
+      let tz2Wallet = Wallet(passphrase: passphrase, signingCurve: .secp256k1)
+    else {
+      XCTFail("Failed to generate wallets.")
+      return
+    }
+
+    XCTAssertEqual(tz1Wallet.publicKey.signingCurve, .ed25519)
+    XCTAssertEqual(tz2Wallet.publicKey.signingCurve, .secp256k1)
+  }
+
+  func testWalletGenerationCurvesWithSeed() {
+    let tz1SecretKey =
+      "edskRw8ZJM3P3f81VnfChULCLh7KwhZMvp6rniDHNeEcQiNBevrTkwtzYwtqmEvbf5HJTQeb1WvTL5UUcsMjVh5RZArcRdXbQC"
+    let tz2SecretKey =
+      "spsk1fYtbGsvDEeb4NGanSiYQYcLFNZYNZ9F7jSvmCbT55DHcbtWjL"
+    guard
+      let tz1Wallet = Wallet(secretKey: tz1SecretKey, signingCurve: .ed25519),
+      let tz2Wallet = Wallet(secretKey: tz2SecretKey, signingCurve: .secp256k1)
+    else {
+      XCTFail("Failed to generate wallets.")
+      return
+    }
+
+    XCTAssertEqual(tz1Wallet.publicKey.signingCurve, .ed25519)
+    XCTAssertEqual(tz2Wallet.publicKey.signingCurve, .secp256k1)
+  }
 }

TezosKit.xcodeproj/project.pbxproj

@@ -52,10 +52,6 @@
       </MacroExpansion>
       <CommandLineArguments>
       </CommandLineArguments>
-      <AdditionalOptions>
-      </AdditionalOptions>
-      <CodeCoverageTargets>
-      </CodeCoverageTargets>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -78,8 +74,6 @@
       </MacroExpansion>
       <CommandLineArguments>
       </CommandLineArguments>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

TezosKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -52,10 +52,6 @@
       </MacroExpansion>
       <CommandLineArguments>
       </CommandLineArguments>
-      <AdditionalOptions>
-      </AdditionalOptions>
-      <CodeCoverageTargets>
-      </CodeCoverageTargets>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -78,8 +74,6 @@
       </MacroExpansion>
       <CommandLineArguments>
       </CommandLineArguments>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

TezosKit.xcodeproj/xcshareddata/xcschemes/TezosKit_iOS.xcscheme

@@ -57,7 +57,19 @@ public struct SecretKey {
       return nil
     }
 
-    self.init(keyPair.secretKey, signingCurve: .ed25519)
+    // Key is 64 bytes long. The first 32 bytes are the private key. Sodium, the ed25519 library expects extended
+    // private keys, so pass down the full 64 bytes.
+    let secretKeyBytes = keyPair.secretKey
+    switch signingCurve {
+    case .ed25519:
+      self.init(secretKeyBytes, signingCurve: signingCurve)
+    case .secp256k1:
+      let privateKeyBytes = Array(secretKeyBytes[..<32])
+      self.init(privateKeyBytes, signingCurve: signingCurve)
+    case .p256:
+      fatalError("unimplemented")
+    }
+
   }
 
   /// Initialize a secret key with the given base58check encoded string.