Dgld 2

.gitignore

@@ -8,6 +8,8 @@ xcode/
 cmake-build-debug/
 .cquery_cache/
 .cxx/
+CMakeCache.txt
+CMakeFiles/
 
 # Dependencies
 node_modules

CMakeLists.txt

@@ -4,7 +4,11 @@ project(TrustWalletCore)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+if(ANDROID)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++")
+endif()
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
@@ -18,6 +22,7 @@ else()
     set(PREFIX "$ENV{PREFIX}")
 endif()
 
+
 include_directories(${PREFIX}/include)
 link_directories(${PREFIX}/lib)
 
@@ -88,3 +93,19 @@ if(NOT ANDROID AND NOT IOS_PLATFORM AND NOT WASM)
 endif()
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/swift/cpp.xcconfig.in ${CMAKE_CURRENT_SOURCE_DIR}/swift/cpp.xcconfig @ONLY)
+
+if(ANDROID)
+    # Workaround: <https://developercommunity.visualstudio.com/content/problem/171290/android-ndk-include-paths-are-incorrect.html>
+    include_directories(BEFORE SYSTEM
+        $ENV{NDK_DIR}/sources/android/support/include
+        $ENV{NDK_DIR}/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8/include # stddef.h
+        $ENV{NDK_DIR}/sysroot/usr/include
+        $ENV{NDK_DIR}/sources/cxx-stl/llvm-libc++abi/include
+        $ENV{NDK_DIR}/sources/cxx-stl/llvm-libc++/include
+    )
+else()
+    include_directories(BEFORE SYSTEM
+        /usr/include/x86_64-linux-gnu/c++/7.5.0
+        /usr/include/c++/7.5.0
+    )
+endif()

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

@@ -0,0 +1,33 @@
+// Copyright © 2017-2020 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.
+
+package com.trustwallet.core.app.blockchains.digitalgold
+
+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.*
+
+class TestDigitalGoldAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        // TODO: Check and finalize implementation
+
+        val key = PrivateKey("__PRIVATE_KEY_DATA__".toHexByteArray())
+        val pubkey = key.publicKeyEd25519
+        val address = AnyAddress(pubkey, CoinType.DIGITALGOLD)
+        val expected = AnyAddress("__EXPECTED_RESULT_ADDRESS__", CoinType.DIGITALGOLD)
+
+        assertEquals(pubkey.data().toHex(), "0x__EXPECTED_PUBKEY_DATA__")
+        assertEquals(address.description(), expected.description())
+    }
+}

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

@@ -0,0 +1,45 @@
+// Copyright © 2017-2020 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.
+
+package com.trustwallet.core.app.blockchains.digitalgold
+
+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.toHexBytes
+import com.trustwallet.core.app.utils.toHexBytesInByteString
+import junit.framework.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.BitcoinSigner
+import wallet.core.jni.proto.Bitcoin
+
+class TestDigitalGoldSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun DigitalGoldTransactionSigning() {
+        // TODO: Finalize implementation
+
+        //val transfer = DigitalGold.TransferMessage.newBuilder()
+        //    .setTo("...")
+        //    .setAmount(...)
+        //    ...
+        //    .build()
+        //val signingInput = DigitalGold.SigningInput.newBuilder()
+        //    ...
+        //    .build()
+
+        //val output: DigitalGold.SigningOutput = DigitalGoldSigner.sign(signingInput)
+
+        //assertEquals(
+        //    "__EXPECTED_RESULT_DATA__",
+        //    Numeric.toHexString(output.encoded.toByteArray())
+        //)
+    }
+}

bootstrap.sh

@@ -10,7 +10,7 @@ echo "#### Generating files... ####"
 tools/generate-files
 
 echo "#### Building... ####"
-cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Debug
+cmake . -Bbuild -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
 make -Cbuild -j12 tests TrezorCryptoTests
 
 if [ -x "$(command -v clang-tidy)" ]; then

cmake/Protobuf.cmake

@@ -1,5 +1,5 @@
-set(protobuf_SOURCE_DIR ${CMAKE_SOURCE_DIR}/wallet-core/build/local/src/protobuf/protobuf-3.9.0)
-set(protobuf_source_dir ${CMAKE_SOURCE_DIR}/wallet-core/build/local/src/protobuf/protobuf-3.9.0)
+set(protobuf_SOURCE_DIR ${CMAKE_SOURCE_DIR}/build/local/src/protobuf/protobuf-3.9.0)
+set(protobuf_source_dir ${CMAKE_SOURCE_DIR}/build/local/src/protobuf/protobuf-3.9.0)
 
 # Updated from https://github.com/protocolbuffers/protobuf/blob/master/cmake/libprotopuf.cmake
 

