fix conflicts

Author: AlaaElattar

.dart_tool/package_config.json

@@ -171,9 +171,9 @@
     },
     {
       "name": "file",
-      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/file-7.0.0",
+      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/file-6.1.4",
       "packageUri": "lib/",
-      "languageVersion": "3.0"
+      "languageVersion": "2.12"
     },
     {
       "name": "fixnum",
@@ -219,9 +219,9 @@
     },
     {
       "name": "http",
-      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/http-1.2.1",
+      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/http-1.2.0",
       "packageUri": "lib/",
-      "languageVersion": "3.3"
+      "languageVersion": "3.2"
     },
     {
       "name": "http_multi_server",
@@ -285,9 +285,9 @@
     },
     {
       "name": "melos",
-      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/melos-4.1.0",
+      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/melos-3.4.0",
       "packageUri": "lib/",
-      "languageVersion": "3.0"
+      "languageVersion": "2.18"
     },
     {
       "name": "merlin",
@@ -309,7 +309,7 @@
     },
     {
       "name": "moment_dart",
-      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/moment_dart-2.0.2",
+      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/moment_dart-2.1.0",
       "packageUri": "lib/",
       "languageVersion": "2.19"
     },
@@ -381,9 +381,9 @@
     },
     {
       "name": "process",
-      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/process-5.0.2",
+      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/process-4.2.4",
       "packageUri": "lib/",
-      "languageVersion": "3.0"
+      "languageVersion": "2.14"
     },
     {
       "name": "prompts",
@@ -405,7 +405,7 @@
     },
     {
       "name": "pub_updater",
-      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/pub_updater-0.4.0",
+      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/pub_updater-0.3.1",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
@@ -433,12 +433,24 @@
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
+    {
+      "name": "ristretto255",
+      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/ristretto255-1.0.2",
+      "packageUri": "lib/",
+      "languageVersion": "3.0"
+    },
     {
       "name": "rmb_client",
       "rootUri": "../packages/rmb_client",
       "packageUri": "lib/",
       "languageVersion": "3.2"
     },
+    {
+      "name": "secp256k1_ecdsa",
+      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/secp256k1_ecdsa-0.4.0",
+      "packageUri": "lib/",
+      "languageVersion": "3.0"
+    },
     {
       "name": "shelf",
       "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/shelf-1.4.1",
@@ -615,9 +627,9 @@
     },
     {
       "name": "web",
-      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/web-0.5.1",
+      "rootUri": "file:///home/alaa/.pub-cache/hosted/pub.dev/web-0.4.2",
       "packageUri": "lib/",
-      "languageVersion": "3.3"
+      "languageVersion": "3.2"
     },
     {
       "name": "web_socket_channel",
@@ -656,7 +668,8 @@
       "languageVersion": "3.2"
     }
   ],
-  "generated": "2024-01-10T13:39:16.827881Z",
+  "generated": "2024-06-01T17:42:48.645343Z",
   "generator": "pub",
-  "generatorVersion": "3.3.3"
+  "generatorVersion": "3.4.0",
+  "pubCache": "file:///home/alaa/.pub-cache"
 }

packages/rmb_client/lib/rmb_client.dart

@@ -5,6 +5,7 @@ import 'dart:convert';
 import 'dart:typed_data';
 import 'package:polkadart_keyring/polkadart_keyring.dart';
 import 'package:rmb_client/src/sign.dart';
+import 'package:tfchain_client/models/twins.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 import 'package:tfchain_client/tfchain_client.dart' as TFClient;
 

packages/rmb_client/lib/src/client.dart

@@ -1,7 +1,5 @@
 part of "../rmb_client.dart";
 
