fix: stake/unstake schema

witnet · Jun 4, 2024 · c0c1b6f · c0c1b6f
1 parent 47fee38
commit c0c1b6f
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 15 deletions.
diff --git a/lib/src/schema/stake_key.dart b/lib/src/schema/stake_key.dart
@@ -54,7 +54,7 @@ class StakeKey extends GeneratedMessage {
   Uint8List get pbBytes => writeToBuffer();
 
   @TagNumber(1)
-  PublicKeyHash get validator => $_getN(1);
+  PublicKeyHash get validator => $_getN(0);
   @TagNumber(1)
   set validator(PublicKeyHash v) {
     setField(1, v);
@@ -68,7 +68,7 @@ class StakeKey extends GeneratedMessage {
   PublicKeyHash ensureValidator() => $_ensure(0);
 
   @TagNumber(2)
-  PublicKeyHash get withdrawer => $_getN(2);
+  PublicKeyHash get withdrawer => $_getN(1);
   @TagNumber(2)
   set withdrawer(PublicKeyHash v) {
     setField(2, v);

diff --git a/lib/src/schema/stake_output.dart b/lib/src/schema/stake_output.dart
@@ -63,10 +63,10 @@ class StakeOutput extends GeneratedMessage {
   Uint8List get pbBytes => writeToBuffer();
 
   @TagNumber(1)
-  Int64 get value => $_getI64(1);
+  Int64 get value => $_getI64(0);
   @TagNumber(1)
   set value(Int64 v) {
-    $_setInt64(0, v);
+    setField(1, v);
   }
 
   @TagNumber(1)
@@ -75,7 +75,7 @@ class StakeOutput extends GeneratedMessage {
   void clearValue() => clearField(1);
 
   @TagNumber(2)
-  StakeKey get key => $_getN(2);
+  StakeKey get key => $_getN(1);
   @TagNumber(2)
   set key(StakeKey v) {
     setField(2, v);
@@ -89,7 +89,7 @@ class StakeOutput extends GeneratedMessage {
   StakeKey ensureKey() => $_ensure(1);
 
   @TagNumber(3)
-  KeyedSignature get authorization => $_getN(3);
+  KeyedSignature get authorization => $_getN(2);
   @TagNumber(3)
   set authorization(KeyedSignature v) {
     setField(3, v);

diff --git a/lib/src/schema/transaction.dart b/lib/src/schema/transaction.dart
@@ -143,16 +143,55 @@ class Transaction extends GeneratedMessage {
   String toRawJson({bool asHex = false}) => json.encode(jsonMap(asHex: asHex));
 
   Map<String, dynamic> jsonMap({bool asHex = false}) {
-    final txType = hasDataRequest() ? 'DataRequest' : 'ValueTransfer';
-    return {
-      "transaction": {
-        txType: {
-          "body": transaction.body.jsonMap(asHex: asHex),
-          "signatures": List<dynamic>.from(
-              transaction.signatures.map((x) => x.jsonMap(asHex: asHex))),
+    if (hasValueTransfer())
+      return {
+        "transaction": {
+          'ValueTransfer': {
+            "body": transaction.body.jsonMap(asHex: asHex),
+            "signatures": List<dynamic>.from(
+                transaction.signatures.map((x) => x.jsonMap(asHex: asHex))),
+          }
         }
-      }
-    };
+      };
+    if (hasDataRequest())
+      return {
+        "transaction": {
+          'DataRequest': {
+            "body": transaction.body.jsonMap(asHex: asHex),
+            "signatures": List<dynamic>.from(
+                transaction.signatures.map((x) => x.jsonMap(asHex: asHex))),
+          }
+        }
+      };
+    if (hasStake())
+      return {
+        "transaction": {
+          'Stake': {
+            "body": transaction.body.jsonMap(asHex: asHex),
+            "signatures": List<dynamic>.from(
+                transaction.signatures.map((x) => x.jsonMap(asHex: asHex))),
+          },
+        }
+      };
+    if (hasUnstake())
+      return {
+        "transaction": {
+          'Unstake': {
+            "body": transaction.body.jsonMap(asHex: asHex),
+            "signature": transaction.signature.jsonMap(asHex: asHex),
+          }
+        }
+      };
+    else
+      return {
+        "transaction": {
+          'ValueTransfer': {
+            "body": transaction.body.jsonMap(asHex: asHex),
+            "signatures": List<dynamic>.from(
+                transaction.signatures.map((x) => x.jsonMap(asHex: asHex))),
+          }
+        }
+      };
   }
 
   @override
@@ -181,6 +220,8 @@ class Transaction extends GeneratedMessage {
     if (hasReveal()) return reveal;
     if (hasTally()) return tally;
     if (hasMint()) return mint;
+    if (hasStake()) return stake;
+    if (hasUnstake()) return unstake;
   }
 
   TransactionKind whichKind() => _Transaction_KindByTag[$_whichOneof(0)]!;