From 0cf425f3d4cd50d020c150e60bbbd30b450d9843 Mon Sep 17 00:00:00 2001
From: Maxim Pestryakov <17238054+MaximPestryakov@users.noreply.github.com>
Date: Tue, 27 Jun 2023 20:14:05 -0500
Subject: [PATCH] [WASM] Fixed CoinType.deriveAddressFromPublicKeyAndDerivation

---
 wasm/src/CoinTypeExt.cpp    |  6 +++++-
 wasm/src/CoinTypeExt.h      |  1 +
 wasm/tests/CoinType.test.ts | 34 +++++++++++++++++++++++++++++++---
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/wasm/src/CoinTypeExt.cpp b/wasm/src/CoinTypeExt.cpp
index 25b63214826..7dfcf0af553 100644
--- a/wasm/src/CoinTypeExt.cpp
+++ b/wasm/src/CoinTypeExt.cpp
@@ -72,6 +72,9 @@ namespace TW::Wasm {
     auto CoinTypeExt::deriveAddressFromPublicKey(TWCoinType coin, WasmPublicKey* publicKey) {
         return TWStringToStd(TWCoinTypeDeriveAddressFromPublicKey(coin, publicKey->instance));
     }
+    auto CoinTypeExt::deriveAddressFromPublicKeyAndDerivation(TWCoinType coin, WasmPublicKey* publicKey, TWDerivation derivation) {
+        return TWStringToStd(TWCoinTypeDeriveAddressFromPublicKeyAndDerivation(coin, publicKey->instance, derivation));
+    }
 
     EMSCRIPTEN_BINDINGS(Wasm_CoinTypeExt) {
         class_<CoinTypeExt>("CoinTypeExt")
@@ -92,6 +95,7 @@ namespace TW::Wasm {
             .class_function("derivationPath", &CoinTypeExt::derivationPath)
             .class_function("derivationPathWithDerivation", &CoinTypeExt::derivationPathWithDerivation)
             .class_function("deriveAddress", &CoinTypeExt::deriveAddress, allow_raw_pointers())
-            .class_function("deriveAddressFromPublicKey", &CoinTypeExt::deriveAddressFromPublicKey, allow_raw_pointers());
+            .class_function("deriveAddressFromPublicKey", &CoinTypeExt::deriveAddressFromPublicKey, allow_raw_pointers())
+            .class_function("deriveAddressFromPublicKeyAndDerivation", &CoinTypeExt::deriveAddressFromPublicKeyAndDerivation, allow_raw_pointers());
     };
 }
diff --git a/wasm/src/CoinTypeExt.h b/wasm/src/CoinTypeExt.h
index 66c62410655..538928204c8 100644
--- a/wasm/src/CoinTypeExt.h
+++ b/wasm/src/CoinTypeExt.h
@@ -44,5 +44,6 @@ namespace TW::Wasm {
         static auto derivationPathWithDerivation(TWCoinType coin, TWDerivation derivation);
         static auto deriveAddress(TWCoinType coin, WasmPrivateKey* privateKey);
         static auto deriveAddressFromPublicKey(TWCoinType coin, WasmPublicKey* publicKey);
+        static auto deriveAddressFromPublicKeyAndDerivation(TWCoinType coin, WasmPublicKey* publicKey, TWDerivation derivation);
     };
 }
diff --git a/wasm/tests/CoinType.test.ts b/wasm/tests/CoinType.test.ts
index 44941975f57..285891251c6 100644
--- a/wasm/tests/CoinType.test.ts
+++ b/wasm/tests/CoinType.test.ts
@@ -9,7 +9,7 @@ import { assert } from "chai";
 
 describe("CoinType", () => {
   it("test raw value", () => {
-    const { CoinType, CoinTypeExt, Blockchain, Purpose, Curve, Derivation, PrivateKey, HexCoding } = globalThis.core;
+    const { CoinType } = globalThis.core;
 
     assert.equal(CoinType.bitcoin.value, 0);
     assert.equal(CoinType.litecoin.value, 2);
@@ -18,15 +18,43 @@ describe("CoinType", () => {
     assert.equal(CoinType.binance.value, 714);
     assert.equal(CoinType.cosmos.value, 118);
     assert.equal(CoinType.solana.value, 501);
+  });
+
+  it("test CoinTypeExt methods", () => {
+    const { CoinType, CoinTypeExt, Blockchain, Purpose, Curve, Derivation } = globalThis.core;
+
     assert.equal(CoinTypeExt.blockchain(CoinType.solana), Blockchain.solana);
     assert.equal(CoinTypeExt.purpose(CoinType.solana), Purpose.bip44);
     assert.equal(CoinTypeExt.curve(CoinType.solana), Curve.ed25519);
     assert.isTrue(CoinTypeExt.validate(CoinType.solana, "Bxp8yhH9zNwxyE4UqxP7a7hgJ5xTZfxNNft7YJJ2VRjT"))
     assert.equal(CoinTypeExt.derivationPath(CoinType.solana), "m/44'/501'/0'");
     assert.equal(CoinTypeExt.derivationPathWithDerivation(CoinType.solana, Derivation.solanaSolana), "m/44'/501'/0'/0'");
-    let data = HexCoding.decode("8778cc93c6596387e751d2dc693bbd93e434bd233bc5b68a826c56131821cb63")
+  });
+
+  it("test deriveAddress", () => {
+    const { CoinType, CoinTypeExt, PrivateKey, HexCoding } = globalThis.core;
+
+    const data = HexCoding.decode("8778cc93c6596387e751d2dc693bbd93e434bd233bc5b68a826c56131821cb63");
     const key = PrivateKey.createWithData(data);
-    let addr = CoinTypeExt.deriveAddress(CoinType.solana, key);
+    const addr = CoinTypeExt.deriveAddress(CoinType.solana, key);
     assert.equal(addr, "7v91N7iZ9mNicL8WfG6cgSCKyRXydQjLh6UYBWwm6y1Q")
   });
+
+  it("test deriveAddressFromPublicKey", () => {
+    const { CoinType, CoinTypeExt, PublicKey, PublicKeyType, HexCoding } = globalThis.core;
+
+    const data = HexCoding.decode("044516c4aa5352035e1bb5be132694e1389a4ac37d32e5e717d35ee4c4dfab513226a9d14ea37a55962ad3644a08e2ce551b4495beabb9b09e688c7b92eba18acc");
+    const key = PublicKey.createWithData(data, PublicKeyType.secp256k1Extended);
+    const addr = CoinTypeExt.deriveAddressFromPublicKey(CoinType.ethereum, key);
+    assert.equal(addr, "0x996891c410FB76C19DBA72C6f6cEFF2d9DD069b1");
+  });
+
+  it("test deriveAddressFromPublicKeyAndDerivation", () => {
+    const { CoinType, CoinTypeExt, Derivation, PublicKey, PublicKeyType, HexCoding } = globalThis.core;
+
+    const data = HexCoding.decode("0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798");
+    const key = PublicKey.createWithData(data, PublicKeyType.secp256k1);
+    const addr = CoinTypeExt.deriveAddressFromPublicKeyAndDerivation(CoinType.bitcoin, key, Derivation.bitcoinSegwit);
+    assert.equal(addr, "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4");
+  });
 });