fix(eco): use originChain for intent settlement

also, slightly changed adapter metadata structure to simplify the implementation

Co-Authored-By: Lisandro Corbalan <lmcorbalan@gmail.com>

Author: fernandomg

typescript/solver/solvers/BaseFiller.ts

@@ -81,7 +81,7 @@ export abstract class BaseFiller<
       try {
         await this.fill(parsedArgs, data, originChainName, blockNumber);
 
-        await this.settleOrder(parsedArgs, data);
+        await this.settleOrder(parsedArgs, data, originChainName);
       } catch (error) {
         this.log.error({
           msg: `Failed processing intent`,
@@ -145,7 +145,11 @@ export abstract class BaseFiller<
     blockNumber: number,
   ): Promise<void>;
 
-  protected async settleOrder(parsedArgs: TParsedArgs, data: TIntentData) {
+  protected async settleOrder(
+    parsedArgs: TParsedArgs,
+    data: TIntentData,
+    originChainName: string,
+  ) {
     return;
   }
 

typescript/solver/solvers/eco/config/metadata.ts

@@ -8,12 +8,9 @@ const metadata: EcoMetadata = {
       chainName: "optimismsepolia",
     },
   ],
-  adapters: [
-    {
-      address: "0x218FB5210d4eE248f046F3EC8B5Dd1c7Bc0756e5",
-      chainName: "basesepolia",
-    },
-  ],
+  adapters: {
+    basesepolia: "0x218FB5210d4eE248f046F3EC8B5Dd1c7Bc0756e5",
+  },
 };
 
 EcoMetadataSchema.parse(metadata);

typescript/solver/solvers/eco/filler.ts

@@ -60,10 +60,12 @@ export class EcoFiller extends BaseFiller<EcoMetadata, ParsedArgs, IntentData> {
   protected async prepareIntent(
     parsedArgs: ParsedArgs,
   ): Promise<Result<IntentData>> {
-    const adapter =
-      this.metadata.adapters[parsedArgs._destinationChain.toString()];
+    const chainName = this.multiProvider.getChainName(
+      parsedArgs._destinationChain.toString(),
+    );
+    const adapterAddress = this.metadata.adapters[chainName];
 
-    if (!adapter) {
+    if (!adapterAddress) {
       return {
         error: "No adapter found for destination chain",
         success: false,
@@ -73,7 +75,7 @@ export class EcoFiller extends BaseFiller<EcoMetadata, ParsedArgs, IntentData> {
     try {
       await super.prepareIntent(parsedArgs);
 
-      return { data: { adapter }, success: true };
+      return { data: { adapterAddress }, success: true };
     } catch (error: any) {
       return {
         error: error.message ?? "Failed to prepare Eco Intent.",
@@ -96,7 +98,7 @@ export class EcoFiller extends BaseFiller<EcoMetadata, ParsedArgs, IntentData> {
       msg: "Approving tokens",
       protocolName: this.metadata.protocolName,
       intentHash: parsedArgs._hash,
-      adapterAddress: data.adapter.address,
+      adapterAddress: data.adapterAddress,
     });
 
     const erc20Interface = Erc20__factory.createInterface();
@@ -115,25 +117,21 @@ export class EcoFiller extends BaseFiller<EcoMetadata, ParsedArgs, IntentData> {
       return acc;
     }, {});
 
-    const signer = this.multiProvider.getSigner(data.adapter.chainName);
+    const destinationChainId = parsedArgs._destinationChain.toString();
+    const signer = this.multiProvider.getSigner(destinationChainId);
+
     await Promise.all(
       Object.entries(requiredAmountsByTarget).map(
         async ([target, requiredAmount]) => {
           const erc20 = Erc20__factory.connect(target, signer);
 
-          const tx = await erc20.approve(data.adapter.address, requiredAmount);
+          const tx = await erc20.approve(data.adapterAddress, requiredAmount);
           await tx.wait();
         },
       ),
     );
 
-    const _chainId = parsedArgs._destinationChain.toString();
-
-    const filler = this.multiProvider.getSigner(_chainId);
-    const ecoAdapter = EcoAdapter__factory.connect(
-      data.adapter.address,
-      filler,
-    );
+    const ecoAdapter = EcoAdapter__factory.connect(data.adapterAddress, signer);
 
     const claimantAddress =
       await this.multiProvider.getSignerAddress(originChainName);
@@ -169,10 +167,14 @@ export class EcoFiller extends BaseFiller<EcoMetadata, ParsedArgs, IntentData> {
     });
   }
 
-  settleOrder(parsedArgs: ParsedArgs, data: IntentData) {
+  settleOrder(
+    parsedArgs: ParsedArgs,
+    data: IntentData,
+    originChainName: string,
+  ) {
     return withdrawRewards(
       parsedArgs,
-      data.adapter.chainName,
+      originChainName,
       this.multiProvider,
       this.metadata.protocolName,
     );

typescript/solver/solvers/eco/types.ts

@@ -18,13 +18,11 @@ export const EcoMetadataSchema = BaseMetadataSchema.extend({
       processedIds: z.array(z.string()).optional(),
     }),
   ),
-  adapters: z.array(
-    z.object({
-      address: addressSchema,
-      chainName: z.string().refine((name) => chainNames.includes(name), {
-        message: "Invalid chainName",
-      }),
+  adapters: z.record(
+    z.string().refine((name) => chainNames.includes(name), {
+      message: "Invalid chainName",
     }),
+    addressSchema,
   ),
   customRules: z
     .object({
@@ -41,7 +39,7 @@ export const EcoMetadataSchema = BaseMetadataSchema.extend({
 
 export type EcoMetadata = z.infer<typeof EcoMetadataSchema>;
 
-export type IntentData = { adapter: EcoMetadata["adapters"][number] };
+export type IntentData = { adapterAddress: z.infer<typeof addressSchema> };
 
 export type ParsedArgs = IntentCreatedEventObject & {
   orderId: string;