Skip to content

refactor: update PoP to include registrantAddress and chainId #210

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

Merged
ItsANameToo merged 1 commit into from
Oct 9, 2026
Merged

refactor: update PoP to include registrantAddress and chainId #210

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
8 changes: 8 additions & 0 deletions src/main/java/org/arkecosystem/crypto/exceptions/InvalidProofOfPossessionException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package org.arkecosystem.crypto.exceptions;

public class InvalidProofOfPossessionException extends IllegalArgumentException {

public InvalidProofOfPossessionException(String message) {
super(message);
}
}
6 changes: 4 additions & 2 deletions src/main/java/org/arkecosystem/crypto/transactions/builder/ValidatorRegistrationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
public class ValidatorRegistrationBuilder
extends AbstractTransactionBuilder<ValidatorRegistrationBuilder> {

public ValidatorRegistrationBuilder validatorPassphrase(String passphrase) {
ProofOfPossession.Result pop = ProofOfPossession.fromMnemonic(passphrase);
public ValidatorRegistrationBuilder validatorProof(
String passphrase, String registrantAddress) {
ProofOfPossession.Result pop =
ProofOfPossession.fromMnemonic(passphrase, registrantAddress);
this.transaction.validatorPublicKey = Hex.encode(pop.pk);
this.transaction.validatorProof = Hex.encode(pop.pop);

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/arkecosystem/crypto/transactions/builder/ValidatorUpdateBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@

public class ValidatorUpdateBuilder extends AbstractTransactionBuilder<ValidatorUpdateBuilder> {

public ValidatorUpdateBuilder validatorPassphrase(String passphrase) {
ProofOfPossession.Result pop = ProofOfPossession.fromMnemonic(passphrase);
public ValidatorUpdateBuilder validatorProof(String passphrase, String registrantAddress) {
ProofOfPossession.Result pop =
ProofOfPossession.fromMnemonic(passphrase, registrantAddress);
this.transaction.validatorPublicKey = Hex.encode(pop.pk);
this.transaction.validatorProof = Hex.encode(pop.pop);

Expand All @@ -26,5 +27,4 @@ protected AbstractTransaction getTransactionInstance() {
protected ValidatorUpdateBuilder instance() {
return this;
}

}
34 changes: 27 additions & 7 deletions src/main/java/org/arkecosystem/crypto/utils/ProofOfPossession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,22 @@

import java.nio.charset.StandardCharsets;
import java.text.Normalizer;
import org.arkecosystem.crypto.configuration.Network;
import org.arkecosystem.crypto.encoding.Hex;
import org.arkecosystem.crypto.exceptions.InvalidProofOfPossessionException;
import org.bouncycastle.crypto.digests.SHA512Digest;
import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
import org.bouncycastle.crypto.params.KeyParameter;
import org.web3j.abi.TypeEncoder;
import org.web3j.abi.datatypes.DynamicBytes;
import org.web3j.abi.datatypes.generated.Uint256;
import supranational.blst.P1;
import supranational.blst.P2;
import supranational.blst.SecretKey;

public class ProofOfPossession {

private static final String POP_DST = "BLS_POP_BLS12381G2_XMD:SHA-256_SSWU_RO_POP_";
private static final String POP_DST = "MAINSAIL_BLS_POP_BLS12381G2_XMD:SHA-256_SSWU_RO_POP_";

public static final class Result {
public final byte[] pk;
Expand All @@ -32,16 +37,33 @@ public static String deriveBlsPublicKey(String passphrase) {
return Hex.encode(new P1(deriveChildSk(passphrase)).compress());
}

public static Result buildProofOfPossession(byte[] secretKeyBytes) {
public static Result buildProofOfPossession(byte[] secretKeyBytes, String registrantAddress) {
if (!Address.validate(registrantAddress)) {
throw new InvalidProofOfPossessionException(
"registrantAddress must be a valid address. Got " + registrantAddress + ".");
}

SecretKey sk = new SecretKey();
sk.from_bendian(secretKeyBytes);

// 1. Derive the compressed public key (48-byte G1).
byte[] pk = new P1(sk).compress();
P2 sig = new P2().hash_to(pk, POP_DST).sign_with(sk);

// 2. Hash chainId ‖ registrantAddress ‖ pk to a G2 point under POP_DST, binding
// the proof to the registrant and chain.
String packedChainId = TypeEncoder.encodePacked(new Uint256(Network.get().chainId()));
String packedAddress =
TypeEncoder.encodePacked(new org.web3j.abi.datatypes.Address(registrantAddress));
String packedPk = TypeEncoder.encodePacked(new DynamicBytes(pk));
byte[] message = Hex.decode(packedChainId + packedAddress + packedPk);

// 3. Sign the hashed G2 point with the secret key.
P2 sig = new P2().hash_to(message, POP_DST).sign_with(sk);
return new Result(pk, sig.compress());
}

public static Result fromMnemonic(String passphrase) {
return buildProofOfPossession(deriveBlsPrivateKey(passphrase));
public static Result fromMnemonic(String passphrase, String registrantAddress) {
return buildProofOfPossession(deriveBlsPrivateKey(passphrase), registrantAddress);
}

private static SecretKey deriveChildSk(String passphrase) {
Expand All @@ -62,6 +84,4 @@ private static byte[] passphraseToSeed(String passphrase) {
gen.init(pass, salt, 2048);
return ((KeyParameter) gen.generateDerivedParameters(512)).getKey();
}


}
11 changes: 6 additions & 5 deletions src/main/java/org/arkecosystem/crypto/utils/TransactionEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import org.arkecosystem.crypto.encoding.Hex;
import org.arkecosystem.crypto.enums.AbiFunction;
import org.arkecosystem.crypto.enums.ContractAbiType;
import org.arkecosystem.crypto.utils.ProofOfPossession;

public final class TransactionEncoder {

Expand Down Expand Up @@ -41,8 +40,9 @@ public static String usernameResignation() {
Collections.emptyList());
}

public static String validatorRegistration(String passphrase) {
ProofOfPossession.Result pop = ProofOfPossession.fromMnemonic(passphrase);
public static String validatorRegistration(String passphrase, String registrantAddress) {
ProofOfPossession.Result pop =
ProofOfPossession.fromMnemonic(passphrase, registrantAddress);
return encode(
ContractAbiType.CONSENSUS,
AbiFunction.VALIDATOR_REGISTRATION,
Expand All @@ -56,8 +56,9 @@ public static String validatorResignation() {
Collections.emptyList());
}

public static String validatorUpdate(String passphrase) {
ProofOfPossession.Result pop = ProofOfPossession.fromMnemonic(passphrase);
public static String validatorUpdate(String passphrase, String registrantAddress) {
ProofOfPossession.Result pop =
ProofOfPossession.fromMnemonic(passphrase, registrantAddress);
return encode(
ContractAbiType.CONSENSUS,
AbiFunction.UPDATE_VALIDATOR,
Expand Down
4 changes: 3 additions & 1 deletion ...t/java/org/arkecosystem/crypto/transactions/builder/ValidatorRegistrationBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.Map;
import org.arkecosystem.crypto.AbstractTest;
import org.arkecosystem.crypto.encoding.Hex;
import org.arkecosystem.crypto.identities.Address;
import org.junit.jupiter.api.Test;

public class ValidatorRegistrationBuilderTest extends AbstractTest {
Expand All @@ -25,7 +26,8 @@ public void it_should_sign_it_with_a_passphrase() throws Exception {
.nonce(Long.parseLong(data.get("nonce").toString()))
.network(((Number) data.get("network")).intValue())
.gasLimit(((Number) data.get("gasLimit")).longValue())
.validatorPassphrase(VALIDATOR_PASSPHRASE)
.validatorProof(
VALIDATOR_PASSPHRASE, Address.fromPassphrase(this.passphrase))
.recipientAddress((String) data.get("recipientAddress"))
.sign(this.passphrase);

Expand Down
4 changes: 3 additions & 1 deletion src/test/java/org/arkecosystem/crypto/transactions/builder/ValidatorUpdateBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.Map;
import org.arkecosystem.crypto.AbstractTest;
import org.arkecosystem.crypto.encoding.Hex;
import org.arkecosystem.crypto.identities.Address;
import org.junit.jupiter.api.Test;

public class ValidatorUpdateBuilderTest extends AbstractTest {
Expand All @@ -25,7 +26,8 @@ public void it_should_sign_it_with_a_passphrase() throws Exception {
.nonce(Long.parseLong(data.get("nonce").toString()))
.network(((Number) data.get("network")).intValue())
.gasLimit(((Number) data.get("gasLimit")).longValue())
.validatorPassphrase(VALIDATOR_PASSPHRASE)
.validatorProof(
VALIDATOR_PASSPHRASE, Address.fromPassphrase(this.passphrase))
.recipientAddress((String) data.get("recipientAddress"))
.sign(this.passphrase);

Expand Down
Loading