Skip to content

Commit 86f17ee

Browse files
authored
fix: cctp used nonces in tests (#849)
Signed-off-by: Reinis Martinsons <[email protected]>
1 parent c813704 commit 86f17ee

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

test/svm/SvmSpoke.HandleReceiveMessage.ts

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ describe("svm_spoke.handle_receive_message", () => {
2626
let usedNonces: web3.PublicKey;
2727
let selfAuthority: web3.PublicKey;
2828
let eventAuthority: web3.PublicKey;
29-
const firstNonce = 1;
3029
const attestation = Buffer.alloc(0);
31-
let nonce = firstNonce;
30+
let nonce = 0;
3231
let remainingAccounts: web3.AccountMeta[];
3332
const cctpMessageversion = 0;
3433
let destinationCaller = new web3.PublicKey(new Uint8Array(32)); // We don't use permissioned caller.
@@ -57,10 +56,15 @@ describe("svm_spoke.handle_receive_message", () => {
5756
[Buffer.from("message_transmitter")],
5857
messageTransmitterProgram.programId
5958
);
60-
[usedNonces] = web3.PublicKey.findProgramAddressSync(
61-
[Buffer.from("used_nonces"), Buffer.from(remoteDomain.toString()), Buffer.from(firstNonce.toString())],
62-
messageTransmitterProgram.programId
63-
);
59+
usedNonces = await messageTransmitterProgram.methods
60+
.getNoncePda({
61+
nonce: new BN(nonce.toString()),
62+
sourceDomain: remoteDomain.toNumber(),
63+
})
64+
.accounts({
65+
messageTransmitter: messageTransmitterState,
66+
})
67+
.view();
6468
[selfAuthority] = web3.PublicKey.findProgramAddressSync([Buffer.from("self_authority")], program.programId);
6569
[eventAuthority] = web3.PublicKey.findProgramAddressSync([Buffer.from("__event_authority")], program.programId);
6670

@@ -145,10 +149,15 @@ describe("svm_spoke.handle_receive_message", () => {
145149

146150
it("Block Wrong Source Domain", async () => {
147151
const sourceDomain = 666;
148-
[receiveMessageAccounts.usedNonces] = web3.PublicKey.findProgramAddressSync(
149-
[Buffer.from("used_nonces"), Buffer.from(sourceDomain.toString()), Buffer.from(firstNonce.toString())],
150-
messageTransmitterProgram.programId
151-
);
152+
receiveMessageAccounts.usedNonces = await messageTransmitterProgram.methods
153+
.getNoncePda({
154+
nonce: new BN(nonce.toString()),
155+
sourceDomain,
156+
})
157+
.accounts({
158+
messageTransmitter: messageTransmitterState,
159+
})
160+
.view();
152161

153162
const calldata = ethereumIface.encodeFunctionData("pauseDeposits", [true]);
154163
const messageBody = Buffer.from(calldata.slice(2), "hex");

0 commit comments

Comments
 (0)