feat: add legacy transaction option

Author: nnn-gif

contracts/.gitignore

@@ -23,4 +23,5 @@ broadcast
 contracts/coverage_report
 coverage_report
 config-local
+/tools/forge-wrapper/dist
 

contracts/tools/forge-wrapper/package.json

@@ -8,7 +8,7 @@
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",
-    "dev": "ts-node src/index.ts"
+    "dev": "ts-node --transpile-only src/index.ts"
   },
   "dependencies": {
     "chalk": "^5.3.0",

contracts/tools/forge-wrapper/src/commands/call.ts

@@ -56,6 +56,11 @@ export function registerCallCommand(program: Command): void {
             );
           }
           castArgs.push("send", ...baseArgs, "--rpc-url", rpcUrl, "--private-key", privateKey);
+          
+          // Add legacy flag if network requires it
+          if (networkConfig.legacy) {
+            castArgs.push("--legacy");
+          }
         } else {
           castArgs.push("call", ...baseArgs, "--rpc-url", rpcUrl);
         }

contracts/tools/forge-wrapper/src/commands/configure.ts

@@ -67,14 +67,18 @@ function buildCastArgs(
   to: string,
   signature: string,
   params: string[],
-  value?: string
+  value?: string,
+  useLegacy?: boolean
 ): string[] {
   const args = ["send", to, signature, ...params];
   const trimmedValue = value?.trim();
   if (trimmedValue && trimmedValue.length > 0) {
     args.push("--value", trimmedValue);
   }
   args.push("--rpc-url", rpcUrl, "--private-key", privateKey);
+  if (useLegacy) {
+    args.push("--legacy");
+  }
   return args;
 }
 
@@ -115,7 +119,8 @@ export async function executeContractSend(
     record.address,
     options.signature,
     options.params,
-    options.value
+    options.value,
+    networkConfig.legacy
   );
   const printable = formatCommand("cast", maskCastArgs(castArgs));
   // eslint-disable-next-line no-console

contracts/tools/forge-wrapper/src/commands/deploy.ts

@@ -105,6 +105,11 @@ export async function executeDeploy(options: DeployOptions): Promise<DeploymentR
     String(networkConfig.chain_id),
   ];
 
+  // Add legacy flag early if needed
+  if (options.legacy || networkConfig.legacy) {
+    displayArgs.push("--legacy");
+  }
+
   let constructorArgs = options.constructorArgs;
   if (constructorArgs.length === 0) {
     const template = getTemplate(options.alias);
@@ -123,10 +128,6 @@ export async function executeDeploy(options: DeployOptions): Promise<DeploymentR
     displayArgs.push("--constructor-args", ...constructorArgs);
   }
 
-  if (options.salt) {
-    displayArgs.push("--salt", options.salt);
-  }
-
   const actualForgeArgs = [...displayArgs, "--json"];
 
   const maskedCommand = formatCommand("forge", maskSensitiveArgs(displayArgs));
@@ -233,7 +234,9 @@ export function registerDeployCommand(program: Command): void {
     .option("--constructor-arg <value>", "Constructor argument", collectArgs, [])
     .option("--salt <salt>", "Deterministic deployment salt")
     .option("--dry-run", "Print command without executing")
-    .action(async (alias: string, cmdOptions) => {
+    .option("--legacy", "Use legacy transactions instead of EIP1559")
+  
+  .action(async (alias: string, cmdOptions) => {
       const network = cmdOptions.network ?? getDefaultNetwork();
       if (!network) {
         throw new Error("Network is required (pass --network or set FORGE_WRAPPER_NETWORK)");
@@ -253,6 +256,7 @@ export function registerDeployCommand(program: Command): void {
           rpcUrl: cmdOptions.rpcUrl,
           dryRun: Boolean(cmdOptions.dryRun),
           salt: cmdOptions.salt,
+          legacy: Boolean(cmdOptions.legacy),
         });
 
         if (!cmdOptions.dryRun) {

contracts/tools/forge-wrapper/src/types.ts

@@ -58,6 +58,7 @@ export const networkConfigSchema = z.object({
     .transform((value) => value ?? {}),
   gas: gasConfigSchema.optional(),
   verification: verificationConfigSchema.optional(),
+  legacy: z.boolean().optional(),
 });
 
 export type NetworkConfig = z.infer<typeof networkConfigSchema>;
@@ -102,6 +103,7 @@ export interface DeployOptions {
   salt?: string;
   privateKeyOverride?: string;
   deployerAddress?: string;
+  legacy?: boolean;
 }
 
 export interface CallOptions {

services/bridge/internal/bridge/transaction_handler.go

@@ -407,17 +407,15 @@ func (h *TransactionHandler) getMonitoringInfo(txCtx *TransactionContext) string
 func (h *TransactionHandler) waitForReceipt(ctx context.Context, client rpc.EthClient, txHash common.Hash, routerID string) (*types.Receipt, error) {
 	logger.Infof("Waiting for transaction receipt: %s, router=%s", txHash.Hex(), routerID)
 
-	timeout := time.After(5 * time.Minute)
 	ticker := time.NewTicker(5 * time.Second)
 	defer ticker.Stop()
 
 	attempts := 0
 	for {
 		select {
 		case <-ctx.Done():
+			logger.Warnf("Context canceled while waiting for receipt %s, router=%s: %v", txHash.Hex(), routerID, ctx.Err())
 			return nil, ctx.Err()
-		case <-timeout:
-			return nil, fmt.Errorf("timeout waiting for transaction receipt after 5 minutes")
 		case <-ticker.C:
 			attempts++
 			receipt, err := client.TransactionReceipt(ctx, txHash)