@lombard.finance/sdk 2.0.16 → 2.1.1

package/src/web3Sdk/signStakeAndBake/signStakeAndBake.stories.tsx

@@ -1,31 +1,15 @@
-import { FormControl, InputLabel, MenuItem, Select } from '@mui/material';
-import type { Meta } from '@storybook/react';
-import { useState } from 'react';
-import { OChainId } from '../../common/types/types';
+import type { Meta, StoryObj } from '@storybook/react';
+
 import { Button } from '../../stories/components/Button';
 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 {
-  getStakeAndBakeVaults,
-  SUPPORTED_STAKE_AND_BAKE_CHAINS,
-} from './contracts';
-import { signStakeAndBake } from './signStakeAndBake';
+import { signStakeAndBake, ISignStakeAndBakeParams } from './signStakeAndBake';
 
 const { name } = signStakeAndBake;
 const nameWithWhitespaces = fromCamelCase(name);
 
-const EXPIRY_OPTIONS = {
-  '10 seconds': 10,
-  '1 minute': 60,
-  '1 hour': 3600,
-  '1 day': 86400,
-  '1 year': 31536000,
-} as const;
-
-type ExpiryOption = keyof typeof EXPIRY_OPTIONS;
-
 const meta = {
   title: 'Web3SDK/signStakeAndBake',
   component: StoryView,
@@ -34,13 +18,22 @@ const meta = {
 
 export default meta;
 
-export function StoryView() {
-  const [selectedExpiry, setSelectedExpiry] =
-    useState<ExpiryOption>('10 seconds');
-  const [selectedChain, setSelectedChain] = useState(OChainId.holesky);
-  const vaults = getStakeAndBakeVaults(selectedChain);
-  const [selectedVaultKey, setSelectedVaultKey] = useState(vaults[0].key);
+type Story = StoryObj<typeof meta>;
+
+export const WithParams: Story = {
+  args: {
+    value: '20000',
+    expiry: 3600,
+    vaultKey: 'veda',
+  },
+};
+
+type SignStakeAndBakeParams = Pick<
+  ISignStakeAndBakeParams,
+  'value' | 'expiry' | 'vaultKey'
+>;
 
+export function StoryView(props: SignStakeAndBakeParams) {
   const {
     data: connectData,
     error: connectError,
@@ -53,24 +46,18 @@ export function StoryView() {
       return;
     }
 
-    const expiry =
-      Math.floor(Date.now() / 1000) + EXPIRY_OPTIONS[selectedExpiry];
-
     return signStakeAndBake({
       provider: connectData.provider,
       address: connectData.account,
-      chainId: selectedChain,
-      value: '1999',
-      expiry,
-      vaultKey: selectedVaultKey,
+      chainId: connectData.chainId,
+
+      value: props.value,
+      expiry: props.expiry,
+      vaultKey: props.vaultKey,
     });
   };
 
-  const { data, error, isLoading, refetch } = useQuery(
-    request,
-    [selectedExpiry, selectedChain, selectedVaultKey],
-    false,
-  );
+  const { data, error, isLoading, refetch } = useQuery(request, [], false);
 
   const formattedConnectData = connectData && {
     account: connectData.account,
@@ -96,71 +83,9 @@ export function StoryView() {
         <CodeBlock text={connectError || formattedConnectData} />
       </div>
 
-      <div className="mb-4">
-        <FormControl fullWidth>
-          <InputLabel id="chain-select-label">Chain</InputLabel>
-          <Select
-            labelId="chain-select-label"
-            value={selectedChain}
-            label="Chain"
-            onChange={e => {
-              const newChainId = Number(e.target.value) as typeof selectedChain;
-              setSelectedChain(newChainId);
-              // Reset vault selection to first vault of new chain
-              const newVaults = getStakeAndBakeVaults(newChainId);
-              setSelectedVaultKey(newVaults[0].key);
-            }}
-          >
-            {SUPPORTED_STAKE_AND_BAKE_CHAINS.map(chainId => (
-              <MenuItem key={chainId} value={chainId}>
-                {chainId}
-              </MenuItem>
-            ))}
-          </Select>
-        </FormControl>
-      </div>
-
-      <div className="mb-4">
-        <FormControl fullWidth>
-          <InputLabel id="vault-select-label">Vault</InputLabel>
-          <Select
-            labelId="vault-select-label"
-            value={selectedVaultKey}
-            label="Vault"
-            onChange={e => setSelectedVaultKey(e.target.value)}
-          >
-            {vaults.map(vault => (
-              <MenuItem key={vault.key} value={vault.key}>
-                {vault.name}
-              </MenuItem>
-            ))}
-          </Select>
-        </FormControl>
-      </div>
-
-      <div className="mb-4">
-        <FormControl fullWidth>
-          <InputLabel id="expiry-select-label">Expiry Time</InputLabel>
-          <Select
-            labelId="expiry-select-label"
-            value={selectedExpiry}
-            label="Expiry Time"
-            onChange={e => setSelectedExpiry(e.target.value as ExpiryOption)}
-          >
-            {Object.keys(EXPIRY_OPTIONS).map(option => (
-              <MenuItem key={option} value={option}>
-                {option}
-              </MenuItem>
-            ))}
-          </Select>
-        </FormControl>
-      </div>
-
       <Button
         onClick={refetch}
-        disabled={
-          isLoading || !connectData || connectData.chainId !== selectedChain
-        }
+        disabled={isLoading || !connectData}
         isLoading={isLoading}
       >
         {nameWithWhitespaces}

package/src/web3Sdk/signStakeAndBake/signStakeAndBake.ts

@@ -1,3 +1,4 @@
+import { IEnvParam } from 'common/types/internalTypes';
 import { TChainId } from '../../common/types/types';
 import { Provider } from '../../provider';
 import { IProviderBasedParams } from '../types';
@@ -9,7 +10,7 @@ const NO_SIGNATURE_ERROR =
   'Failed to obtain a valid signature. The response is undefined or invalid.';
 
 export interface ISignStakeAndBakeParams
-  extends Pick<IProviderBasedParams, 'provider'> {
+  extends Pick<IProviderBasedParams, 'provider'>, IEnvParam {
   /**
    * The address to sign with (owner)
    */
@@ -61,6 +62,7 @@ export async function signStakeAndBake({
   expiry,
   rpcUrl,
   vaultKey,
+  env
 }: ISignStakeAndBakeParams): Promise<ISignStakeAndBakeResult> {
   const providerInstance = new Provider({
     provider,
@@ -68,7 +70,7 @@ export async function signStakeAndBake({
     chainId,
   });
 
-  const verifyingContract = getVerifyingContract(chainId);
+  const verifyingContract = getVerifyingContract(chainId, env);
   const spender = getStakeAndBakeSpenderContract(chainId, vaultKey);
 
   const typedDataObject = await getStakeAndBakeTypedData({

package/src/web3Sdk/signStakeAndBake/utils.ts

@@ -1,4 +1,4 @@
-import { TChainId } from '../../common/types/types';
+import { OEnv, TChainId, TEnv } from '../../common/types/types';
 import { getLbtcAddressConfig } from '../lbtcAddressConfig';
 
 /**
@@ -6,11 +6,16 @@ import { getLbtcAddressConfig } from '../lbtcAddressConfig';
  * @param chainId The chain ID
  * @returns The LBTC contract address for the chain
  */
-export const getVerifyingContract = (chainId: TChainId): string => {
-  const lbtcAddressConfig = getLbtcAddressConfig('stage');
+export const getVerifyingContract = (
+  chainId: TChainId,
+  env: TEnv = OEnv.prod,
+): string => {
+  const lbtcAddressConfig = getLbtcAddressConfig(env);
   const address = lbtcAddressConfig[chainId];
   if (!address) {
-    throw new Error(`No LBTC contract address configured for chain ID ${chainId}`);
+    throw new Error(
+      `No LBTC contract address configured for chain ID ${chainId}`,
+    );
   }
   return address;
-};
+};

package/src/web3Sdk/lbtcOFTAdapterAddressConfig.ts

@@ -1,47 +0,0 @@
-import { defaultEnv } from '../common/const';
-import { OChainId, OEnv, TOFTChainId, TEnv } from '../common/types/types';
-
-type TToChainId = Partial<Record<TOFTChainId, string>>;
-
-type LbtcOFTAdapterConfig = Partial<Record<TOFTChainId, TToChainId>>;
-
-const stageConfig: LbtcOFTAdapterConfig = {
-  [OChainId.sepolia]: {
-    [OChainId.berachainBartioTestnet]:
-      '0xe3748bF0Ec0A76767539eE28610B3367e35fe2C2',
-  },
-  [OChainId.berachainBartioTestnet]: {
-    [OChainId.sepolia]: '0x1977013acaf27856ac8048C42EE2ed0134d53895',
-  },
-};
-
-const testnetConfig: LbtcOFTAdapterConfig = {
-  ...stageConfig,
-};
-
-const prodConfig: LbtcOFTAdapterConfig = {
-  ...stageConfig,
-  [OChainId.corn]: {
-    [OChainId.ethereum]: '0xfc7B20D9B59A8A466f4fC3d34aA69a7D98e71d7A',
-  },
-  [OChainId.ethereum]: {
-    [OChainId.corn]: '0x6bc15d7930839ec18a57f6f7df72ae1b439d077f',
-    [OChainId.swell]: '0x37E92d760a15231e652a2C502182a6b44c7510c0',
-  },
-  [OChainId.swell]: {
-    [OChainId.ethereum]: '0x7B3784AD646C10A8Ddf42b47a4f4bd9aFD351E54',
-  },
-};
-
-export function getLbtcOFTAdapterAddressConfig(
-  env: TEnv = defaultEnv,
-): LbtcOFTAdapterConfig {
-  switch (env) {
-    case OEnv.prod:
-      return prodConfig;
-    case OEnv.testnet:
-      return testnetConfig;
-    default:
-      return stageConfig;
-  }
-}