Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimize MessageProof decoding #31

Merged
merged 1 commit into from
Aug 2, 2023
Merged

Optimize MessageProof decoding #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions bmv/btpblock/src/main/java/foundation/icon/btp/bmv/btpblock/BTPMessageVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import foundation.icon.btp.lib.BMV;
import foundation.icon.btp.lib.BMVStatus;
import foundation.icon.btp.lib.BTPAddress;
import foundation.icon.score.util.Logger;
import foundation.icon.score.util.StringUtil;
import score.Address;
import score.Context;
import score.VarDB;
Expand All @@ -33,7 +31,6 @@
import java.util.List;

public class BTPMessageVerifier implements BMV {
private static final Logger logger = Logger.getLogger(BTPMessageVerifier.class);
private static final String HASH = "keccak-256";
private static final String SIGNATURE_ALG = "ecdsa-secp256k1";
private final VarDB<BMVProperties> propertiesDB = Context.newVarDB("properties", BMVProperties.class);
Expand Down Expand Up @@ -242,11 +239,7 @@ private byte[][] handleMessageProof(MessageProof messageProof, BlockUpdate block
}
}
if (expectedMessageCnt.intValue() != result.total) {
var rightProofNodes = messageProof.getRightProofNodes();
for (int i = 0; i < rightProofNodes.length; i++) {
logger.println("ProofInRight["+i+"] : " + "NumOfLeaf:"+rightProofNodes[i].getNumOfLeaf()
+ "value:" + StringUtil.bytesToHex(rightProofNodes[i].getValue()));
}
messageProof.printRightNodes();
throw BMVException.unknown(
"mismatch MessageCount offset:" + result.offset +
", expected:" + expectedMessageCnt +
Expand Down
49 changes: 20 additions & 29 deletions bmv/btpblock/src/main/java/foundation/icon/btp/bmv/btpblock/MessageProof.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,19 @@

package foundation.icon.btp.bmv.btpblock;

import foundation.icon.score.util.StringUtil;
import score.Context;
import score.ObjectReader;
import scorex.util.ArrayList;

import java.util.List;

public class MessageProof {
private final ProofNode[] leftProofNodes;
private final List<ProofNode> leftProofNodes;
private final byte[][] messages;
private final ProofNode[] rightProofNodes;
private final List<ProofNode> rightProofNodes;

public MessageProof(ProofNode[] leftProofNodes, byte[][] messages, ProofNode[] rightProofNodes) {
public MessageProof(List<ProofNode> leftProofNodes, byte[][] messages, List<ProofNode> rightProofNodes) {
this.leftProofNodes = leftProofNodes;
this.messages = messages;
this.rightProofNodes = rightProofNodes;
Expand All @@ -37,52 +38,32 @@ public byte[][] getMessages() {
return messages;
}

public ProofNode[] getLeftProofNodes() {
return leftProofNodes;
}

public ProofNode[] getRightProofNodes() {
return rightProofNodes;
}

public static MessageProof readObject(ObjectReader r) {
r.beginList();
List<ProofNode> lNodes = new ArrayList<>();
r.beginList();
while(r.hasNext()) {
while (r.hasNext()) {
lNodes.add(r.read(ProofNode.class));
}
r.end();
var lSize = lNodes.size();
ProofNode[] leftProofNodes = new ProofNode[lSize];
for (int i = 0; i < lSize; i++){
leftProofNodes[i] = lNodes.get(i);
}
byte[][] messages;
List<byte[]> messageList = new ArrayList<>();
r.beginList();
while(r.hasNext()) {
while (r.hasNext()) {
messageList.add(r.readByteArray());
}
int messagesLength = messageList.size();
messages = new byte[messagesLength][];
for(int i = 0; i < messagesLength; i++) {
byte[][] messages = new byte[messageList.size()][];
for (int i = 0; i < messages.length; i++) {
messages[i] = messageList.get(i);
}
r.end();
List<ProofNode> rNodes = new ArrayList<>();
r.beginList();
while(r.hasNext()) {
while (r.hasNext()) {
rNodes.add(r.read(ProofNode.class));
}
r.end();
var rSize = rNodes.size();
ProofNode[] rightProofNodes = new ProofNode[rSize];
for (int i = 0; i < rSize; i++){
rightProofNodes[i] = rNodes.get(i);
}
r.end();
return new MessageProof(leftProofNodes, messages, rightProofNodes);
return new MessageProof(lNodes, messages, rNodes);
}

public static MessageProof fromBytes(byte[] bytes) {
Expand Down Expand Up @@ -119,6 +100,16 @@ public ProveResult proveMessage() {
return new ProveResult(node.getValue(), left, total);
}

public void printRightNodes() {
int i = 0;
for (ProofNode pn : rightProofNodes) {
Context.println("ProofInRight[" + i + "]"
+ ": numOfLeaf=" + pn.getNumOfLeaf()
+ ", value=" + StringUtil.bytesToHex(pn.getValue()));
i++;
}
}

public static class ProveResult {
final byte[] hash;
final int offset;
Expand Down