@lombard.finance/sdk 2.0.8 → 2.0.10

package/src/web3Sdk/signStakeAndBake/getTypedData.ts

@@ -1,15 +1,14 @@
-import { IEnvParam } from '../../common/types/internalTypes';
 import { TChainId } from '../../common/types/types';
 import { getPermitNonce } from '../getPermitNonce';
-import { getLbtcAddressConfig } from '../lbtcAddressConfig';
 
-export interface IStakeAndBakeTypedData extends IEnvParam {
+export interface IStakeAndBakeTypedData {
   chainId: TChainId;
-  expiryDate: number;
+  expiry: number;
   owner: string;
   spender: string;
   value: string;
   rpcUrl?: string;
+  verifyingContract: string;
 }
 
 /**
@@ -20,16 +19,13 @@ export interface IStakeAndBakeTypedData extends IEnvParam {
  */
 export async function getStakeAndBakeTypedData({
   chainId,
-  expiryDate,
+  expiry,
   owner,
   spender,
   value,
-  env,
   rpcUrl,
+  verifyingContract,
 }: IStakeAndBakeTypedData) {
-  const lbtcAddresses = getLbtcAddressConfig(env);
-  const verifyingContract = lbtcAddresses[chainId];
-
   const nonce = await getPermitNonce({
     owner,
     chainId,
@@ -76,7 +72,7 @@ export async function getStakeAndBakeTypedData({
       spender,
       value,
       nonce,
-      deadline: expiryDate.toString(),
+      deadline: expiry.toString(),
     },
   };
 }

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

@@ -1,13 +1,20 @@
-import { FormControl, InputLabel, MenuItem, Select } from '@mui/material';
-import type { Meta, StoryObj } from '@storybook/react';
-import { useState } from 'react';
-import { OChainId, OEnv } from '../../common/types/types';
+import {
+  FormControl,
+  InputLabel,
+  MenuItem,
+  Select,
+  TextField,
+} from '@mui/material';
+import type { Meta } from '@storybook/react';
+import { useEffect, useState } from 'react';
+import { OChainId } from '../../common/types/types';
 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 { ISignStakeAndBakeParams, signStakeAndBake } from './signStakeAndBake';
+import { VAULT_CONTRACTS } from './contracts';
+import { signStakeAndBake } from './signStakeAndBake';
 
 const { name } = signStakeAndBake;
 const nameWithWhitespaces = fromCamelCase(name);
@@ -22,6 +29,8 @@ const EXPIRY_OPTIONS = {
 
 type ExpiryOption = keyof typeof EXPIRY_OPTIONS;
 
+const AVAILABLE_CHAINS = Object.keys(VAULT_CONTRACTS).map(Number);
+
 const meta = {
   title: 'Web3SDK/signStakeAndBake',
   component: StoryView,
@@ -30,19 +39,16 @@ const meta = {
 
 export default meta;
 
-type Story = StoryObj<typeof meta>;
-
-export const WithParams: Story = {
-  args: {
-    env: OEnv.stage,
-  },
-};
-
-type SignStakeAndBakeProps = Pick<ISignStakeAndBakeParams, 'env'>;
-
-export function StoryView(props: SignStakeAndBakeProps) {
+export function StoryView() {
   const [selectedExpiry, setSelectedExpiry] =
     useState<ExpiryOption>('10 seconds');
+  const [selectedChain, setSelectedChain] = useState(OChainId.holesky);
+  const [spender, setSpender] = useState(
+    VAULT_CONTRACTS[OChainId.holesky].SPENDER,
+  );
+  const [verifyingContract, setVerifyingContract] = useState(
+    VAULT_CONTRACTS[OChainId.holesky].VERIFYING_CONTRACT,
+  );
 
   const {
     data: connectData,
@@ -51,28 +57,34 @@ export function StoryView(props: SignStakeAndBakeProps) {
     connect,
   } = useConnect();
 
+  useEffect(() => {
+    const contracts = VAULT_CONTRACTS[selectedChain];
+    setSpender(contracts.SPENDER);
+    setVerifyingContract(contracts.VERIFYING_CONTRACT);
+  }, [selectedChain]);
+
   const request = async () => {
     if (!connectData || !connectData.provider) {
       return;
     }
 
-    const chainId = OChainId.holesky;
-    const expiryDate =
+    const expiry =
       Math.floor(Date.now() / 1000) + EXPIRY_OPTIONS[selectedExpiry];
 
     return signStakeAndBake({
       provider: connectData.provider,
       address: connectData.account,
-      chainId,
-      env: props.env,
+      chainId: selectedChain,
       value: '1999',
-      expiryDate,
+      expiry,
+      spender,
+      verifyingContract,
     });
   };
 
   const { data, error, isLoading, refetch } = useQuery(
     request,
-    [selectedExpiry],
+    [selectedExpiry, selectedChain, spender, verifyingContract],
     false,
   );
 
@@ -100,6 +112,48 @@ export function StoryView(props: SignStakeAndBakeProps) {
         <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 =>
+              setSelectedChain(Number(e.target.value) as typeof selectedChain)
+            }
+          >
+            {AVAILABLE_CHAINS.map(chainId => (
+              <MenuItem key={chainId} value={chainId}>
+                {chainId}
+              </MenuItem>
+            ))}
+          </Select>
+        </FormControl>
+      </div>
+
+      <div className="mb-4">
+        <FormControl fullWidth>
+          <TextField
+            label="Spender Address"
+            value={spender}
+            onChange={e => setSpender(e.target.value)}
+            helperText="The address that will be authorized to spend tokens"
+          />
+        </FormControl>
+      </div>
+
+      <div className="mb-4">
+        <FormControl fullWidth>
+          <TextField
+            label="Verifying Contract"
+            value={verifyingContract}
+            onChange={e => setVerifyingContract(e.target.value)}
+            helperText="The contract that will verify the signature"
+          />
+        </FormControl>
+      </div>
+
       <div className="mb-4">
         <FormControl fullWidth>
           <InputLabel id="expiry-select-label">Expiry Time</InputLabel>
@@ -121,7 +175,7 @@ export function StoryView(props: SignStakeAndBakeProps) {
       <Button
         onClick={refetch}
         disabled={
-          isLoading || !connectData || connectData.chainId !== OChainId.holesky
+          isLoading || !connectData || connectData.chainId !== selectedChain
         }
         isLoading={isLoading}
       >

package/src/web3Sdk/signStakeAndBake/signStakeAndBake.ts

@@ -1,16 +1,13 @@
-import { IEnvParam } from '../../common/types/internalTypes';
 import { TChainId } from '../../common/types/types';
 import { Provider } from '../../provider';
 import { IProviderBasedParams } from '../types';
-import { getStakeAndBakeSpenderAddress } from './config';
 import { getStakeAndBakeTypedData } from './getTypedData';
 
 const NO_SIGNATURE_ERROR =
   'Failed to obtain a valid signature. The response is undefined or invalid.';
 
 export interface ISignStakeAndBakeParams
-  extends Pick<IProviderBasedParams, 'provider'>,
-    IEnvParam {
+  extends Pick<IProviderBasedParams, 'provider'> {
   /**
    * The address to sign with (owner)
    */
@@ -24,13 +21,21 @@ export interface ISignStakeAndBakeParams
    */
   value: string;
   /**
-   * Expiry date in seconds
+   * Expiry date as a unix timestamp
    */
-  expiryDate: number;
+  expiry: number;
   /**
    * Optional RPC URL for the network
    */
   rpcUrl?: string;
+  /**
+   * The spender address that will be authorized to spend tokens
+   */
+  spender: string;
+  /**
+   * The contract address that will verify the signature
+   */
+  verifyingContract: string;
 }
 
 export interface ISignStakeAndBakeResult {
@@ -55,9 +60,10 @@ export async function signStakeAndBake({
   provider,
   chainId,
   value,
-  env,
-  expiryDate,
+  expiry,
   rpcUrl,
+  spender,
+  verifyingContract,
 }: ISignStakeAndBakeParams): Promise<ISignStakeAndBakeResult> {
   const providerInstance = new Provider({
     provider,
@@ -65,16 +71,14 @@ export async function signStakeAndBake({
     chainId,
   });
 
-  const spender = getStakeAndBakeSpenderAddress(chainId);
-
   const typedDataObject = await getStakeAndBakeTypedData({
     chainId,
-    expiryDate,
+    expiry,
     owner: address,
     spender,
     value,
-    env,
     rpcUrl,
+    verifyingContract,
   });
 
   const typedData = JSON.stringify(typedDataObject);