fast-bridge: Add fast bridge contract #361

dhruvja · 2024-08-06T17:53:02Z

Has the escrow contract for fast bridge which would be used to escrow the funds of the solver and unescrow when it receives the acknowledgement through IBC.

Co-authored-by: doradelta <[email protected] > "

Co-authored-by: doradelta <[email protected]>

…d-light-client into fast-bridge

Co-authored-by: dhruvja <[email protected]>

solana/bridge-escrow/programs/bridge-escrow/src/lib.rs

For cross domain transfers, an acknowledgement is sent from destination to source in form of a token transfer. The packet contains the memo that has the information about unlocking the funds. The source would then parse the memo and unlock the funds to the solver mentioned in the memo. Since we only have token transfers enabled and no cross chain messages, a token needs to be transferred. For this, we create a dummy token owned by the program which mints a token everytime and sends a transfer. The timeout of the transfer is set to infinite so that it always reaches the counterparty chain. Also the `on_receive_transfer` method accepts a memo which unlocks the funds to the solver. Right now it is being called by the auctioneer but once the hooks are enabled on `solana-ibc` program, this method would then be called by the `solana-ibc` program.

Emitting events for all instructions so that they can be parsed from the logs and be acted upon.

If the solver is not able to solve the intent, then the escrowed funds can be issued back to the user. In case of single domain intents, the funds just get transferred to the user from the escrow account. But for cross chain intents, a timeout message is sent to the other chain with a flag of `Timeout` and the user who should receive it. The intent should store the user on source chain so that during timeout, we know whom to refund the funds to. For the memo, it is the same format and only the receiver is changed to user address instead of solver. --------- Co-authored-by: doradelta <[email protected]>

dhruvja · 2024-09-25T07:50:50Z

solana/bridge-escrow/programs/bridge-escrow/src/lib.rs

+    pub fn escrow_and_store_intent(
+        ctx: Context<EscrowAndStoreIntent>, 
+        amount: u64, 
+        new_intent: IntentPayload


Remove the winner_solver and user_in from payload so that u dont need the checks below. You can just assign these value below.

dhruvja · 2024-09-25T07:51:10Z

solana/bridge-escrow/programs/bridge-escrow/src/lib.rs

+        );
+
+        intent.intent_id = new_intent.intent_id.clone();
+        intent.user_in = new_intent.user_in.clone();


Suggested change

intent.user_in = new_intent.user_in.clone();

intent.user_in = ctx.accounts.user.key();

dhruvja · 2024-09-25T07:51:26Z

solana/bridge-escrow/programs/bridge-escrow/src/lib.rs

+        intent.timeout_timestamp_in_sec = new_intent.timeout_timestamp_in_sec;
+        intent.creation_timestamp_in_sec = current_timestamp;
+        intent.amount_out = new_intent.amount_out.clone();
+        intent.winner_solver = new_intent.winner_solver;


Suggested change

intent.winner_solver = new_intent.winner_solver;

intent.winner_solver = String::default();

dhruvja · 2024-09-25T07:52:47Z

solana/bridge-escrow/programs/bridge-escrow/src/lib.rs

+pub struct IntentPayload {
+    pub intent_id: String,
+    pub user_in: String,
+    pub user_out: Pubkey,
+    pub token_in: String,
+    pub amount_in: u64,
+    pub token_out: String,
+    pub amount_out: String,
+    pub winner_solver: Pubkey,
+    pub timeout_timestamp_in_sec: u64,
+    pub single_domain: bool,
+}


Suggested change

pub struct IntentPayload {

pub intent_id: String,

pub user_in: String,

pub user_out: Pubkey,

pub token_in: String,

pub amount_in: u64,

pub token_out: String,

pub amount_out: String,

pub winner_solver: Pubkey,

pub timeout_timestamp_in_sec: u64,

pub single_domain: bool,

}

pub struct IntentPayload {

pub intent_id: String,

pub user_out: Pubkey,

pub token_in: String,

pub amount_in: u64,

pub token_out: String,

pub amount_out: String,

pub timeout_timestamp_in_sec: u64,

pub single_domain: bool,

}

dhruvja · 2024-09-25T07:54:52Z

solana/bridge-escrow/programs/bridge-escrow/src/lib.rs

+        require!(
+            intent.intent_id == intent_id,
+            ErrorCode::IntentDoesNotExist
+        );


You are getting the intent PDA from intent_id in the accounts below so this check might not be required.

dhruvja · 2024-09-25T08:01:37Z

solana/bridge-escrow/programs/bridge-escrow/src/lib.rs

