Add Cardano/Shelley address support, remove Cardano/Byron (#845)

* Cardano: Add Shelley address, remove Byron signer.
* Switch to AnyAddress.
* Add copy constructor, code quality.
* Move copy ctor to CPP to satisfy codacy.
* Remove some trailing spaces.
* Adjust exception handling in AddressV3.
* Add Cardano HRP to coins.json ("addr").
* Minor namespace adjustment.

Author: optout21

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

@@ -81,7 +81,7 @@ class CoinAddressDerivationTests {
         KUSAMA -> assertEquals("DE2jNrgosggXWJXfYDmRgy1q8XKkbtzSxj2uWAy5fbBfZwT", address)
         POLKADOT -> assertEquals("1b97X8xTpFKMDzJpxiVhdYMNvekBDSfvGFf4DutxFkUjqfR", address)
         KAVA -> assertEquals("kava1drpa0x9ptz0fql3frv562rcrhj2nstuz3pas87", address)
-        CARDANO -> assertEquals("Ae2tdPwUPEZJ2TwjFBMCnjz6t43pr4QVnBjCGSW8BMsttrt2WagC1D7LUWa", address)
+        CARDANO -> assertEquals("addr1snpa4z7ntyfszv7ckquprdw75w4qjqh0qmya9jtkpxxlzxghlqyvv7l0yjamh8fxraw06p3ua8sj2g2gv98v4849s43t9g2999kquuu5egnprk", address)
         NEO -> assertEquals("AT6w7PJvwPcSqHvtbNBY2aHPDv12eW5Uuf", address)
     }
 }

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

@@ -23,7 +23,7 @@ class TestCardanoAddress {
         val key = PrivateKey("b0884d248cb301edd1b34cf626ba6d880bb3ae8fd91b4696446999dc4f0b5744309941d56938e943980d11643c535e046653ca6f498c014b88f2ad9fd6e71effbf36a8fa9f5e11eb7a852c41e185e3969d518e66e6893c81d3fc7227009952d4".toHexByteArray())
         val pubkey = key.publicKeyEd25519Extended
         val address = AnyAddress(pubkey, CoinType.CARDANO)
-        val expected = AnyAddress("Ae2tdPwUPEZ6RUCnjGHFqi59k5WZLiv3HoCCNGCW8SYc5H9srdTzn1bec4W", CoinType.CARDANO)
+        val expected = AnyAddress("addr1snpa4z7ntyfszv7ckquprdw75w4qjqh0qmya9jtkpxxlzxghlqyvv7l0yjamh8fxraw06p3ua8sj2g2gv98v4849s43t9g2999kquuu5egnprk", CoinType.CARDANO)
 
         assertEquals(pubkey.data().toHex(), "0x57fd54be7b38bb8952782c2f59aa276928a4dcbb66c8c62ce44f9d623ecd5a03bf36a8fa9f5e11eb7a852c41e185e3969d518e66e6893c81d3fc7227009952d4")
     }

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

@@ -1290,15 +1290,16 @@
         "symbol": "ADA",
         "decimals": 6,
         "blockchain": "Cardano",
-        "derivationPath": "m/44'/1815'/0'/0/0",
+        "derivationPath": "m/1852'/1815'/0'/0/0",
         "curve": "ed25519Extended",
         "publicKeyType": "ed25519Extended",
