Skip to content

Commit d14ebcd

Browse files
committed
solana: Update SDK code to match program
1 parent 697aa06 commit d14ebcd

File tree

2 files changed

+22
-20
lines changed

2 files changed

+22
-20
lines changed

solana/ts/lib/ntt.ts

+21-19
Original file line numberDiff line numberDiff line change
@@ -298,23 +298,25 @@ export namespace NTT {
298298
return await program.methods
299299
.initializeMultisig({ chainId, limit: limit, mode })
300300
.accountsStrict({
301-
payer: args.payer,
302-
deployer: args.owner,
303-
programData: programDataAddress(program.programId),
304-
config: pdas.configAccount(),
305-
mint: args.mint,
306-
rateLimit: pdas.outboxRateLimitAccount(),
301+
common: {
302+
payer: args.payer,
303+
deployer: args.owner,
304+
programData: programDataAddress(program.programId),
305+
config: pdas.configAccount(),
306+
mint: args.mint,
307+
rateLimit: pdas.outboxRateLimitAccount(),
308+
tokenAuthority: pdas.tokenAuthority(),
309+
custody: await NTT.custodyAccountAddress(
310+
pdas,
311+
args.mint,
312+
args.tokenProgram
313+
),
314+
tokenProgram: args.tokenProgram,
315+
associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
316+
bpfLoaderUpgradeableProgram: BPF_LOADER_UPGRADEABLE_PROGRAM_ID,
317+
systemProgram: SystemProgram.programId,
318+
},
307319
multisig: args.multisig,
308-
tokenProgram: args.tokenProgram,
309-
tokenAuthority: pdas.tokenAuthority(),
310-
custody: await NTT.custodyAccountAddress(
311-
pdas,
312-
args.mint,
313-
args.tokenProgram
314-
),
315-
bpfLoaderUpgradeableProgram: BPF_LOADER_UPGRADEABLE_PROGRAM_ID,
316-
associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
317-
systemProgram: SystemProgram.programId,
318320
})
319321
.instruction();
320322
}
@@ -658,7 +660,7 @@ export namespace NTT {
658660

659661
// TODO: document that if recipient is provided, then the instruction can be
660662
// created before the inbox item is created (i.e. they can be put in the same tx)
661-
export async function createReleaseInboundMultisigMintInstruction(
663+
export async function createReleaseInboundMintMultisigInstruction(
662664
program: Program<NttBindings.NativeTokenTransfer<IdlVersion>>,
663665
config: NttBindings.Config<IdlVersion>,
664666
args: {
@@ -679,7 +681,7 @@ export namespace NTT {
679681
.recipientAddress;
680682

681683
const transferIx = await program.methods
682-
.releaseInboundMultisigMint({
684+
.releaseInboundMintMultisig({
683685
revertOnDelay: args.revertOnDelay,
684686
})
685687
.accountsStrict({
@@ -697,8 +699,8 @@ export namespace NTT {
697699
tokenAuthority: pdas.tokenAuthority(),
698700
tokenProgram: config.tokenProgram,
699701
custody: await custodyAccountAddress(pdas, config),
700-
multisig: args.multisig,
701702
},
703+
multisig: args.multisig,
702704
})
703705
.instruction();
704706

solana/ts/sdk/ntt.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ export class SolanaNtt<N extends Network, C extends SolanaChains>
10111011
...releaseArgs,
10121012
})
10131013
: multisig
1014-
? NTT.createReleaseInboundMultisigMintInstruction(
1014+
? NTT.createReleaseInboundMintMultisigInstruction(
10151015
this.program,
10161016
config,
10171017
{

0 commit comments

Comments
 (0)