Skip to content

Commit 05e002e

Browse files
DrBlastDrBlast
committed
added support of CommitToGenerationTransaction
1 parent dd15678 commit 05e002e

9 files changed

Lines changed: 391 additions & 5 deletions

File tree

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.wavesplatform</groupId>
88
<artifactId>waves-transactions</artifactId>
9-
<version>1.2.5</version>
9+
<version>1.2.6</version>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -174,12 +174,12 @@
174174
<dependency>
175175
<groupId>com.wavesplatform</groupId>
176176
<artifactId>waves-crypto</artifactId>
177-
<version>2.0.5</version>
177+
<version>2.0.6</version>
178178
</dependency>
179179
<dependency>
180180
<groupId>com.wavesplatform</groupId>
181181
<artifactId>protobuf-schemas</artifactId>
182-
<version>1.5.2</version>
182+
<version>1.5.3-90-SNAPSHOT</version>
183183
</dependency>
184184

185185
<!-- json -->

‎src/main/java/com/wavesplatform/transactions/CommitToGenerationTransaction.java‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
package com.wavesplatform.transactions;
2+
3+
import com.google.common.primitives.Ints;
4+
import com.wavesplatform.crypto.BlsUtils;
5+
import com.wavesplatform.crypto.Bytes;
6+
import com.wavesplatform.transactions.account.BlsPublicKey;
7+
import com.wavesplatform.transactions.account.BlsSignature;
8+
import com.wavesplatform.transactions.account.PrivateKey;
9+
import com.wavesplatform.transactions.account.PublicKey;
10+
import com.wavesplatform.transactions.common.Amount;
11+
import com.wavesplatform.transactions.common.Proof;
12+
import supranational.blst.SecretKey;
13+
14+
import java.io.IOException;
15+
import java.util.List;
16+
import java.util.Objects;
17+
18+
public class CommitToGenerationTransaction extends Transaction {
19+
20+
public static final int TYPE = 20;
21+
public static final int LATEST_VERSION = 1;
22+
public static final long MIN_FEE = 100_00000;
23+
24+
private final Integer generationPeriodStart;
25+
private final BlsPublicKey endorserPublicKey;
26+
private final BlsSignature commitmentSignature;
27+
28+
public CommitToGenerationTransaction(PublicKey sender, int generationPeriodStart, BlsPublicKey endorserPublicKey, BlsSignature commitmentSignature, Amount fee, int version, byte chainId, long timestamp, List<Proof> proofs) {
29+
super(TYPE, version, chainId, sender, fee, timestamp, proofs);
30+
this.generationPeriodStart = generationPeriodStart;
31+
this.endorserPublicKey = endorserPublicKey;
32+
this.commitmentSignature = commitmentSignature;
33+
}
34+
35+
public static CommitToGenerationTransaction fromBytes(byte[] bytes) throws IOException {
36+
return (CommitToGenerationTransaction) Transaction.fromBytes(bytes);
37+
}
38+
39+
public static CommitToGenerationTransaction fromJson(String json) throws IOException {
40+
return (CommitToGenerationTransaction) Transaction.fromJson(json);
41+
}
42+
43+
44+
public int generationPeriodStart() {
45+
return generationPeriodStart;
46+
}
47+
48+
public BlsPublicKey endorserPublicKey() {
49+
return endorserPublicKey;
50+
}
51+
52+
public BlsSignature commitmentSignature() {
53+
return commitmentSignature;
54+
}
55+
56+
@Override
57+
public boolean equals(Object o) {
58+
if (this == o) return true;
59+
if (o == null || getClass() != o.getClass()) return false;
60+
if (!super.equals(o)) return false;
61+
CommitToGenerationTransaction that = (CommitToGenerationTransaction) o;
62+
return this.generationPeriodStart.equals(that.generationPeriodStart)
63+
&& this.endorserPublicKey.equals(that.endorserPublicKey)
64+
&& this.commitmentSignature.equals(that.commitmentSignature);
65+
}
66+
67+
@Override
68+
public int hashCode() {
69+
return Objects.hash(super.hashCode(), generationPeriodStart, endorserPublicKey, commitmentSignature);
70+
}
71+
72+
public static CommitToGenerationTransactionBuilder builder(int generationPeriodStart) {
73+
return new CommitToGenerationTransactionBuilder(generationPeriodStart);
74+
}
75+
76+
public static class CommitToGenerationTransactionBuilder
77+
extends TransactionBuilder<CommitToGenerationTransactionBuilder, CommitToGenerationTransaction> {
78+
private final Integer generationPeriodStart;
79+
private BlsPublicKey endorserPublicKey;
80+
private BlsSignature commitmentSignature;
81+
82+
protected CommitToGenerationTransactionBuilder(int generationPeriodStart) {
83+
super(LATEST_VERSION, MIN_FEE);
84+
this.generationPeriodStart = generationPeriodStart;
85+
this.endorserPublicKey = null;
86+
this.commitmentSignature = null;
87+
}
88+
89+
public CommitToGenerationTransactionBuilder endorserPublicKey(BlsPublicKey pk) {
90+
this.endorserPublicKey = pk;
91+
return this;
92+
}
93+
94+
public CommitToGenerationTransactionBuilder commitmentSignature(BlsSignature commitmentSignature) {
95+
this.commitmentSignature = commitmentSignature;
96+
return this;
97+
}
98+
99+
protected CommitToGenerationTransaction _build() {
100+
return new CommitToGenerationTransaction(sender, generationPeriodStart, endorserPublicKey, commitmentSignature, feeWithExtra(), version, chainId, timestamp, Proof.emptyList());
101+
}
102+
103+
@Override
104+
public CommitToGenerationTransaction getSignedWith(PrivateKey privateKey) {
105+
if (sender == null) {
106+
sender = privateKey.publicKey();
107+
}
108+
CommitToGenerationTransaction unsignedTx = getUnsigned();
109+
SecretKey blsSk = BlsUtils.mkBlsSecretKey(privateKey.bytes());
110+
111+
byte[] blsPubBytes = this.endorserPublicKey != null
112+
? this.endorserPublicKey.bytes()
113+
: BlsUtils.mkBlsPublicKey(blsSk);
114+
115+
byte[] blsSigBytes = this.commitmentSignature != null
116+
? this.commitmentSignature.bytes()
117+
: BlsUtils.sign(blsSk, Bytes.concat(blsPubBytes, Ints.toByteArray(unsignedTx.generationPeriodStart()))
118+
);
119+
120+
CommitToGenerationTransaction txWithBls = new CommitToGenerationTransaction(
121+
unsignedTx.sender(),
122+
unsignedTx.generationPeriodStart(),
123+
BlsPublicKey.as(blsPubBytes),
124+
BlsSignature.as(blsSigBytes),
125+
unsignedTx.fee(),
126+
unsignedTx.version(),
127+
unsignedTx.chainId(),
128+
unsignedTx.timestamp(),
129+
Proof.emptyList()
130+
);
131+
132+
return txWithBls.addProof(privateKey);
133+
}
134+
135+
}
136+
137+
138+
}

