Skip to content

Commit

Permalink
remove messenger in Solana
Browse files Browse the repository at this point in the history
  • Loading branch information
@Haykhovhannisyan1
Haykhovhannisyan1 committed Oct 7, 2024
1 parent 32ab8cf commit 1d25b8b
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 41 deletions.
16 changes: 4 additions & 12 deletions packages/solana/token/programs/token/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const OWNER: &str = "H732946dBhRx5pBbJnFJK7Gy4K6mSA5Svdt1eueExrTp";
/// 2) lock(src_receiver, hashlock, timelock, tokenContract, amount) - a
/// sender calls this to create a new HTLC on a given token (tokenContract)
/// for the given amount. A [u8; 32] Id is returned.
/// 3) add_lock(Id, hashlock) - the messenger calls this function
/// 3) add_lock(Id, hashlock) - the sender calls this function
/// to add hashlock to the HTLC.
/// 4) redeem(Id, secret) - once the src_receiver knows the secret of
/// the hashlock hash they can claim the tokens with this function
Expand Down Expand Up @@ -145,7 +145,6 @@ pub mod anchor_htlc {
src_asset: String,
src_receiver: Pubkey,
timelock: u64,
messenger: Pubkey,
amount: u64,
commit_bump: u8,
) -> Result<[u8; 32]> {
Expand Down Expand Up @@ -180,7 +179,6 @@ pub mod anchor_htlc {
htlc.secret = [0u8; 32];
htlc.amount = amount;
htlc.timelock = timelock;
htlc.messenger = messenger;
htlc.token_contract = *ctx.accounts.token_contract.to_account_info().key;
htlc.token_wallet = *ctx.accounts.htlc_token_account.to_account_info().key;
htlc.redeemed = false;
Expand Down Expand Up @@ -212,7 +210,6 @@ pub mod anchor_htlc {
dst_asset: String,
src_asset: String,
src_receiver: Pubkey,
messenger: Pubkey,
amount: u64,
lock_bump: u8,
) -> Result<[u8; 32]> {
Expand Down Expand Up @@ -248,7 +245,6 @@ pub mod anchor_htlc {
htlc.secret = [0u8; 32];
htlc.amount = amount;
htlc.timelock = timelock;
htlc.messenger = messenger;
htlc.token_contract = *ctx.accounts.token_contract.to_account_info().key;
htlc.token_wallet = *ctx.accounts.htlc_token_account.to_account_info().key;
htlc.redeemed = false;
Expand All @@ -257,7 +253,7 @@ pub mod anchor_htlc {
Ok(Id)
}

/// @dev Called by the messenger to add hashlock to the HTLC
/// @dev Called by the sender to add hashlock to the HTLC
///
/// @param Id of the HTLC.
/// @param hashlock to be added.
Expand Down Expand Up @@ -354,7 +350,6 @@ pub mod anchor_htlc {
msg!("secret: {:?}", hex::encode(htlc.secret.clone()));
msg!("amount: {:?}", htlc.amount);
msg!("timelock: {:?}", htlc.timelock);
msg!("messenger: {:?}", htlc.messenger);
msg!("token_contract: {:?}", htlc.token_contract);
msg!("token_wallet: {:?}", htlc.token_wallet);
msg!("redeemed: {:?}", htlc.redeemed);
Expand All @@ -371,7 +366,6 @@ pub mod anchor_htlc {
secret: htlc.secret.clone(),
amount: htlc.amount,
timelock: htlc.timelock,
messenger: htlc.messenger,
token_contract: htlc.token_contract,
token_wallet: htlc.token_wallet,
redeemed: htlc.redeemed,
Expand All @@ -393,7 +387,6 @@ pub struct HTLC {
pub secret: [u8; 32],
pub amount: u64, //TODO: check if this should be u256, though the spl uses u64
pub timelock: u64, //TODO: check if this should be u256
pub messenger: Pubkey,
pub token_contract: Pubkey,
pub token_wallet: Pubkey,
pub redeemed: bool,
Expand Down Expand Up @@ -619,7 +612,7 @@ pub struct Refund<'info> {
#[instruction(Id: [u8;32])]
pub struct AddLock<'info> {
#[account(mut)]
messenger: Signer<'info>,
sender: Signer<'info>,

#[account(mut,
seeds = [
Expand All @@ -628,7 +621,7 @@ pub struct AddLock<'info> {
bump,
constraint = !htlc.redeemed @ HTLCError::AlreadyRedeemed,
constraint = !htlc.refunded @ HTLCError::AlreadyRefunded,
constraint = htlc.sender == messenger.key() || htlc.messenger == messenger.key() @ HTLCError::UnauthorizedAccess,
constraint = htlc.sender == sender.key() @ HTLCError::UnauthorizedAccess,
constraint = htlc.hashlock == [0u8;32] @ HTLCError::HashlockAlreadySet,
)]
pub htlc: Box<Account<'info, HTLC>>,
Expand Down Expand Up @@ -674,7 +667,6 @@ pub struct GetDetails<'info> {
// pub src_asset: String,
// pub amount: u64,
// pub timelock: u64,
// pub messenger: Pubkey,
// pub token_contract: Pubkey,
// }

Expand Down
55 changes: 26 additions & 29 deletions packages/solana/token/tests/token.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ describe("HTLC", () => {
console.log(`[${TIMELOCK * 1000}] the Timelock`);

const commitTx = await program.methods
.commit(IDArray, HOPCHAINS, HOPASSETS, HOPADDRESSES, DSTCHAIN, DSTASSET, DSTADDRESS, SRCASSET, bob.publicKey, TIMELOCK, wallet.publicKey, new anchor.BN(AMOUNT), pda.htlcBump)
.commit(IDArray, HOPCHAINS, HOPASSETS, HOPADDRESSES, DSTCHAIN, DSTASSET, DSTADDRESS, SRCASSET, bob.publicKey, TIMELOCK, new anchor.BN(AMOUNT), pda.htlcBump)
.accountsPartial({
sender: wallet.publicKey,
htlc: pda.htlc,
Expand All @@ -225,13 +225,11 @@ describe("HTLC", () => {

const lockCommitTx = await program.methods.addLock(IDArray, HASHLOCKArray, TIMELOCK).
accountsPartial({
messenger: wallet.publicKey,
sender: wallet.publicKey,
htlc: pda.htlc,

}).signers([wallet.payer])
.rpc();


const [, htlcBalancePost] = await readAccount(pda.htlcTokenAccount, provider);
assert.equal(htlcBalancePost, "1000000000");

Expand All @@ -243,38 +241,38 @@ describe("HTLC", () => {
)
const details = await program.methods.getDetails(IDArray).accountsPartial({ htlc: pda.htlc }).rpc();
console.log(`[${details}] the details`);
// const redeemTx = await program.methods.redeem(IDArray, SECRETArray, pda.htlcBump).
// accountsPartial({
// userSigning: wallet.publicKey,
// htlc: pda.htlc,
// htlcTokenAccount: pda.htlcTokenAccount,
// sender: wallet.publicKey,
// srcReceiver: bob.publicKey,
// tokenContract: tokenMint,
// srcReceiverTokenAccount: bobTokenAccount,
// })
// .signers([wallet.payer])
// .rpc();

// //Assert that 100 tokens were sent to bob.
// const [, bobBalance] = await readAccount(bobTokenAccount, provider);
// assert.equal(bobBalance, "1000000000");

await wait(20000);
const refundTx = await program.methods.refund(IDArray, pda.htlcBump).
const redeemTx = await program.methods.redeem(IDArray, SECRETArray, pda.htlcBump).
accountsPartial({
userSigning: wallet.publicKey,
htlc: pda.htlc,
htlcTokenAccount: pda.htlcTokenAccount,
sender: wallet.publicKey,
srcReceiver: bob.publicKey,
tokenContract: tokenMint,
senderTokenAccount: walletTokenAccount,
srcReceiverTokenAccount: bobTokenAccount,
})
.signers([wallet.payer])
.rpc();

const [, WalletBalanceRefund] = await readAccount(walletTokenAccount, provider);
assert.equal(WalletBalanceRefund, "1337000000");
//Assert that 100 tokens were sent to bob.
const [, bobBalance] = await readAccount(bobTokenAccount, provider);
assert.equal(bobBalance, "1000000000");

// await wait(20000);
// const refundTx = await program.methods.refund(IDArray, pda.htlcBump).
// accountsPartial({
// userSigning: wallet.publicKey,
// htlc: pda.htlc,
// htlcTokenAccount: pda.htlcTokenAccount,
// sender: wallet.publicKey,
// tokenContract: tokenMint,
// senderTokenAccount: walletTokenAccount,
// })
// .signers([wallet.payer])
// .rpc();

// const [, WalletBalanceRefund] = await readAccount(walletTokenAccount, provider);
// assert.equal(WalletBalanceRefund, "1337000000");

// Assert that htlc token account was correctly closed.
try {
Expand Down Expand Up @@ -306,7 +304,6 @@ describe("HTLC", () => {
// // console.log(`tokenLocked srcAsset ${event.srcAsset}`);
// // console.log(`tokenLocked amount ${event.amount}`);
// // console.log(`tokenLocked timelock ${event.timelock}`);
// // console.log(`tokenLocked messenger ${event.messenger}`);
// // console.log(`tokenLocked ID ${event.ID}`);
// // console.log(`tokenLocked tokenContract ${event.tokenContract}`);
// // });
Expand All @@ -317,7 +314,7 @@ describe("HTLC", () => {


// const lockTx = await program.methods
// .lock(IDArray, HASHLOCKArray, TIMELOCK, DSTCHAIN, DSTADDRESS, DSTASSET, SRCASSET, bob.publicKey, wallet.publicKey, new anchor.BN(AMOUNT), pda.htlcBump)
// .lock(IDArray, HASHLOCKArray, TIMELOCK, DSTCHAIN, DSTADDRESS, DSTASSET, SRCASSET, bob.publicKey, new anchor.BN(AMOUNT), pda.htlcBump)
// .accountsPartial({
// sender: wallet.publicKey,
// htlc: pda.htlc,
Expand Down Expand Up @@ -380,7 +377,7 @@ describe("HTLC", () => {
// console.log(`[${TIME * 1000}] the Timelock`);

// const lockTx = await program.methods
// .lock(IDArray, HASHLOCKArray, TIMELOCK, DSTCHAIN, DSTADDRESS, DSTASSET, SRCASSET, bob.publicKey, wallet.publicKey, new anchor.BN(AMOUNT), pda.htlcBump)
// .lock(IDArray, HASHLOCKArray, TIMELOCK, DSTCHAIN, DSTADDRESS, DSTASSET, SRCASSET, bob.publicKey, new anchor.BN(AMOUNT), pda.htlcBump)
// .accountsPartial({
// sender: wallet.publicKey,
// htlc: pda.htlc,
Expand Down

0 comments on commit 1d25b8b

Please sign in to comment.