@lombard.finance/sdk 2.2.1 → 2.4.1

package/src/web3Sdk/lbtcAddressConfig.ts

@@ -1,8 +1,6 @@
-import {
-  defaultEnv,
-  ZERO_ADDRESS as PLACEHOLDER_ADDRESS,
-} from '../common/const';
-import { OChainId, OEnv, TChainId, TEnv } from '../common/types/types';
+import { ZERO_ADDRESS as PLACEHOLDER_ADDRESS } from '../common/const';
+import { OChainId, TChainId } from '../common/types/types';
+import { Env, defaultEnv } from '@lombard.finance/sdk-common';
 
 type LbtcTokenConfig = Record<TChainId, string>;
 
@@ -79,11 +77,11 @@ const prodConfig: LbtcTokenConfig = {
   [OChainId.morphHolesky]: PLACEHOLDER_ADDRESS,
 };
 
-export function getLbtcAddressConfig(env: TEnv = defaultEnv): LbtcTokenConfig {
+export function getLbtcAddressConfig(env: Env = defaultEnv): LbtcTokenConfig {
   switch (env) {
-    case OEnv.prod:
+    case Env.prod:
       return prodConfig;
-    case OEnv.testnet:
+    case Env.testnet:
       return testnetConfig;
     default:
       return stageConfig;

package/src/web3Sdk/signLbtcDestionationAddr/index.ts

@@ -1 +1 @@
-export * from './signLbtcDestionationAddr';
+export * from './signLbtcDestinationAddr';

package/src/web3Sdk/signLbtcDestionationAddr/{signLbtcDestionationAddr.ts → signLbtcDestinationAddr.ts}

@@ -1,19 +1,19 @@
 import { Provider } from '../../provider';
 import { IProviderBasedParams } from '../types';
 
-export type SignLbtcDestionationAddrParams = IProviderBasedParams;
+export type SignLbtcDestinationAddrParams = IProviderBasedParams;
 
 /**
  * Signs the destination address for the LBTC in active chain
  * in the current account. Signing is necessary for the
  * generation of the deposit address.
  *
- * @param {SignLbtcDestionationAddrParams} params
+ * @param {SignLbtcDestinationAddrParams} params
  *
  * @returns {Promise<string>} The signature of the message.
  */
-export async function signLbtcDestionationAddr(
-  params: SignLbtcDestionationAddrParams,
+export async function signLbtcDestinationAddr(
+  params: SignLbtcDestinationAddrParams,
 ): Promise<string> {
   const provider = new Provider(params);
 

package/src/web3Sdk/signLbtcDestionationAddr/signLbtcDestionationAddr.stories.tsx

@@ -6,9 +6,9 @@ import { CodeBlock } from '../../stories/components/CodeBlock';
 import { useConnect } from '../../stories/hooks/useConnect';
 import useQuery from '../../stories/hooks/useQuery';
 import { fromCamelCase } from '../../stories/utils/fromCamelCase';
-import { signLbtcDestionationAddr } from './signLbtcDestionationAddr';
+import { signLbtcDestinationAddr } from './signLbtcDestinationAddr';
 
-const { name } = signLbtcDestionationAddr;
+const { name } = signLbtcDestinationAddr;
 const nameWithWhitespaces = fromCamelCase(name);
 
 const meta = {
@@ -32,7 +32,7 @@ export function StoryView() {
       return;
     }
 
-    return signLbtcDestionationAddr(connectData);
+    return signLbtcDestinationAddr(connectData);
   };
 
   const { data, error, isLoading, refetch } = useQuery(request, [], false);

package/src/web3Sdk/signNetworkFee/signNetworkFee.stories.tsx

@@ -1,4 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/react';
+import { defaultEnv } from '@lombard.finance/sdk-common';
 import { Button } from '../../stories/components/Button';
 import { CodeBlock } from '../../stories/components/CodeBlock';
 import { useConnect } from '../../stories/hooks/useConnect';
@@ -6,7 +7,6 @@ import useQuery from '../../stories/hooks/useQuery';
 import { fromCamelCase } from '../../stories/utils/fromCamelCase';
 import { MS_PER_DAY } from '../const';
 import { ISignNetworkFeeParams, signNetworkFee } from './signNetworkFee';
-import { defaultEnv } from '../../common/const';
 
 const { name } = signNetworkFee;
 const nameWithWhitespaces = fromCamelCase(name);

package/src/web3Sdk/signStakeAndBake/utils.ts

@@ -1,14 +1,16 @@
-import { OEnv, TChainId, TEnv } from '../../common/types/types';
+import { TChainId } from '../../common/types/types';
 import { getLbtcAddressConfig } from '../lbtcAddressConfig';
+import { Env } from '@lombard.finance/sdk-common';
 
 /**
  * Gets the LBTC contract address for a given chain ID
  * @param chainId The chain ID
+ * @param env
  * @returns The LBTC contract address for the chain
  */
 export const getVerifyingContract = (
   chainId: TChainId,
-  env: TEnv = OEnv.prod,
+  env: Env = Env.prod,
 ): string => {
   const lbtcAddressConfig = getLbtcAddressConfig(env);
   const address = lbtcAddressConfig[chainId];

package/src/web3Sdk/unstakeLBTC/unstakeLBTC.stories.tsx

@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/react';
-import { defaultEnv } from '../../common/const';
+import { defaultEnv } from '@lombard.finance/sdk-common';
 import { Button } from '../../stories/components/Button';
 import { CodeBlock } from '../../stories/components/CodeBlock';
 import { useConnect } from '../../stories/hooks/useConnect';

package/src/web3Sdk/unstakeLBTC/unstakeLBTC.ts

@@ -1,4 +1,4 @@
-import { getOutputScript } from '../../btcSdk/utils/getOutputScript';
+import { getOutputScript } from '@lombard.finance/sdk-common';
 import { IEnvParam } from '../../common/types/internalTypes';
 import { toSatoshi } from '../../common/utils/convertSatoshi';
 import { IWeb3SendResult, Provider } from '../../provider';
@@ -34,7 +34,7 @@ export function unstakeLBTC({
   const tokenContract = getLbtcTokenContract(provider, env);
   const outputScript = getOutputScript(btcAddress, env);
 
-  const amountSat = toSatoshi(amount);
+  const amountSat = toSatoshi(amount).toNumber();
 
   const tx = tokenContract.methods.redeem(outputScript, amountSat);
 

package/src/web3Sdk/utils/chainIdToEnv.ts

@@ -1,4 +1,5 @@
-import { OChainId, OEnv, TChainId, TEnv } from '../../common/types/types';
+import { OChainId, TChainId } from '../../common/types/types';
+import { Env } from '@lombard.finance/sdk-common';
 
 const PROD_NATIVE_MINT_CHAINS = [
   OChainId.ethereum,
@@ -6,6 +7,6 @@ const PROD_NATIVE_MINT_CHAINS = [
   OChainId.binanceSmartChain,
 ] as TChainId[];
 
-export const chainIdToEnv = (chainId: TChainId): TEnv => {
-  return PROD_NATIVE_MINT_CHAINS.includes(chainId) ? OEnv.prod : OEnv.stage;
+export const chainIdToEnv = (chainId: TChainId): Env => {
+  return PROD_NATIVE_MINT_CHAINS.includes(chainId) ? Env.prod : Env.stage;
 };

package/src/web3Sdk/utils/getLbtcTokenContract.ts

@@ -1,11 +1,14 @@
 import { ReadProvider } from '../../provider/ReadProvider';
-import { TEnv } from '../../common/types/types';
+import { Env } from '@lombard.finance/sdk-common';
 import { isValidChain } from '../../common/utils/isValidChain';
 import { Provider } from '../../provider';
 import { getLbtcAddressConfig } from '../lbtcAddressConfig';
 import { getTokenABI } from './getTokenABI';
 
-export function getLbtcTokenContract(provider: Provider | ReadProvider, env?: TEnv) {
+export function getLbtcTokenContract(
+  provider: Provider | ReadProvider,
+  env?: Env,
+) {
   const lbtcAddressConfig = getLbtcAddressConfig(env);
   const { chainId } = provider;
 

package/src/btcSdk/utils/getOutputScript.ts

@@ -1,67 +0,0 @@
-import * as ecc from '@bitcoin-js/tiny-secp256k1-asmjs';
-import {
-  address as addressUtils,
-  initEccLib,
-  networks,
-  payments,
-} from 'bitcoinjs-lib';
-import { OEnv, TEnv } from '../../common/types/types';
-
-initEccLib(ecc);
-
-type AddressType = 'p2tr' | 'p2wpkh' | 'p2wsh';
-
-/**
- * Get output script from address.
- *
- * @param address - The address.
- * @param networkMode - The network mode.
- *
- * @returns The output script.
- */
-export function getOutputScript(
-  address: string,
-  env: TEnv = OEnv.prod,
-): string {
-  const addressType = getAddressType(address);
-
-  const payment = payments[addressType]({
-    address,
-    network: env === OEnv.prod ? networks.bitcoin : networks.testnet,
-  });
-
-  const paymentOutputScript = payment.output?.toString('hex');
-
-  if (!paymentOutputScript) {
-    throw new Error('Output script is not found.');
-  }
-
-  return `0x${paymentOutputScript}`;
-}
-
-function getAddressType(address: string): AddressType {
-  const result = addressUtils.fromBech32(address);
-
-  const isP2TR = result.version === 1 && result.data.length === 32;
-  if (isP2TR) {
-    return 'p2tr';
-  }
-
-  const isP2WPKH = result.version === 0 && result.data.length === 20;
-  if (isP2WPKH) {
-    return 'p2wpkh';
-  }
-
-  if (isP2WSHAddressType(address)) {
-    return 'p2wsh';
-  }
-
-  throw new Error('Address type is not supported.');
-}
-
-function isP2WSHAddressType(address: string): boolean {
-  return (
-    (address.startsWith('bc1') || address.startsWith('tb1')) &&
-    address.length === 62
-  );
-}