‎src/main/java/com/wavesplatform/transactions/account/BlsPublicKey.java‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package com.wavesplatform.transactions.account;
2+
3+
import com.wavesplatform.transactions.common.Base58String;
4+
5+
import java.util.Arrays;
6+
7+
public class BlsPublicKey extends Base58String {
8+
9+
public static final int BYTES_LENGTH = 48;
10+
public BlsPublicKey(byte[] blsPublicKey) throws IllegalArgumentException {
11+
super(blsPublicKey);
12+
if (blsPublicKey.length != BYTES_LENGTH )
13+
throw new IllegalArgumentException("BLSPublic key has wrong size in bytes. "
14+
+ "Expected: " + BYTES_LENGTH + ", actual: " + blsPublicKey.length);
15+
}
16+
17+
public BlsPublicKey(String blsPublicKey) {
18+
super(blsPublicKey);
19+
Base58String bls = new Base58String(blsPublicKey);
20+
21+
if ( bls.bytes().length != BYTES_LENGTH)
22+
throw new IllegalArgumentException("BLSPublic key has wrong size in bytes. "
23+
+ "Expected: " + BYTES_LENGTH + ", actual: " + bls.bytes().length);
24+
}
25+
26+
public static BlsPublicKey as(byte[] bytes) {
27+
return new BlsPublicKey(bytes);
28+
}
29+
30+
public static BlsPublicKey as(String base58Encoded) {
31+
return new BlsPublicKey(base58Encoded);
32+
}
33+
34+
public boolean equals(byte[] anotherKey) {
35+
return Arrays.equals(this.bytes, anotherKey);
36+
}
37+
38+
@Override
39+
public boolean equals(Object o) {
40+
if (this == o) return true;
41+
if (o == null || getClass() != o.getClass()) return false;
42+
BlsPublicKey bls = (BlsPublicKey) o;
43+
return Arrays.equals(bytes, bls.bytes);
44+
}
45+
}