+        let signer_seeds = core::slice::from_ref(&seeds);
+
+        if withdraw_user_flag {
+            // Case 1: User withdrawal


you should also check if the intent really timed out or not.

dhruvja · 2024-09-25T08:04:35Z

solana/bridge-escrow/programs/bridge-escrow/src/lib.rs

+            // bool withdraw_user,
+            // string intentId,
+            // string from,
+            // string token,
+            // string to,
+            // string amount,
+            // string solver_out


Should contain the timestamp at which the acknowledgement was sent so that if the bridge halts or smtg, it wont be considered as timeout even though the solver solved the intent.

Suggested change

// bool withdraw_user,

// string intentId,

// string from,

// string token,

// string to,

// string amount,

// string solver_out

// bool withdraw_user,

// string intentId,

// string from,

// string token,

// string to,

// string amount,

// string solver_out

// u64 current_timestamp

dhruvja · 2024-09-25T08:05:39Z

solana/bridge-escrow/programs/bridge-escrow/src/lib.rs

+            })?;
+        } else {
+            // Send a cross domain message to the source chain to unlock the funds
+            let my_custom_memo = format!(


This memo should contain the 7 parts as above ( 8 with timestamp ), since its the same method that receives the memo.

dhruvja · 2024-09-25T08:11:37Z

solana/bridge-escrow/programs/bridge-escrow/src/lib.rs

+    ///
+    /// For the cross chain intents, a message is sent to the source chain to unlock
+    /// the funds.
+    pub fn user_cancel_intent(


If the intent is stored on source chain, then the destination has no intent right? so how would this work?

dhruvja · 2024-09-25T08:13:31Z

solana/bridge-escrow/programs/bridge-escrow/src/lib.rs

+#[instruction(intent_id: String)]
+pub struct SplTokenTransfer<'info> {
+    // Intent reading
+    #[account(mut, close = auctioneer, seeds = [INTENT_SEED, intent_id.as_bytes()], bump)]
+    pub intent: Box<Account<'info, Intent>>,


If the intent is not stored on destination chain, we cant get the intent account.

Suggested change

#[instruction(intent_id: String)]

pub struct SplTokenTransfer<'info> {

// Intent reading

#[account(mut, close = auctioneer, seeds = [INTENT_SEED, intent_id.as_bytes()], bump)]

pub intent: Box<Account<'info, Intent>>,

pub struct SplTokenTransfer<'info> {

dhruvja and others added 7 commits July 20, 2024 20:02

added bridge escrow contract

49d3d54

Co-authored-by: doradelta <[email protected] > "

added bridge escrow contract

45e42c0

Co-authored-by: doradelta <[email protected]>

Merge branch 'fast-bridge' of https://github.com/ComposableFi/emulate…

44423f4

…d-light-client into fast-bridge

bridge-scrow -> tests.rs (#355)

f7d4780

Co-authored-by: dhruvja <[email protected]>

test push alberto

aadd44b

on_receive_transfer & send_funds_to_user escrow contract

f7a5ec8

on_receive_transfer & send_funds_to_user escrow contract

44cdd86

dhruvja commented Aug 8, 2024

View reviewed changes

solana/bridge-escrow/programs/bridge-escrow/src/lib.rs Outdated Show resolved Hide resolved

solana/bridge-escrow/programs/bridge-escrow/src/lib.rs Outdated Show resolved Hide resolved

doradelta and others added 22 commits August 8, 2024 19:32

on_receive_transfer & send_funds_to_user escrow contract

30ecf73

some docs and quick fixes

38d798b

add timeout method

35c58ee

fix receive method argument

1d7e0d7

added tests for single domain

a308799

assert tests conditiosn

2f45602

bridge escrow - auctioneer_transfer

9ee7025

remove auctioner_trasnfer() on escrow Program

3255b59

add single domain in intent

4cd9003

update tests and send funds to user method

01ae66c

Update lib.rs

0e41399

Update lib.rs

aec6bf8

update escrow id

93d26ad

fmt

f821b35

pull from master and fix merge conflicts

b05cb01

fix clippy

aa04971

fix clippy

b84d3ee

use struct for ix args instead of multiple args

0a02300

fmt

777c22a

fix wallet path

5e86bc1

fast-bridge: Emit events for each method. (#374)

15a4ad7

Emitting events for all instructions so that they can be parsed from the logs and be acted upon.

dhruvja and others added 19 commits August 27, 2024 18:10

remove intent from on receive transfer method

89a44de

add timeout and on receive methods in tests

43b9908

change token in to string instead of pubkey

0772575

set arbitrary space

7bfa988

allocate accounts to heap

4902f26

use intent payload instead of string

4b6e54c

Update lib.rs

0986913

Update lib.rs

9e63fab

hardcode solana ibc address

dcab6ba

Update lib.rs

1603619

Update lib.rs

5c569ba

avoid deserialization of solana ibc accounts

e938903

change token_mint & receiver_token_account on SplTokenTransfer struct

3acbc6f

box mint and receiver token account

8639a56

Update lib.rs

346c2f1

Update bridge.rs

a543834

Update lib.rs

82d6fcc

Update lib.rs

6d03458

dhruvja commented Sep 25, 2024

View reviewed changes

Update tests.rs

d843604

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fast-bridge: Add fast bridge contract #361

fast-bridge: Add fast bridge contract #361

dhruvja commented Aug 6, 2024

dhruvja Sep 25, 2024

dhruvja Sep 25, 2024

dhruvja Sep 25, 2024

dhruvja Sep 25, 2024

dhruvja Sep 25, 2024

dhruvja Sep 25, 2024

dhruvja Sep 25, 2024

dhruvja Sep 25, 2024

dhruvja Sep 25, 2024

dhruvja Sep 25, 2024

	intent.user_in = new_intent.user_in.clone();
	intent.user_in = ctx.accounts.user.key();

	intent.winner_solver = new_intent.winner_solver;
	intent.winner_solver = String::default();

fast-bridge: Add fast bridge contract #361

Are you sure you want to change the base?

fast-bridge: Add fast bridge contract #361

Conversation

dhruvja commented Aug 6, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment