Improve hyperliquid logic

Author: ted-palmer

packages/sdk/src/utils/executeSteps/signatureStep.ts

@@ -9,7 +9,7 @@ import type { AxiosRequestConfig } from 'axios'
 import { LogLevel } from '../logger.js'
 import type { RelayClient } from '../../client.js'
 import type { SetStateData } from './index.js'
-import { sendUsd } from '../hyperliquid.js'
+import { postHyperliquidSignature } from '../hyperliquid.js'
 
 /**
  * Handles the execution of a signature step item, including signing, posting, and validation.
@@ -68,8 +68,12 @@ export async function handleSignatureStepItem({
     }
   }
 
-  if (chain.id === 1337 && signature && step?.id === ('sign' as any)) {
-    await sendUsd(client, signature, stepItem)
+  if (
+    chain.id === 1337 &&
+    signature &&
+    step?.id === ('hyperliquid-signature' as any)
+  ) {
+    await postHyperliquidSignature(client, signature, stepItem)
   }
 
   if (postData) {

packages/sdk/src/utils/hyperliquid.ts

@@ -4,46 +4,17 @@ import axios from 'axios'
 import type { RelayClient } from '../client.js'
 import { LogLevel } from './logger.js'
 
-function updateHyperliquidSignatureChainId(
-  step: Execute['steps'][0],
-  activeWalletChainId: number
-): Execute['steps'][0] {
-  return {
-    ...step,
-    items: step.items?.map((item) => ({
-      ...item,
-      data: {
-        ...item.data,
-        sign: {
-          ...item.data.sign,
-          domain: {
-            ...item.data.sign.domain,
-            chainId: activeWalletChainId
-          }
-        },
-        ...(item.data.post && {
-          post: {
-            ...item.data.post,
-            body: {
-              ...item.data.post.body,
-              signatureChainId: activeWalletChainId
-            }
-          }
-        })
-      }
-    }))
-  }
-}
-
 function prepareHyperliquidSignatureStep(
   step: Execute['steps'][0],
   chainId: number
 ) {
-  const items = step?.items
-  const amount = items?.[0]?.data?.action?.parameters?.amount
-  const destination = items?.[0]?.data?.action?.parameters?.destination
+  const stepItem = step?.items?.[0]
+  const action = stepItem?.data?.action
+  const eip712Types = stepItem?.data?.eip712Types
+  const eip712PrimaryType = stepItem?.data?.eip712PrimaryType
+
   const signatureStep = {
-    id: 'sign' as any,
+    id: 'hyperliquid-signature' as any,
     action: 'Confirm transaction in your wallet',
     description: `Sign a message to confirm the transaction`,
     kind: 'signature' as const,
@@ -60,27 +31,19 @@ function prepareHyperliquidSignatureStep(
               verifyingContract: '0x0000000000000000000000000000000000000000'
             },
             types: {
-              'HyperliquidTransaction:UsdSend': [
-                { name: 'hyperliquidChain', type: 'string' },
-                { name: 'destination', type: 'string' },
-                { name: 'amount', type: 'string' },
-                { name: 'time', type: 'uint64' }
-              ],
+              ...eip712Types,
               EIP712Domain: [
                 { name: 'name', type: 'string' },
                 { name: 'version', type: 'string' },
                 { name: 'chainId', type: 'uint256' },
                 { name: 'verifyingContract', type: 'address' }
               ]
             },
-            primaryType: 'HyperliquidTransaction:UsdSend',
+            primaryType: eip712PrimaryType,
             value: {
-              type: 'usdSend',
-              signatureChainId: `0x${chainId.toString(16)}`,
-              hyperliquidChain: 'Mainnet',
-              destination: destination?.toLowerCase(),
-              amount,
-              time: items?.[0]?.data?.nonce
+              ...action.parameters,
+              type: action.type,
+              signatureChainId: `0x${chainId.toString(16)}`
             }
           }
         },
@@ -97,28 +60,7 @@ function prepareHyperliquidSignatureStep(
   return signatureStep
 }
 
-export function prepareHyperliquidSteps(
-  steps: Execute['steps'],
-  activeWalletChainId: number
-): Execute['steps'] {
-  return steps.map((step) => {
-    // Skip steps that have already been converted (id is set to 'sign' by prepareHyperliquidSignatureStep)
-    if ((step.id as string) === 'sign') {
-      return step
-    }
-    // Update signature steps to use the active wallet chain ID
-    if (step.kind === 'signature') {
-      return updateHyperliquidSignatureChainId(step, activeWalletChainId)
-    }
-    // Convert transaction steps to Hyperliquid signature steps
-    if (step.kind === 'transaction') {
-      return prepareHyperliquidSignatureStep(step, activeWalletChainId)
-    }
-    return step
-  })
-}
-
-export async function sendUsd(
+export async function postHyperliquidSignature(
   client: RelayClient,
   signature: string,
   stepItem: Execute['steps'][0]['items'][0]
@@ -129,23 +71,16 @@ export async function sendUsd(
   )
   const { r, s, v } = parseSignature(signature as `0x${string}`)
 
-  const nonce = stepItem?.data?.sign?.value?.time
+  const action = stepItem?.data?.sign?.value
 
   const res = await axios.post('https://api.hyperliquid.xyz/exchange', {
     signature: {
       r,
       s,
       v: Number(v ?? 0n)
     },
-    nonce: nonce,
-    action: {
-      type: stepItem?.data?.sign?.value?.type,
-      signatureChainId: `0x${stepItem?.data?.sign?.domain?.chainId?.toString(16)}`,
-      hyperliquidChain: 'Mainnet',
-      destination: stepItem?.data?.sign?.value?.destination?.toLowerCase(),
-      amount: stepItem?.data?.sign?.value?.amount,
-      time: nonce
-    }
+    nonce: action?.nonce,
+    action
   })
   if (
     !res ||
@@ -161,3 +96,55 @@ export async function sendUsd(
   )
   return res.data
 }
+
+function updateHyperliquidSignatureChainId(
+  step: Execute['steps'][0],
+  activeWalletChainId: number
+): Execute['steps'][0] {
+  return {
+    ...step,
+    items: step.items?.map((item) => ({
+      ...item,
+      data: {
+        ...item.data,
+        sign: {
+          ...item.data.sign,
+          domain: {
+            ...item.data.sign.domain,
+            chainId: activeWalletChainId
+          }
+        },
+        ...(item.data.post && {
+          post: {
+            ...item.data.post,
+            body: {
+              ...item.data.post.body,
+              signatureChainId: activeWalletChainId
+            }
+          }
+        })
+      }
+    }))
+  }
+}
+
+export function prepareHyperliquidSteps(
+  steps: Execute['steps'],
+  activeWalletChainId: number
+): Execute['steps'] {
+  return steps.map((step) => {
+    // Skip steps that have already been converted (id is set to 'sign' by prepareHyperliquidSignatureStep)
+    if ((step.id as string) === 'hyperliquid-signature') {
+      return step
+    }
+    // Update signature steps to use the active wallet chain ID
+    if (step.kind === 'signature') {
+      return updateHyperliquidSignatureChainId(step, activeWalletChainId)
+    }
+    // Convert transaction steps to Hyperliquid signature steps
+    if (step.kind === 'transaction') {
+      return prepareHyperliquidSignatureStep(step, activeWalletChainId)
+    }
+    return step
+  })
+}