‎src/main/java/com/wavesplatform/transactions/account/BlsSignature.java‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package com.wavesplatform.transactions.account;
2+
3+
import com.wavesplatform.transactions.common.Base58String;
4+
5+
import java.util.Arrays;
6+
7+
public class BlsSignature extends Base58String {
8+
public static final int BYTES_LENGTH = 96;
9+
public BlsSignature(byte[] blsSignature) throws IllegalArgumentException {
10+
super(blsSignature);
11+
if (blsSignature.length != BYTES_LENGTH )
12+
throw new IllegalArgumentException("BLSPublic key has wrong size in bytes. "
13+
+ "Expected: " + BYTES_LENGTH + ", actual: " + blsSignature.length);
14+
}
15+
16+
public BlsSignature(String blsSignature) {
17+
super(blsSignature);
18+
Base58String bls = new Base58String(blsSignature);
19+
20+
if ( bls.bytes().length != BYTES_LENGTH)
21+
throw new IllegalArgumentException("BlsSignature key has wrong size in bytes. "
22+
+ "Expected: " + BYTES_LENGTH + ", actual: " + bls.bytes().length);
23+
}
24+
25+
public static BlsSignature as(byte[] bytes) {
26+
return new BlsSignature(bytes);
27+
}
28+
29+
public static BlsSignature as(String base58Encoded) {
30+
return new BlsSignature(base58Encoded);
31+
}
32+
33+
public boolean equals(byte[] anotherKey) {
34+
return Arrays.equals(this.bytes, anotherKey);
35+
}
36+
37+
@Override
38+
public boolean equals(Object o) {
39+
if (this == o) return true;
40+
if (o == null || getClass() != o.getClass()) return false;
41+
BlsSignature blsSig = (BlsSignature) o;
42+
return Arrays.equals(bytes, blsSig.bytes);
43+
}
44+
}

‎src/main/java/com/wavesplatform/transactions/common/Base64String.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
public class Base64String implements ByteString {
1111

12-
private final byte[] bytes;
12+
protected final byte[] bytes;
1313
private final Supplier<String> encoded;
1414

1515
public static Base64String empty() {

‎src/main/java/com/wavesplatform/transactions/serializers/ProtobufConverter.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import com.wavesplatform.protobuf.transaction.TransactionOuterClass.SignedTransaction;
1313
import com.wavesplatform.transactions.*;
1414
import com.wavesplatform.transactions.account.Address;
15+
import com.wavesplatform.transactions.account.BlsPublicKey;
16+
import com.wavesplatform.transactions.account.BlsSignature;
1517
import com.wavesplatform.transactions.account.PublicKey;
1618
import com.wavesplatform.transactions.common.*;
1719
import com.wavesplatform.transactions.data.*;
@@ -286,6 +288,18 @@ else if (e.getValueCase() == VALUE_NOT_SET)
286288
.fee(pbAmountToAmount(pbTx.getFee()))
287289
.timestamp(pbTx.getTimestamp())
288290
.getUnsigned();
291+
} else if (pbTx.hasCommitToGeneration()) {
292+
TransactionOuterClass.CommitToGenerationTransactionData commitToGeneration = pbTx.getCommitToGeneration();
293+
tx = CommitToGenerationTransaction
294+
.builder(commitToGeneration.getGenerationPeriodStart())
295+
.endorserPublicKey(BlsPublicKey.as(commitToGeneration.getEndorserPublicKey().toByteArray()))
296+
.commitmentSignature(BlsSignature.as(commitToGeneration.getCommitmentSignature().toByteArray()))
297+
.version(pbTx.getVersion())
298+
.chainId((byte) pbTx.getChainId())
299+
.sender(PublicKey.as(pbTx.getSenderPublicKey().toByteArray()))
300+
.fee(pbAmountToAmount(pbTx.getFee()))
301+
.timestamp(pbTx.getTimestamp())
302+
.getUnsigned();
289303
} else throw new InvalidProtocolBufferException("Can't recognize transaction type");
290304

291305
pbSignedTx.getProofsList().forEach(p -> tx.proofs().add(Proof.as(p.toByteArray())));
@@ -553,6 +567,13 @@ public static TransactionOuterClass.Transaction toUnsignedProtobuf(Transaction t
553567
.setName(uaiTx.name())
554568
.setDescription(uaiTx.description())
555569
.build());
570+
} else if (tx instanceof CommitToGenerationTransaction) {
571+
CommitToGenerationTransaction commitToGeneration = (CommitToGenerationTransaction) tx;
572+
protoBuilder.setCommitToGeneration(TransactionOuterClass.CommitToGenerationTransactionData.newBuilder()
573+
.setGenerationPeriodStart(commitToGeneration.generationPeriodStart())
574+
.setEndorserPublicKey(ByteString.copyFrom(commitToGeneration.endorserPublicKey().bytes()))
575+
.setCommitmentSignature(ByteString.copyFrom(commitToGeneration.commitmentSignature().bytes()))
576+
.build());
556577
}
557578