+        "hrp": "addr",
         "explorer": {
-            "url": "https://cardanoexplorer.com",
+            "url": "https://shelleyexplorer.cardano.org",
             "txPath": "/tx/",
             "accountPath": "/address/",
             "sampleTx": "b7a6c5cadab0f64bdc89c77ee4a351463aba5c33f2cef6bbd6542a74a90a3af3",
-            "sampleAccount": "DdzFFzCqrhstpwKc8WMvPwwBb5oabcTW9zc5ykA37wJR4tYQucvsR9dXb2kEGNXkFJz2PtrpzfRiZkx8R1iNo8NYqdsukVmv7EAybFwC"
+            "sampleAccount": "addr1s3xuxwfetyfe7q9u3rfn6je9stlvcgmj8rezd87qjjegdtxm3y3f2mgtn87mrny9r77gm09h6ecslh3gmarrvrp9n4yzmdnecfxyu59jz29g8j"
         },
         "info": {
             "url": "https://www.cardano.org",

coins.json

@@ -29,7 +29,7 @@ enum TWCoinType {
     TWCoinTypeBitcoinCash = 145,
     TWCoinTypeBravoCoin = 282,
     TWCoinTypeCallisto = 820,
-    TWCoinTypeCardano = 1815,
+    TWCoinTypeCardano = 1815, // Note: Cardano Shelley testnet uses purpose 1852 (not 44) 1852/1815
     TWCoinTypeCosmos = 118,
     TWCoinTypeDash = 5,
     TWCoinTypeDecred = 42,

include/TrustWalletCore/TWCardanoSigner.h

@@ -19,6 +19,7 @@ enum TWPurpose {
     TWPurposeBIP44 = 44,
     TWPurposeBIP49 = 49, // Derivation scheme for P2WPKH-nested-in-P2SH
     TWPurposeBIP84 = 84, // Derivation scheme for P2WPKH
+    TWPurposeBIP1852 = 1852, // Derivation scheme used by Cardano-Shelley
 };
 
 TW_EXTERN_C_END

include/TrustWalletCore/TWCoinType.h

@@ -110,7 +110,7 @@ std::pair<std::string, Data> Bech32::decode(const std::string& str) {
     if (lower && upper)
         ok = false;
     size_t pos = str.rfind('1');
-    if (ok && str.size() <= 90 && pos != str.npos && pos >= 1 && pos + 7 <= str.size()) {
+    if (ok && str.size() <= 120 && pos != str.npos && pos >= 1 && pos + 7 <= str.size()) {
         Data values;
         values.resize(str.size() - 1 - pos);
         for (size_t i = 0; i < str.size() - 1 - pos; ++i) {

include/TrustWalletCore/TWPurpose.h

@@ -4,7 +4,7 @@
 // terms governing use, modification, and redistribution, is contained in the
 // file LICENSE at the root of the source code distribution tree.
 
-#include "Address.h"
+#include "AddressV2.h"
 #include "../Cbor.h"
 #include "../Data.h"
 #include "../Base58.h"
@@ -18,7 +18,7 @@ using namespace TW;
 using namespace TW::Cardano;
 using namespace std;
 
-bool Address::parseAndCheck(const std::string& addr, Data& root_out, Data& attrs_out, byte& type_out) {
+bool AddressV2::parseAndCheck(const std::string& addr, Data& root_out, Data& attrs_out, byte& type_out) {
     // Decode Bas58, decode payload + crc, decode root, attr
     Data base58decoded = Base58::bitcoin.decode(addr);
     if (base58decoded.size() == 0) {
@@ -49,7 +49,7 @@ bool Address::parseAndCheck(const std::string& addr, Data& root_out, Data& attrs
     return true;
 }
 
-bool Address::isValid(const std::string& string) {
+bool AddressV2::isValid(const std::string& string) {
     try {
         Data root;
         Data attrs;
@@ -62,14 +62,14 @@ bool Address::isValid(const std::string& string) {
     }
 }
 
-Address::Address(const std::string& string) {
+AddressV2::AddressV2(const std::string& string) {
     if (!parseAndCheck(string, root, attrs, type)) {
         throw std::invalid_argument("Invalid address string");
     }
     // values stored
 }
 
-Address::Address(const PublicKey& publicKey) {
+AddressV2::AddressV2(const PublicKey& publicKey) {
     // input is extended pubkey, 64-byte
     if (publicKey.type != TWPublicKeyTypeED25519Extended) {
         throw std::invalid_argument("Invalid public key type");
@@ -81,7 +81,7 @@ Address::Address(const PublicKey& publicKey) {
     attrs = emptyMap.encoded();
 }
 
-Data Address::getCborData() const {
+Data AddressV2::getCborData() const {
     // put together string represenatation, CBOR representation
     // inner data: pubkey, attrs, type
     auto cbor1 = Cbor::Encode::array({
@@ -101,12 +101,12 @@ Data Address::getCborData() const {
     return cbor2.encoded();
 }
 
-string Address::string() const {
+string AddressV2::string() const {
     // Base58 encode the CBOR data
     return Base58::bitcoin.encode(getCborData());
 }
 
-Data Address::keyHash(const TW::Data& xpub) {
+Data AddressV2::keyHash(const TW::Data& xpub) {
     if (xpub.size() != 64) { throw invalid_argument("invalid xbub length"); }
     // hash of follwoing Cbor-array: [0, [0, xbub], {} ]
     // 3rd entry map is empty map for V2, contains derivation path for V1

src/Bech32.cpp

@@ -37,7 +37,7 @@ namespace TW::Cardano {
  */
 
 /// A Cardano address.  Type is 0 (public key).
-class Address {
+class AddressV2 {
   public:
     /// root key
     Data root;
@@ -54,10 +54,10 @@ class Address {
     static bool isValid(const std::string& string);
 
     /// Initializes a Cardano address with a string representation.  Throws if invalid.
-    explicit Address(const std::string& string);
+    explicit AddressV2(const std::string& string);
 
     /// Initializes a V2, public key type Cardano address from an extended public key.
-    explicit Address(const PublicKey& publicKey);
+    explicit AddressV2(const PublicKey& publicKey);
 
     /// Returns a string representation of the address.
     std::string string() const;
@@ -72,8 +72,13 @@ class Address {
     static bool parseAndCheck(const std::string& addr, TW::Data& root_out, TW::Data& attrs_out, TW::byte& type_out);
 };
 
-inline bool operator==(const Address& lhs, const Address& rhs) {
+inline bool operator==(const AddressV2& lhs, const AddressV2& rhs) {
     return lhs.root == rhs.root && lhs.attrs == rhs.attrs && lhs.type == rhs.type;
 }
 
 } // namespace TW::Cardano
+
+/// Wrapper for C interface.
+struct TWCardanoAddressV2 {
+    TW::Cardano::AddressV2 impl;
+};