@atomiqlabs/sdk 1.3.14 → 1.3.16

package/src/chains/solana/SolanaChainInitializer.ts

@@ -1,99 +1,99 @@
-import {
-    SolanaBtcRelay,
-    SolanaChainType, SolanaFees, SolanaRetryPolicy,
-    SolanaSwapData,
-    SolanaSwapProgram,
-    StoredDataAccount
-} from "@atomiqlabs/chain-solana";
-import {
-    BitcoinNetwork,
-    CtorChainData
-} from "@atomiqlabs/sdk-lib";
-import {BitcoinRpc, IStorageManager} from "@atomiqlabs/base";
-import {Connection} from "@solana/web3.js";
-import {SolanaChains} from "./SolanaChains";
-import {SolanaChainEventsBrowser} from "@atomiqlabs/chain-solana/dist/solana/events/SolanaChainEventsBrowser";
-import {SdkChain} from "../ChainInitializer";
-import {MultichainSwapperOptions} from "../../MultichainSwapper";
-
-const chainId = "SOLANA" as const;
-
-type SolanaSwapperOptions = {
-    rpcUrl: string | Connection,
-    dataAccountStorage?: IStorageManager<StoredDataAccount>,
-    retryPolicy?: SolanaRetryPolicy,
-
-    btcRelayContract?: string,
-    swapContract?: string,
-
-    fees?: SolanaFees
-};
-
-function getSolanaCtorData(options: MultichainSwapperOptions, bitcoinRpc: BitcoinRpc<any>, network: BitcoinNetwork): CtorChainData<SolanaChainType> {
-    const connection = typeof(options.chains.SOLANA.rpcUrl)==="string" ?
-        new Connection(options.chains.SOLANA.rpcUrl) :
-        options.chains.SOLANA.rpcUrl;
-
-    const Fees = options.chains.SOLANA.fees ?? new SolanaFees(connection, 200000, 4, 100);
-    const btcRelay = new SolanaBtcRelay(connection, bitcoinRpc, options.chains.SOLANA.btcRelayContract ?? SolanaChains[network].addresses.btcRelayContract, Fees);
-    const swapContract = new SolanaSwapProgram(
-        connection,
-        btcRelay,
-        options.chains.SOLANA.dataAccountStorage || options.storageCtor("solAccounts"),
-        options.chains.SOLANA.swapContract ?? SolanaChains[network].addresses.swapContract,
-        options.chains.SOLANA.retryPolicy ?? {transactionResendInterval: 1000},
-        Fees
-    )
-    const chainEvents = new SolanaChainEventsBrowser(connection, swapContract);
-
-    return {
-        btcRelay,
-        swapContract,
-        chainEvents,
-        swapDataConstructor: SolanaSwapData,
-        //These are defined here to keep the data from old SolLightning-sdk, not needed for other chains
-        storage: {
-            toBtc: options.storageCtor("SOLv4-"+options.bitcoinNetwork+"-Swaps-ToBTC"),
-            toBtcLn: options.storageCtor("SOLv4-"+options.bitcoinNetwork+"-Swaps-ToBTCLN"),
-            fromBtc: options.storageCtor("SOLv4-"+options.bitcoinNetwork+"-Swaps-FromBTC"),
-            fromBtcLn: options.storageCtor("SOLv4-"+options.bitcoinNetwork+"-Swaps-FromBTCLN"),
-            lnForGas: options.storageCtor("SOLv4-"+options.bitcoinNetwork+"-Swaps-LnForGas"),
-            onchainForGas: options.storageCtor("SOLv4-"+options.bitcoinNetwork+"-Swaps-OnchainForGas")
-        }
-    }
-}
-
-const SolanaAssets = {
-    WBTC: {
-        address: "3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh",
-        decimals: 8
-    },
-    USDC: {
-        address: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
-        decimals: 6
-    },
-    USDT: {
-        address: "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB",
-        decimals: 6
-    },
-    SOL: {
-        address: "So11111111111111111111111111111111111111112",
-        decimals: 9
-    },
-    BONK: {
-        address: "DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263",
-        decimals: 5
-    }
-} as const;
-
-export type SdkSolanaType = {
-    ChainType: SolanaChainType,
-    Options: SolanaSwapperOptions,
-    Assets: typeof SolanaAssets
-};
-
-export const SdkSolana: SdkChain<SdkSolanaType> = {
-    getCtorData: getSolanaCtorData,
-    assets: SolanaAssets,
-    chainIdentifier: chainId
-} as const;
+import {
+    SolanaBtcRelay,
+    SolanaChainType, SolanaFees, SolanaRetryPolicy,
+    SolanaSwapData,
+    SolanaSwapProgram,
+    StoredDataAccount
+} from "@atomiqlabs/chain-solana";
+import {
+    BitcoinNetwork,
+    CtorChainData
+} from "@atomiqlabs/sdk-lib";
+import {BitcoinRpc, IStorageManager} from "@atomiqlabs/base";
+import {Connection} from "@solana/web3.js";
+import {SolanaChains} from "./SolanaChains";
+import {SolanaChainEventsBrowser} from "@atomiqlabs/chain-solana/dist/solana/events/SolanaChainEventsBrowser";
+import {SdkChain} from "../ChainInitializer";
+import {MultichainSwapperOptions} from "../../MultichainSwapper";
+
+const chainId = "SOLANA" as const;
+
+type SolanaSwapperOptions = {
+    rpcUrl: string | Connection,
+    dataAccountStorage?: IStorageManager<StoredDataAccount>,
+    retryPolicy?: SolanaRetryPolicy,
+
+    btcRelayContract?: string,
+    swapContract?: string,
+
+    fees?: SolanaFees
+};
+
+function getSolanaCtorData(options: MultichainSwapperOptions, bitcoinRpc: BitcoinRpc<any>, network: BitcoinNetwork): CtorChainData<SolanaChainType> {
+    const connection = typeof(options.chains.SOLANA.rpcUrl)==="string" ?
+        new Connection(options.chains.SOLANA.rpcUrl) :
+        options.chains.SOLANA.rpcUrl;
+
+    const Fees = options.chains.SOLANA.fees ?? new SolanaFees(connection, 200000, 4, 100);
+    const btcRelay = new SolanaBtcRelay(connection, bitcoinRpc, options.chains.SOLANA.btcRelayContract ?? SolanaChains[network].addresses.btcRelayContract, Fees);
+    const swapContract = new SolanaSwapProgram(
+        connection,
+        btcRelay,
+        options.chains.SOLANA.dataAccountStorage || options.storageCtor("solAccounts"),
+        options.chains.SOLANA.swapContract ?? SolanaChains[network].addresses.swapContract,
+        options.chains.SOLANA.retryPolicy ?? {transactionResendInterval: 1000},
+        Fees
+    )
+    const chainEvents = new SolanaChainEventsBrowser(connection, swapContract);
+
+    return {
+        btcRelay,
+        swapContract,
+        chainEvents,
+        swapDataConstructor: SolanaSwapData,
+        //These are defined here to keep the data from old SolLightning-sdk, not needed for other chains
+        storage: {
+            toBtc: options.storageCtor("SOLv4-"+options.bitcoinNetwork+"-Swaps-ToBTC"),
+            toBtcLn: options.storageCtor("SOLv4-"+options.bitcoinNetwork+"-Swaps-ToBTCLN"),
+            fromBtc: options.storageCtor("SOLv4-"+options.bitcoinNetwork+"-Swaps-FromBTC"),
+            fromBtcLn: options.storageCtor("SOLv4-"+options.bitcoinNetwork+"-Swaps-FromBTCLN"),
+            lnForGas: options.storageCtor("SOLv4-"+options.bitcoinNetwork+"-Swaps-LnForGas"),
+            onchainForGas: options.storageCtor("SOLv4-"+options.bitcoinNetwork+"-Swaps-OnchainForGas")
+        }
+    }
+}
+
+const SolanaAssets = {
+    WBTC: {
+        address: "3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh",
+        decimals: 8
+    },
+    USDC: {
+        address: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
+        decimals: 6
+    },
+    USDT: {
+        address: "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB",
+        decimals: 6
+    },
+    SOL: {
+        address: "So11111111111111111111111111111111111111112",
+        decimals: 9
+    },
+    BONK: {
+        address: "DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263",
+        decimals: 5
+    }
+} as const;
+
+export type SdkSolanaType = {
+    ChainType: SolanaChainType,
+    Options: SolanaSwapperOptions,
+    Assets: typeof SolanaAssets
+};
+
+export const SdkSolana: SdkChain<SdkSolanaType> = {
+    getCtorData: getSolanaCtorData,
+    assets: SolanaAssets,
+    chainIdentifier: chainId
+} as const;

