diff --git a/programs/mmm/src/instructions/cnft/mod.rs b/programs/mmm/src/instructions/cnft/mod.rs index 3dd87ea..ba9e952 100644 --- a/programs/mmm/src/instructions/cnft/mod.rs +++ b/programs/mmm/src/instructions/cnft/mod.rs @@ -1,5 +1,5 @@ -pub mod sol_cnft_fulfill_buy; pub mod metadata_args; +pub mod sol_cnft_fulfill_buy; +pub use metadata_args::*; pub use sol_cnft_fulfill_buy::*; -pub use metadata_args::*; \ No newline at end of file diff --git a/programs/mmm/src/instructions/mod.rs b/programs/mmm/src/instructions/mod.rs index f6157d7..753895e 100644 --- a/programs/mmm/src/instructions/mod.rs +++ b/programs/mmm/src/instructions/mod.rs @@ -1,20 +1,20 @@ #![allow(missing_docs)] pub mod admin; +pub mod cnft; pub mod ext_vanilla; pub mod mip1; pub mod mpl_core_asset; pub mod ocp; pub mod vanilla; -pub mod cnft; pub use admin::*; +pub use cnft::*; pub use ext_vanilla::*; pub use mip1::*; pub use mpl_core_asset::*; pub use ocp::*; pub use vanilla::*; -pub use cnft::*; use anchor_lang::{prelude::*, AnchorDeserialize, AnchorSerialize}; diff --git a/programs/mmm/src/state.rs b/programs/mmm/src/state.rs index 1be05ee..fbb248d 100644 --- a/programs/mmm/src/state.rs +++ b/programs/mmm/src/state.rs @@ -138,7 +138,6 @@ impl SellState { 200; // padding } - // Wrapper structs to replace the Anchor program types until the Metaplex libs have // better Anchor support. pub struct BubblegumProgram; @@ -149,7 +148,6 @@ impl Id for BubblegumProgram { } } - #[derive(Clone)] pub struct TreeConfigAnchor(pub TreeConfig); diff --git a/sdk/src/mmmClient.ts b/sdk/src/mmmClient.ts index 83020a0..fee18d8 100644 --- a/sdk/src/mmmClient.ts +++ b/sdk/src/mmmClient.ts @@ -305,7 +305,8 @@ export class MMMClient { | ReturnType | ReturnType | ReturnType - | ReturnType; + | ReturnType + | ReturnType; const mintOrCoreAsset = await this.conn.getAccountInfo(assetMint); let { key: buysideSolEscrowAccount } = getMMMBuysideSolEscrowPDA(