Add beacon hash field

aionick · Sep 20, 2019 · 5114e24 · 5114e24
1 parent 7ad146b
commit 5114e24
Showing 1 changed file with 33 additions and 3 deletions.
diff --git a/src/main/SignedTransactionBuilder.java b/src/main/SignedTransactionBuilder.java
@@ -47,6 +47,7 @@ public final class SignedTransactionBuilder {
     private byte[] data = null;
     private long energyPrice = -1;
     private byte type = 0x1;
+    private byte[] beaconHash = null;
 
     /**
      * The private key used to sign the transaction with.
@@ -143,6 +144,11 @@ public SignedTransactionBuilder useAvmTransactionType() {
         return this;
     }
 
+    public SignedTransactionBuilder beaconHash(byte[] hash) {
+        this.beaconHash = hash;
+        return this;
+    }
+
     /**
      * Constructs a transaction whose fields correspond to the fields as they have been set by the
      * provided builder methods, and signs this transaction with the provided private key.
@@ -183,7 +189,6 @@ public byte[] buildSignedTransaction() throws InvalidKeySpecException, InvalidKe
 
         byte[] nonce = this.nonce.toByteArray();
         byte[] timestamp = BigInteger.valueOf(System.currentTimeMillis() * 1000).toByteArray();
-
         byte[] encodedNonce = RLP.encodeElement(nonce);
         byte[] encodedTo = RLP.encodeElement(to);
         byte[] encodedValue = RLP.encodeElement(value);
@@ -193,7 +198,22 @@ public byte[] buildSignedTransaction() throws InvalidKeySpecException, InvalidKe
         byte[] encodedEnergyPrice = RLP.encodeLong((this.energyPrice == -1) ? 10_000_000_000L : this.energyPrice);
         byte[] encodedType = RLP.encodeByte(this.type);
 
-        byte[] fullEncoding = RLP.encodeList(encodedNonce, encodedTo, encodedValue, encodedData, encodedTimestamp, encodedEnergy, encodedEnergyPrice, encodedType);
+        final byte[] fullEncoding;
+        final byte[] shapeIdEncoded;
+        final byte[] beaconHashEncoded;
+        if(beaconHash == null) {
+            beaconHashEncoded = null;
+            shapeIdEncoded = null;
+            fullEncoding = RLP.encodeList(encodedNonce, encodedTo, encodedValue, encodedData, encodedTimestamp,
+                    encodedEnergy, encodedEnergyPrice, encodedType);
+        } else {
+            // For details, see https://aionnetwork.atlassian.net/wiki/spaces/TE/pages/292389035/Transaction+RLP+Encoding
+            beaconHashEncoded = RLP.encodeElement(beaconHash);
+            byte shapeId = (byte)1;
+            shapeIdEncoded = RLP.encodeByte(shapeId);
+            fullEncoding = RLP.encodeList(encodedNonce, encodedTo, encodedValue, encodedData, encodedTimestamp,
+                    encodedEnergy, encodedEnergyPrice, encodedType, shapeIdEncoded, beaconHashEncoded);
+        }
 
         byte[] rawHash = blake2b(fullEncoding);
         byte[] signatureOnly = sign(privateKey, rawHash);
@@ -202,7 +222,16 @@ public byte[] buildSignedTransaction() throws InvalidKeySpecException, InvalidKe
         System.arraycopy(signatureOnly, 0, preEncodeSignature, publicKey.length, signatureOnly.length);
         byte[] signature = RLP.encodeElement(preEncodeSignature);
 
-        return RLP.encodeList(encodedNonce, encodedTo, encodedValue, encodedData, encodedTimestamp, encodedEnergy, encodedEnergyPrice, encodedType, signature);
+        if(beaconHash == null) {
+            return RLP.encodeList(encodedNonce, encodedTo, encodedValue,
+                    encodedData, encodedTimestamp, encodedEnergy,
+                    encodedEnergyPrice, encodedType, signature);
+        } else {
+            return RLP.encodeList(encodedNonce, encodedTo, encodedValue,
+                    encodedData, encodedTimestamp, encodedEnergy,
+                    encodedEnergyPrice, encodedType, signature,
+                    shapeIdEncoded, beaconHashEncoded);
+        }
     }
 
     /**
@@ -246,6 +275,7 @@ public void reset() {
         this.data = null;
         this.energyPrice = -1;
         this.type = 0x1;
+        this.beaconHash = null;
     }
 
     private static byte[] addSkPrefix(byte[] skString) {