Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ jobs:
- name: Lint
run: pnpm programs:lint

format_and_lint_interface:
name: Format & Lint Interface
format_and_lint_pinterface:
name: Format & Lint P-Interface
runs-on: ubuntu-latest
steps:
- name: Git Checkout
Expand All @@ -75,10 +75,10 @@ jobs:
rustfmt: true

- name: Format
run: pnpm interface:format
run: pnpm p-interface:format

- name: Lint
run: pnpm interface:lint
run: pnpm p-interface:lint

format_and_lint_ptoken:
name: Format & Lint p-token
Expand All @@ -98,7 +98,7 @@ jobs:

- name: Lint
run: pnpm p-token:lint

audit_rust:
name: Audit Rust
runs-on: ubuntu-latest
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
build_ptoken:
name: Build p-token
runs-on: ubuntu-latest
needs: [format_and_lint_interface, format_and_lint_ptoken]
needs: [format_and_lint_pinterface, format_and_lint_ptoken]
steps:
- name: Git Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
type: choice
options:
- clients/rust
- interface
- p-interface
- program
- p-token
level:
Expand Down
22 changes: 11 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace]
resolver = "2"
members = ["interface", "p-token", "program"]
members = ["p-interface", "p-token", "program"]

[workspace.package]
authors = ["Anza Maintainers <maintainers@anza.xyz>"]
Expand Down
4 changes: 2 additions & 2 deletions interface/Cargo.toml → p-interface/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "spl-token-interface"
name = "pinocchio-token-interface"
version = "0.0.0"
description = "Instructions and types for interacting with SPL Token program"
description = "Pinocchio instructions and types for interacting with SPL Token program"
authors = { workspace = true}
repository = { workspace = true}
license = { workspace = true}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion p-token/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ logging = []
[dependencies]
pinocchio = { workspace = true }
pinocchio-log = { version = "0.5", default-features = false }
spl-token-interface = { version = "^0", path = "../interface" }
pinocchio-token-interface = { version = "^0", path = "../p-interface" }

[dev-dependencies]
assert_matches = "1.5.0"
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/entrypoint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use {
pubkey::Pubkey,
ProgramResult,
},
spl_token_interface::error::TokenError,
pinocchio_token_interface::error::TokenError,
};

program_entrypoint!(process_instruction);
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/amount_to_ui_amount.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use {
ProgramResult,
},
pinocchio_log::logger::{Argument, Logger},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
state::{load, mint::Mint},
},
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/batch.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
crate::entrypoint::inner_process_instruction,
pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult},
spl_token_interface::error::TokenError,
pinocchio_token_interface::error::TokenError,
};

/// The size of the batch instruction header.
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/close_account.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
super::validate_owner,
pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
state::{
account::{Account, INCINERATOR_ID},
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/get_account_data_size.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use {
account_info::AccountInfo, program::set_return_data, program_error::ProgramError,
ProgramResult,
},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
state::{account::Account, load, mint::Mint, Transmutable},
},
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/initialize_account2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use {
pubkey::{Pubkey, PUBKEY_BYTES},
ProgramResult,
},
spl_token_interface::error::TokenError,
pinocchio_token_interface::error::TokenError,
};

#[inline(always)]
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/initialize_account3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use {
pubkey::{Pubkey, PUBKEY_BYTES},
ProgramResult,
},
spl_token_interface::error::TokenError,
pinocchio_token_interface::error::TokenError,
};

#[inline(always)]
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/initialize_immutable_owner.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use {
pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
state::{account::Account, load_unchecked, Initializable},
},
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/initialize_multisig.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
super::shared,
pinocchio::{account_info::AccountInfo, ProgramResult},
spl_token_interface::error::TokenError,
pinocchio_token_interface::error::TokenError,
};

#[inline(always)]
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/initialize_multisig2.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
super::shared,
pinocchio::{account_info::AccountInfo, ProgramResult},
spl_token_interface::error::TokenError,
pinocchio_token_interface::error::TokenError,
};

