Merge pull request #24 from cypherstack/staging

Add trusted node feature to Monero and Wownero

Author: julian-CStack

cw_core/lib/node.dart

@@ -19,7 +19,8 @@ class Node extends HiveObject with Keyable {
       required WalletType type,
       this.login,
       this.password,
-      this.useSSL}) {
+      this.useSSL,
+      this.trusted = false}) {
     uriRaw = uri;
     this.type = type;
   }
@@ -29,7 +30,8 @@ class Node extends HiveObject with Keyable {
         login = map['login'] as String?,
         password = map['password'] as String?,
         typeRaw = map['typeRaw'] as int?,
-        useSSL = map['useSSL'] as bool?;
+        useSSL = map['useSSL'] as bool?,
+        trusted = map['trusted'] as bool? ?? false;
 
   static const typeId = 1;
   static const boxName = 'Nodes';
@@ -49,6 +51,9 @@ class Node extends HiveObject with Keyable {
   @HiveField(4)
   bool? useSSL;
 
+  @HiveField(5)
+  bool trusted;
+
   bool get isSSL => useSSL ?? false;
 
   Uri? get uri {

cw_monero/ios/Classes/monero_api.cpp

@@ -795,6 +795,16 @@ extern "C"
         return strdup(get_current_wallet()->getSubaddressLabel(accountIndex, addressIndex).c_str());
     }
 
+    void set_trusted_daemon(bool arg)
+    {
+        m_wallet->setTrustedDaemon(arg);
+    }
+
+    bool trusted_daemon()
+    {
+        return m_wallet->trustedDaemon();
+    }
+
     bool validate_address(char *address)
     {
         return get_current_wallet()->addressValid(std::string(address), 0); // TODO fix like by making the command below work or by otherwise detecting nettype

cw_monero/ios/Classes/monero_api.h

@@ -30,6 +30,9 @@ void set_refresh_from_block_height(uint64_t height);
 void set_recovering_from_seed(bool is_recovery);
 void store(char *path);
 
+void set_trusted_daemon(bool arg);
+bool trusted_daemon();
+
 bool validate_address(char *address);
 
 #ifdef __cplusplus

cw_monero/lib/api/signatures.dart

@@ -137,5 +137,8 @@ typedef rescan_blockchain = Void Function();
 typedef get_subaddress_label = Pointer<Utf8> Function(
     Int32 accountIndex, Int32 addressIndex);
 
-typedef validate_address = Int8 Function(
-    Pointer<Utf8> address);
+typedef set_trusted_daemon = Void Function(Int8 trusted);
+
+typedef trusted_daemon = Int8 Function();
+
+typedef validate_address = Int8 Function(Pointer<Utf8> address);

cw_monero/lib/api/types.dart

@@ -136,4 +136,8 @@ typedef RescanBlockchainAsync = void Function();
 typedef GetSubaddressLabel = Pointer<Utf8> Function(
     int accountIndex, int addressIndex);
 
+typedef SetTrustedDaemon = void Function(int);
+
+typedef TrustedDaemon = int Function();
+
 typedef ValidateAddress = int Function(Pointer<Utf8> address);

cw_monero/lib/api/wallet.dart

@@ -123,6 +123,14 @@ final getSubaddressLabelNative = moneroApi
     .lookup<NativeFunction<get_subaddress_label>>('get_subaddress_label')
     .asFunction<GetSubaddressLabel>();
 
+final setTrustedDaemonNative = moneroApi
+    .lookup<NativeFunction<set_trusted_daemon>>('set_trusted_daemon')
+    .asFunction<SetTrustedDaemon>();
+
+final trustedDaemonNative = moneroApi
+    .lookup<NativeFunction<trusted_daemon>>('trusted_daemon')
+    .asFunction<TrustedDaemon>();
+
 final validateAddressNative = moneroApi
     .lookup<NativeFunction<validate_address>>('validate_address')
     .asFunction<ValidateAddress>();
@@ -394,6 +402,11 @@ String getSubaddressLabel(int accountIndex, int addressIndex) {
       pointer: getSubaddressLabelNative(accountIndex, addressIndex));
 }
 
+Future setTrustedDaemon(bool trusted) async =>
+    setTrustedDaemonNative(_boolToInt(trusted));
+
+Future<bool> trustedDaemon() async => trustedDaemonNative() != 0;
+
 bool validateAddress(String address) {
   final addressPointer = address.toNativeUtf8();
   final valid = validateAddressNative(addressPointer) != 0;

cw_monero/lib/monero_wallet.dart

@@ -145,6 +145,8 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
           password: node.password,
           useSSL: node.isSSL,
           isLightWallet: false); // FIXME: hardcoded value
+
+      monero_wallet.setTrustedDaemon(node.trusted);
       syncStatus = ConnectedSyncStatus();
       syncStatusChanged?.call();
     } catch (e) {

cw_wownero/ios/Classes/wownero_api.cpp

@@ -886,6 +886,16 @@ extern "C"
         return strdup(get_current_wallet()->getSubaddressLabel(accountIndex, addressIndex).c_str());
     }
 
+    void set_trusted_daemon(bool arg)
+    {
+        m_wallet->setTrustedDaemon(arg);
+    }
+
+    bool trusted_daemon()
+    {
+        return m_wallet->trustedDaemon();
+    }
+
     bool validate_address(char *address)
     {
         return get_current_wallet()->addressValid(std::string(address), 0); // TODO fix like by making the command below work or by otherwise detecting nettype

cw_wownero/ios/Classes/wownero_api.h

@@ -32,6 +32,9 @@ void set_refresh_from_block_height(uint64_t height);
 void set_recovering_from_seed(bool is_recovery);
 void store(char *path);
 
+void set_trusted_daemon(bool arg);
+bool trusted_daemon();
+
 bool validate_address(char *address);
 
 #ifdef __cplusplus

cw_wownero/lib/api/signatures.dart

@@ -145,6 +145,8 @@ typedef rescan_blockchain = Void Function();
 typedef get_subaddress_label = Pointer<Utf8> Function(
     Int32 accountIndex, Int32 addressIndex);
 
-typedef validate_address = Int8 Function(
-    Pointer<Utf8> address);
+typedef set_trusted_daemon = Void Function(Int8 trusted);
 
+typedef trusted_daemon = Int8 Function();
+
+typedef validate_address = Int8 Function(Pointer<Utf8> address);