package/src/chains/solana/SolanaChains.ts

@@ -1,16 +1,16 @@
-import {BitcoinNetwork} from "@atomiqlabs/sdk-lib";
-
-export const SolanaChains = {
-    [BitcoinNetwork.TESTNET]: {
-        addresses: {
-            swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
-            btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
-        }
-    },
-    [BitcoinNetwork.MAINNET]: {
-        addresses: {
-            swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
-            btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
-        }
-    }
-} as const;
+import {BitcoinNetwork} from "@atomiqlabs/sdk-lib";
+
+export const SolanaChains = {
+    [BitcoinNetwork.TESTNET]: {
+        addresses: {
+            swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
+            btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
+        }
+    },
+    [BitcoinNetwork.MAINNET]: {
+        addresses: {
+            swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",
+            btcRelayContract: "3KHSHFpEK6bsjg3bqcxQ9qssJYtRCMi2S9TYVe4q6CQc"
+        }
+    }
+} as const;

package/src/example/BrowserExample.ts

@@ -1,120 +1,120 @@
-import {SolanaKeypairWallet, SolanaSigner, SolanaSwapperWithSigner, MultichainSwapper, Tokens} from "../";
-import {Keypair} from "@solana/web3.js";
-import * as BN from "bn.js";
-
-const solanaRpc = "https://api.mainnet-beta.solana.com";
-
-let solanaSwapper: SolanaSwapperWithSigner;
-
-async function setupSwapper() {
-    //Setup the multichain swapper
-    const swapper: MultichainSwapper = new MultichainSwapper({
-        chains: {
-            SOLANA: {
-                rpcUrl: solanaRpc
-            }
-        }
-    });
-    await swapper.init();
-
-    //Create new random keypair wallet
-    const wallet = new SolanaKeypairWallet(Keypair.generate()); //This is just a dummy, you should load the wallet from file, or etc.
-    //Or in React, using solana wallet adapter
-    //const wallet = useAnchorWallet();
-
-    const signer: SolanaSigner = new SolanaSigner(wallet);
-    //Extract a Solana specific swapper (used for swapping between Solana and Bitcoin) with a defined signer
-    solanaSwapper = swapper.withChain("SOLANA").withSigner(signer);
-}
-
-async function createToBtcSwap() {
-    const fromToken = Tokens.SOLANA.SOL;
-    const toToken = Tokens.BITCOIN.BTC;
-    const exactIn = false; //exactIn = false, so we specify the output amount
-    const amount = new BN(10000); //Amount in BTC base units - sats
-    const recipientBtcAddress = "bc1qtw67hj77rt8zrkkg3jgngutu0yfgt9czjwusxt"; //BTC address of the recipient
-
-    const swap = await solanaSwapper.create(
-        fromToken,
-        toToken,
-        amount,
-        exactIn,
-        recipientBtcAddress
-    );
-
-    //Input amounts
-    const inputTokenAmount = swap.getInput().amount;
-    const inputValueInUsd = await swap.getInput().usdValue();
-
-    //Output amounts
-    const outputTokenAmount = swap.getOutput().amount;
-    const outputValueInUsd = await swap.getOutput().usdValue();
-
-    //Initiate the swap by locking up the SOL
-    await swap.commit();
-    //Wait for bitcoin payout to happen
-    const paymentSuccess = await swap.waitForPayment();
-    if(paymentSuccess) {
-        //Payment was successful, we can get the transaction id
-        const bitcoinTxId = swap.getBitcoinTxId();
-    } else {
-        //If payment is unsuccessful we can refund and get our funds back
-        await swap.refund();
-    }
-}
-
-async function createFromBtcSwap() {
-    const fromToken = Tokens.BITCOIN.BTC;
-    const toToken = Tokens.SOLANA.SOL;
-    const exactIn = true; //exactIn = true, so we specify the input amount
-    const amount = new BN(10000); //Amount in BTC base units - sats
-
-    const swap = await solanaSwapper.create(
-        fromToken,
-        toToken,
-        amount,
-        exactIn
-    );
-
-    //Input amounts
-    const inputTokenAmount = swap.getInput().amount; //Human readable input token amount with decimals
-    const inputValueInUsd = await swap.getInput().usdValue(); //Fetches the USD value of the input
-
-    //Output amounts
-    const outputTokenAmount = swap.getOutput().amount; //Human readable output token amount with decimals
-    const outputValueInUsd = await swap.getOutput().usdValue(); //Fetches the USD value of the output
-
-    //Initiate the swap, this will prompt a Solana transaction, as we need to open the BTC swap address
-    await swap.commit();
-
-    const qrCodeData = swap.getQrData(); //Data that can be displayed as QR code - URL with the address and amount
-    const bitcoinAddress = swap.getBitcoinAddress(); //Bitcoin address to send the BTC to - exact amount needs to be sent!
-    const timeout = swap.getTimeoutTime(); //The BTC should be sent before the timeout
-
-    console.log("Please send exactly "+inputTokenAmount+" BTC to "+bitcoinAddress);
-
-    //Waits for bitcoin transaction to be received
-    await swap.waitForBitcoinTransaction(
-        null, null,
-        (
-            txId: string, //Transaction ID received
-            confirmations: number, //Current confirmation count of the transaction
-            targetConfirmations: number, //Required confirmations for the transaction to be accepted
-            transactionETAms: number //Estimated time in milliseconds till the transaction is accepted
-        ) => {
-            //This callback receives periodic updates about the incoming transaction
-            console.log("Tx received: "+txId+" confirmations: "+confirmations+"/"+targetConfirmations+" ETA: "+transactionETAms+" ms");
-        }
-    ); //This returns as soon as the transaction is accepted
-
-    //Swap will get automatically claimed by the watchtowers
-    await swap.waitTillClaimed();
-}
-
-async function main() {
-    await setupSwapper();
-    // await createToBtcSwap();
-    // await createFromBtcSwap();
-}
-
-main();
+import {SolanaKeypairWallet, SolanaSigner, SolanaSwapperWithSigner, MultichainSwapper, Tokens} from "../";
+import {Keypair} from "@solana/web3.js";
+import * as BN from "bn.js";
+
+const solanaRpc = "https://api.mainnet-beta.solana.com";
+
+let solanaSwapper: SolanaSwapperWithSigner;
+
+async function setupSwapper() {
+    //Setup the multichain swapper
+    const swapper: MultichainSwapper = new MultichainSwapper({
+        chains: {
+            SOLANA: {
+                rpcUrl: solanaRpc
+            }
+        }
+    });
+    await swapper.init();
+
+    //Create new random keypair wallet
+    const wallet = new SolanaKeypairWallet(Keypair.generate()); //This is just a dummy, you should load the wallet from file, or etc.
+    //Or in React, using solana wallet adapter
+    //const wallet = useAnchorWallet();
+
+    const signer: SolanaSigner = new SolanaSigner(wallet);
+    //Extract a Solana specific swapper (used for swapping between Solana and Bitcoin) with a defined signer
+    solanaSwapper = swapper.withChain("SOLANA").withSigner(signer);
+}
+
+async function createToBtcSwap() {
+    const fromToken = Tokens.SOLANA.SOL;
+    const toToken = Tokens.BITCOIN.BTC;
+    const exactIn = false; //exactIn = false, so we specify the output amount
+    const amount = new BN(10000); //Amount in BTC base units - sats
+    const recipientBtcAddress = "bc1qtw67hj77rt8zrkkg3jgngutu0yfgt9czjwusxt"; //BTC address of the recipient
+
+    const swap = await solanaSwapper.create(
+        fromToken,
+        toToken,
+        amount,
+        exactIn,
+        recipientBtcAddress
+    );
+
+    //Input amounts
+    const inputTokenAmount = swap.getInput().amount;
+    const inputValueInUsd = await swap.getInput().usdValue();
+
+    //Output amounts
+    const outputTokenAmount = swap.getOutput().amount;
+    const outputValueInUsd = await swap.getOutput().usdValue();
+
+    //Initiate the swap by locking up the SOL
+    await swap.commit();
+    //Wait for bitcoin payout to happen
+    const paymentSuccess = await swap.waitForPayment();
+    if(paymentSuccess) {
+        //Payment was successful, we can get the transaction id
+        const bitcoinTxId = swap.getBitcoinTxId();
+    } else {
+        //If payment is unsuccessful we can refund and get our funds back
+        await swap.refund();
+    }
+}
+
+async function createFromBtcSwap() {
+    const fromToken = Tokens.BITCOIN.BTC;
+    const toToken = Tokens.SOLANA.SOL;
+    const exactIn = true; //exactIn = true, so we specify the input amount
+    const amount = new BN(10000); //Amount in BTC base units - sats
+
+    const swap = await solanaSwapper.create(
+        fromToken,
+        toToken,
+        amount,
+        exactIn
+    );
+
+    //Input amounts
+    const inputTokenAmount = swap.getInput().amount; //Human readable input token amount with decimals
+    const inputValueInUsd = await swap.getInput().usdValue(); //Fetches the USD value of the input
+
+    //Output amounts
+    const outputTokenAmount = swap.getOutput().amount; //Human readable output token amount with decimals
+    const outputValueInUsd = await swap.getOutput().usdValue(); //Fetches the USD value of the output
+
+    //Initiate the swap, this will prompt a Solana transaction, as we need to open the BTC swap address
+    await swap.commit();
+
+    const qrCodeData = swap.getQrData(); //Data that can be displayed as QR code - URL with the address and amount
+    const bitcoinAddress = swap.getBitcoinAddress(); //Bitcoin address to send the BTC to - exact amount needs to be sent!
+    const timeout = swap.getTimeoutTime(); //The BTC should be sent before the timeout
+
+    console.log("Please send exactly "+inputTokenAmount+" BTC to "+bitcoinAddress);
+
+    //Waits for bitcoin transaction to be received
+    await swap.waitForBitcoinTransaction(
+        null, null,
+        (
+            txId: string, //Transaction ID received
+            confirmations: number, //Current confirmation count of the transaction
+            targetConfirmations: number, //Required confirmations for the transaction to be accepted
+            transactionETAms: number //Estimated time in milliseconds till the transaction is accepted
+        ) => {
+            //This callback receives periodic updates about the incoming transaction
+            console.log("Tx received: "+txId+" confirmations: "+confirmations+"/"+targetConfirmations+" ETA: "+transactionETAms+" ms");
+        }
+    ); //This returns as soon as the transaction is accepted
+
+    //Swap will get automatically claimed by the watchtowers
+    await swap.waitTillClaimed();
+}
+
+async function main() {
+    await setupSwapper();
+    // await createToBtcSwap();
+    // await createFromBtcSwap();
+}
+
+main();