-// TODO: How to import tfchain_client ??
-
 class Client {
   KeyPair? signer;
   String relayUrl;
@@ -12,6 +10,7 @@ class Client {
   WebSocketChannel? channel;
   int? retries;
   TFClient.QueryClient? client;
+  String keypairType;
   var connections = new Map();
 
   Client(
@@ -20,18 +19,14 @@ class Client {
     this.mnemonic,
     this.session, {
     this.retries = 5,
-    required String keypairType,
+    required this.keypairType,
   }) {
     final key = '${relayUrl}:${mnemonic}:${keypairType}';
     if (connections.containsKey(key)) {
       // TODO: how to return from constructor ??
       // return connections[key] as Client;
     }
 
-    if (keypairType != "ed25519") {
-      throw ArgumentError("Unsupported Keypair type");
-    }
-
     client = TFClient.QueryClient(chainUrl);
     client?.connect();
   }
@@ -51,9 +46,13 @@ class Client {
       print("connected to relay ");
 
       print(signer!.address);
-      twin = await client?.twins
-          .getTwinIdByAccountId(accountId: signer!.publicKey.bytes);
+      twin = await client?.twins.getTwinIdByAccountId(
+          QueryTwinsGetTwinByAccountIdOptions(
+              accountId: signer!.publicKey.bytes));
       print(twin);
+      if (twin == 0) {
+        throw "Couldn't find a user for the provided mnemonic on this network.";
+      }
 
       await channel!.ready;
     } catch (e) {
@@ -79,7 +78,11 @@ class Client {
     String jwt =
         '${base64Url.encode(utf8.encode(jsonEncode(header)))}.${base64Url.encode(utf8.encode(jsonEncode(claims)))}';
 
-    signer = await KeyPair.fromMnemonic(mnemonic);
+    if (keypairType == KPType.ed25519) {
+      signer = await KeyPair.ed25519.fromMnemonic(mnemonic);
+    } else if (keypairType == KPType.sr25519) {
+      signer = await KeyPair.sr25519.fromMnemonic(mnemonic);
+    }
 
     Uint8List sigPrefixed = sign(Uint8List.fromList(jwt.codeUnits), signer!);
     String token = '$jwt.${base64Url.encode(sigPrefixed)}';

packages/rmb_client/lib/src/sign.dart

@@ -4,7 +4,7 @@ import 'dart:typed_data';
 import 'package:polkadart_keyring/polkadart_keyring.dart';
 
 class KPType {
-  static const sr25519 = "sr25519"; //not supported
+  static const sr25519 = "sr25519";
   static const ed25519 = "ed25519";
 }
 
@@ -14,8 +14,12 @@ Uint8List sign(Uint8List payload, KeyPair signer) {
   final newPayload = Uint8List.fromList(payload.sublist(0, payload.length - 1));
 
   // String resultString = String.fromCharCodes(newPayload);
-
-  String typePrefix = "e";
+  String typePrefix = "";
+  if (signer.keyPairType.toString() == KPType.ed25519) {
+    typePrefix = "e";
+  } else if (signer.keyPairType.toString() == KPType.sr25519) {
+    typePrefix = "s";
+  }
 
   final sig = signer.sign(newPayload);
 

packages/rmb_client/pubspec.yaml

@@ -10,12 +10,12 @@ environment:
 # Add regular dependencies here.
 dependencies:
   fixnum: ^1.1.0
-  polkadart_keyring: ^0.2.1
+  polkadart_keyring: ^0.4.3
   protobuf: ^3.1.0
   web_socket_channel: ^2.4.1
   tfchain_client:
     path: ../tfchain_client
 
 dev_dependencies:
-  lints: ^2.1.0
+  lints: ^4.0.0
   test: ^1.24.0

packages/tfchain_client/pubspec.yaml

@@ -13,6 +13,9 @@ dependencies:
   hex: ^0.2.0
   bip39: ^1.0.6
   convert: ^3.1.1
+  moment_dart: ^2.1.0
+  signer: 
+    path: ../signer
 
 dev_dependencies:
   lints: ^3.0.0

pubspec.lock

@@ -229,10 +229,10 @@ packages:
     dependency: transitive
     description:
       name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "6.1.4"
   fixnum:
     dependency: transitive
     description:
@@ -293,10 +293,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
+      sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -381,10 +381,10 @@ packages:
     dependency: "direct main"
     description:
       name: melos
-      sha256: "7266e9fc9fee5f4a0c075e5cec375c00736dfc944358f533b740b93b3d8d681e"
+      sha256: "96e64bbade5712c3f010137e195bca9f1b351fac34ab1f322af492ae34032067"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "3.4.0"
   merlin:
     dependency: transitive
     description:
@@ -413,10 +413,10 @@ packages:
     dependency: transitive
     description:
       name: moment_dart
-      sha256: "252e06594ad7d1f1815c18a9112b76451fcee05743667c0566e24b83a078b91d"
+      sha256: e8683f46ea80dbe47bb0f9f684253630f6a09faa5f626869e1f31bdcf14f6b91
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
   mustache_template:
     dependency: transitive
     description:
@@ -509,10 +509,10 @@ packages:
     dependency: transitive
     description:
       name: process
-      sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32"
+      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.2"
+    version: "4.2.4"
   prompts:
     dependency: transitive
     description:
@@ -541,10 +541,10 @@ packages:
     dependency: transitive
     description:
       name: pub_updater
-      sha256: "54e8dc865349059ebe7f163d6acce7c89eb958b8047e6d6e80ce93b13d7c9e60"
+      sha256: b06600619c8c219065a548f8f7c192b3e080beff95488ed692780f48f69c0625
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.0"
+    version: "0.3.1"
   pubspec:
     dependency: transitive
     description:
@@ -585,6 +585,13 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
+  rmb_client:
+    dependency: "direct main"
+    description:
+      path: "packages/rmb_client"
+      relative: true
+    source: path
+    version: "1.0.0"
   secp256k1_ecdsa:
     dependency: transitive
     description:
@@ -593,13 +600,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.4.0"
-  rmb_client:
-    dependency: "direct main"
-    description:
-      path: "packages/rmb_client"
-      relative: true
-    source: path
-    version: "1.0.0"
   shelf:
     dependency: transitive
     description:
@@ -834,10 +834,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+      sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.4.2"
   web_socket_channel:
     dependency: transitive
     description: