Skip to content

ENT-14766- Sample to support the key rotation #122

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

Draft
filipesoliveira wants to merge 4 commits into
base: release/4.12
Choose a base branch
from
Draft

ENT-14766- Sample to support the key rotation #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87ee66f
ENT-14766- Sample to support the key rotation.
filipesoliveira Mar 31, 2026
340874d
Update.
filipesoliveira Apr 20, 2026
df6fcbd
Added comments explaining the changes.
filipesoliveira Apr 30, 2026
d0d5061
Updated the AcceptanceFlow and added comments.
filipesoliveira Apr 30, 2026
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
24 changes: 24 additions & 0 deletions Advanced/negotiation-cordapp/repositories.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,28 @@ repositories {
maven { url 'https://jitpack.io' }
maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }

// Repository where the user-reported artifact resides
maven {
url "https://software.r3.com/artifactory/r3-corda-releases"
credentials {
username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME')
password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD')
}
content {
includeGroupByRegex 'com\\.r3(\\..*)?'
}
}

// Repository for corda-dev artifacts (contains net.corda SNAPSHOTs like corda-shell 4.14-SNAPSHOT)
maven {
url "https://software.r3.com/artifactory/corda-dev"
credentials {
username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME')
password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD')
}
content {
includeGroupByRegex 'net\\.corda(\\..*)?'
}
}
}
26 changes: 17 additions & 9 deletions ...n-cordapp/workflows/src/main/java/net/corda/samples/negotiation/flows/AcceptanceFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import co.paralleluniverse.fibers.Suspendable;
import com.google.common.collect.ImmutableList;

import net.corda.core.crypto.keyrotation.crossprovider.PartyIdentityResolver;
import net.corda.samples.negotiation.contracts.ProposalAndTradeContract;
import net.corda.samples.negotiation.states.ProposalState;
import net.corda.samples.negotiation.states.TradeState;
Expand All @@ -17,7 +18,6 @@
import net.corda.core.transactions.LedgerTransaction;
import net.corda.core.transactions.SignedTransaction;
import net.corda.core.transactions.TransactionBuilder;
import net.corda.core.utilities.ProgressTracker;
import org.jetbrains.annotations.NotNull;

