Solana withdrawals migration (#96)

* chore: start migrating to new allocator

* chore: start migrating to new allocator

* chore: start migrating to new allocator

* chore: start migrating to new allocator

* chore: start migrating to new allocator

* chore: start migrating to new allocator

* fix: onchain allocator cache

* fix: onchain allocator cache

* fix: onchain allocator cache

* chore: migrate to new allocator

* chore: migrate to new allocator

* chore: migrate to new allocator

* chore: migrate to new allocator

* chore: migrate to new allocator

* chore: migrate to new allocator

* chore: migrate to new allocator

* chore: upgrade sdk

* feat: prepare for solana withdrawals migration

* fix: build

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.50",
+    "@reservoir0x/relay-protocol-sdk": "^0.0.59",
     "@sinclair/typebox": "^0.34.14",
     "@solana/web3.js": "^1.98.2",
     "asn1.js": "^5.4.1",

src/api/queries/chains/v1.ts

@@ -27,6 +27,7 @@ const Schema = {
               Type.Literal("sui-vm"),
               Type.Literal("ton-vm"),
               Type.Literal("tron-vm"),
+              Type.Literal("lighter-vm"),
             ],
             {
               description: "The vm type of the chain",

src/services/request-handler/index.ts

@@ -4,7 +4,7 @@ import {
   getDecodedWithdrawalId,
   getVmTypeNativeCurrency,
 } from "@reservoir0x/relay-protocol-sdk";
-import { PublicKey, Keypair } from "@solana/web3.js";
+import { PublicKey, Keypair, SystemProgram } from "@solana/web3.js";
 import * as bitcoin from "bitcoinjs-lib";
 import bs58 from "bs58";
 import { randomBytes } from "crypto";
@@ -20,6 +20,7 @@ import {
   parseAbi,
   zeroAddress,
   encodeAbiParameters,
+  zeroHash,
 } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 import TronWeb from "tronweb";
@@ -299,6 +300,9 @@ export class RequestHandlerService {
             amount: request.amount,
             nonce: BigInt("0x" + randomBytes(8).toString("hex")).toString(),
             expiration,
+            // TODO: Use correct values fetched from the depository
+            domain: zeroHash,
+            vaultAddress: SystemProgram.programId.toBase58(),
           };
 
           id = getDecodedWithdrawalId({

src/utils/onchain-allocator.ts

@@ -85,24 +85,8 @@ const getPayloadBuilder = async (address: string) => {
   };
 };
 
-export const getOnchainAllocator = async (chainId: string) => {
-  let allocator = config.onchainAllocator;
-  if (
-    process.env.SERVICE === "relay-protocol-hub-dev" &&
-    [
-      "ethereum",
-      "optimism",
-      "polygon",
-      "abstract",
-      "base",
-      "arbitrum",
-      "solana",
-      "hyperliquid",
-    ].includes(chainId)
-  ) {
-    allocator = "0x45348c213bf7ddb8e45f34ca4f333307a78ecb9a";
-  }
-
+export const getOnchainAllocator = async (_chainId: string) => {
+  const allocator = config.onchainAllocator;
   if (!allocator) {
     throw externalError("Onchain allocator not configured");
   }
@@ -190,11 +174,12 @@ const extractEddsaSignature = (rawNearSignature: string): string => {
 
 let _getSignerCache = new Map<string, string>();
 export const getSigner = async (chainId: string) => {
-  const vmType = await getChain(chainId).then((c) => c.vmType);
-  if (_getSignerCache.has(vmType)) {
-    return _getSignerCache.get(vmType)!;
+  if (_getSignerCache.has(chainId)) {
+    return _getSignerCache.get(chainId)!;
   }
 
+  const vmType = await getChain(chainId).then((c) => c.vmType);
+
   let domainId: number | undefined;
   switch (vmType) {
     case "ethereum-vm":
@@ -235,7 +220,7 @@ export const getSigner = async (chainId: string) => {
     case "ethereum-vm":
     case "hyperliquid-vm": {
       _getSignerCache.set(
-        vmType,
+        chainId,
         publicKeyToAddress(
           `0x04${Buffer.from(bs58.decode(publicKey)).toString("hex")}`
         ).toLowerCase()
@@ -245,7 +230,7 @@ export const getSigner = async (chainId: string) => {
     }
 
     case "solana-vm": {
-      _getSignerCache.set(vmType, publicKey);
+      _getSignerCache.set(chainId, publicKey);
 
       break;
     }
@@ -255,7 +240,7 @@ export const getSigner = async (chainId: string) => {
     }
   }
 
-  return _getSignerCache.get(vmType)!;
+  return _getSignerCache.get(chainId)!;
 };
 
 export const getSignature = async (id: string) => {

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.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==
+"@reservoir0x/relay-protocol-sdk@^0.0.59":
+  version "0.0.59"
+  resolved "https://registry.yarnpkg.com/@reservoir0x/relay-protocol-sdk/-/relay-protocol-sdk-0.0.59.tgz#ee6edcfd54d3bb58aa835f79471797474f55bb97"
+  integrity sha512-T0nxQiGCclvDdsfsaXI+oydjRHmSY9xvVqNCZHRj+QOYmG/hl3wj+f/+uqacPI/ht+AGnvrx5FtKJIm36c78Yw==
   dependencies:
     "@coral-xyz/anchor" "^0.31.1"
     "@mysten/sui" "^1.24.0"