558579
return protoBuilder.build();

‎src/main/java/com/wavesplatform/transactions/serializers/Scheme.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ public static Scheme of(int txType, int txVersion) {
3333
if (txType == EthereumTransaction.TYPE_TAG) {
3434
return Scheme.PROTOBUF;
3535
}
36+
if (txType == CommitToGenerationTransaction.TYPE) {
37+
return Scheme.PROTOBUF;
38+
}
3639

3740
throw new IllegalArgumentException("Unsupported transaction type " + txType + " with version " + txVersion);
3841
}

‎src/main/java/com/wavesplatform/transactions/serializers/json/JsonSerializer.java‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import com.wavesplatform.crypto.base.Base64;
99
import com.wavesplatform.transactions.*;
1010
import com.wavesplatform.transactions.account.Address;
11+
import com.wavesplatform.transactions.account.BlsPublicKey;
12+
import com.wavesplatform.transactions.account.BlsSignature;
1113
import com.wavesplatform.transactions.account.PublicKey;
1214
import com.wavesplatform.transactions.common.*;
1315
import com.wavesplatform.transactions.data.*;
@@ -16,7 +18,6 @@
1618
import com.wavesplatform.transactions.invocation.*;
1719
import com.wavesplatform.transactions.mass.Transfer;
1820
import com.wavesplatform.transactions.serializers.Scheme;
19-
import org.bouncycastle.util.encoders.Hex;
2021
import org.web3j.crypto.RawTransaction;
2122
import org.web3j.crypto.Sign;
2223
import org.web3j.crypto.SignedRawTransaction;
@@ -278,6 +279,12 @@ public static Transaction fromJson(JsonNode json) throws IOException {
278279
default:
279280
throw new IOException("Unsupported payload type");
280281
}
282+
} else if (type == CommitToGenerationTransaction.TYPE) {
283+
if (!fee.assetId().isWaves())
284+
throw new IOException("feeAssetId field must be null for CommitToGenerationTransaction");
285+
return new CommitToGenerationTransaction(sender, json.get("generationPeriodStart").asInt(),
286+
blsPublicKeyFromJson(json, "endorserPublicKey"), blsSignatureFromJson(json, "commitmentSignature"),
287+
fee, version, chainId, timestamp, proofs);
281288
}
282289

283290
throw new IOException("Can't parse json of transaction with type " + type);
@@ -510,6 +517,11 @@ else if (e instanceof DeleteEntry) {
510517
EthereumTransaction.Transfer transfer = (EthereumTransaction.Transfer) et.payload();
511518
transferToJson(payload.put("type", "transfer"), transfer.recipient(), transfer.amount());
512519
}
520+
} else if (tx instanceof CommitToGenerationTransaction) {
521+
CommitToGenerationTransaction gct = (CommitToGenerationTransaction) tx;
522+
jsObject.put("generationPeriodStart", gct.generationPeriodStart());
523+
jsObject.put("endorserPublicKey", gct.endorserPublicKey().toString());
524+
jsObject.put("commitmentSignature", gct.commitmentSignature().toString());
513525
}
514526

515527
jsObject.put("fee", tx.fee().value());
@@ -633,6 +645,17 @@ public static Base64String scriptFromJson(JsonNode json) {
633645
return base64FromJson(json, "script");
634646
}
635647

648+
public static BlsPublicKey blsPublicKeyFromJson(JsonNode json, String fieldName){
649+
return BlsPublicKey.as(base58FromJson(json, fieldName).bytes());
650+
}
651+
652+
public static BlsSignature blsSignatureFromJson(JsonNode json, String fieldName){
653+
return BlsSignature.as(base58FromJson(json, fieldName).bytes());
654+
}
655+
656+
public static Base58String base58FromJson(JsonNode json, String fieldName) {
657+
return json.hasNonNull(fieldName) ? new Base58String(json.get(fieldName).asText()) : Base58String.empty();
658+
}
636659
public static Base64String base64FromJson(JsonNode json, String fieldName) {
637660
return json.hasNonNull(fieldName) ? new Base64String(json.get(fieldName).asText()) : Base64String.empty();
638661
}

0 commit comments

Comments
 (0)