coins.json

@@ -1380,5 +1380,41 @@
             "clientPublic": "https://api.elrond.com",
             "clientDocs": "https://docs.elrond.com"
         }
+    },
+    {
+        "id": "dgld",
+        "name": "DigitalGold",
+        "symbol": "DGLD",
+        "decimals": 8,
+        "blockchain": "Bitcoin",
+        "derivationPath": "m/44'/452'/0'/0/0",
+        "curve": "secp256k1",
+        "publicKeyType": "secp256k1",
+        "p2pkhPrefix": 38,
+        "p2shPrefix": 97,
+        "hrp": "bc",
+        "publicKeyHasher": "sha256ripemd",
+        "base58Hasher": "sha256d",
+        "xpub": "zpub",
+        "xprv": "zprv",
+        "explorer": {
+            "url": "https://explorer.dgld.ch",
+            "txPath": "/tx/",
+            "accountPath": "/address/",
+            "sampleTx": "68e203d1837aad907f4c09b22835e78304a7ae5c4268d0c2487958e3a1858b6e",
+            "sampleAccount": "g3X4Jwf9WLuBqET7tr2bCkDX3A2FGBrUm8"
+        },
+        "info": {
+            "url": "https://dgld.ch/",
+            "client": "https://github.com/goldtokensa/ocean-wallet/releases",
+            "clientPublic": "",
+            "clientDocs": "https://github.com/goldtokensa/ocean-wallet/releases"
+        }
     }
 ]
+
+
+
+
+
+

docs/coins.md

@@ -39,6 +39,7 @@ This list is generated from [./coins.json](../coins.json)
 | 397     | NEAR             | NEAR   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/near/info/logo.png" width="32" />         | <https://nearprotocol.com>    |
 | 425     | Aion             | AION   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/aion/info/logo.png" width="32" />         | <https://aion.network>        |
 | 434     | Kusama           | KSM    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/kusama/info/logo.png" width="32" />       | <https://kusama.network>      |
+| 452     | DigitalGold      | DGLD   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/dgld/info/logo.png" width="32" />         | <https://dgld.ch/>            |
 | 457     | Aeternity        | AE     | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/aeternity/info/logo.png" width="32" />    | <https://aeternity.com>       |
 | 459     | Kava             | KAVA   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/kava/info/logo.png" width="32" />         | <https://kava.io>             |
 | 461     | Filecoin         | FIL    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/filecoin/info/logo.png" width="32" />     | <https://filecoin.io/>        |

include/TrustWalletCore/TWCoinType.h

@@ -81,6 +81,7 @@ enum TWCoinType {
     TWCoinTypePolkadot = 354,
     TWCoinTypeFilecoin = 461,
     TWCoinTypeElrond = 508,
+    TWCoinTypeDigitalGold = 452,
 };
 
 /// Returns the blockchain for a coin type.

src/Base58.cpp

@@ -11,6 +11,7 @@
 
 #include <algorithm>
 #include <cctype>
+#include <cassert>
 
 using namespace TW;
 
