Skip to content
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

Update fee wallet #14

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Update fee wallet #14

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
2 changes: 1 addition & 1 deletion clients/js/src/generated/instructions/captureV1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ export function captureV1(
}
if (!resolvedAccounts.feeSolAccount.value) {
resolvedAccounts.feeSolAccount.value = publicKey(
'GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3'
'C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD'
);
}
if (!resolvedAccounts.recentBlockhashes.value) {
Expand Down
2 changes: 1 addition & 1 deletion clients/js/src/generated/instructions/captureV2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export function captureV2(
}
if (!resolvedAccounts.feeSolAccount.value) {
resolvedAccounts.feeSolAccount.value = publicKey(
'GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3'
'C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD'
);
}
if (!resolvedAccounts.recentBlockhashes.value) {
Expand Down
2 changes: 1 addition & 1 deletion clients/js/src/generated/instructions/releaseV1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ export function releaseV1(
}
if (!resolvedAccounts.feeSolAccount.value) {
resolvedAccounts.feeSolAccount.value = publicKey(
'GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3'
'C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD'
);
}
if (!resolvedAccounts.recentBlockhashes.value) {
Expand Down
2 changes: 1 addition & 1 deletion clients/js/src/generated/instructions/releaseV2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export function releaseV2(
}
if (!resolvedAccounts.feeSolAccount.value) {
resolvedAccounts.feeSolAccount.value = publicKey(
'GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3'
'C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD'
);
}
if (!resolvedAccounts.recentBlockhashes.value) {
Expand Down
6 changes: 3 additions & 3 deletions clients/rust/src/generated/instructions/capture_v1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ impl CaptureV1InstructionData {
/// 6. `[writable]` escrow_token_account
/// 7. `[]` token
/// 8. `[writable]` fee_token_account
/// 9. `[writable, optional]` fee_sol_account (default to `GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3`)
/// 9. `[writable, optional]` fee_sol_account (default to `C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD`)
/// 10. `[writable]` fee_project_account
/// 11. `[optional]` recent_blockhashes (default to `SysvarS1otHashes111111111111111111111111111`)
/// 12. `[optional]` mpl_core (default to `CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d`)
Expand Down Expand Up @@ -244,7 +244,7 @@ impl CaptureV1Builder {
self.fee_token_account = Some(fee_token_account);
self
}
/// `[optional account, default to 'GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3']`
/// `[optional account, default to 'C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD']`
#[inline(always)]
pub fn fee_sol_account(
&mut self,
Expand Down Expand Up @@ -334,7 +334,7 @@ impl CaptureV1Builder {
.fee_token_account
.expect("fee_token_account is not set"),
fee_sol_account: self.fee_sol_account.unwrap_or(solana_program::pubkey!(
"GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3"
"C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD"
)),
fee_project_account: self
.fee_project_account
Expand Down
6 changes: 3 additions & 3 deletions clients/rust/src/generated/instructions/capture_v2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ impl CaptureV2InstructionData {
/// 7. `[writable]` escrow_token_account
/// 8. `[]` token
/// 9. `[writable]` fee_token_account
/// 10. `[writable, optional]` fee_sol_account (default to `GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3`)
/// 10. `[writable, optional]` fee_sol_account (default to `C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD`)
/// 11. `[writable]` fee_project_account
/// 12. `[optional]` recent_blockhashes (default to `SysvarS1otHashes111111111111111111111111111`)
/// 13. `[optional]` mpl_core (default to `CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d`)
Expand Down Expand Up @@ -257,7 +257,7 @@ impl CaptureV2Builder {
self.fee_token_account = Some(fee_token_account);
self
}
/// `[optional account, default to 'GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3']`
/// `[optional account, default to 'C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD']`
#[inline(always)]
pub fn fee_sol_account(
&mut self,
Expand Down Expand Up @@ -348,7 +348,7 @@ impl CaptureV2Builder {
.fee_token_account
.expect("fee_token_account is not set"),
fee_sol_account: self.fee_sol_account.unwrap_or(solana_program::pubkey!(
"GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3"
"C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD"
)),
fee_project_account: self
.fee_project_account
Expand Down
6 changes: 3 additions & 3 deletions clients/rust/src/generated/instructions/release_v1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ impl ReleaseV1InstructionData {
/// 6. `[writable]` escrow_token_account
/// 7. `[]` token
/// 8. `[writable]` fee_token_account
/// 9. `[writable, optional]` fee_sol_account (default to `GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3`)
/// 9. `[writable, optional]` fee_sol_account (default to `C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD`)
/// 10. `[writable]` fee_project_account
/// 11. `[optional]` recent_blockhashes (default to `SysvarS1otHashes111111111111111111111111111`)
/// 12. `[optional]` mpl_core (default to `CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d`)
Expand Down Expand Up @@ -244,7 +244,7 @@ impl ReleaseV1Builder {
self.fee_token_account = Some(fee_token_account);
self
}
/// `[optional account, default to 'GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3']`
/// `[optional account, default to 'C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD']`
#[inline(always)]
pub fn fee_sol_account(
&mut self,
Expand Down Expand Up @@ -334,7 +334,7 @@ impl ReleaseV1Builder {
.fee_token_account
.expect("fee_token_account is not set"),
fee_sol_account: self.fee_sol_account.unwrap_or(solana_program::pubkey!(
"GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3"
"C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD"
)),
fee_project_account: self
.fee_project_account
Expand Down
6 changes: 3 additions & 3 deletions clients/rust/src/generated/instructions/release_v2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ impl ReleaseV2InstructionData {
/// 7. `[writable]` escrow_token_account
/// 8. `[]` token
/// 9. `[writable]` fee_token_account
/// 10. `[writable, optional]` fee_sol_account (default to `GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3`)
/// 10. `[writable, optional]` fee_sol_account (default to `C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD`)
/// 11. `[writable]` fee_project_account
/// 12. `[optional]` recent_blockhashes (default to `SysvarS1otHashes111111111111111111111111111`)
/// 13. `[optional]` mpl_core (default to `CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d`)
Expand Down Expand Up @@ -257,7 +257,7 @@ impl ReleaseV2Builder {
self.fee_token_account = Some(fee_token_account);
self
}
/// `[optional account, default to 'GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3']`
/// `[optional account, default to 'C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD']`
#[inline(always)]
pub fn fee_sol_account(
&mut self,
Expand Down Expand Up @@ -348,7 +348,7 @@ impl ReleaseV2Builder {
.fee_token_account
.expect("fee_token_account is not set"),
fee_sol_account: self.fee_sol_account.unwrap_or(solana_program::pubkey!(
"GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3"
"C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD"
)),
fee_project_account: self
.fee_project_account
Expand Down
8 changes: 4 additions & 4 deletions configs/kinobi.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ kinobi.update(
},
mplCore: { defaultValue: k.publicKeyValueNode("CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d") },
recentBlockhashes: { defaultValue: k.publicKeyValueNode("SysvarS1otHashes111111111111111111111111111") },
feeSolAccount: { defaultValue: k.publicKeyValueNode("GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3") }
feeSolAccount: { defaultValue: k.publicKeyValueNode("C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD") }
}
},
releaseV1: {
Expand All @@ -103,7 +103,7 @@ kinobi.update(
},
mplCore: { defaultValue: k.publicKeyValueNode("CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d") },
recentBlockhashes: { defaultValue: k.publicKeyValueNode("SysvarS1otHashes111111111111111111111111111") },
feeSolAccount: { defaultValue: k.publicKeyValueNode("GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3") }
feeSolAccount: { defaultValue: k.publicKeyValueNode("C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD") }
}
},
initEscrowV2: {
Expand Down Expand Up @@ -133,7 +133,7 @@ kinobi.update(
},
mplCore: { defaultValue: k.publicKeyValueNode("CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d") },
recentBlockhashes: { defaultValue: k.publicKeyValueNode("SysvarS1otHashes111111111111111111111111111") },
feeSolAccount: { defaultValue: k.publicKeyValueNode("GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3") }
feeSolAccount: { defaultValue: k.publicKeyValueNode("C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD") }
}
},
releaseV2: {
Expand All @@ -147,7 +147,7 @@ kinobi.update(
},
mplCore: { defaultValue: k.publicKeyValueNode("CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d") },
recentBlockhashes: { defaultValue: k.publicKeyValueNode("SysvarS1otHashes111111111111111111111111111") },
feeSolAccount: { defaultValue: k.publicKeyValueNode("GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3") }
feeSolAccount: { defaultValue: k.publicKeyValueNode("C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD") }
}
},
})
Expand Down
2 changes: 1 addition & 1 deletion programs/mpl-hybrid/src/constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use solana_program::{pubkey, pubkey::Pubkey};

pub const FEE_WALLET: Pubkey = pubkey!("GjF4LqmEhV33riVyAwHwiEeAHx4XXFn2yMY3fmMigoP3");
pub const FEE_WALLET: Pubkey = pubkey!("C3iyKknpNPeZXQEVLkR8ZJxcgB8xdsqXkyrV1RwEmdrD");
pub const SLOT_HASHES: Pubkey = pubkey!("SysvarS1otHashes111111111111111111111111111");
pub const MPL_CORE: Pubkey = pubkey!("CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d");
pub const PROTOCOL_FEE: u64 = 5000000;