wip

witnet · Nov 24, 2023 · 205a62b · 205a62b
1 parent 7f0107f
commit 205a62b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/lib/src/network/explorer/explorer_api.dart b/lib/src/network/explorer/explorer_api.dart
@@ -1151,25 +1151,28 @@ class MintInfo {
 class InputUtxo {
   InputUtxo({
     required this.address,
-    required this.input,
+    required this.inputUtxo,
     required this.value,
   });
 
   final String address;
-  final Input input;
+  final String inputUtxo;
   final int value;
 
   String rawJson() => json.encode(jsonMap());
 
   Map<String, dynamic> jsonMap() {
     return {
-      "pkh": address,
-      "output_pointer":
-          '${input.outputPointer.transactionId.hex}:${input.outputPointer.outputIndex}',
+      "address": address,
       "value": value,
+      "input_utxo": inputUtxo,
     };
   }
 
+
+  factory InputUtxo.fromJson(Map<String, dynamic> json) => 
+    InputUtxo(address: json["address"], inputUtxo: json["input_utxo"], value: json["value"]);
+
   @override
   String toString() {
     // TODO: implement toString
@@ -1212,12 +1215,31 @@ class ValueTransferInfo extends HashInfo {
         epoch: data["epoch"],
         timestamp: data["timestamp"],
         hash: data["hash"],
+        block: data["block"],
+        confirmed: data["confirmed"],
+        reverted: data["reverted"],
         inputAddresses: data["input_addresses"],
+        inputUtxos: data["input_utxos"].map((x) => InputUtxo())
+        inputsMerged: data["inputs_merged"].map((x) => InputMerged.fromJson( x["address"], x["value"])),
         outputAddresses: data["output_addresses"],
-        value: data["value"],
+        // merge in outputs
+        outputValues: data["output_values"],
+        timelocks: data["timelocks"],
+        utxos: data["utxos"], // List "address": "string", "value": 1, "timelock": 0, "locked": false
+        utxosMerged: data["utxos_merged"], //same as above
         fee: data["fee"],
+        value: data["value"],
+        priority: data["priority"],
         weight: data["weight"],
-        priority: data["priority"]);
+        trueOutputAddresses: data["true_output_addresses"],
+        change_output_addresses: data["change_output_addresses"],
+        trueValue: data["true_value"],
+        changeValue: data["change_value"],
+
+
+    );
+
+
   }
 
   factory ValueTransferInfo.fromDbJson(Map<String, dynamic> data) {

diff --git a/lib/src/network/explorer/explorer_client.dart b/lib/src/network/explorer/explorer_client.dart
@@ -179,13 +179,11 @@ class ExplorerClient {
       var data = await _processGet(uri);
       if (data.containsKey('response_type')) {
         switch (data['response_type'] as String) {
+          case 'pending':
           case 'value_transfer':
             return ValueTransferInfo.fromJson(data);
           case 'block':
             return BlockDetails.fromJson(data);
-          // fixme: add support for pending
-          // case 'pending':
-
           // fixme: add support for data requests
           case 'data_request':
           case 'commit':