Waves support (#489)

* Added Curve25519 signing and validation logic

* Update include/TrustWalletCore/TWCurve.h

Co-Authored-By: hewig <[email protected]>

* Added Curve25519 description in trezor-crypto readme

* ge25519_p1p1_1 don't collide with ed25519 ge25519_p1p1 now

* curve25519 test cases were added

* tests fix

* Added Waves Blockchain definition

* Added Waves Address encoding/decoding

with tests

* Added Waves Transaction signing

* review fixes

* Added attachment comment

* code quality

Author: Tolsi

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/CoinAddressDerivationTests.kt

@@ -79,5 +79,6 @@ class CoinAddressDerivationTests {
         ARK -> assertEquals("Ac49m5pu5YpMMNgEbSYeZUEpRMHcSK3DfV", address)
         MONETARYUNIT -> assertEquals("7W3QRu8FttKzmYtRbXNKopeHweAKWuun2q", address)
         RAVENCOIN -> assertEquals("RHoCwPc2FCQqwToYnSiAb3SrCET4zEHsbS", address)
+        WAVES -> assertEquals("3P63vkaHhyE9pPv9EfsjwGKqmZYcCRHys4n", address)
     }
 }

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/waves/TestAddress.kt

@@ -0,0 +1,35 @@
+package com.trustwallet.core.app.blockchains.waves
+
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.PrivateKey
+import wallet.core.jni.PublicKey
+import wallet.core.jni.PublicKeyType
+import wallet.core.jni.WavesAddress
+
+class TestAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddressFromPrivateKey() {
+        val key = PrivateKey("9864a747e1b97f131fabb6b447296c9b6f0201e79fb3c5356e6c77e89b6a806a".toHexByteArray())
+        val pubkey = key.getPublicKeyCurve25519()
+        val address = WavesAddress(pubkey)
+
+        assertEquals(pubkey.data().toHex(), "0x559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d".toLowerCase())
+        assertEquals(address.description(), "3P2uzAzX9XTu1t32GkWw68YFFLwtapWvDds")
+    }
+
+    @Test
+    fun testAddressFromPublicKey() {
+        val pubkey = PublicKey("559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d".toHexByteArray(), PublicKeyType.CURVE25519)
+        val address = WavesAddress(pubkey)
+
+        assertEquals(address.description(), "3P2uzAzX9XTu1t32GkWw68YFFLwtapWvDds")
+    }
+}

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/waves/TestWavesSigner.kt

@@ -0,0 +1,38 @@
+package com.trustwallet.core.app.blockchains.waves
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.Numeric
+import com.trustwallet.core.app.utils.toHexByteArray
+import com.trustwallet.core.app.utils.toHex
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.PrivateKey
+import wallet.core.jni.WavesSigner
+import wallet.core.jni.proto.Waves
+
+class TestWavesTransactionSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testWavesTransactionSigning() {
+        val signingInput = Waves.SigningInput.newBuilder()
+        signingInput.apply {
+            amount = 100_000_000
+            amountAsset = "DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq"
+            fee = 100_000
+            feeAsset = "DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq"
+            to = "3PPCZQkvdMJpmx7Zrz1cnYsPe9Bt1XT2Ckx"
+            attachment = ByteString.copyFrom("68656c6c6f".toHexByteArray())
+            timestamp = 1559146613
+            publicKey = ByteString.copyFrom("794e8429ddf58353eacab99b4c2b3b71c8c1b5927980db2d6f8db52744dd103d".toHexByteArray())
+            privateKey = ByteString.copyFrom("68b7a9adb4a655b205f43dac413803785921e22cd7c4d05857b203a62621075f".toHexByteArray())
+        }
+
+        val sign: Waves.SigningOutput = WavesSigner.sign(signingInput.build())
+        val signBytes = sign.signature
+        assertEquals(signBytes.toByteArray().toHex(), "0x5d6a77b1fd9b53d9735cd2543ba94215664f2b07d6c7befb081221fcd49f5b6ad6b9ac108582e8d3e74943bdf35fd80d985edf4b4de1fb1c5c427e84d0879f8f")
+    }
+}

coins.json

@@ -649,5 +649,16 @@
         "xpub": "xpub",
         "xprv": "xprv",
         "explorer": "https://ravencoin.network/tx/"
+    },
+    {
+        "id": "waves",
+        "name": "Waves",
+        "symbol": "WAVES",
+        "decimals": 8,
+        "blockchain": "Waves",
+        "derivationPath": "m/44'/5741564'/0'/0'/0'",
+        "curve": "ed25519",
+        "publicKeyType": "curve25519",
+        "explorer": "https://wavesexplorer.com/tx/"
     }
 ]

include/TrustWalletCore/TWBlockchain.h

@@ -37,6 +37,7 @@ enum TWBlockchain {
     TWBlockchainNEO = 22,
     TWBlockchainSteem = 23,
     TWBlockchainNULS = 24,
+    TWBlockchainWaves = 25,
 };
 
 TW_EXTERN_C_END

include/TrustWalletCore/TWCoinType.h

