Skip to content

Commit c0c1b6f

Browse files
committed
fix: stake/unstake schema
1 parent 47fee38 commit c0c1b6f

File tree

3 files changed

+56
-15
lines changed

3 files changed

+56
-15
lines changed

lib/src/schema/stake_key.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class StakeKey extends GeneratedMessage {
5454
Uint8List get pbBytes => writeToBuffer();
5555

5656
@TagNumber(1)
57-
PublicKeyHash get validator => $_getN(1);
57+
PublicKeyHash get validator => $_getN(0);
5858
@TagNumber(1)
5959
set validator(PublicKeyHash v) {
6060
setField(1, v);
@@ -68,7 +68,7 @@ class StakeKey extends GeneratedMessage {
6868
PublicKeyHash ensureValidator() => $_ensure(0);
6969

7070
@TagNumber(2)
71-
PublicKeyHash get withdrawer => $_getN(2);
71+
PublicKeyHash get withdrawer => $_getN(1);
7272
@TagNumber(2)
7373
set withdrawer(PublicKeyHash v) {
7474
setField(2, v);

lib/src/schema/stake_output.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ class StakeOutput extends GeneratedMessage {
6363
Uint8List get pbBytes => writeToBuffer();
6464

6565
@TagNumber(1)
66-
Int64 get value => $_getI64(1);
66+
Int64 get value => $_getI64(0);
6767
@TagNumber(1)
6868
set value(Int64 v) {
69-
$_setInt64(0, v);
69+
setField(1, v);
7070
}
7171

7272
@TagNumber(1)
@@ -75,7 +75,7 @@ class StakeOutput extends GeneratedMessage {
7575
void clearValue() => clearField(1);
7676

7777
@TagNumber(2)
78-
StakeKey get key => $_getN(2);
78+
StakeKey get key => $_getN(1);
7979
@TagNumber(2)
8080
set key(StakeKey v) {
8181
setField(2, v);
@@ -89,7 +89,7 @@ class StakeOutput extends GeneratedMessage {
8989
StakeKey ensureKey() => $_ensure(1);
9090

9191
@TagNumber(3)
92-
KeyedSignature get authorization => $_getN(3);
92+
KeyedSignature get authorization => $_getN(2);
9393
@TagNumber(3)
9494
set authorization(KeyedSignature v) {
9595
setField(3, v);

lib/src/schema/transaction.dart

Lines changed: 50 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,55 @@ class Transaction extends GeneratedMessage {
143143
String toRawJson({bool asHex = false}) => json.encode(jsonMap(asHex: asHex));
144144

145145
Map<String, dynamic> jsonMap({bool asHex = false}) {
146-
final txType = hasDataRequest() ? 'DataRequest' : 'ValueTransfer';
147-
return {
148-
"transaction": {
149-
txType: {
150-
"body": transaction.body.jsonMap(asHex: asHex),
151-
"signatures": List<dynamic>.from(
152-
transaction.signatures.map((x) => x.jsonMap(asHex: asHex))),
146+
if (hasValueTransfer())
147+
return {
148+
"transaction": {
149+
'ValueTransfer': {
150+
"body": transaction.body.jsonMap(asHex: asHex),
151+
"signatures": List<dynamic>.from(
152+
transaction.signatures.map((x) => x.jsonMap(asHex: asHex))),
153+
}
153154
}
154-
}
155-
};
155+
};
156+
if (hasDataRequest())
157+
return {
158+
"transaction": {
159+
'DataRequest': {
160+
"body": transaction.body.jsonMap(asHex: asHex),
161+
"signatures": List<dynamic>.from(
162+
transaction.signatures.map((x) => x.jsonMap(asHex: asHex))),
163+
}
164+
}
165+
};
166+
if (hasStake())
167+
return {
168+
"transaction": {
169+
'Stake': {
170+
"body": transaction.body.jsonMap(asHex: asHex),
171+
"signatures": List<dynamic>.from(
172+
transaction.signatures.map((x) => x.jsonMap(asHex: asHex))),
173+
},
174+
}
175+
};
176+
if (hasUnstake())
177+
return {
178+
"transaction": {
179+
'Unstake': {
180+
"body": transaction.body.jsonMap(asHex: asHex),
181+
"signature": transaction.signature.jsonMap(asHex: asHex),
182+
}
183+
}
184+
};
185+
else
186+
return {
187+
"transaction": {
188+
'ValueTransfer': {
189+
"body": transaction.body.jsonMap(asHex: asHex),
190+
"signatures": List<dynamic>.from(
191+
transaction.signatures.map((x) => x.jsonMap(asHex: asHex))),
192+
}
193+
}
194+
};
156195
}
157196

158197
@override
@@ -181,6 +220,8 @@ class Transaction extends GeneratedMessage {
181220
if (hasReveal()) return reveal;
182221
if (hasTally()) return tally;
183222
if (hasMint()) return mint;
223+
if (hasStake()) return stake;
224+
if (hasUnstake()) return unstake;
184225
}
185226

186227
TransactionKind whichKind() => _Transaction_KindByTag[$_whichOneof(0)]!;

0 commit comments

Comments
 (0)