Merge branch 'main' into staging

Author: georgeroman

package.json

@@ -19,7 +19,7 @@
     "@fastify/swagger-ui": "^5.2.3",
     "@fastify/type-provider-typebox": "^5.1.0",
     "@near-js/providers": "^2.3.1",
-    "@reservoir0x/relay-protocol-sdk": "^0.0.43",
+    "@reservoir0x/relay-protocol-sdk": "^0.0.50",
     "@sinclair/typebox": "^0.34.14",
     "@solana/web3.js": "^1.98.2",
     "asn1.js": "^5.4.1",

src/services/request-handler/index.ts

@@ -19,6 +19,7 @@ import {
   http,
   parseAbi,
   zeroAddress,
+  encodeAbiParameters,
 } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 import TronWeb from "tronweb";
@@ -125,7 +126,9 @@ export class RequestHandlerService {
                 )?.topics[1]
             );
           if (!payloadId) {
-            throw externalError("Could not submit withdrawal request");
+            throw externalError(
+              "Withdrawal request submission failed to generate payload"
+            );
           }
 
           encodedData = await contract.read.payloads([payloadId as Hex]);
@@ -270,7 +273,9 @@ export class RequestHandlerService {
                 )?.topics[1]
             );
           if (!payloadId) {
-            throw externalError("Could not submit withdrawal request");
+            throw externalError(
+              "Withdrawal request submission failed to generate payload"
+            );
           }
 
           encodedData = await contract.read.payloads([payloadId as Hex]);
@@ -453,6 +458,64 @@ export class RequestHandlerService {
         }
       }
 
+      case "hyperliquid-vm": {
+        if (request.mode === "onchain") {
+          const { contract, publicClient, walletClient } =
+            await getOnchainAllocator();
+
+          const currentTime = BigInt(Date.now());
+
+          // TODO: Add support for "sendAsset"
+          const data = encodeAbiParameters([{ type: "uint64" }], [currentTime]);
+
+          payloadParams = {
+            chainId: chain.metadata.allocatorChainId!,
+            depository: chain.depository!,
+            currency: request.currency.toLowerCase(),
+            amount: request.amount,
+            spender: walletClient.account.address.toLowerCase(),
+            receiver: request.recipient.toLowerCase(),
+            data,
+            nonce: `0x${randomBytes(32).toString("hex")}`,
+          };
+
+          // This is needed before being able to submit withdraw requests
+          await handleOneTimeApproval();
+
+          const txHash = await contract.write.submitWithdrawRequest([
+            payloadParams as any,
+          ]);
+          payloadId = await publicClient
+            .waitForTransactionReceipt({ hash: txHash })
+            .then(
+              (receipt) =>
+                receipt.logs.find(
+                  (l) =>
+                    l.address.toLowerCase() ===
+                      contract.address.toLowerCase() &&
+                    // We need the "PayloadBuild" event
+                    l.topics[0] ===
+                      "0x007d52d35e656ce646ba5807d55724e47d53e72435a328e89eb6ce56b0e95d6a"
+                )?.topics[1]
+            );
+          if (!payloadId) {
+            throw externalError(
+              "Withdrawal request submission failed to generate payload"
+            );
+          }
+
+          encodedData = await contract.read.payloads([payloadId as Hex]);
+
+          id = getDecodedWithdrawalId(
+            decodeWithdrawal(encodedData, chain.vmType)
+          );
+
+          break;
+        } else {
+          throw externalError("Offchain allocator mode not implemented");
+        }
+      }
+
       case "tron-vm": {
         if (request.mode === "onchain") {
           throw externalError("Onchain allocator mode not implemented");

yarn.lock

@@ -1463,10 +1463,10 @@
   resolved "https://registry.yarnpkg.com/@protobuf-ts/runtime/-/runtime-2.11.1.tgz#ee2bf2fac6e2d8deac0ca63471a77481548e5553"
   integrity sha512-KuDaT1IfHkugM2pyz+FwiY80ejWrkH1pAtOBOZFuR6SXEFTsnb/jiQWQ1rCIrcKx2BtyxnxW6BWwsVSA/Ie+WQ==
 
-"@reservoir0x/relay-protocol-sdk@^0.0.43":
-  version "0.0.43"
-  resolved "https://registry.yarnpkg.com/@reservoir0x/relay-protocol-sdk/-/relay-protocol-sdk-0.0.43.tgz#9851289f3c3a5c100a41ae7620a8a54a8a249c7c"
-  integrity sha512-wHb2wB1TwVYZvUr1qzMOOX0rbSTz/5FXMNML198J9+AATEOlUMPOY75EpMeE4J3mRqGh8GEZ2hWYulLimS2TLg==
+"@reservoir0x/relay-protocol-sdk@^0.0.50":
+  version "0.0.50"
+  resolved "https://registry.yarnpkg.com/@reservoir0x/relay-protocol-sdk/-/relay-protocol-sdk-0.0.50.tgz#0a5b42e9f52aa8143ed13e6bf389e19274cd8f92"
+  integrity sha512-2WcysR1rb2r5yqUxbSXDEvIvUk6lcDfG/pb7GUGr4Ub4AA9TNofCu2fgkB1Yu2HySfDADYWZ420wm7P26SGZQg==
   dependencies:
     "@coral-xyz/anchor" "^0.31.1"
     "@mysten/sui" "^1.24.0"
@@ -4866,6 +4866,7 @@ string-length@^4.0.1:
     strip-ansi "^6.0.0"
 
 "string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  name string-width-cjs
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -5283,6 +5284,7 @@ wordwrap@^1.0.0:
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+  name wrap-ansi-cjs
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==