@@ -77,7 +78,7 @@ Data Base58::decode(const char* begin, const char* end) const {
     auto it = begin;
 
     // Skip leading spaces.
-    it = std::find_if_not(it, end, std::isspace);
+    it = std::find_if_not(it, end, [](unsigned char ch) -> bool { return std::isspace(ch); });
 
     // Skip and count leading zeros.
     std::size_t zeroes = 0;
@@ -118,7 +119,7 @@ Data Base58::decode(const char* begin, const char* end) const {
     }
 
     // Skip trailing spaces.
-    it = std::find_if_not(it, end, std::isspace);
+    it = std::find_if_not(it, end, [](unsigned char ch) -> bool { return std::isspace(ch); });
     if (it != end) {
         // Extra charaters at the end
         return {};

src/Base58Address.h

@@ -26,10 +26,13 @@ class Base58Address {
     std::array<byte, size> bytes;
 
     /// Determines whether a collection of bytes makes a valid  address.
-    template <typename T>
-    static bool isValid(const T& data) {
+    static bool isValid(const Data& data) {
         return data.size() == size;
     }
+    /*template <typename T>
+    static bool isValid(const T& data) {
+        return data.size() == size;
+    }*/
 
     /// Determines whether a string makes a valid address.
     static bool isValid(const std::string& string) {

src/BinaryCoding.h

@@ -12,6 +12,7 @@
 #include <cstdint>
 #include <vector>
 #include <string>
+#include <tuple>
 
 namespace TW {
 

src/Bitcoin/Entry.cpp

@@ -22,6 +22,7 @@ bool Entry::validateAddress(TWCoinType coin, const string& address, TW::byte p2p
         case TWCoinTypeMonacoin:
         case TWCoinTypeQtum:
         case TWCoinTypeViacoin:
+        case TWCoinTypeDigitalGold:
         case TWCoinTypeBitcoinGold:
             return SegwitAddress::isValid(address, hrp)
                 || Address::isValid(address, {{p2pkh}, {p2sh}});
@@ -73,6 +74,7 @@ string Entry::deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byt
         case TWCoinTypeQtum:
         case TWCoinTypeRavencoin:
         case TWCoinTypeZcoin:
+        case TWCoinTypeDigitalGold:
         default:
             return Address(publicKey, p2pkh).string();
     }

src/Bitcoin/Entry.h

@@ -28,6 +28,7 @@ class Entry: public CoinEntry {
             TWCoinTypeRavencoin,
             TWCoinTypeViacoin,
             TWCoinTypeZcoin,
+            TWCoinTypeDigitalGold,
         };
     }
     virtual bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;

src/Bitcoin/Script.h

@@ -13,6 +13,7 @@
 
 #include <string>
 #include <vector>
+#include <cassert>
 
 namespace TW::Bitcoin {
 

src/Data.h

@@ -28,6 +28,10 @@ inline Data data(const byte* data, size_t size) {
     return std::vector<byte>(data, data + size);
 }
 
+inline Data data(byte b) {
+    return std::vector<byte>({b});
+}
+
 inline void append(Data& data, const Data& suffix) {
     data.insert(data.end(), suffix.begin(), suffix.end());
 }

src/Encrypt.cpp

@@ -8,6 +8,7 @@
 #include "Data.h"
 #include <TrezorCrypto/aes.h>
 #include <cassert>
+#include <cstring>
 
 namespace TW::Encrypt {
 

src/Filecoin/Address.cpp

@@ -9,6 +9,8 @@
 #include "../Base32.h"
 #include "../Data.h"
 
+#include <cstring>
+
 using namespace TW;
 using namespace TW::Filecoin;
 

src/HDWallet.cpp

@@ -18,6 +18,7 @@
 #include <TrustWalletCore/TWHRP.h>
 
 #include <array>
+#include <cstring>
 
 using namespace TW;
 

src/NEO/ReadData.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <cctype>
+#include <climits>
 
 #include "../Data.h"
 #include "../BinaryCoding.h"

src/Nebulas/Address.cpp

@@ -8,6 +8,7 @@
 #include "../Base58.h"
 #include "../Hash.h"
 #include "../HexCoding.h"
+#include <cstring>
 
 using namespace TW::Nebulas;
 

src/Waves/Address.cpp

@@ -13,6 +13,7 @@
 #include <HexCoding.h>
 #include <cassert>
 #include <stdexcept>
+#include <cstring>
 
 using namespace TW;
 using namespace TW::Waves;

src/interface/TWStoredKey.cpp

@@ -14,6 +14,7 @@
 #include <stdexcept>
 #include <cassert>
 
+
 using namespace TW::Keystore;
 
 struct TWStoredKey* _Nullable TWStoredKeyLoad(TWString* _Nonnull path) {

swift/Tests/Blockchains/DigitalGoldTests.swift

@@ -0,0 +1,28 @@
+// Copyright © 2017-2020 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.
+
+import TrustWalletCore
+import XCTest
+
+class DigitalGoldTests: XCTestCase {
+    // TODO: Check and finalize implementation
+
+    func testAddress() {
+        // TODO: Check and finalize implementation
+
+        let key = PrivateKey(data: Data(hexString: "__PRIVATE_KEY_DATA__")!)!
+        let pubkey = key.getPublicKeyEd25519()
+        let address = AnyAddress(publicKey: pubkey, coin: .digitalgold)
+        let addressFromString = AnyAddress(string: "__ADDRESS_DATA__", coin: .digitalgold)!
+
+        XCTAssertEqual(pubkey.data.hexString, "__EXPECTED_PUBKEY_DATA__")
+        XCTAssertEqual(address.description, addressFromString.description)
+    }
+
+    func testSign() {
+        // TODO: Create implementation
+    }
+}

tests/CMakeLists.txt

@@ -6,7 +6,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 
 # Add googletest directly to our build. This defines
 # the gtest and gtest_main targets.
-add_subdirectory(${CMAKE_SOURCE_DIR}/wallet-core/build/local/src/gtest/googletest-release-1.8.1
+add_subdirectory(${CMAKE_SOURCE_DIR}/build/local/src/gtest/googletest-release-1.8.1
                  ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
                  EXCLUDE_FROM_ALL)