@@ -74,6 +74,7 @@ enum TWCoinType {
     TWCoinTypeARK = 111,
     TWCoinTypeMonetaryUnit = 31,
     TWCoinTypeRavencoin = 175,
+    TWCoinTypeWaves = 5741564,
 };
 
 /// Returns the blockchain for a coin type.

include/TrustWalletCore/TWCurve.h

@@ -15,6 +15,7 @@ enum TWCurve {
     TWCurveSECP256k1              /* "secp256k1" */,
     TWCurveED25519                /* "ed25519" */,
     TWCurveED25519Blake2bNano     /* "ed25519-blake2b-nano" */,
+    TWCurveCurve25519             /* "curve25519" */,
     TWCurveNIST256p1              /* "nist256p1" */,
 };
 

include/TrustWalletCore/TWPrivateKey.h

@@ -36,22 +36,26 @@ bool TWPrivateKeyIsValid(TWData *_Nonnull data);
 TW_EXPORT_PROPERTY
 TWData *_Nonnull TWPrivateKeyData(struct TWPrivateKey *_Nonnull pk);
 
-/// Returns the public key associated with this pirvate key.
+/// Returns the public key associated with this private key.
 TW_EXPORT_METHOD
 struct TWPublicKey *_Nonnull TWPrivateKeyGetPublicKeySecp256k1(struct TWPrivateKey *_Nonnull pk, bool compressed);
 
-/// Returns the public key associated with this pirvate key.
+/// Returns the public key associated with this private key.
 TW_EXPORT_METHOD
 struct TWPublicKey *_Nonnull TWPrivateKeyGetPublicKeyNist256p1(struct TWPrivateKey *_Nonnull pk);
 
-/// Returns the public key associated with this pirvate key.
+/// Returns the public key associated with this private key.
 TW_EXPORT_METHOD
 struct TWPublicKey *_Nonnull TWPrivateKeyGetPublicKeyEd25519(struct TWPrivateKey *_Nonnull pk);
 
-/// Returns the public key associated with this pirvate key.
+/// Returns the public key associated with this private key.
 TW_EXPORT_METHOD
 struct TWPublicKey *_Nonnull TWPrivateKeyGetPublicKeyEd25519Blake2b(struct TWPrivateKey *_Nonnull pk);
 
+/// Returns the public key associated with this private key.
+TW_EXPORT_METHOD
+struct TWPublicKey *_Nonnull TWPrivateKeyGetPublicKeyCurve25519(struct TWPrivateKey *_Nonnull pk);
+
 /// Signs a digest using ECDSA and given curve.
 TW_EXPORT_METHOD
 TWData *_Nullable TWPrivateKeySign(struct TWPrivateKey *_Nonnull pk, TWData *_Nonnull digest, enum TWCurve curve);

include/TrustWalletCore/TWPublicKeyType.h

@@ -18,6 +18,7 @@ enum TWPublicKeyType {
     TWPublicKeyTypeNIST256p1Extended = 3,
     TWPublicKeyTypeED25519 = 4,
     TWPublicKeyTypeED25519Blake2b = 5,
+    TWPublicKeyTypeCURVE25519 = 6,
 };
 
 TW_EXTERN_C_END

include/TrustWalletCore/TWWavesAddress.h

@@ -0,0 +1,49 @@
+// Copyright © 2017-2019 Trust Wallet.
+//
+// This file is part of Trust. The full Trust copyright notice, including
+// terms governing use, modification, and redistribution, is contained in the
+// file LICENSE at the root of the source code distribution tree.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWData.h"
+#include "TWString.h"
+
+TW_EXTERN_C_BEGIN
+
+struct TWPublicKey;
+
+/// Represents an Waves address.
+TW_EXPORT_CLASS
+struct TWWavesAddress;
+
+/// Compares two addresses for equality.
+TW_EXPORT_STATIC_METHOD
+bool TWWavesAddressEqual(struct TWWavesAddress *_Nonnull lhs, struct TWWavesAddress *_Nonnull rhs);
+
+/// Determines if the string is a valid address.
+TW_EXPORT_STATIC_METHOD
+bool TWWavesAddressIsValidString(TWString *_Nonnull string);
+
+/// Creates an address from a string representaion.
+TW_EXPORT_STATIC_METHOD
+struct TWWavesAddress *_Nullable TWWavesAddressCreateWithString(TWString *_Nonnull string);
+
+/// Creates an address from a public key.
+TW_EXPORT_STATIC_METHOD
+struct TWWavesAddress *_Nonnull TWWavesAddressCreateWithPublicKey(
+    struct TWPublicKey *_Nonnull publicKey);
+
+TW_EXPORT_METHOD
+void TWWavesAddressDelete(struct TWWavesAddress *_Nonnull address);
+
+/// Returns the address string representation.
+TW_EXPORT_PROPERTY
+TWString *_Nonnull TWWavesAddressDescription(struct TWWavesAddress *_Nonnull address);
+
+/// Returns the key hash.
+TW_EXPORT_PROPERTY
+TWData *_Nonnull TWWavesAddressKeyHash(struct TWWavesAddress *_Nonnull address);
+
+TW_EXTERN_C_END