Prepare for allocator migration (#90)

* feat: prepare for allocator migration by allowing different allocator per chain id

* chore: override base allocator on dev

* fix: tweaks

Author: georgeroman

src/api/queries/configs/v1.ts

@@ -34,7 +34,7 @@ export default {
     _req: FastifyRequestTypeBox<typeof Schema>,
     reply: FastifyReplyTypeBox<typeof Schema>
   ) => {
-    const { walletClient } = await getOnchainAllocator();
+    const { walletClient } = await getOnchainAllocator("ethereum");
 
     return reply.status(200).send({
       configs: {

src/services/request-handler/index.ts

@@ -98,7 +98,7 @@ export class RequestHandlerService {
       case "ethereum-vm": {
         if (request.mode === "onchain") {
           const { contract, publicClient, walletClient } =
-            await getOnchainAllocator();
+            await getOnchainAllocator(request.chainId);
 
           payloadParams = {
             chainId: chain.metadata.allocatorChainId!,
@@ -112,7 +112,7 @@ export class RequestHandlerService {
           };
 
           // This is needed before being able to submit withdraw requests
-          await handleOneTimeApproval();
+          await handleOneTimeApproval(request.chainId);
 
           const txHash = await contract.write.submitWithdrawRequest([
             payloadParams as any,
@@ -238,7 +238,7 @@ export class RequestHandlerService {
       case "solana-vm": {
         if (request.mode === "onchain") {
           const { contract, publicClient, walletClient } =
-            await getOnchainAllocator();
+            await getOnchainAllocator(request.chainId);
 
           // The "solana-vm" payload builder expects addresses to be hex-encoded
           const toHexString = (address: string) =>
@@ -259,7 +259,7 @@ export class RequestHandlerService {
           };
 
           // This is needed before being able to submit withdraw requests
-          await handleOneTimeApproval();
+          await handleOneTimeApproval(request.chainId);
 
           const txHash = await contract.write.submitWithdrawRequest([
             payloadParams as any,
@@ -466,7 +466,7 @@ export class RequestHandlerService {
       case "hyperliquid-vm": {
         if (request.mode === "onchain") {
           const { contract, publicClient, walletClient } =
-            await getOnchainAllocator();
+            await getOnchainAllocator(request.chainId);
 
           const isNativeCurrency =
             request.currency === getVmTypeNativeCurrency(chain.vmType);
@@ -509,7 +509,7 @@ export class RequestHandlerService {
           };
 
           // This is needed before being able to submit withdraw requests
-          await handleOneTimeApproval();
+          await handleOneTimeApproval(request.chainId);
 
           const txHash = await contract.write.submitWithdrawRequest([
             payloadParams as any,
@@ -716,7 +716,9 @@ export class RequestHandlerService {
       throw externalError("Withdrawal request not using 'onchain' mode");
     }
 
-    const { contract, publicClient } = await getOnchainAllocator();
+    const { contract, publicClient } = await getOnchainAllocator(
+      withdrawalRequest.chainId
+    );
 
     const payloadTimestamp = await contract.read.payloadTimestamps([
       withdrawalRequest.payloadId as Hex,

src/utils/onchain-allocator.ts

@@ -85,8 +85,16 @@ const getPayloadBuilder = async (address: string) => {
   };
 };
 
-export const getOnchainAllocator = async () => {
-  if (!config.onchainAllocator) {
+export const getOnchainAllocator = async (chainId: string) => {
+  let allocator = config.onchainAllocator;
+  if (
+    process.env.SERVICE === "relay-protocol-hub-dev" &&
+    ["base"].includes(chainId)
+  ) {
+    allocator = "0x45348c213bf7ddb8e45f34ca4f333307a78ecb9a";
+  }
+
+  if (!allocator) {
     throw externalError("Onchain allocator not configured");
   }
 
@@ -99,7 +107,7 @@ export const getOnchainAllocator = async () => {
   return {
     contract: getContract({
       client: walletClient,
-      address: config.onchainAllocator as Address,
+      address: allocator as Address,
       abi: parseAbi([
         `function submitWithdrawRequest(${PayloadParams} params) returns (bytes32)`,
         `function signWithdrawPayloadHash(${PayloadParams} params, bytes signature, ${GasSettings} gasSettings, uint32 index)`,
@@ -115,10 +123,12 @@ export const getOnchainAllocator = async () => {
 };
 
 let _allowanceCache: bigint | undefined;
-export const handleOneTimeApproval = async () => {
+export const handleOneTimeApproval = async (chainId: string) => {
   const { walletClient } = await getPublicAndWalletClients();
 
-  const allocator = await getOnchainAllocator().then((a) => a.contract.address);
+  const allocator = await getOnchainAllocator(chainId).then(
+    (a) => a.contract.address
+  );
 
   const wNearContract = getContract({
     client: walletClient,
@@ -194,7 +204,7 @@ export const getSigner = async (chainId: string) => {
     }
   }
 
-  const { contract } = await getOnchainAllocator();
+  const { contract } = await getOnchainAllocator(chainId);
 
   const args = {
     domain_id: domainId,
@@ -252,7 +262,7 @@ export const getSignature = async (id: string) => {
     );
   }
 
-  const onchainAllocator = await getOnchainAllocator();
+  const onchainAllocator = await getOnchainAllocator(chain.id);
   const payloadBuilderAddress =
     await onchainAllocator.contract.read.payloadBuilders([
       BigInt(chain.metadata.allocatorChainId),