feat: add MPL-404 instructions #161

qapquiz · 2024-11-06T15:59:38Z

instructions

init_escrow
init_nft_data
update_escrow
update_new_data
capture
release

This pull request was created for https://app.gib.work/bounties/aeb1c1a9-9af0-4265-9501-8c9e469afd0b in an attempt to solve a bounty #152 . Payment for the bounty is immediately sent to the contributor after merge.

- init_escrow - update_escrow - capture - release

enzotar · 2024-11-06T16:15:00Z

Nice. Can you add the remaining instructions and tests. Here's an example command with a test:

flow-backend/crates/cmds-solana/src/transfer_sol.rs

Line 70 in cce3b95

mod tests {

qapquiz · 2024-11-06T16:20:46Z

Nice. Can you add the remaining instructions and tests. Here's an example command with a test:

flow-backend/crates/cmds-solana/src/transfer_sol.rs

Line 70 in cce3b95

mod tests {

Okay I will add. 🫡

- init_nft_data - upadate_new_data

qapquiz · 2024-11-07T15:33:44Z

@enzotar Do you have a proper way to setup token and nft collection for testing purpose?

enzotar · 2024-11-07T18:15:15Z

@enzotar Do you have a proper way to setup token and nft collection for testing purpose?

Here you go, try these #163

enzotar · 2024-11-07T18:18:18Z

You can import the jsons into Space Operator to edit the flows.

qapquiz · 2024-11-09T09:14:01Z

@enzotar Could you take a look at this first? Is it okay for you?

flow-backend/crates/cmds-solana/src/mpl_404/init_escrow.rs

Lines 109 to 253 in 477a6ea

    
           #[cfg(test)] 
        
           mod tests { 
        
               use crate::utils::ui_amount_to_amount; 
        
               use mpl_core::instructions::CreateCollectionV2Builder; 
        
               use solana_sdk::native_token::LAMPORTS_PER_SOL; 
        
               use super::*; 
        
               async fn create_mock_collection( 
        
                   ctx: &Context, 
        
                   collection: &Keypair, 
        
                   payer: &Keypair, 
        
                   name: String, 
        
                   uri: String, 
        
               ) { 
        
                   let ix = CreateCollectionV2Builder::new() 
        
                       .collection(collection.pubkey()) 
        
                       .payer(payer.pubkey()) 
        
                       .update_authority(Some(payer.pubkey())) 
        
                       .name(name) 
        
                       .uri(uri) 
        
                       .instruction(); 
        
                   let (mut create_collection_tx, recent_blockhash) = 
        
                       execute(&ctx.solana_client, &payer.pubkey(), &[ix]) 
        
                           .await 
        
                           .unwrap(); 
        
                   try_sign_wallet( 
        
                       &ctx, 
        
                       &mut create_collection_tx, 
        
                       &[&payer, &collection], 
        
                       recent_blockhash, 
        
                   ) 
        
                   .await 
        
                   .unwrap(); 
        
                   let create_collection_signature = 
        
                       submit_transaction(&ctx.solana_client, create_collection_tx) 
        
                           .await 
        
                           .unwrap(); 
        
                   dbg!(create_collection_signature); 
        
               } 
        
               #[test] 
        
               fn test_build() { 
        
                   build().unwrap(); 
        
               } 
        
               #[tokio::test] 
        
