@atomiqlabs/sdk 5.0.0-dev.7 → 6.0.1

package/README.md

@@ -6,7 +6,7 @@ Example SDK integration in NodeJS available [here](https://github.com/atomiqlabs
 
 ## Installation
 ```
-npm install @atomiqlabs/sdk@dev
+npm install @atomiqlabs/sdk
 ```
 
 ## Installing chain-specific connectors
@@ -14,9 +14,8 @@ npm install @atomiqlabs/sdk@dev
 You can install only the chain-specific connectors that your project requires
 
 ```
-npm install @atomiqlabs/chain-solana@dev
-npm install @atomiqlabs/chain-starknet@dev
-npm install @atomiqlabs/chain-evm@dev
+npm install @atomiqlabs/chain-solana
+npm install @atomiqlabs/chain-starknet
 ```
 
 ## How to use?
@@ -27,13 +26,11 @@ npm install @atomiqlabs/chain-evm@dev
 - Swaps:
   - [Smart Chain -> BTC L1](#swap-smart-chain---bitcoin-on-chain)
   - [BTC L1 -> Solana (Old swap protocol)](#swap-bitcoin-on-chain---solana)
-  - [BTC L1 -> Starknet/EVM (New swap protocol)](#swap-bitcoin-on-chain---starknetevm)
+  - [BTC L1 -> Starknet (New swap protocol)](#swap-bitcoin-on-chain---starknet)
   - [Smart Chain -> BTC Lightning network L2](#swap-smart-chain---bitcoin-lightning-network)
   - [Smart Chain -> BTC Lightning network L2 (LNURL-pay)](#swap-smart-chain---bitcoin-lightning-network-1)
-  - [BTC Lightning network L2 -> Solana (Old swap protocol)](#swap-bitcoin-lightning-network---solana)
-  - [BTC Lightning network L2 -> Starknet/EVM (New swap protocol)](#swap-bitcoin-lightning-network---starknetevm)
-  - [BTC Lightning network L2 (LNURL-withdraw) -> Solana (Old swap protocol)](#swap-bitcoin-lightning-network---solana-1)
-  - [BTC Lightning network L2 (LNURL-withdraw) -> Starknet/EVM (New swap protocol)](#swap-bitcoin-lightning-network---starknetevm-1)
+  - [BTC Lightning network L2 -> Smart Chain](#swap-bitcoin-lightning-network---smart-chain)
+  - [BTC Lightning network L2 (LNURL-withdraw) -> Smart Chain](#swap-bitcoin-lightning-network---smart-chain-1)
 - [Swap states](#getting-state-of-the-swap)
 - [Swap size limits](#swap-size-limits)
 - [Stored swaps](#stored-swaps)
@@ -51,8 +48,7 @@ Set Solana & Starknet RPC URL to use
 
 ```typescript
 const solanaRpc = "https://api.mainnet-beta.solana.com";
-const starknetRpc = "https://starknet-mainnet.public.blastapi.io/rpc/v0_8";
-const citreaRpc = "https://rpc.testnet.citrea.xyz";
+const starknetRpc = "https://starknet-mainnet.public.blastapi.io/rpc/v0_7";
 ```
 
 Create swapper factory, here we can pick and choose which chains we want to have supported in the SDK, ensure the "as const" keyword is used such that the typescript compiler can properly infer the types.
@@ -60,10 +56,9 @@ Create swapper factory, here we can pick and choose which chains we want to have
 ```typescript
 import {SolanaInitializer, SolanaInitializerType} from "@atomiqlabs/chain-solana";
 import {StarknetInitializer, StarknetInitializerType} from "@atomiqlabs/chain-starknet";
-import {CitreaInitializer, CitreaInitializerType} from "@atomiqlabs/chain-evm";
 import {SwapperFactory} from "@atomiqlabs/sdk";
 
-const Factory = new SwapperFactory<[SolanaInitializerType, StarknetInitializerType, CitreaInitializerType]>([SolanaInitializer, StarknetInitializer, CitreaInitializer] as const);
+const Factory = new SwapperFactory<[SolanaInitializerType, StarknetInitializerType]>([SolanaInitializer, StarknetInitializer] as const);
 const Tokens = Factory.Tokens; //Get the supported tokens for all the specified chains.
 ```
 
@@ -80,10 +75,7 @@ const swapper = Factory.newSwapper({
             rpcUrl: solanaRpc //You can also pass Connection object here
         },
         STARKNET: {
-            rpcUrl: starknetRpc //You can also pass Provider object here           
-        },
-        CITREA: {
-            rpcUrl: citreaRpc, //You can also pass JsonApiProvider object here
+            rpcUrl: starknetRpc //You can also pass Provider object here
         }
     },
     bitcoinNetwork: BitcoinNetwork.TESTNET //or BitcoinNetwork.MAINNET, BitcoinNetwork.TESTNET4 - this also sets the network to use for Solana (solana devnet for bitcoin testnet) & Starknet (sepolia for bitcoin testnet)
@@ -113,9 +105,6 @@ const swapper = Factory.newSwapper({
         },
         STARKNET: {
             rpcUrl: starknetRpc //You can also pass Provider object here
-        },
-        CITREA: {
-            rpcUrl: citreaRpc, //You can also pass JsonApiProvider object here
         }
     },
     bitcoinNetwork: BitcoinNetwork.TESTNET, //or BitcoinNetwork.MAINNET - this also sets the network to use for Solana (solana devnet for bitcoin testnet) & Starknet (sepolia for bitcoin testnet)
@@ -155,22 +144,14 @@ const solanaSigner = new SolanaSigner(new SolanaKeypairWallet(Keypair.fromSecret
 ```
 
 ```typescript
-import {StarknetSigner, StarknetKeypairWallet} from "@atomiqlabs/chain-starknet";
+import {SolanaKeypairWallet, SolanaSigner} from "@atomiqlabs/chain-solana";
 //Creating Starknet signer from private key
 const starknetSigner = new StarknetSigner(new StarknetKeypairWallet(starknetRpc, starknetKey));
 ```
 
-```typescript
-import {BaseWallet, SigningKey} from "ethers";
-import {EVMSigner} from "@atomiqlabs/chain-evm";
-//Creating EVM signer from private key
-const wallet = new BaseWallet(new SigningKey(evmKey));
-const evmWallet = new EVMSigner(wallet, wallet.address);
-```
-
 ### Initialization
 
-Initialize the swapper, this should be done once when your app starts. Checks existing in-progress swaps and does initial LP discovery
+Initialize the swapper
 
 ```typescript
 await swapper.init();
@@ -186,6 +167,12 @@ To make it easier to do swaps between bitcoin and a specific chain we can extrac
 const solanaSwapper = swapper.withChain<"SOLANA">("SOLANA");
 ```
 
+or also with signer
+
+```typescript
+const starknetSwapperWithSigner = swapper.withChain<"STARKNET">("STARKNET").withSigner(signer);
+```
+
 ### Bitcoin on-chain swaps
 
 #### Swap Smart chain -> Bitcoin on-chain
@@ -193,14 +180,18 @@ const solanaSwapper = swapper.withChain<"SOLANA">("SOLANA");
 Getting swap quote
 
 ```typescript
+const _exactIn = false; //exactIn = false, so we specify the output amount
+const _amount = 10000n; //Amount in BTC base units - sats (10000 sats = 0.0001 BTC)
+const _address = "bc1qtw67hj77rt8zrkkg3jgngutu0yfgt9czjwusxt"; //BTC address of the recipient
+
 //Create the swap: swapping SOL to Bitcoin on-chain, receiving _amount of satoshis (smallest unit of bitcoin) to _address
 const swap = await swapper.swap(
     Tokens.SOLANA.SOL, //From specified source token
     Tokens.BITCOIN.BTC, //Swap to BTC
-    "0.0001", //Amount can be either passed in base units as bigint or in decimal format as string
-    SwapAmountType.EXACT_OUT, //EXACT_OUT, so we specify the output amount
+    _amount,
+    _exactIn,
     solanaSigner.getAddress(), //Source address and smart chain signer
-    "bc1qtw67hj77rt8zrkkg3jgngutu0yfgt9czjwusxt" //BTC address of the recipient
+    _address //Destination of the swap
 );
 
 //Get the amount required to pay and fee
@@ -219,80 +210,30 @@ const marketPrice = swap.getPriceInfo().marketPrice; //Current market price
 const difference = swap.getPriceInfo().difference; //Difference between the swap price & current market price
 ```
 
-Executing the swap (simple)
+Initiating the swap
 
 ```typescript
-const swapSuccessful = await swap.execute(
-    solanaSigner,
-    { //Callbacks
-        onSourceTransactionSent: (txId: string) => {
-            //Transaction on the source chain was sent
-        },
-        onSourceTransactionConfirmed: (txId: string) => {
-            //Transaction on the source chain was confirmed
-        },
-        onSwapSettled: (destinationTxId: string) => {
-            //Bitcoin transaction on the destination chain was sent and swap settled
-        }
-    }
-);
+//Initiate and pay for the swap
+await swap.commit(solanaSigner);
+```
+
+or [sign and send transaction manually](#manually-signing-smart-chain-transactions)
 
-//Refund in case of failure
-if(!swapSuccessful) {
+Wait for the swap to execute, refund in case of failure
+
+```typescript
+//Wait for the swap to conclude
+const result: boolean = await swap.waitForPayment();
+if(!result) {
     //Swap failed, money can be refunded
-    await swap.refund(solanaSigner);
+    await swap.refund();
 } else {
-    //Swap successful!
+    //Swap successful, we can get the bitcoin txId
+    const bitcoinTxId = swap.getBitcoinTxId();
 }
 ```
 
-<details>
-<summary>Manual swap execution (advanced)</summary>
-
-- __1.__ Initiate the swap on the smart-chain side
-
-  - __a.__ Commit with a signer
-  ```typescript
-  await swap.commit(solanaSigner);
-  ```
-
-  - __b.__ Or get the transactions & [sign and send transaction manually](#manually-signing-smart-chain-transactions)
-  ```typescript
-  const txsCommit = await swap.txsCommit();
-  //Sign and send these...
-  ...
-  //Important to wait till SDK processes the swap initialization
-  await swap.waitTillCommited();
-  ```
-
-- __2.__ Wait for the swap to execute and for the payment to be sent
-  ```typescript
-  const swapSuccessful = await swap.waitForPayment();
-  ```
-
-- __3.__ In case the swap fails we can refund our funds on the source chain
-
-  - __a.__ Refund with a signer
-  ```typescript
-  if(!swapSuccessful) {
-      await swap.refund(solanaSigner);
-      return;
-  }
-  ```
-
-  - __b.__ Or get the transactions & [sign and send transaction manually](#manually-signing-smart-chain-transactions)
-  ```typescript
-  if(!swapSuccessful) {
-      const txsRefund = await swap.txsRefund();
-      //Sign and send these...
-      ...
-  }
-  ```
-
-</details>
-
-<details>
-<summary>Swap states</summary>
+##### Swap states
 
 - ToBTCSwapState.REFUNDED = -3
   - Swap failed and was successfully refunded
@@ -311,8 +252,6 @@ if(!swapSuccessful) {
 - ToBTCSwapState.REFUNDABLE = 4
   - Swap was initiated but counterparty failed to process it, the user can now refund his funds
 
-</details>
-
 #### Swap Bitcoin on-chain -> Solana
 
 NOTE: Solana uses an old swap protocol for Bitcoin on-chain -> Solana swaps, the flow here is different from the one for Starknet and other chains.
@@ -320,12 +259,15 @@ NOTE: Solana uses an old swap protocol for Bitcoin on-chain -> Solana swaps, the
 Getting swap quote
 
 ```typescript
+const _exactIn = true; //exactIn = true, so we specify the input amount
+const _amount = fromHumanReadableString("0.0001", Tokens.BITCOIN.BTC); //Amount in BTC base units - sats, we can also use a utility function here
+
 //Create the swap: swapping _amount of satoshis of Bitcoin on-chain to SOL
 const swap = await swapper.swap(
     Tokens.BITCOIN.BTC, //Swap from BTC
     Tokens.SOLANA.SOL, //Into specified destination token
-    "0.0001", //Amount can be either passed in base units as bigint or in decimal format as string
-    SwapAmountType.EXACT_IN, //EXACT_IN, so we specify the input amount
+    _amount,
+    _exactIn, //Whether we define an input or output amount
     undefined, //Source address for the swap, not used for swaps from BTC
     solanaSigner.getAddress() //Destination address
 );
@@ -351,123 +293,67 @@ const marketPrice = swap.getPriceInfo().marketPrice; //Current market price
 const difference = swap.getPriceInfo().difference; //Difference between the swap price & current market price
 ```
 
-Executing the swap (simple)
+Initiating the swap
 
 ```typescript
-const automaticSettlementSuccess = await swap.execute(
-    solanaSigner,
-    { //Bitcoin wallet, you can also pass null/undefined and send the bitcoin transaction from an external wallet
-        address: "bc1pscnrk588hdj79mwccucu06007mj5np2jurwfwp5mvhkjldzyphzqyk62m5",
-        publicKey: "03a2d8b728935f61d5bcba0cfb09c2c443c483b5c31ebd180e1833f37344bd34ba",
-        signPsbt: (psbt: {psbt, psbtHex: string, psbtBase64: string}, signInputs: number[]) => {
-            //Sign the PSBT with the bitcoin wallet
-            ...
-            //Return the signed PSBT in the hex or base64 format!
-            return "<signed PSBT>";
-        }
-    },
-    { //Callbacks
-        onDestinationCommitSent: (swapAddressOpeningTxId: string) => {
-            //Swap address opening transaction sent on the destination chain
-        },
-        onSourceTransactionSent: (txId: string) => {
-            //Bitcoin transaction sent on the source
-        },
-        onSourceTransactionConfirmationStatus: (txId: string, confirmations: number, targetConfirmations: number, txEtaMs: number) => {
-            //Bitcoin transaction confirmation status updates
-        },
-        onSourceTransactionConfirmed: (txId: string) => {
-            //Bitcoin transaction confirmed
-        },
-        onSwapSettled: (destinationTxId: string) => {
-            //Swap settled on the destination
-        }
-    }
-);
+//Initiate the swap on the destination chain (Solana) by opening up the bitcoin swap address
+await swap.commit(solanaSigner);
+```
 
-//In case the automatic swap settlement fails, we can settle it manually using the wallet of the destination chain
-if(!automaticSettlementSuccess) {
-    await swap.claim(solanaSigner);
+or [sign and send transaction manually](#manually-signing-smart-chain-transactions)
+
+Sending bitcoin
+
+```typescript
+//Get the bitcoin address
+const receivingAddressOnBitcoin = swap.getAddress();
+//Get the QR code data (contains the address and amount)
+const qrCodeData = swap.getHyperlink(); //Data that can be displayed in the form of QR code
+//Send the exact amount of BTC to the provided address
+```
+
+or get a psbt and sign it
+
+```typescript
+//Or obtain the funded PSBT (input already added) - ready for signing
+const {psbt, signInputs} = await swap.getFundedPsbt({address: "", publicKey: ""});
+for(let signIdx of signInputs) {
+    psbt.signIdx(..., signIdx); //Or pass it to external signer
 }
+const bitcoinTxId = await swap.submitPsbt(psbt);
 ```
 
-<details>
-<summary>Manual swap execution (advanced)</summary>
-
-- __1.__ Initiate the swap on the destination chain (Solana) by opening up the bitcoin swap address
-
-  - __a.__ Commit using signer
-  ```typescript
-  await swap.commit(solanaWallet);
-  ```
-
-  - __b.__ Or get the transactions & [sign and send transaction manually](#manually-signing-smart-chain-transactions)
-  ```typescript
-  const txsCommit = await swap.txsCommit();
-  //Sign and send these...
-  ...
-  //Important to wait till SDK processes the swap initialization
-  await swap.waitTillCommited();
-  ```
-
-- __2.__ Send bitcoin transaction
-
-  - __a.__ Get funded PSBT and sign it 
-  ```typescript
-    const {psbt, psbtHex, psbtBase64, signInputs} = await swap.getFundedPsbt({
-        address: "bc1pscnrk588hdj79mwccucu06007mj5np2jurwfwp5mvhkjldzyphzqyk62m5",
-        publicKey: "03a2d8b728935f61d5bcba0cfb09c2c443c483b5c31ebd180e1833f37344bd34ba"
-    });
-    //Sign the psbt
-    const signedPsbt = ...; //Can be hex or base64 encoded
-    const bitcoinTxId = await swap.submitPsbt(signedPsbt);
-  ```
-
-  - __b.__ Get the bitcoin address or deeplink and send from external wallet
-  ```typescript
-  //It is imporant to send the EXACT amount, sending different amount will lead to loss of funds!
-  const btcSwapAddress = swap.getAddress();
-  const btcDeepLink = swap.getHyperlink();
-  ```
-  
-- __3.__ Wait for the bitcoin on-chain transaction to confirm
-  ```typescript
-  await swap.waitForBitcoinTransaction(
-      (txId, confirmations, targetConfirmations, txEtaMs) => {
-          //Bitcoin transaction confirmation status callback
-      }
-  );
-  ```
-
-- __4.__ Wait for the automatic settlement of the swap
-  ```typescript
-  const automaticSettlementSuccess = await swap.waitTillClaimed(30);
-  ```
-
-- __5.__ In case the automatic swap settlement fails, we can settle it manually using the wallet of the destination chain
-
-  - __a.__ Claim with a signer
-  ```typescript
-  if(!automaticSettlementSuccess) {
-      await swap.claim(solanaSigner);
-  }
-  ```
-
-  - __b.__ Or get the transactions & [sign and send transaction manually](#manually-signing-smart-chain-transactions)
-  ```typescript
-  if(!automaticSettlementSuccess) {}
-      const txsClaim = await swap.txsClaim();
-      //Sign and send these...
-      ...
-      //Important to wait till SDK processes the swap initialization
-      await swap.waitTillCommited();
-  }
-  ```
+Waiting for swap execution
 
-</details>
+```typescript
+try {
+    //Wait for the payment to arrive
+    await swap.waitForBitcoinTransaction(
+        null, null,
+        (
+            txId: string, //Transaction ID of the received bitcoin transaction
+            confirmations: number, //Current confirmations of the transaction
+            targetConfirmations: number, //Required confirmations
+            transactionETAms: number //Estimated in time (in milliseconds) until when the transaction will receive required amount of confirmations
+        ) => {
+            //Callback for transaction updates
+        }
+    );
+} catch(e) {
+    //Error occurred while waiting for payment, this is most likely due to network errors
+    return;
+}
+
+//Swap should get automatically claimed by the watchtowers, if not we can call swap.claim() ourselves
+try {
+  await swap.waitTillClaimed(timeoutSignal(30*1000));
+} catch (e) {
+  //Claim ourselves when automatic claim doesn't happen in 30 seconds
+  await swap.claim(solanaSigner);
+}
+```
 
-<details>
-<summary>Swap states</summary>
+##### Swap states
 
 - FromBTCSwapState.EXPIRED = -3
   - Bitcoin swap address expired
@@ -484,21 +370,23 @@ if(!automaticSettlementSuccess) {
 - FromBTCSwapState.CLAIM_CLAIMED = 3
   - Swap funds are claimed to the user's wallet
 
-</details>
 
-#### Swap Bitcoin on-chain -> Starknet/EVM
+#### Swap Bitcoin on-chain -> Starknet
 
-NOTE: Starknet & EVM uses a new swap protocol for Bitcoin on-chain -> Smart chain swaps, the flow here is different from the one for Solana!
+NOTE: Starknet uses a new swap protocol for Bitcoin on-chain -> Solana swaps, the flow here is different from the one for Solana!
 
 Getting swap quote
 
 ```typescript
+const _exactIn = true; //exactIn = true, so we specify the input amount
+const _amount = fromHumanReadableString("0.0001", Tokens.BITCOIN.BTC); //Amount in BTC base units - sats, we can also use a utility function here
+
 //Create the swap: swapping _amount of satoshis of Bitcoin on-chain to SOL
 const swap = await swapper.swap(
     Tokens.BITCOIN.BTC, //Swap from BTC
     Tokens.STARKNET.STRK, //Into specified destination token
-    "0.0001", //Amount can be either passed in base units as bigint or in decimal format as string
-    SwapAmountType.EXACT_IN, //EXACT_IN, so we specify the input amount
+    _amount,
+    _exactIn, //Whether we define an input or output amount
     undefined, //Source address for the swap, not used for swaps from BTC
     starknetSigner.getAddress(), //Destination address
     {
@@ -522,109 +410,62 @@ const marketPrice = swap.getPriceInfo().marketPrice; //Current market price
 const difference = swap.getPriceInfo().difference; //Difference between the swap price & current market price
 ```
 
-Executing the swap (simple)
+Initiating the swap
 
 ```typescript
-const automaticSettlementSuccess = await swap.execute(
-    { //Bitcoin wallet
-        address: "bc1pscnrk588hdj79mwccucu06007mj5np2jurwfwp5mvhkjldzyphzqyk62m5",
-        publicKey: "03a2d8b728935f61d5bcba0cfb09c2c443c483b5c31ebd180e1833f37344bd34ba",
-        signPsbt: (psbt: {psbt, psbtHex: string, psbtBase64: string}, signInputs: number[]) => {
-            //Sign the PSBT with the bitcoin wallet
-            ...
-            //Return the signed PSBT in the hex or base64 format!
-            return "<signed PSBT>";
-        }
-    },
-    { //Callbacks
-        onSourceTransactionSent: (txId: string) => {
-            //Bitcoin transaction sent on the source
-        },
-        onSourceTransactionConfirmationStatus: (txId: string, confirmations: number, targetConfirmations: number, txEtaMs: number) => {
-            //Bitcoin transaction confirmation status updates
-        },
-        onSourceTransactionConfirmed: (txId: string) => {
-            //Bitcoin transaction confirmed
-        },
-        onSwapSettled: (destinationTxId: string) => {
-            //Swap settled on the destination
-        }
-    }
-);
-
-//In case the automatic swap settlement fails, we can settle it manually using the wallet of the destination chain
-if(!automaticSettlementSuccess) {
-    await swap.claim(starknetWallet);
+//Obtain the funded PSBT (input already added) - ready for signing
+const {psbt, signInputs} = await swap.getFundedPsbt({address: "", publicKey: ""});
+for(let signIdx of signInputs) {
+    psbt.signIdx(..., signIdx); //Or pass it to external signer
 }
+const bitcoinTxId = await swap.submitPsbt(psbt);
 ```
 
+or get raw PSBT and add inputs manually
 
-<details>
-<summary>Manual swap execution (advanced)</summary>
-
-- __1.__ Send bitcoin transaction
-
-  - __a.__ Get funded PSBT and sign it
-  ```typescript
-    const {psbt, psbtHex, psbtBase64, signInputs} = await swap.getFundedPsbt({
-        address: "bc1pscnrk588hdj79mwccucu06007mj5np2jurwfwp5mvhkjldzyphzqyk62m5",
-        publicKey: "03a2d8b728935f61d5bcba0cfb09c2c443c483b5c31ebd180e1833f37344bd34ba"
-    });
-    //Sign the psbt
-    const signedPsbt = ...; //Can be hex or base64 encoded
-    const bitcoinTxId = await swap.submitPsbt(signedPsbt);
-  ```
-
-  - __b.__ Or obtain raw PSBT to which inputs still need to be added
-  ```typescript
-  const {psbt, psbtHex, psbtBase64, in1sequence} = await swap.getPsbt();
-  psbt.addInput(...);
-  //Make sure the second input's sequence (index 1) is as specified in the in1sequence variable
-  psbt.updateInput(1, {sequence: in1sequence});
-  //Sign the PSBT, sign every input except the first one
-  for(let i=1;i<psbt.inputsLength; i++) psbt.signIdx(..., i); //Or pass it to external signer
-  //Submit the signed PSBT, can be the Transaction object, or hex/base64 serialized
-  const bitcoinTxId = await swap.submitPsbt(psbt);
-  ```
-
-- __2.__ Wait for the bitcoin on-chain transaction to confirm
-  ```typescript
-  await swap.waitForBitcoinTransaction(
-      (txId, confirmations, targetConfirmations, txEtaMs) => {
-          //Bitcoin transaction confirmation status callback
-      }
-  );
-  ```
-
-- __3.__ Wait for the automatic settlement of the swap
-  ```typescript
-  const automaticSettlementSuccess = await swap.waitTillClaimed(60);
-  ```
-
-- __4.__ In case the automatic swap settlement fails, we can settle it manually using the wallet of the destination chain
-
-  - __a.__ Claim with a signer
-  ```typescript
-  if(!automaticSettlementSuccess) {
-      await swap.claim(starknetSigner);
-  }
-  ```
-
-  - __b.__ Or get the transactions & [sign and send transaction manually](#manually-signing-smart-chain-transactions)
-  ```typescript
-  if(!automaticSettlementSuccess) {}
-      const txsClaim = await swap.txsClaim();
-      //Sign and send these...
-      ...
-      //Important to wait till SDK processes the swap initialization
-      await swap.waitTillCommited();
-  }
-  ```
+```typescript
+//Or obtain raw PSBT to which inputs still need to be added
+const {psbt, in1sequence} = await swap.getPsbt();
+psbt.addInput(...);
+//Make sure the second input's sequence (index 1) is as specified in the in1sequence variable
+psbt.updateInput(1, {sequence: in1sequence});
+//Sign the PSBT, sign every input except the first one
+for(let i=1;i<psbt.inputsLength; i++) psbt.signIdx(..., i); //Or pass it to external signer
+//Submit the signed PSBT
+const bitcoinTxId = await swap.submitPsbt(psbt);
+```
 
-</details>
+Waiting for swap execution
 
-<details>
-<summary>Swap states</summary>
+```typescript
+try {
+    //Wait for the payment to arrive
+    await swap.waitForBitcoinTransaction(
+        null, null,
+        (
+            txId: string, //Transaction ID of the received bitcoin transaction
+            confirmations: number, //Current confirmations of the transaction
+            targetConfirmations: number, //Required confirmations
+            transactionETAms: number //Estimated in time (in milliseconds) until when the transaction will receive required amount of confirmations
+        ) => {
+            //Callback for transaction updates
+        }
+    );
+} catch(e) {
+    //Error occurred while waiting for payment, this is most likely due to network errors
+    return;
+}
+
+//Swap should get automatically claimed by the watchtowers, if not we can call swap.claim() ourselves
+try {
+  await swap.waitTillClaimedOrFronted(timeoutSignal(30*1000));
+} catch (e) {
+  //Claim ourselves when automatic claim doesn't happen in 30 seconds
+  await swap.claim(starknetSigner);
+}
+```
+
+##### Swap states
 
 - SpvFromBTCSwapState.CLOSED = -5
   - Catastrophic failure during swap, shall never happen
@@ -650,8 +491,6 @@ if(!automaticSettlementSuccess) {
   - Bitcoin swap transaction is confirmed
 - SpvFromBTCSwapState.CLAIM_CLAIMED = 6
   - Swap funds are claimed to the user's wallet
-  - 
-</details>
 
 ### Bitcoin lightning network swaps
 
@@ -660,15 +499,17 @@ if(!automaticSettlementSuccess) {
 Getting swap quote
 
 ```typescript
+//Destination lightning network invoice, amount needs to be part of the invoice!
+const _lightningInvoice = "lnbc10u1pj2q0g9pp5ejs6m677m39cznpzum7muruvh50ys93ln82p4j9ks2luqm56xxlshp52r2anlhddfa9ex9vpw9gstxujff8a0p8s3pzvua930js0kwfea6scqzzsxqyz5vqsp5073zskc5qfgp7lre0t6s8uexxxey80ax564hsjklfwfjq2ew0ewq9qyyssqvzmgs6f8mvuwgfa9uqxhtza07qem4yfhn9wwlpskccmuwplsqmh8pdy6c42kqdu8p73kky9lsnl40qha5396d8lpgn90y27ltfc5rfqqq59cya";
+
 //Create the swap: swapping SOL to Bitcoin lightning
 const swap = await swapper.swap(
     Tokens.SOLANA.SOL, //From specified source token
     Tokens.BITCOIN.BTCLN, //Swap to BTC-LN
     undefined, //Amount is specified in the lightning network invoice!
-    SwapAmountType.EXACT_OUT, //Make sure we use EXACT_OUT for swaps to BTC-LN, if you want to use EXACT_IN and set an amount, use LNURL-pay!
+    false, //Make sure we use exactIn=false for swaps to BTC-LN, if you want to use exactIn=true and set an amount, use LNURL-pay!
     solanaSigner.getAddress(), //Source address and smart chain signer
-    //Destination lightning network invoice, amount needs to be part of the invoice!
-    "lnbc10u1pj2q0g9pp5ejs6m677m39cznpzum7muruvh50ys93ln82p4j9ks2luqm56xxlshp52r2anlhddfa9ex9vpw9gstxujff8a0p8s3pzvua930js0kwfea6scqzzsxqyz5vqsp5073zskc5qfgp7lre0t6s8uexxxey80ax564hsjklfwfjq2ew0ewq9qyyssqvzmgs6f8mvuwgfa9uqxhtza07qem4yfhn9wwlpskccmuwplsqmh8pdy6c42kqdu8p73kky9lsnl40qha5396d8lpgn90y27ltfc5rfqqq59cya"
+    _lightningInvoice //Destination of the swap
 );
 
 //Get the amount required to pay and fee
@@ -687,80 +528,30 @@ const marketPrice = swap.getPriceInfo().marketPrice; //Current market price
 const difference = swap.getPriceInfo().difference; //Difference between the swap price & current market price
 ```
 
-Executing the swap (simple)
+Initiating the swap
 
 ```typescript
-const swapSuccessful = await swap.execute(
-    solanaSigner,
-    { //Callbacks
-        onSourceTransactionSent: (txId: string) => {
-            //Transaction on the source chain was sent
-        },
-        onSourceTransactionConfirmed: (txId: string) => {
-            //Transaction on the source chain was confirmed
-        },
-        onSwapSettled: (destinationTxId: string) => {
-            //Lightning payment on the destination chain was sent and swap settled
-        }
-    }
-);
+//Initiate and pay for the swap
+await swap.commit(solanaSigner);
+```
 
-//Refund in case of failure
-if(!swapSuccessful) {
-    //Swap failed, money can be refunded
-    await swap.refund(solanaSigner);
+or [sign and send transaction manually](#manually-signing-smart-chain-transactions)
+
+Wait for the swap to execute, refund in case of failure
+
+```typescript
+//Wait for the swap to conclude
+const result: boolean = await swap.waitForPayment();
+if(!result) {
+  //Swap failed, money can be refunded
+  await swap.refund(solanaSigner);
 } else {
-    //Swap successful!
+  //Swap successful, we can get the lightning payment secret pre-image, which acts as a proof of payment
+  const lightningSecret = swap.getSecret();
 }
 ```
 
-<details>
-<summary>Manual swap execution (advanced)</summary>
-
-- __1.__ Initiate the swap on the smart-chain side
-
-  - __a.__ Commit with a signer
-  ```typescript
-  await swap.commit(solanaSigner);
-  ```
-
-  - __b.__ Or get the transactions & [sign and send transaction manually](#manually-signing-smart-chain-transactions)
-  ```typescript
-  const txsCommit = await swap.txsCommit();
-  //Sign and send these...
-  ...
-  //Important to wait till SDK processes the swap initialization
-  await swap.waitTillCommited();
-  ```
-
-- __2.__ Wait for the swap to execute and for the payment to be sent
-  ```typescript
-  const swapSuccessful = await swap.waitForPayment();
-  ```
-
-- __3.__ In case the swap fails we can refund our funds on the source chain
-
-  - __a.__ Refund with a signer
-  ```typescript
-  if(!swapSuccessful) {
-      await swap.refund(solanaSigner);
-      return;
-  }
-  ```
-
-  - __b.__ Or get the transactions & [sign and send transaction manually](#manually-signing-smart-chain-transactions)
-  ```typescript
-  if(!swapSuccessful) {
-      const txsRefund = await swap.txsRefund();
-      //Sign and send these...
-      ...
-  }
-  ```
-
-</details>
-
-<details>
-<summary>Swap states</summary>
+##### Swap states
 
 - ToBTCSwapState.REFUNDED = -3
     - Swap failed and was successfully refunded
@@ -779,20 +570,19 @@ if(!swapSuccessful) {
 - ToBTCSwapState.REFUNDABLE = 4
     - Swap was initiated but counterparty failed to process it, the user can now refund his funds
 
-</details>
-
-#### Swap Bitcoin lightning network -> Solana
-
-NOTE: Solana uses an old swap protocol for Bitcoin lightning network -> Solana swaps, the flow here is different from the one for Starknet and other chains.
+#### Swap Bitcoin lightning network -> Smart chain
 
 Getting swap quote
 
 ```typescript
+const _exactIn = true; //exactIn = true, so we specify the input amount
+const _amount = 10000n; //Amount in BTC base units - sats
+
 const swap = await swapper.swap(
     Tokens.BITCOIN.BTCLN, //Swap from BTC-LN
-    Tokens.SOLANA.SOL, //Into specified destination token
-    10000n, //Amount can be either passed in base units as bigint or in decimal format as string
-    SwapAmountType.EXACT_IN, //SwapAmountType.EXACT_IN, so we specify the input amount
+    Tokens.STARKNET.STRK, //Into specified destination token
+    _amount,
+    _exactIn, //Whether we define an input or output amount
     undefined, //Source address for the swap, not used for swaps from BTC-LN
     signer.getAddress() //Destination address
 );
@@ -821,72 +611,40 @@ const marketPrice = swap.getPriceInfo().marketPrice; //Current market price
 const difference = swap.getPriceInfo().difference; //Difference between the swap price & current market price
 ```
 
-Executing the swap (simple)
+Pay the displayed lightning network invoice from an external wallet
+
+Wait for the payment to be received
 
 ```typescript
-await swap.execute(
-    solanaSigner, 
-    { //Lightning network wallet, you can also pass null/undefined and pay the LN invoice from an external wallet
-        payInvoice: (bolt11PaymentRequest: string) => {
-            //Here you would usually call the WebLN or NWC to execute the payment, it's completely fine if the
-            // promise here would block till the payment is settled
-            return Promise.resolve("");
-        }
-    },
-    { //Callbacks
-        onSourceTransactionReceived: (sourceLnPaymentHash: string) => {
-            //Lightning network payment received by the LP
-        },
-        onDestinationCommitSent: (destinationCommitTxId: string) => {
-            //HTLC initialization transaction sent on the destination chain
-        },
-        onDestinationClaimSent: (destinationClaimTxId: string) => {
-            //HTLC claim transaction sent on the destination chain
-        },
-        onSwapSettled: (destinationClaimTxId: string) => {
-            //Swap settled and funds received on destination
-        }
-    }
-);
+//Start listening to incoming lightning network payment
+const success = await swap.waitForPayment();
+if(!success) {
+    //Lightning network payment not received in time and quote expired!
+    return;
+}
 ```
 
-<details>
-<summary>Manual swap execution (advanced)</summary>
-
-- __1.__ Pay the LN invoice from a lightning network wallet
-  ```typescript
-  const lightningInvoice = swap.getAddress();
-  ```
-
-- __2.__ Start listening to incoming lightning network payment
-  ```typescript
-  const success = await swap.waitForPayment();
-  if(!success) {
-      //Lightning network payment not received in time and quote expired
-      return;
-  }
-  ```
-
-- __3.__ Claim the swap at the destination
-
-  - __a.__ Commit & claim with signer
-  ```typescript
-  await swap.commitAndClaim(solanaSigner);
-  ```
+Claim the funds on the destination smart chains, this settles the swap and lightning network payment
 
-  - __b.__ Or get the transactions & [sign and send transaction manually](#manually-signing-smart-chain-transactions)
-  ```typescript
-  const txsCommitAndClaim = await swap.txsCommitAndClaim();
-  //Take EXTRA care to make sure transaction are sent sequentially and in order - always wait
-  // for prior transaction confirmation before sending the next one
-  //Sign and send these...
-  ...
-  ```
+```typescript
+try {
+    //Claim the swap funds - this will initiate 2 transactions
+    if(swap.canCommitAndClaimInOneShot()) {
+      //Some chains (e.g. Solana) support signing multiple transactions in one flow
+      await swap.commitAndClaim(solanaSigner);
+    } else {
+      //Other chains (e.g. Starknet) don't support signing multiple transaction in one flow, therefore you need to sign one-by-one
+      await swap.commit(starknetSigner);
+      await swap.claim(starknetSigner);
+    }
+} catch(e) {
+    //Error occurred while waiting for payment
+}
+```
 
-</details>
+or [sign and send transactions manually](#manually-signing-smart-chain-transactions)
 
-<details>
-<summary>Swap states</summary>
+##### Swap states
 
 - FromBTCLNSwapState.FAILED = -4
   - If the claiming of the funds was initiated, but never concluded, the user will get his lightning network payment refunded
@@ -905,138 +663,6 @@ await swap.execute(
 - FromBTCLNSwapState.CLAIM_CLAIMED = 3
   - Funds were successfully claimed & lightning network secret pre-image revealed, so the lightning network payment will settle now
 
-</details>
-
-#### Swap Bitcoin lightning network -> Starknet/EVM
-
-Getting swap quote
-
-```typescript
-const swap = await swapper.swap(
-    Tokens.BITCOIN.BTCLN, //Swap from BTC-LN
-    Tokens.STARKNET.STRK, //Into specified destination token
-    10000n, //Amount can be either passed in base units as bigint or in decimal format as string
-    SwapAmountType.EXACT_IN, //SwapAmountType.EXACT_IN, so we specify the input amount
-    undefined, //Source address for the swap, not used for swaps from BTC-LN
-    signer.getAddress(), //Destination address
-    {
-        gasAmount: 1_000_000_000_000_000_000n //We can also request a gas drop on the destination chain (here requesting 1 STRK)
-    }
-);
-
-//Get the bitcoin lightning network invoice (the invoice contains pre-entered amount)
-const receivingLightningInvoice: string = swap.getAddress();
-//Get the URI hyperlink (contains the lightning network invoice) which can be displayed also as QR code
-const qrCodeData: string = swap.getHyperlink();
-
-//Get the amount required to pay and fee
-const input: string = swap.getInputWithoutFee().toString(); //Input amount excluding fees
-const fee: string = swap.getFee().amountInSrcToken.toString(); //Fees paid on the output
-const inputWithFees: string = swap.getInput().toString(); //Total amount paid including fees
-
-const output: string = swap.getOutput().toString(); //Total output amount
-
-//Get swap expiration time
-const expiry: number = swap.getQuoteExpiry(); //Expiration time of the swap quote in UNIX milliseconds, swap needs to be initiated before this time
-
-//Get pricing info
-const swapPrice = swap.getPriceInfo().swapPrice; //Price of the current swap (excluding fees)
-const marketPrice = swap.getPriceInfo().marketPrice; //Current market price
-const difference = swap.getPriceInfo().difference; //Difference between the swap price & current market price
-```
-
-Executing the swap (simple)
-
-```typescript
-const automaticSettlementSuccess = await swap.execute(
-    { //Lightning network wallet, you can also pass null/undefined and pay the LN invoice from an external wallet
-        payInvoice: (bolt11PaymentRequest: string) => {
-            //Here you would usually call the WebLN or NWC to execute the payment, it's completely fine if the
-            // promise here would block till the payment is settled
-            return Promise.resolve("");
-        }
-    },
-    { //Callbacks
-        onSourceTransactionReceived: (sourceLnPaymentHash: string) => {
-            //Lightning network payment received by the LP
-        },
-        onSwapSettled: (destinationClaimTxId: string) => {
-            //Swap settled and funds received on destination
-        }
-    }
-);
-
-//In case the automatic swap settlement fails, we can settle it manually using the wallet of the destination chain
-if(!automaticSettlementSuccess) {
-    await swap.claim(starknetSigner);
-}
-```
-
-
-<details>
-<summary>Manual swap execution (advanced)</summary>
-
-- __1.__ Pay the LN invoice from a lightning network wallet
-  ```typescript
-  const lightningInvoice = swap.getAddress();
-  ```
-
-- __2.__ Start listening to incoming lightning network payment
-  ```typescript
-  const success = await swap.waitForPayment();
-  if(!success) {
-      //Lightning network payment not received in time and quote expired
-      return;
-  }
-  ```
-
-- __3.__ Wait for the swap to be automatically settled
-  ```typescript
-  const automaticSettlementSuccess = await swap.waitTillClaimed(60);
-  ```
-
-- __4.__ In case the automatic swap settlement fails, we can settle it manually using the wallet of the destination chain
-
-  - __a.__ Claim with signer
-  ```typescript
-  if(!automaticSettlementSuccess) {
-      await swap.claim(starknetSigner);
-  }
-  ```
-
-  - __b.__ Or get the transactions & [sign and send transaction manually](#manually-signing-smart-chain-transactions)
-  ```typescript
-  if(!automaticSettlementSuccess) {
-      const txsClaim = await swap.txsClaim();
-      //Sign and send these...
-      ...
-  }
-  ```
-
-</details>
-
-<details>
-<summary>Swap states</summary>
-
-- FromBTCLNAutoSwapState.FAILED = -4
-  - If the claiming of the funds was initiated, but never concluded, the user will get his lightning network payment refunded
-- FromBTCLNAutoSwapState.QUOTE_EXPIRED = -3
-  - Swap quote expired and cannot be executed anymore
-- FromBTCLNAutoSwapState.QUOTE_SOFT_EXPIRED = -2
-  - Swap quote soft-expired (i.e. the quote probably expired, but if there is already an initialization transaction sent it might still succeed)
-- FromBTCLNAutoSwapState.EXPIRED = -1
-  - Lightning network invoice expired, meaning the swap is expired
-- FromBTCLNAutoSwapState.PR_CREATED = 0
-  - Swap is created, the user should now pay the provided lightning network invoice
-- FromBTCLNAutoSwapState.PR_PAID = 1
-  - Lightning network invoice payment was received (but cannot be settled by the counterparty yet)
-- FromBTCLNAutoSwapState.CLAIM_COMMITED = 2
-  - A swap HTLC was offered by the LP to the user
-- FromBTCLNAutoSwapState.CLAIM_CLAIMED = 3
-  - Funds were successfully claimed & lightning network secret pre-image revealed, so the lightning network payment will settle now
-
-</details>
-
 ### LNURLs & readable lightning identifiers
 
 LNURLs extend the lightning network functionality by creating static lightning addreses (LNURL-pay & static internet identifiers) and QR codes which allow you to pull funds from them (LNURL-withdraw)
@@ -1069,15 +695,18 @@ LNURLs & lightning identifiers:
 Getting swap quote
 
 ```typescript
+const _lnurlOrIdentifier: string = "lnurl1dp68gurn8ghj7ampd3kx2ar0veekzar0wd5xjtnrdakj7tnhv4kxctttdehhwm30d3h82unvwqhkx6rfvdjx2ctvxyesuk0a27"; //Destination LNURL-pay or readable identifier
+const _exactIn = false; //exactIn = false, so we specify the output amount
+const _amount: bigint = 10000n; //Amount of satoshis to send (1 BTC = 100 000 000 satoshis)
+
 //Create the swap: swapping SOL to Bitcoin lightning
 const swap = await swapper.swap(
     Tokens.SOLANA.SOL, //From specified source token
     Tokens.BITCOIN.BTCLN, //Swap to BTC-LN
-    10000n, //Now we can specify an amount for a lightning network payment!
-    SwapAmountType.EXACT_OUT, //We can also use exactIn=true here and set an amount in input token
+    _amount, //Now we can specify an amount for a lightning network payment!
+    _exactIn, //We can also use exactIn=true here and set an amount in input token
     solanaSigner.getAddress(), //Source address and smart chain signer
-    //Destination LNURL-pay or readable identifier
-    "lnurl1dp68gurn8ghj7ampd3kx2ar0veekzar0wd5xjtnrdakj7tnhv4kxctttdehhwm30d3h82unvwqhkx6rfvdjx2ctvxyesuk0a27",
+    _lnurlOrIdentifier, //Destination of the swap
     {
         comment: "Hello world" //For LNURL-pay we can also pass a comment to the recipient
     }
@@ -1099,105 +728,53 @@ const marketPrice = swap.getPriceInfo().marketPrice; //Current market price
 const difference = swap.getPriceInfo().difference; //Difference between the swap price & current market price
 ```
 
-
-Executing the swap (simple)
+Initiating the swap
 
 ```typescript
-const swapSuccessful = await swap.execute(
-    solanaSigner,
-    { //Callbacks
-        onSourceTransactionSent: (txId: string) => {
-            //Transaction on the source chain was sent
-        },
-        onSourceTransactionConfirmed: (txId: string) => {
-            //Transaction on the source chain was confirmed
-        },
-        onSwapSettled: (destinationTxId: string) => {
-            //Lightning payment on the destination chain was sent and swap settled
-        }
-    }
-);
-
-//Refund in case of failure
-if(!swapSuccessful) {
-    //Swap failed, money can be refunded
-    await swap.refund(solanaSigner);
-    return;
-}
-
-//Swap successful!
-const lightningSecret = swap.getSecret();
-//In case the LNURL contained a success action, we can read it now and display it to user
-if(swap.hasSuccessAction()) {
-  //Contains a success action that should displayed to the user
-  const successMessage = swap.getSuccessAction();
-  const description: string = successMessage.description; //Description of the message
-  const text: (string | null) = successMessage.text; //Main text of the message
-  const url: (string | null) = successMessage.url; //URL link which should be displayed
-}
+//Initiate and pay for the swap
+await swap.commit(solanaSigner);
 ```
 
-<details>
-<summary>Manual swap execution (advanced)</summary>
+or [sign and send transaction manually](#manually-signing-smart-chain-transactions)
 
-- __1.__ Initiate the swap on the smart-chain side
+Wait for the swap to execute, refund in case of failure
 
-  - __a.__ Commit with a signer
-  ```typescript
-  await swap.commit(solanaSigner);
-  ```
-
-  - __b.__ Or get the transactions & [sign and send transaction manually](#manually-signing-smart-chain-transactions)
-  ```typescript
-  const txsCommit = await swap.txsCommit();
-  //Sign and send these...
-  ...
-  //Important to wait till SDK processes the swap initialization
-  await swap.waitTillCommited();
-  ```
-
-- __2.__ Wait for the swap to execute and for the payment to be sent
-
-  ```typescript
-  const swapSuccessful = await swap.waitForPayment();
-  ```
-
-- __3.__ In case the swap fails we can refund our funds on the source chain
-
-  - __a.__ Refund with a signer
-  ```typescript
-  if(!swapSuccessful) {
-      await swap.refund(solanaSigner);
-      return;
-  }
-  ```
-
-  - __b.__ Or get the transactions & [sign and send transaction manually](#manually-signing-smart-chain-transactions)
-  ```typescript
-  if(!swapSuccessful) {
-      const txsRefund = await swap.txsRefund();
-      //Sign and send these...
-      ...
+```typescript
+//Wait for the swap to conclude
+const result: boolean = await swap.waitForPayment();
+if(!result) {
+  //Swap failed, money can be refunded
+  await swap.refund(solanaSigner);
+} else {
+  //Swap successful, we can get the lightning payment secret pre-image, which acts as a proof of payment
+  const lightningSecret = swap.getSecret();
+  //In case the LNURL contained a success action, we can read it now and display it to user
+  if(swap.hasSuccessAction()) {
+    //Contains a success action that should displayed to the user
+    const successMessage = swap.getSuccessAction();
+    const description: string = successMessage.description; //Description of the message
+    const text: (string | null) = successMessage.text; //Main text of the message
+    const url: (string | null) = successMessage.url; //URL link which should be displayed
   }
-  ```
-
-</details>
-
-#### Swap Bitcoin lightning network -> Solana
+}
+```
 
-NOTE: Solana uses an old swap protocol for Bitcoin lightning network -> Solana swaps, the flow here is different from the one for Starknet and other chains.
+#### Swap Bitcoin lightning network -> Smart chain
 
 Getting swap quote
 
 ```typescript
+const _lnurl: string = "lnurl1dp68gurn8ghj7ampd3kx2ar0veekzar0wd5xjtnrdakj7tnhv4kxctttdehhwm30d3h82unvwqhkx6rfvdjx2ctvxyesuk0a27"; //Destination LNURL-pay or readable identifier
+const _exactIn = true; //exactIn = true, so we specify the input amount
+const _amount = 10000n; //Amount in BTC base units - sats
+
 const swap = await swapper.swap(
     Tokens.BITCOIN.BTCLN, //Swap from BTC-LN
-    Tokens.SOLANA.SOL, //Into specified destination token
-    10000n,
-    SwapAmountType.EXACT_IN, //EXACT_IN, so we specify the input amount
-    //Source LNURL-withdraw link
-    "lnurl1dp68gurn8ghj7ampd3kx2ar0veekzar0wd5xjtnrdakj7tnhv4kxctttdehhwm30d3h82unvwqhkx6rfvdjx2ctvxyesuk0a27",
-    signer.getAddress(), //Destination address
+    Tokens.STARKNET.STRK, //Into specified destination token
+    _amount,
+    _exactIn, //Whether we define an input or output amount
+    _lnurl, //Source LNURL for the swap
+    signer.getAddress() //Destination address
 );
 
 //Get the amount required to pay and fee
@@ -1219,152 +796,36 @@ const marketPrice = swap.getPriceInfo().marketPrice; //Current market price
 const difference = swap.getPriceInfo().difference; //Difference between the swap price & current market price
 ```
 
-Executing the swap (simple)
-
-```typescript
-await swap.execute(
-    solanaSigner, 
-    undefined, //No need to specify a wallet, we are sourcing the fund from LNURL-withdraw link
-    { //Callbacks
-        onSourceTransactionReceived: (sourceLnPaymentHash: string) => {
-            //Lightning network payment received by the LP
-        },
-        onDestinationCommitSent: (destinationCommitTxId: string) => {
-            //HTLC initialization transaction sent on the destination chain
-        },
-        onDestinationClaimSent: (destinationClaimTxId: string) => {
-            //HTLC claim transaction sent on the destination chain
-        },
-        onSwapSettled: (destinationClaimTxId: string) => {
-            //Swap settled and funds received on destination
-        }
-    }
-);
-```
-
-<details>
-<summary>Manual swap execution (advanced)</summary>
-
-- __1.__ Start listening to incoming lightning network payment (this also requests the payment from LNURL-withdraw service)
-  ```typescript
-  const success = await swap.waitForPayment();
-  if(!success) {
-      //Lightning network payment not received in time and quote expired
-      return;
-  }
-  ```
-
-- __2.__ Claim the swap at the destination
-
-  - __a.__ Commit & claim with signer
-  ```typescript
-  await swap.commitAndClaim(solanaSigner);
-  ```
-
-  - __b.__ Or get the transactions & [sign and send transaction manually](#manually-signing-smart-chain-transactions)
-  ```typescript
-  const txsCommitAndClaim = await swap.txsCommitAndClaim();
-  //Take EXTRA care to make sure transaction are sent sequentially and in order - always wait
-  // for prior transaction confirmation before sending the next one
-  //Sign and send these...
-  ...
-  ```
-
-</details>
-
-#### Swap Bitcoin lightning network -> Starknet/EVM
-
-Getting swap quote
+Wait for the payment to be received
 
 ```typescript
-const swap = await swapper.swap(
-    Tokens.BITCOIN.BTCLN, //Swap from BTC-LN
-    Tokens.STARKNET.STRK, //Into specified destination token
-    10000n,
-    SwapAmountType.EXACT_IN, //EXACT_IN, so we specify the input amount
-    //Source LNURL-withdraw link
-    "lnurl1dp68gurn8ghj7ampd3kx2ar0veekzar0wd5xjtnrdakj7tnhv4kxctttdehhwm30d3h82unvwqhkx6rfvdjx2ctvxyesuk0a27",
-    signer.getAddress(), //Destination address
-    {
-        gasAmount: 1_000_000_000_000_000_000n //We can also request a gas drop on the destination chain (here requesting 1 STRK)
-    }
-);
-
-//Get the amount required to pay and fee
-const input: string = swap.getInputWithoutFee().toString(); //Input amount excluding fees
-const fee: string = swap.getFee().amountInSrcToken.toString(); //Fees paid on the output
-const inputWithFees: string = swap.getInput().toString(); //Total amount paid including fees
-
-const output: string = swap.getOutput().toString(); //Total output amount
-
-//Get swap expiration time
-const expiry: number = swap.getQuoteExpiry(); //Expiration time of the swap quote in UNIX milliseconds, swap needs to be initiated before this time
-
-//Get pricing info
-const swapPrice = swap.getPriceInfo().swapPrice; //Price of the current swap (excluding fees)
-const marketPrice = swap.getPriceInfo().marketPrice; //Current market price
-const difference = swap.getPriceInfo().difference; //Difference between the swap price & current market price
+//Start listening to incoming lightning network payment
+const success = await swap.waitForPayment();
+if(!success) {
+    //Lightning network payment not received in time and quote expired!
+    return;
+}
 ```
 
-
-Executing the swap (simple)
+Claim the funds on the destination smart chains, this settles the swap and lightning network payment
 
 ```typescript
-const automaticSettlementSuccess = await swap.execute(
-    undefined, //No need to specify a wallet, we are sourcing the funds from LNURL-withdraw link
-    { //Callbacks
-        onSourceTransactionReceived: (sourceLnPaymentHash: string) => {
-            //Lightning network payment received by the LP
-        },
-        onSwapSettled: (destinationClaimTxId: string) => {
-            //Swap settled and funds received on destination
-        }
+try {
+    //Claim the swap funds - this will initiate 2 transactions
+    if(swap.canCommitAndClaimInOneShot()) {
+      //Some chains (e.g. Solana) support signing multiple transactions in one flow
+      await swap.commitAndClaim(solanaSigner);
+    } else {
+      //Other chains (e.g. Starknet) don't support signing multiple transaction in one flow, therefore you need to sign one-by-one
+      await swap.commit(starknetSigner);
+      await swap.claim(starknetSigner);
     }
-);
-
-//In case the automatic swap settlement fails, we can settle it manually using the wallet of the destination chain
-if(!automaticSettlementSuccess) {
-    await swap.claim(starknetSigner);
+} catch(e) {
+    //Error occurred while waiting for payment
 }
 ```
 
-
-<details>
-<summary>Manual swap execution (advanced)</summary>
-
-- __1.__ Start listening to incoming lightning network payment (this also requests the payment from LNURL-withdraw service)
-  ```typescript
-  const success = await swap.waitForPayment();
-  if(!success) {
-      //Lightning network payment not received in time and quote expired
-      return;
-  }
-  ```
-
-- __2.__ Wait for the swap to be automatically settled
-  ```typescript
-  const automaticSettlementSuccess = await swap.waitTillClaimed(60);
-  ```
-
-- __3.__ In case the automatic swap settlement fails, we can settle it manually using the wallet of the destination chain
-
-  - __a.__ Claim with signer
-  ```typescript
-  if(!automaticSettlementSuccess) {
-      await swap.claim(starknetSigner);
-  }
-  ```
-
-  - __b.__ Or get the transactions & [sign and send transaction manually](#manually-signing-smart-chain-transactions)
-  ```typescript
-  if(!automaticSettlementSuccess) {
-      const txsClaim = await swap.txsClaim();
-      //Sign and send these...
-      ...
-  }
-  ```
-
-</details>
+or [sign and send transactions manually](#manually-signing-smart-chain-transactions)
 
 ### Getting state of the swap
 
@@ -1470,12 +931,14 @@ Returns swaps that are ready to be claimed by the client, this can happen if cli
 const claimableSolanaSwaps = await solanaSwapper.getClaimableSwaps("SOLANA", solanaSigner.getAddress());
 //Claim all the claimable swaps
 for(let swap of claimableSolanaSwaps) {
+    if(swap.canCommit()) await swap.commit(solanaSigner); //This is for Bitcoin (lightning) -> Smart chain swaps, where commit & claim procedure might be needed
     await swap.claim(solanaSigner);
 }
 //Get the swaps
 const claimableStarknetSwaps = await solanaSwapper.getClaimableSwaps("STARKNET", starknetSigner.getAddress());
 //Claim all the claimable swaps
 for(let swap of claimableStarknetSwaps) {
+  if(swap.canCommit()) await swap.commit(starknetSigner); //This is for Bitcoin (lightning) -> Smart chain swaps, where commit & claim procedure might be needed
   await swap.claim(starknetSigner);
 }
 ```
@@ -1564,7 +1027,7 @@ After sending the transactions, you also need to make sure the SDK has enough ti
 ```typescript
 //Example for Solana
 const txns = await swap.txsCommit(); //Also works with txsClaim, txsRefund, txCommitAndClaim
-txns.forEach(val => if(val.signers.length>0) { val.tx.sign(...val.signers) });
+txns.forEach(val => val.tx.sign(...val.signers));
 const signedTransactions = await solanaSigner.wallet.signAllTransactions(txns.map(val => val.tx));
 for(let tx of signedTransactions) {
     const res = await solanaRpc.sendRawTransaction(tx.serialize());
@@ -1579,13 +1042,6 @@ for(let tx of txns) {
     if(tx.type==="DEPLOY_ACCOUNT") await starknetSigner.account.deployAccount(tx.tx, tx.details);
 }
 await swap.waitTillCommited(); //Or other relevant waitTillClaimed, waitTillRefunded
-
-//Example for EVM
-const txns = await swap.txsCommit(); //Also works with txsClaim, txsRefund, txCommitAndClaim
-for(let tx of txns) {
-  await evmSigner.account.sendTransaction(tx);
-}
-await swap.waitTillCommited(); //Or other relevant waitTillClaimed, waitTillRefunded
 ```
 
 ### Additional swapper options