pub fn process_initialize_multisig2(
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use {
account_info::AccountInfo, program_error::ProgramError, pubkey::Pubkey,
syscalls::sol_memcpy_, ProgramResult,
},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
program::ID as TOKEN_PROGRAM_ID,
state::{
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/revoke.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
super::validate_owner,
pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
state::{account::Account, load_mut},
},
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/set_authority.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use {
pinocchio::{
account_info::AccountInfo, program_error::ProgramError, pubkey::Pubkey, ProgramResult,
},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
instruction::AuthorityType,
state::{account::Account, load_mut, mint::Mint, Transmutable},
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/shared/approve.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
crate::processor::validate_owner,
pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
state::{account::Account, load, load_mut, mint::Mint},
},
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/shared/burn.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
crate::processor::{check_account_owner, validate_owner},
pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
state::{account::Account, load_mut, mint::Mint},
},
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/shared/initialize_account.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use {
sysvars::{rent::Rent, Sysvar},
ProgramResult,
},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
native_mint::is_native_mint,
state::{
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/shared/initialize_mint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use {
sysvars::{rent::Rent, Sysvar},
ProgramResult,
},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
state::{load_mut_unchecked, mint::Mint, Initializable},
},
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/shared/initialize_multisig.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use {
sysvars::{rent::Rent, Sysvar},
ProgramResult,
},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
state::{load_mut_unchecked, multisig::Multisig, Initializable},
},
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/shared/mint_to.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
crate::processor::{check_account_owner, validate_owner},
pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
state::{account::Account, load_mut, mint::Mint},
},
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/shared/toggle_account_state.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
crate::processor::validate_owner,
pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
state::{account::Account, account_state::AccountState, load, load_mut, mint::Mint},
},
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/shared/transfer.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
crate::processor::{check_account_owner, validate_owner},
pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
state::{account::Account, load, load_mut, load_mut_unchecked, mint::Mint},
},
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/sync_native.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
super::check_account_owner,
pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
state::{account::Account, load_mut},
},
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/ui_amount_to_amount.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use {
account_info::AccountInfo, program::set_return_data, program_error::ProgramError,
ProgramResult,
},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
state::{load, mint::Mint},
},
Expand Down
2 changes: 1 addition & 1 deletion p-token/src/processor/withdraw_excess_lamports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use {
sysvars::{rent::Rent, Sysvar},
ProgramResult,
},
spl_token_interface::{
pinocchio_token_interface::{
error::TokenError,
state::{account::Account, load, mint::Mint, multisig::Multisig, Transmutable},
},
Expand Down
2 changes: 1 addition & 1 deletion p-token/tests/initialize_mint.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
mod setup;

use {
pinocchio_token_interface::state::mint::Mint,
setup::TOKEN_PROGRAM_ID,
solana_keypair::Keypair,
solana_program_option::COption,
Expand All @@ -10,7 +11,6 @@ use {
solana_signer::Signer,
solana_system_interface::instruction::create_account,
solana_transaction::Transaction,
spl_token_interface::state::mint::Mint,
std::mem::size_of,
};

Expand Down
2 changes: 1 addition & 1 deletion p-token/tests/initialize_mint2.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
mod setup;

use {
pinocchio_token_interface::state::mint::Mint,
setup::TOKEN_PROGRAM_ID,
solana_keypair::Keypair,
solana_program_option::COption,
Expand All @@ -10,7 +11,6 @@ use {
solana_signer::Signer,
solana_system_interface::instruction::create_account,
solana_transaction::Transaction,
spl_token_interface::state::mint::Mint,
std::mem::size_of,
};

Expand Down
2 changes: 1 addition & 1 deletion p-token/tests/setup/mint.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use {
pinocchio_token_interface::state::mint::Mint,
solana_keypair::Keypair,
solana_program_error::ProgramError,
solana_program_test::{BanksClientError, ProgramTestContext},
solana_pubkey::Pubkey,
solana_signer::Signer,
solana_system_interface::instruction::create_account,
solana_transaction::Transaction,
spl_token_interface::state::mint::Mint,
std::mem::size_of,
};

Expand Down
2 changes: 1 addition & 1 deletion p-token/tests/setup/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ pub mod account;
#[allow(dead_code)]
pub mod mint;

pub const TOKEN_PROGRAM_ID: Pubkey = Pubkey::new_from_array(spl_token_interface::program::ID);
pub const TOKEN_PROGRAM_ID: Pubkey = Pubkey::new_from_array(pinocchio_token_interface::program::ID);
Loading
Loading