fix: PublicKey.verifyTransaction() should use the right field in th…

…e protobufs Signed-off-by: Daniel Akhterov <[email protected]>
hashgraph · Dec 21, 2021 · 1b8ccd6 · 1b8ccd6
1 parent 54bc66a
commit 1b8ccd6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/sdk/src/main/java/com/hedera/hashgraph/sdk/PublicKey.java b/sdk/src/main/java/com/hedera/hashgraph/sdk/PublicKey.java
@@ -84,6 +84,8 @@ static PublicKey fromAliasBytes(ByteString aliasBytes) {
      */
     public abstract boolean verify(byte[] message, byte[] signature);
 
+    abstract ByteString extractSignatureFromProtobuf(SignaturePair pair);
+
     public boolean verifyTransaction(Transaction<?> transaction) {
         if (!transaction.isFrozen()) {
             transaction.freeze();
@@ -95,7 +97,7 @@ public boolean verifyTransaction(Transaction<?> transaction) {
                 if (sigPair.getPubKeyPrefix().equals(ByteString.copyFrom(toBytes()))) {
                     found = true;
 
-                    if (!verify(signedTransaction.getBodyBytes().toByteArray(), sigPair.getEd25519().toByteArray())) {
+                    if (!verify(signedTransaction.getBodyBytes().toByteArray(), extractSignatureFromProtobuf(sigPair).toByteArray())) {
                         return false;
                     }
                 }

diff --git a/sdk/src/main/java/com/hedera/hashgraph/sdk/PublicKeyECDSA.java b/sdk/src/main/java/com/hedera/hashgraph/sdk/PublicKeyECDSA.java
@@ -39,6 +39,11 @@ static PublicKeyECDSA fromSubjectKeyInfoInternal(SubjectPublicKeyInfo subjectPub
         return new PublicKeyECDSA(subjectPublicKeyInfo.getPublicKeyData().getBytes());
     }
 
+    @Override
+    ByteString extractSignatureFromProtobuf(SignaturePair pair) {
+        return pair.getECDSA384();
+    }
+
     @Override
     public boolean verify(byte[] message, byte[] signature) {
         var hash = Crypto.calcKeccak256(message);

diff --git a/sdk/src/main/java/com/hedera/hashgraph/sdk/PublicKeyED25519.java b/sdk/src/main/java/com/hedera/hashgraph/sdk/PublicKeyED25519.java
@@ -31,6 +31,11 @@ static PublicKeyED25519 fromSubjectKeyInfoInternal(SubjectPublicKeyInfo subjectP
         return new PublicKeyED25519(subjectPublicKeyInfo.getPublicKeyData().getBytes());
     }
 
+    @Override
+    ByteString extractSignatureFromProtobuf(SignaturePair pair) {
+        return pair.getEd25519();
+    }
+
     @Override
     public boolean verify(byte[] message, byte[] signature) {
         return Ed25519.verify(signature, 0, keyData, 0, message, 0, message.length);