               async fn test_run() { 
        
                   let ctx = Context::default(); 
        
                   // setup fee_payer 
        
                   let fee_payer = Keypair::from_base58_string("4rQanLxTFvdgtLsGirizXejgYXACawB5ShoZgvz4wwXi4jnii7XHSyUFJbvAk4ojRiEAHvzK6Qnjq7UyJFNbydeQ"); 
        
                   let balance = ctx 
        
                       .solana_client 
        
                       .get_balance(&fee_payer.pubkey()) 
        
                       .await 
        
                       .unwrap() as f64 
        
                       / LAMPORTS_PER_SOL as f64; 
        
                   if balance < 0.1 { 
        
                       let _ = ctx 
        
                           .solana_client 
        
                           .request_airdrop(&fee_payer.pubkey(), LAMPORTS_PER_SOL) 
        
                           .await; 
        
                   } 
        
                   let token = solana_sdk::pubkey!("AdaQ1MKbeKDyXCSnuCtqs5MW9FaY1UMGtpCGbZnpbTbj"); 
        
                   let sol_amount_to_create_token_account = rust_decimal_macros::dec!(0.03); 
        
                   let sol_decimals = 9; 
        
                   let collection = Keypair::new(); 
        
                   create_mock_collection( 
        
                       &ctx, 
        
                       &collection, 
        
                       &fee_payer, 
        
                       String::from("Mock Collection"), 
        
                       String::from("https://example.com"), 
        
                   ) 
        
                   .await; 
        
                   // setup SUT 
        
                   let fee_token_decimals = 9_u8; 
        
                   let authority = fee_payer.clone_keypair(); 
        
                   let fee_wallet = Keypair::new().pubkey(); 
        
                   let name = String::from("Escrow Name"); 
        
                   let uri = String::from("https://base.spaceoperator.com/storage/v1/object/public/blings_gg_nft/asset_metadata.json"); 
        
                   let max = 999_u64; 
        
                   let min = 0_u64; 
        
                   let path = 1; 
        
                   // fund authority and fee_wallet for creating token account 
        
                   let (mut transfer_tx, recent_blockhash) = execute( 
        
                       &ctx.solana_client, 
        
                       &fee_payer.pubkey(), 
        
                       &[ 
        
                           solana_sdk::system_instruction::transfer( 
        
                               &fee_payer.pubkey(), 
        
                               &authority.pubkey(), 
        
                               ui_amount_to_amount(sol_amount_to_create_token_account, sol_decimals).unwrap(), 
        
                           ), 
        
                       ], 
        
                   ) 
        
                   .await 
        
                   .unwrap(); 
        
                   try_sign_wallet(&ctx, &mut transfer_tx, &[&fee_payer], recent_blockhash) 
        
                       .await 
        
                       .unwrap(); 
        
                   let transfer_signature = submit_transaction(&ctx.solana_client, transfer_tx) 
        
                       .await 
        
                       .unwrap(); 
        
                   dbg!(transfer_signature); 
        
                   // init escrow 
        
                   let output = run( 
        
                       ctx, 
        
                       super::Input { 
        
                           fee_payer, 
        
                           fee_token_decimals, 
        
                           authority, 
        
                           collection: collection.pubkey(), 
        
                           token, 
        
                           fee_location: fee_wallet, 
        
                           name, 
        
                           uri, 
        
                           max, 
        
                           min, 
        
                           amount: rust_decimal_macros::dec!(0.1), 
        
                           fee_amount: rust_decimal_macros::dec!(0.1), 
        
                           sol_fee_amount: rust_decimal_macros::dec!(0.1), 
        
                           path, 
        
                           submit: true, 
        
                       }, 
        
                   ) 
        
                   .await 
        
                   .unwrap(); 
        
                   dbg!(output.signature.unwrap()); 
        
               } 
        
           }

enzotar · 2024-11-09T15:26:58Z

@enzotar Could you take a look at this first? Is it okay for you?

flow-backend/crates/cmds-solana/src/mpl_404/init_escrow.rs

Lines 109 to 253 in 477a6ea

#[cfg(test)]

mod tests {

use crate::utils::ui_amount_to_amount;

use mpl_core::instructions::CreateCollectionV2Builder;

use solana_sdk::native_token::LAMPORTS_PER_SOL;

use super::*;

async fn create_mock_collection(

ctx: &Context,

collection: &Keypair,

payer: &Keypair,

name: String,

uri: String,

) {

let ix = CreateCollectionV2Builder::new()

.collection(collection.pubkey())

.payer(payer.pubkey())

.update_authority(Some(payer.pubkey()))

.name(name)

.uri(uri)

.instruction();

let (mut create_collection_tx, recent_blockhash) =

execute(&ctx.solana_client, &payer.pubkey(), &[ix])

.await

.unwrap();

try_sign_wallet(

&ctx,

&mut create_collection_tx,

&[&payer, &collection],

recent_blockhash,

)

.await

.unwrap();

let create_collection_signature =

submit_transaction(&ctx.solana_client, create_collection_tx)

.await

.unwrap();

dbg!(create_collection_signature);

}

#[test]

fn test_build() {

build().unwrap();

}

#[tokio::test]

async fn test_run() {

let ctx = Context::default();

// setup fee_payer

let fee_payer = Keypair::from_base58_string("4rQanLxTFvdgtLsGirizXejgYXACawB5ShoZgvz4wwXi4jnii7XHSyUFJbvAk4ojRiEAHvzK6Qnjq7UyJFNbydeQ");

let balance = ctx

.solana_client

.get_balance(&fee_payer.pubkey())

.await

.unwrap() as f64

/ LAMPORTS_PER_SOL as f64;

if balance < 0.1 {

let _ = ctx

.solana_client

.request_airdrop(&fee_payer.pubkey(), LAMPORTS_PER_SOL)

.await;

}

let token = solana_sdk::pubkey!("AdaQ1MKbeKDyXCSnuCtqs5MW9FaY1UMGtpCGbZnpbTbj");

let sol_amount_to_create_token_account = rust_decimal_macros::dec!(0.03);

let sol_decimals = 9;

let collection = Keypair::new();

create_mock_collection(

&ctx,

&collection,

&fee_payer,

String::from("Mock Collection"),

String::from("https://example.com"),

)

.await;

// setup SUT

let fee_token_decimals = 9_u8;

let authority = fee_payer.clone_keypair();

let fee_wallet = Keypair::new().pubkey();

let name = String::from("Escrow Name");

let uri = String::from("https://base.spaceoperator.com/storage/v1/object/public/blings_gg_nft/asset_metadata.json");

let max = 999_u64;

let min = 0_u64;

let path = 1;

// fund authority and fee_wallet for creating token account

let (mut transfer_tx, recent_blockhash) = execute(

&ctx.solana_client,

&fee_payer.pubkey(),

&[

solana_sdk::system_instruction::transfer(

&fee_payer.pubkey(),

&authority.pubkey(),

ui_amount_to_amount(sol_amount_to_create_token_account, sol_decimals).unwrap(),

),

],

)

.await

.unwrap();

try_sign_wallet(&ctx, &mut transfer_tx, &[&fee_payer], recent_blockhash)

.await

.unwrap();

let transfer_signature = submit_transaction(&ctx.solana_client, transfer_tx)

.await

.unwrap();

dbg!(transfer_signature);

// init escrow

let output = run(

ctx,

super::Input {

fee_payer,

fee_token_decimals,

authority,

collection: collection.pubkey(),

token,

fee_location: fee_wallet,

name,

uri,

max,

min,

amount: rust_decimal_macros::dec!(0.1),

fee_amount: rust_decimal_macros::dec!(0.1),

sol_fee_amount: rust_decimal_macros::dec!(0.1),

path,

submit: true,

},

)

.await

.unwrap();

dbg!(output.signature.unwrap());

}

}

Looks good

…ybrid

qapquiz · 2024-11-10T14:15:27Z

@enzotar Done for all of the v1 instructions ❤️ (oh I just saw that there are more ix urgh)

- init_escrow_v2 - migrate_nft_v1 - migrate_tokens_v1

feat: add MPL-404 instructions

58ec97b

- init_escrow - update_escrow - capture - release

qapquiz added 2 commits November 7, 2024 17:48

fix(mpl-404): some of the instruction not complete

2b7f22d

feat(mpl-404): add remaining instructions

8fdfde0

- init_nft_data - upadate_new_data

test: add test for init_escrow

477a6ea

qapquiz added 2 commits November 9, 2024 18:40

fix(mpl-404): remove unnecessary transfer in init_escrow

80ca964

test(mpl-404): add test for capture

8ac81dc

qapquiz added 7 commits November 9, 2024 23:51

test(mpl-404): add test for release

c860d8c

test(mpl-404): add init_nft_data test

22b4805

deps(mpl-404): use git version instead of 0.1.0 cause of outdated

c3f3b90

fix(mpl-404): capture and release change interface after update mpl-h…

5f5f670

…ybrid

test(mpl-404): add test for update_escrow

9eb0712

test(mpl-404): add test for update_new_data_v1

7336791

chore: cleanup node config and use pda in capture and release instead

ed75524

qapquiz added 2 commits November 11, 2024 02:39

feat(mpl-404): add init_recipe and update_recipe

2252f44

feat(mpl-404): add three more instructions

cad32be

- init_escrow_v2 - migrate_nft_v1 - migrate_tokens_v1

enzotar approved these changes Nov 11, 2024

View reviewed changes

enzotar merged commit 9ee73fe into space-operator:gibwork-mpl-404 Nov 11, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add MPL-404 instructions #161

feat: add MPL-404 instructions #161

Uh oh!

qapquiz commented Nov 6, 2024 •

edited

Loading

Uh oh!

enzotar commented Nov 6, 2024

Uh oh!

qapquiz commented Nov 6, 2024

Uh oh!

qapquiz commented Nov 7, 2024

Uh oh!

enzotar commented Nov 7, 2024

Uh oh!

enzotar commented Nov 7, 2024

Uh oh!

qapquiz commented Nov 9, 2024

Uh oh!

enzotar commented Nov 9, 2024

Uh oh!

qapquiz commented Nov 10, 2024 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

feat: add MPL-404 instructions #161

feat: add MPL-404 instructions #161

Uh oh!

Conversation

qapquiz commented Nov 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

instructions

Uh oh!

enzotar commented Nov 6, 2024

Uh oh!

qapquiz commented Nov 6, 2024

Uh oh!

qapquiz commented Nov 7, 2024

Uh oh!

enzotar commented Nov 7, 2024

Uh oh!

enzotar commented Nov 7, 2024

Uh oh!

qapquiz commented Nov 9, 2024

Uh oh!

enzotar commented Nov 9, 2024

Uh oh!

qapquiz commented Nov 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

qapquiz commented Nov 6, 2024 •

edited

Loading

qapquiz commented Nov 10, 2024 •

edited

Loading