Skip to content

Commit

Permalink
Merge pull request #199 from xch-dev/offer-fixes
Browse files Browse the repository at this point in the history 
Fix offer logic
  • Loading branch information
@Rigidity
Rigidity authored Dec 27, 2024
2 parents 629ccf8 + a4eadeb commit 4042068
Show file tree
Hide file tree
Showing 6 changed files with 461 additions and 51 deletions.
2 changes: 1 addition & 1 deletion crates/sage-wallet/src/wallet/nfts.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ impl Wallet {
return Err(WalletError::MissingDid(did_id));
};

let total_amount = fee as u128 + 1;
let total_amount = fee as u128 + mints.len() as u128;
let coins = self.select_p2_coins(total_amount).await?;
let selected: u128 = coins.iter().map(|coin| coin.amount as u128).sum();

Expand Down
297 changes: 295 additions & 2 deletions crates/sage-wallet/src/wallet/offer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ mod tests {
}

#[test(tokio::test)]
async fn test_xch_for_nft() -> anyhow::Result<()> {
async fn test_offer_xch_for_nft() -> anyhow::Result<()> {
let mut alice = TestWallet::new(1030).await?;
let mut bob = alice.next(2).await?;

Expand Down Expand Up @@ -168,7 +168,7 @@ mod tests {
}

#[test(tokio::test)]
async fn test_nft_for_xch() -> anyhow::Result<()> {
async fn test_offer_nft_for_xch() -> anyhow::Result<()> {
let mut alice = TestWallet::new(2).await?;
let mut bob = alice.next(1030).await?;

Expand Down Expand Up @@ -241,4 +241,297 @@ mod tests {

Ok(())
}

#[test(tokio::test)]
async fn test_offer_nft_same_royalties_for_xch() -> anyhow::Result<()> {
let mut alice = TestWallet::new(3).await?;
let mut bob = alice.next(1030).await?;

let (coin_spends, did) = alice.wallet.create_did(0, false, true).await?;
alice.transact(coin_spends).await?;
alice.wait_for_coins().await;

let (coin_spends, mut nfts, _did) = alice
.wallet
.bulk_mint_nfts(
0,
did.info.launcher_id,
vec![
WalletNftMint {
metadata: NftMetadata::default(),
royalty_puzzle_hash: Some(Bytes32::default()),
royalty_ten_thousandths: 300,
},
WalletNftMint {
metadata: NftMetadata::default(),
royalty_puzzle_hash: Some(Bytes32::default()),
royalty_ten_thousandths: 300,
},
],
false,
true,
)
.await?;
alice.transact(coin_spends).await?;
alice.wait_for_coins().await;

let nft_id_first = nfts.remove(0);
let nft_id_second = nfts.remove(0);

// Create offer
let offer = alice
.wallet
.make_offer(
MakerSide {
xch: 0,
cats: IndexMap::new(),
nfts: vec![
nft_id_first.info.launcher_id,
nft_id_second.info.launcher_id,
],
fee: 0,
},
TakerSide {
xch: 1000,
cats: IndexMap::new(),
nfts: IndexMap::new(),
},
None,
false,
true,
)
.await?;
let offer = alice
.wallet
.sign_make_offer(offer, &alice.agg_sig, alice.master_sk.clone())
.await?;

// Take offer
let offer = bob.wallet.take_offer(offer, 0, false, true).await?;
let spend_bundle = bob
.wallet
.sign_take_offer(offer, &bob.agg_sig, bob.master_sk.clone())
.await?;
bob.push_bundle(spend_bundle).await?;

// We need to wait for both wallets to sync in this case
alice.wait_for_coins().await;
bob.wait_for_coins().await;

// Check balances
assert_eq!(alice.wallet.db.balance().await?, 1000);
assert_ne!(
bob.wallet
.db
.spendable_nft(nft_id_first.info.launcher_id)
.await?,
None
);
assert_ne!(
bob.wallet
.db
.spendable_nft(nft_id_second.info.launcher_id)
.await?,
None
);

Ok(())
}

#[test(tokio::test)]
async fn test_offer_nft_same_royalties_for_cat() -> anyhow::Result<()> {
let mut alice = TestWallet::new(3).await?;
let mut bob = alice.next(1030).await?;

let (coin_spends, did) = alice.wallet.create_did(0, false, true).await?;
alice.transact(coin_spends).await?;
alice.wait_for_coins().await;

let (coin_spends, mut nfts, _did) = alice
.wallet
.bulk_mint_nfts(
0,
did.info.launcher_id,
vec![
WalletNftMint {
metadata: NftMetadata::default(),
royalty_puzzle_hash: Some(Bytes32::default()),
royalty_ten_thousandths: 300,
},
WalletNftMint {
metadata: NftMetadata::default(),
royalty_puzzle_hash: Some(Bytes32::default()),
royalty_ten_thousandths: 300,
},
],
false,
true,
)
.await?;
alice.transact(coin_spends).await?;
alice.wait_for_coins().await;

let nft_id_first = nfts.remove(0);
let nft_id_second = nfts.remove(0);

// Issue CAT
let (coin_spends, asset_id) = bob.wallet.issue_cat(1030, 0, None, false, true).await?;
bob.transact(coin_spends).await?;
bob.wait_for_coins().await;

// Create offer
let offer = alice
.wallet
.make_offer(
MakerSide {
xch: 0,
cats: IndexMap::new(),
nfts: vec![
nft_id_first.info.launcher_id,
nft_id_second.info.launcher_id,
],
fee: 0,
},
TakerSide {
xch: 0,
cats: indexmap! { asset_id => 1000 },
nfts: IndexMap::new(),
},
None,
false,
true,
)
.await?;
let offer = alice
.wallet
.sign_make_offer(offer, &alice.agg_sig, alice.master_sk.clone())
.await?;

// Take offer
let offer = bob.wallet.take_offer(offer, 0, false, true).await?;
let spend_bundle = bob
.wallet
.sign_take_offer(offer, &bob.agg_sig, bob.master_sk.clone())
.await?;
bob.push_bundle(spend_bundle).await?;

// We need to wait for both wallets to sync in this case
alice.wait_for_puzzles().await;
bob.wait_for_coins().await;

// Check balances
assert_eq!(alice.wallet.db.cat_balance(asset_id).await?, 1000);
assert_ne!(
bob.wallet
.db
.spendable_nft(nft_id_first.info.launcher_id)
.await?,
None
);
assert_ne!(
bob.wallet
.db
.spendable_nft(nft_id_second.info.launcher_id)
.await?,
None
);

Ok(())
}

#[test(tokio::test)]
async fn test_offer_nft_mixed_royalties_for_xch() -> anyhow::Result<()> {
let mut alice = TestWallet::new(3).await?;
let mut bob = alice.next(1030).await?;

let (coin_spends, did) = alice.wallet.create_did(0, false, true).await?;
alice.transact(coin_spends).await?;
alice.wait_for_coins().await;

let (coin_spends, mut nfts, _did) = alice
.wallet
.bulk_mint_nfts(
0,
did.info.launcher_id,
vec![
WalletNftMint {
metadata: NftMetadata::default(),
royalty_puzzle_hash: Some(Bytes32::default()),
royalty_ten_thousandths: 300,
},
WalletNftMint {
metadata: NftMetadata::default(),
royalty_puzzle_hash: Some(Bytes32::default()),
royalty_ten_thousandths: 0,
},
],
false,
true,
)
.await?;
alice.transact(coin_spends).await?;
alice.wait_for_coins().await;

let nft_id_first = nfts.remove(0);
let nft_id_second = nfts.remove(0);

// Create offer
let offer = alice
.wallet
.make_offer(
MakerSide {
xch: 0,
cats: IndexMap::new(),
nfts: vec![
nft_id_first.info.launcher_id,
nft_id_second.info.launcher_id,
],
fee: 0,
},
TakerSide {
xch: 1000,
cats: IndexMap::new(),
nfts: IndexMap::new(),
},
None,
false,
true,
)
.await?;
let offer = alice
.wallet
.sign_make_offer(offer, &alice.agg_sig, alice.master_sk.clone())
.await?;

// Take offer
let offer = bob.wallet.take_offer(offer, 0, false, true).await?;
let spend_bundle = bob
.wallet
.sign_take_offer(offer, &bob.agg_sig, bob.master_sk.clone())
.await?;
bob.push_bundle(spend_bundle).await?;

// We need to wait for both wallets to sync in this case
alice.wait_for_coins().await;
bob.wait_for_coins().await;

// Check balances
assert_eq!(alice.wallet.db.balance().await?, 1000);
assert_ne!(
bob.wallet
.db
.spendable_nft(nft_id_first.info.launcher_id)
.await?,
None
);
assert_ne!(
bob.wallet
.db
.spendable_nft(nft_id_second.info.launcher_id)
.await?,
None
);

Ok(())
}
}
Loading

0 comments on commit 4042068

Please sign in to comment.