import java.security.PublicKey;
Expand All @@ -31,7 +31,6 @@ public class AcceptanceFlow {
public static class Initiator extends FlowLogic<SignedTransaction> {

private UniqueIdentifier proposalId;
private ProgressTracker progressTracker = new ProgressTracker();

public Initiator(UniqueIdentifier proposalId) {
this.proposalId = proposalId;
Expand All @@ -47,25 +46,31 @@ public SignedTransaction call() throws FlowException {

ProposalState input = (ProposalState) inputStateAndRef.getState().getData();

//Creating the output
// Creating the output
TradeState output = new TradeState(input.getAmount(), input.getBuyer(), input.getSeller(), input.getLinearId());

//Creating the command
// Creating the command
List<PublicKey> requiredSigners = ImmutableList.of(input.getProposee().getOwningKey(), input.getProposer().getOwningKey());
Command command = new Command(new ProposalAndTradeContract.Commands.Accept(), requiredSigners);

//Building the transaction
// Building the transaction
Party notary = inputStateAndRef.getState().getNotary();
TransactionBuilder txBuilder = new TransactionBuilder(notary)
.addInputState(inputStateAndRef)
.addOutputState(output, ProposalAndTradeContract.ID)
.addCommand(command);

//Signing the transaction ourselves
// Signing the transaction ourselves
SignedTransaction partStx = getServiceHub().signInitialTransaction(txBuilder);

//Gathering the counterparty's signature
Party counterparty = (getOurIdentity().equals(input.getProposer()))? input.getProposee() : input.getProposer();
// Gathering the counterparty's signature
//
// The proposer must be resolved to its latest identity before it can be compared with the party returned by `getOurIdentity`.
//
// The counterparty might be an old key, but the session will be initiated with the most up-to-date identity.
// No need to use the resolved party in this case.
Party proposer = PartyIdentityResolver.Companion.resolveToCurrentParty(input.getProposer(), getServiceHub().getIdentityService());
Party counterparty = (getOurIdentity().equals(proposer))? input.getProposee() : input.getProposer();
FlowSession counterpartySession = initiateFlow(counterparty);
SignedTransaction fullyStx = subFlow(new CollectSignaturesFlow(partStx, ImmutableList.of(counterpartySession)));

Expand All @@ -92,7 +97,10 @@ public SignedTransaction call() throws FlowException {
protected void checkTransaction(@NotNull SignedTransaction stx) throws FlowException {
try {
LedgerTransaction ledgerTx = stx.toLedgerTransaction(getServiceHub(), false);
Party proposee = ledgerTx.inputsOfType(ProposalState.class).get(0).getProposee();

// The proposee must be resolved to its latest identity before it can be compared with the party returned by `counterpartySession`.
// `counterpartySession` always returns the most up-to-date identity of the counterparty.
Party proposee = PartyIdentityResolver.Companion.resolveToCurrentParty(ledgerTx.inputsOfType(ProposalState.class).get(0).getProposee(), getServiceHub().getIdentityService());
if(!proposee.equals(counterpartySession.getCounterparty())){
throw new FlowException("Only the proposee can accept a proposal.");
}
Expand Down
29 changes: 24 additions & 5 deletions ...cordapp/workflows/src/main/java/net/corda/samples/negotiation/flows/ModificationFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import co.paralleluniverse.fibers.Suspendable;
import com.google.common.collect.ImmutableList;
import net.corda.core.crypto.keyrotation.crossprovider.PartyIdentityResolver;
import net.corda.samples.negotiation.contracts.ProposalAndTradeContract;
import net.corda.samples.negotiation.states.ProposalState;
import net.corda.core.contracts.Command;
Expand Down Expand Up @@ -29,7 +30,6 @@ public class ModificationFlow {
public static class Initiator extends FlowLogic<SignedTransaction>{
private UniqueIdentifier proposalId;
private int newAmount;
private ProgressTracker progressTracker = new ProgressTracker();

public Initiator(UniqueIdentifier proposalId, int newAmount) {
this.proposalId = proposalId;
Expand All @@ -44,8 +44,16 @@ public SignedTransaction call() throws FlowException {
ProposalState input = (ProposalState) inputStateAndRef.getState().getData();

//Creating the output
Party counterparty = (getOurIdentity().equals(input.getProposer()))? input.getProposee() : input.getProposer();
ProposalState output = new ProposalState(newAmount, input.getBuyer(),input.getSeller(), getOurIdentity(), counterparty, input.getLinearId());
//
// The proposerParty is retrieved from the state and must be resolved to its latest identity
// before it can be compared with the party returned by `getOurIdentity`. Since the intent is not to
// replace the old key with the new one in the output state, calling `resolveToCurrentParty` is sufficient.
//
// Comparing parties that both originate from states is safe without additional resolution.
Party proposerParty = PartyIdentityResolver.Companion.resolveToCurrentParty(input.getProposer(), getServiceHub().getIdentityService());
Party myPartyFromInput = (getOurIdentity().equals(proposerParty)) ? input.getProposer() : input.getProposee();
Party counterpartyFromInput = (myPartyFromInput.equals(input.getProposer()))? input.getProposee() : input.getProposer();
ProposalState output = new ProposalState(newAmount, input.getBuyer(),input.getSeller(), myPartyFromInput, counterpartyFromInput, input.getLinearId());

@adelel1 adelel1 Jul 20, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code would need changing cause of the line.

Was wondering about updating equals to handle key rotation. if you did that then this would be the only change needed.
Or alternatively define a new func that did an equals, but also handle key rotation. i.e. two parties are equal even if one is rotated.


//Creating the command
List<PublicKey> requiredSigners = ImmutableList.of(input.getProposee().getOwningKey(), input.getProposer().getOwningKey());
Expand All @@ -62,7 +70,10 @@ public SignedTransaction call() throws FlowException {
SignedTransaction partStx = getServiceHub().signInitialTransaction(txBuilder);

//Gathering the counterparty's signatures
FlowSession counterpartySession = initiateFlow(counterparty);
//
// The counterparty might be an old key, but the session will be initiated with the most up-to-date identity.
// No need to use the resolved party in this case.
FlowSession counterpartySession = initiateFlow(counterpartyFromInput);
SignedTransaction fullyStx = subFlow(new CollectSignaturesFlow(partStx, ImmutableList.of(counterpartySession)));

//Finalising the transaction
Expand All @@ -88,7 +99,15 @@ public SignedTransaction call() throws FlowException {
protected void checkTransaction(@NotNull SignedTransaction stx) throws FlowException {
try {
LedgerTransaction ledgerTx = stx.toLedgerTransaction(getServiceHub(), false);
Party proposee = ledgerTx.inputsOfType(ProposalState.class).get(0).getProposee();
ProposalState input = ledgerTx.inputsOfType(ProposalState.class).get(0);

// The counterparty session always provides the most up-to-date identity for the counterparty.
//
// Therefore, any party retrieved from a state must be resolved using `resolveToCurrentParty`.
// While `resolveToCurrentParty` does not rely on a proof, it resolves the party to its latest valid identity.
//
// This ensures that equality checks behave as expected after key rotation.
Party proposee = PartyIdentityResolver.Companion.resolveToCurrentParty(input.getProposee(), getServiceHub().getIdentityService());
if(!proposee.equals(counterpartySession.getCounterparty())){
throw new FlowException("Only the proposee can modify a proposal.");
}
Expand Down
2 changes: 1 addition & 1 deletion ...ion-cordapp/workflows/src/main/java/net/corda/samples/negotiation/flows/ProposalFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public UniqueIdentifier call() throws FlowException {

// Obtain a reference to a notary we wish to use.
/** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=TestNotaryService, L=London, C=GB"));

@filipesoliveira filipesoliveira Mar 31, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be ignore.


TransactionBuilder txBuilder = new TransactionBuilder(notary)
.addOutputState(output, ProposalAndTradeContract.ID)
Expand Down