certusone
/
wormhole
mirror of https://github.com/certusone/wormhole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge f89cc2ae25 into 9af1fac9e1

This commit is contained in:
A5 Pickle 2024-04-22 11:36:15 -05:00 committed by GitHub
parent 9af1fac9e1 f89cc2ae25
commit 21e83ae70a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solana/idl/nft_bridge.json
View File

@ -404,7 +404,7 @@
},
{
"name": "mint",
"isMut": true,
"isMut": false,
"isSigner": false
},
{

4
solana/idl/token_bridge.json
View File

@ -402,7 +402,7 @@
},
{
"name": "mint",
"isMut": true,
"isMut": false,
"isSigner": false
},
{
@ -833,7 +833,7 @@
},
{
"name": "mint",
"isMut": true,
"isMut": false,
"isSigner": false
},
{

2
solana/modules/nft_bridge/program/src/api/transfer.rs
View File

@ -56,7 +56,7 @@ pub struct TransferNative<'b> {
pub from: Mut<Data<'b, SplAccount, { AccountState::Initialized }>>,
pub mint: Mut<Data<'b, SplMint, { AccountState::Initialized }>>,
pub mint: Data<'b, SplMint, { AccountState::Initialized }>,
/// SPL Metadata for the associated Mint
pub spl_metadata: SplTokenMeta<'b>,

2
solana/modules/nft_bridge/program/src/instructions.rs
View File

@ -354,7 +354,7 @@ pub fn transfer_native(
AccountMeta::new(payer, true),
AccountMeta::new_readonly(config_key, false),
AccountMeta::new(from, false),
AccountMeta::new(mint, false),
AccountMeta::new_readonly(mint, false),
AccountMeta::new_readonly(spl_metadata, false),
AccountMeta::new(custody_key, false),
AccountMeta::new_readonly(authority_signer_key, false),

4
solana/modules/token_bridge/program/src/api/transfer.rs
View File

@ -59,7 +59,7 @@ pub struct TransferNative<'b> {
pub from: Mut<Data<'b, SplAccount, { AccountState::Initialized }>>,
pub mint: Mut<Data<'b, SplMint, { AccountState::Initialized }>>,
pub mint: Data<'b, SplMint, { AccountState::Initialized }>,
pub custody: Mut<CustodyAccount<'b, { AccountState::MaybeInitialized }>>,
@ -174,7 +174,7 @@ pub fn verify_and_execute_native_transfers(
derivation_data: &CustodyAccountDerivationData,
payer: &Mut<Signer<AccountInfo>>,
from: &Mut<Data<SplAccount, { AccountState::Initialized }>>,
mint: &Mut<Data<SplMint, { AccountState::Initialized }>>,
mint: &Data<SplMint, { AccountState::Initialized }>,
custody: &Mut<CustodyAccount<{ AccountState::MaybeInitialized }>>,
authority_signer: &AuthoritySigner,
custody_signer: &CustodySigner,

2
solana/modules/token_bridge/program/src/api/transfer_payload.rs
View File

@ -128,7 +128,7 @@ pub struct TransferNativeWithPayload<'b> {
pub config: ConfigAccount<'b, { AccountState::Initialized }>,
pub from: Mut<Data<'b, SplAccount, { AccountState::Initialized }>>,
pub mint: Mut<Data<'b, SplMint, { AccountState::Initialized }>>,
pub mint: Data<'b, SplMint, { AccountState::Initialized }>,
pub custody: Mut<CustodyAccount<'b, { AccountState::MaybeInitialized }>>,
// This could allow someone to race someone else's tx if they do the approval in a separate tx.

4
solana/modules/token_bridge/program/src/instructions.rs
View File

@ -505,7 +505,7 @@ pub fn transfer_native(
AccountMeta::new(payer, true),
AccountMeta::new_readonly(config_key, false),
AccountMeta::new(from, false),
AccountMeta::new(mint, false),
AccountMeta::new_readonly(mint, false),
AccountMeta::new(custody_key, false),
AccountMeta::new_readonly(authority_signer_key, false),
AccountMeta::new_readonly(custody_signer_key, false),
@ -590,7 +590,7 @@ pub fn transfer_native_with_payload(
AccountMeta::new(payer, true),
AccountMeta::new_readonly(config_key, false),
AccountMeta::new(from, false),
AccountMeta::new(mint, false),
AccountMeta::new_readonly(mint, false),
AccountMeta::new(custody_key, false),
AccountMeta::new_readonly(authority_signer_key, false),
AccountMeta::new_readonly(custody_signer_key, false),