Update to 2.6.5

Author: paulo-bc

TrustWalletCore.xcodeproj/project.pbxproj

@@ -23,14 +23,6 @@ extern TWString *_Nonnull TWAnySignerSignJSON(TWString *_Nonnull json, TWData *_
 
 extern bool TWAnySignerSupportsJSON(enum TWCoinType coin);
 
-/// Encodes serialized SigningInput data to raw platform/coin specific bytes
-/// Example: EthereumSigningInput will be encoded as raw RLP bytes which can be sent over JSONRPC (eth_sendRawTransaction)
-extern TWData *_Nonnull TWAnySignerEncode(TWData *_Nonnull input, enum TWCoinType coin);
-
-/// Decodes raw platform/coin specific bytes to representable json data
-/// Example: Ethereum RLP bytes will be decoded into same json returned from JSONRPC (eth_getTransactionByHash)
-extern TWData *_Nonnull TWAnySignerDecode(TWData *_Nonnull input, enum TWCoinType coin);
-
 /// Plan a transaction (for UTXO chains).
 extern TWData *_Nonnull TWAnySignerPlan(TWData *_Nonnull input, enum TWCoinType coin);
 

wallet-core/build/ios/libCore.a

@@ -14,7 +14,6 @@ TW_EXPORT_ENUM(uint32_t)
 enum TWBlockchain {
     TWBlockchainBitcoin = 0,
     TWBlockchainEthereum = 1,
-    TWBlockchainWanchain = 2,
     TWBlockchainVechain = 3,
     TWBlockchainTron = 4,
     TWBlockchainIcon = 5,

wallet-core/build/ios/libTrezorCrypto.a

@@ -85,6 +85,7 @@ enum TWCoinType {
     TWCoinTypeSmartChainLegacy = 10000714,
     TWCoinTypeSmartChain = 20000714,
     TWCoinTypeOasis = 474,
+    TWCoinTypePolygon = 966,
 };
 
 /// Returns the blockchain for a coin type.
@@ -109,21 +110,21 @@ enum TWHDVersion TWCoinTypeXprvVersion(enum TWCoinType coin);
 
 /// Validates an address string.
 TW_EXPORT_METHOD
-bool TWCoinTypeValidate(enum TWCoinType coin, TWString *_Nonnull address);
+bool TWCoinTypeValidate(enum TWCoinType coin, TWString* _Nonnull address);
 
 /// Returns the default derivation path for a particular coin.
 TW_EXPORT_METHOD
-TWString *_Nonnull TWCoinTypeDerivationPath(enum TWCoinType coin);
+TWString* _Nonnull TWCoinTypeDerivationPath(enum TWCoinType coin);
 
 /// Derives the address for a particular coin from the private key.
 TW_EXPORT_METHOD
-TWString *_Nonnull TWCoinTypeDeriveAddress(enum TWCoinType coin,
-                                           struct TWPrivateKey *_Nonnull privateKey);
+TWString* _Nonnull TWCoinTypeDeriveAddress(enum TWCoinType coin,
+                                           struct TWPrivateKey* _Nonnull privateKey);
 
 /// Derives the address for a particular coin from the public key.
 TW_EXPORT_METHOD
-TWString *_Nonnull TWCoinTypeDeriveAddressFromPublicKey(enum TWCoinType coin,
-                                                        struct TWPublicKey *_Nonnull publicKey);
+TWString* _Nonnull TWCoinTypeDeriveAddressFromPublicKey(enum TWCoinType coin,
+                                                        struct TWPublicKey* _Nonnull publicKey);
 
 /// HRP for this coin type
 TW_EXPORT_PROPERTY

wallet-core/build/ios/libprotobuf.a

@@ -0,0 +1,12 @@
+// 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.
+//
+// This is a GENERATED FILE, changes made here WILL BE LOST.
+
+#pragma once
+
+#include "TWData.h"
+

wallet-core/include/TrustWalletCore/TWAnySigner.h

@@ -22,6 +22,8 @@ enum TWEthereumChainID {
     TWEthereumChainIDThunderToken = 108,
     TWEthereumChainIDTomoChain = 88,
     TWEthereumChainIDBinanceSmartChain = 56,
+    TWEthereumChainIDMatic = 137,
+    TWEthereumChainIDWanchain = 888,
 };
 
 TW_EXTERN_C_END

wallet-core/include/TrustWalletCore/TWBlockchain.h

@@ -1,4 +1,4 @@
-// Copyright © 2017-2020 Trust Wallet.
+// Copyright © 2017-2021 Trust Wallet.
 //
 // This file is part of Trust. The full Trust copyright notice, including
 // terms governing use, modification, and redistribution, is contained in the
@@ -21,7 +21,7 @@ TW_EXTERN_C_BEGIN
 TW_EXPORT_CLASS
 struct TWHDWallet;
 
-/// Determines if a mnemonic phrase is valid.
+/// Deprecated; use TWMnemonicIsValid().  Determines if a mnemonic phrase is valid.
 TW_EXPORT_STATIC_METHOD
 bool TWHDWalletIsValid(TWString *_Nonnull mnemonic);
 

wallet-core/include/TrustWalletCore/TWCoinType.h

@@ -0,0 +1,29 @@
+// Copyright © 2017-2021 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 "TWString.h"
+
+TW_EXTERN_C_BEGIN
+
+TW_EXPORT_CLASS
+struct TWMnemonic;
+
+/// Determines whether a mnemonic phrase is valid.
+TW_EXPORT_STATIC_METHOD
+bool TWMnemonicIsValid(TWString *_Nonnull mnemonic);
+
+/// Determines whether word is a valid menemonic word.
+TW_EXPORT_STATIC_METHOD
+bool TWMnemonicIsValidWord(TWString *_Nonnull word);
+
+/// Return BIP39 English words that match the given prefix.  A single string is returned, with space-separated list of words.
+TW_EXPORT_STATIC_METHOD
+TWString* _Nonnull TWMnemonicSuggest(TWString *_Nonnull prefix);
+
+TW_EXTERN_C_END

wallet-core/include/TrustWalletCore/TWCommonProto.h

@@ -60,6 +60,11 @@ struct TWPublicKey *_Nonnull TWPrivateKeyGetPublicKeyEd25519Extended(struct TWPr
 TW_EXPORT_METHOD
 struct TWPublicKey *_Nonnull TWPrivateKeyGetPublicKeyCurve25519(struct TWPrivateKey *_Nonnull pk);
 
+/// Computes an EC Diffie-Hellman secret in constant time
+/// Supported curves: secp256k1
+TW_EXPORT_METHOD
+TWData *_Nullable TWPrivateKeyGetSharedKey(const struct TWPrivateKey *_Nonnull pk, const struct TWPublicKey *_Nonnull publicKey, enum TWCurve curve);
+
 /// Signs a digest using ECDSA and given curve.
 TW_EXPORT_METHOD
 TWData *_Nullable TWPrivateKeySign(struct TWPrivateKey *_Nonnull pk, TWData *_Nonnull digest, enum TWCurve curve);

wallet-core/include/TrustWalletCore/TWEthereumChainID.h

@@ -34,7 +34,7 @@ size_t TWStringSize(TWString *_Nonnull string);
 /// Returns the byte at the provided index.
 char TWStringGet(TWString *_Nonnull string, size_t index);
 
-/// Returns the raw pointer to the string's UTF8 bytes.
+/// Returns the raw pointer to the string's UTF8 bytes (null-terminated).
 const char *_Nonnull TWStringUTF8Bytes(TWString *_Nonnull string);
 
 /// Deletes a string created with a `TWStringCreate*` method.  After delete it must not be used (can segfault)!

wallet-core/include/TrustWalletCore/TWHDWallet.h

@@ -41,30 +41,6 @@ public final class AnySigner {
         return TWStringNSString(TWAnySignerSignJSON(jsonString, keyData, TWCoinType(rawValue: coin.rawValue)))
     }
 
-    public static func encode(input: SigningInput, coin: CoinType) -> Data {
-        do {
-            return nativeEncode(data: try input.serializedData(), coin: coin)
-        } catch let error {
-            fatalError(error.localizedDescription)
-        }
-    }
-
-    public static func nativeEncode(data: Data, coin: CoinType) -> Data {
-        let inputData = TWDataCreateWithNSData(data)
-        defer {
-            TWDataDelete(inputData)
-        }
-        return TWDataNSData(TWAnySignerEncode(inputData, TWCoinType(rawValue: coin.rawValue)))
-    }
-
-    public static func decode(data: Data, coin: CoinType) -> Data {
-        let inputData = TWDataCreateWithNSData(data)
-        defer {
-            TWDataDelete(inputData)
-        }
-        return TWDataNSData(TWAnySignerDecode(inputData, TWCoinType(rawValue: coin.rawValue)))
-    }
-
     public static func plan<TransactionPlan: Message>(input: SigningInput, coin: CoinType) -> TransactionPlan {
         do {
             let outputData = nativePlan(data: try input.serializedData(), coin: coin)

wallet-core/include/TrustWalletCore/TWMnemonic.h

@@ -0,0 +1,26 @@
+// Copyright © 2017-2021 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 Foundation
+
+public extension Mnemonic {
+    typealias ValidationResult = (word: String, index: Int)
+
+    /// Returns mnemonic validation result, an array of wrong word and index tuple
+    static func validate(mnemonic: [String]) -> [ValidationResult] {
+        mnemonic.enumerated().compactMap { (index, word) -> ValidationResult? in
+            if isValidWord(word: word) {
+                return nil
+            }
+            return (word, index)
+        }
+    }
+
+    /// Returns matched suggestion in a native array
+    static func search(prefix: String) -> [String] {
+        return suggest(prefix: prefix).split(separator: " ").map { String($0) }
+    }
+}

wallet-core/include/TrustWalletCore/TWPrivateKey.h

@@ -10,7 +10,6 @@
 public enum Blockchain: UInt32, CaseIterable {
     case bitcoin = 0
     case ethereum = 1
-    case wanchain = 2
     case vechain = 3
     case tron = 4
     case icon = 5

wallet-core/include/TrustWalletCore/TWString.h

@@ -71,4 +71,5 @@ public enum CoinType: UInt32, CaseIterable {
     case smartChainLegacy = 10000714
     case smartChain = 20000714
     case oasis = 474
+    case polygon = 966
 }

wallet-core/swift/Sources/AnySigner.swift

@@ -17,4 +17,6 @@ public enum EthereumChainID: UInt32, CaseIterable {
     case thunderToken = 108
     case tomoChain = 88
     case binanceSmartChain = 56
+    case matic = 137
+    case wanchain = 888
 }

wallet-core/swift/Sources/Extensions/Mnemonic+Extension.swift

@@ -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.
+//
+// This is a GENERATED FILE, changes made here WILL BE LOST.
+//
+
+import Foundation
+
+public final class Mnemonic {
+
+    public static func isValid(mnemonic: String) -> Bool {
+        let mnemonicString = TWStringCreateWithNSString(mnemonic)
+        defer {
+            TWStringDelete(mnemonicString)
+        }
+        return TWMnemonicIsValid(mnemonicString)
+    }
+
+    public static func isValidWord(word: String) -> Bool {
+        let wordString = TWStringCreateWithNSString(word)
+        defer {
+            TWStringDelete(wordString)
+        }
+        return TWMnemonicIsValidWord(wordString)
+    }
+
+    public static func suggest(prefix: String) -> String {
+        let prefixString = TWStringCreateWithNSString(prefix)
+        defer {
+            TWStringDelete(prefixString)
+        }
+        return TWStringNSString(TWMnemonicSuggest(prefixString))
+    }
+
+    let rawValue: OpaquePointer
+
+    init(rawValue: OpaquePointer) {
+        self.rawValue = rawValue
+    }
+
+
+}

wallet-core/swift/Sources/Generated/Enums/Blockchain.swift

@@ -79,6 +79,13 @@ public final class PrivateKey {
         return PublicKey(rawValue: TWPrivateKeyGetPublicKeyCurve25519(rawValue))
     }
 
+    public func getSharedKey(publicKey: PublicKey, curve: Curve) -> Data? {
+        guard let result = TWPrivateKeyGetSharedKey(rawValue, publicKey.rawValue, TWCurve(rawValue: curve.rawValue)) else {
+            return nil
+        }
+        return TWDataNSData(result)
+    }
+
     public func sign(digest: Data, curve: Curve) -> Data? {
         let digestData = TWDataCreateWithNSData(digest)
         defer {

wallet-core/swift/Sources/Generated/Enums/CoinType.swift

@@ -246,8 +246,8 @@ public struct TW_Bitcoin_Proto_TransactionPlan {
   /// Zcash branch id
   public var branchID: Data = Data()
 
-  /// Optional error message
-  public var error: String = String()
+  /// Optional error
+  public var error: TW_Common_Proto_SigningError = .ok
 
   public var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -276,8 +276,8 @@ public struct TW_Bitcoin_Proto_SigningOutput {
   /// Transaction id
   public var transactionID: String = String()
 
-  /// Optional error message
-  public var error: String = String()
+  /// Optional error
+  public var error: TW_Common_Proto_SigningError = .ok
 
   public var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -678,7 +678,7 @@ extension TW_Bitcoin_Proto_TransactionPlan: SwiftProtobuf.Message, SwiftProtobuf
       case 4: try { try decoder.decodeSingularInt64Field(value: &self.change) }()
       case 5: try { try decoder.decodeRepeatedMessageField(value: &self.utxos) }()
       case 6: try { try decoder.decodeSingularBytesField(value: &self.branchID) }()
-      case 7: try { try decoder.decodeSingularStringField(value: &self.error) }()
+      case 7: try { try decoder.decodeSingularEnumField(value: &self.error) }()
       default: break
       }
     }
@@ -703,8 +703,8 @@ extension TW_Bitcoin_Proto_TransactionPlan: SwiftProtobuf.Message, SwiftProtobuf
     if !self.branchID.isEmpty {
       try visitor.visitSingularBytesField(value: self.branchID, fieldNumber: 6)
     }
-    if !self.error.isEmpty {
-      try visitor.visitSingularStringField(value: self.error, fieldNumber: 7)
+    if self.error != .ok {
+      try visitor.visitSingularEnumField(value: self.error, fieldNumber: 7)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -740,7 +740,7 @@ extension TW_Bitcoin_Proto_SigningOutput: SwiftProtobuf.Message, SwiftProtobuf._
       case 1: try { try decoder.decodeSingularMessageField(value: &self._transaction) }()
       case 2: try { try decoder.decodeSingularBytesField(value: &self.encoded) }()
       case 3: try { try decoder.decodeSingularStringField(value: &self.transactionID) }()
-      case 4: try { try decoder.decodeSingularStringField(value: &self.error) }()
+      case 4: try { try decoder.decodeSingularEnumField(value: &self.error) }()
       default: break
       }
     }
@@ -756,8 +756,8 @@ extension TW_Bitcoin_Proto_SigningOutput: SwiftProtobuf.Message, SwiftProtobuf._
     if !self.transactionID.isEmpty {
       try visitor.visitSingularStringField(value: self.transactionID, fieldNumber: 3)
     }
-    if !self.error.isEmpty {
-      try visitor.visitSingularStringField(value: self.error, fieldNumber: 4)
+    if self.error != .ok {
+      try visitor.visitSingularEnumField(value: self.error, fieldNumber: 4)
     }
     try unknownFields.traverse(visitor: &visitor)
   }

wallet-core/swift/Sources/Generated/Enums/EthereumChainID.swift

@@ -0,0 +1,6 @@
+// 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.
+