reproduce [goreleaser]

synapsecns · Jan 28, 2025 · c79a81b · c79a81b
1 parent f6bfa43
commit c79a81b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 37 deletions.
diff --git a/ethergo/submitter/submitter.go b/ethergo/submitter/submitter.go
@@ -423,7 +423,7 @@ func (t *txSubmitterImpl) SubmitTransaction(parentCtx context.Context, chainID *
 	}
 
 	//tmpdebug
-	fmt.Printf("test ver 6\n")
+	fmt.Printf("test ver 7\n")
 
 	// if dynamic gas estimation is not enabled, use cfg var gas_estimate as a gas limit default and do not run a pre-flight simulation
 	// since we do not need it to determine proper gas units
@@ -435,29 +435,22 @@ func (t *txSubmitterImpl) SubmitTransaction(parentCtx context.Context, chainID *
 		transactor.GasLimit = t.config.GetGasEstimate(int(chainID.Uint64()))
 	} else {
 
-		// //tmpdebug
-		// fmt.Printf("SubmitTransaction>forGasEst call \n")
-
-		// transactor_forGasEstimate := copyTransactOpts(transactor)
-
-		// transactor_forGasEstimate.Nonce.Add(transactor_forGasEstimate.Nonce, big.NewInt(1))
+		//tmpdebug
+		fmt.Printf("SubmitTransaction>forGasEst call \n")
 
-		// tx_forGasEstimate, err := call(transactor_forGasEstimate)
+		transactor_forGasEstimate := copyTransactOpts(transactor)
 
-		// fmt.Printf("tx_forGasEstimate: %v\n", tx_forGasEstimate.Gas())
+		transactor_forGasEstimate.Nonce.Add(transactor_forGasEstimate.Nonce, big.NewInt(1))
 
-		// if err != nil {
-		// 	return 0, fmt.Errorf("err contract call for gas est: %w", err)
-		// }
+		tx_forGasEstimate, err := call(transactor_forGasEstimate)
 
-		// // gasEstimate, err := t.getGasEstimate(ctx, chainClient, int(chainID.Uint64()), tx_forGasEstimate)
-		// // if err != nil {
-		// // 	return 0, fmt.Errorf("err getGasEstimate: %w", err)
-		// // }
+		fmt.Printf("tx_forGasEstimate: %v\n", tx_forGasEstimate.Gas())
 
-		// transactor.GasLimit = tx_forGasEstimate.Gas() + 555
+		if err != nil {
+			return 0, fmt.Errorf("err contract call for gas est: %w", err)
+		}
 
-		transactor.GasLimit = 21555 // intentionally set too low
+		transactor.GasLimit = tx_forGasEstimate.Gas() + 555
 
 	}
 
@@ -469,24 +462,6 @@ func (t *txSubmitterImpl) SubmitTransaction(parentCtx context.Context, chainID *
 		return 0, fmt.Errorf("err contract call for tx: %w", err)
 	}
 
-	// if t.config.GetDynamicGasEstimate(int(chainID.Uint64())) {
-
-	// 	//tmpdebug
-	// 	fmt.Printf("tx.Gas (pre): %d\n", tx.Gas())
-	// 	transactor.GasLimit = tx.Gas() + 555
-
-	// 	//tmpdebug
-	// 	fmt.Printf("transactor.GasLimit2: %d\n", transactor.GasLimit)
-
-	// 	tx, err = call(transactor)
-	// 	if err != nil {
-	// 		return 0, fmt.Errorf("err contract call 2 for tx: %w", err)
-	// 	}
-
-	// 	//tmpdebug
-	// 	fmt.Printf("tx.Gas (post): %d\n", tx.Gas())
-	// }
-
 	//tmpdebug
 	fmt.Printf("tx.Gas: %d\n", tx.Gas())
 
@@ -789,7 +764,6 @@ func (t *txSubmitterImpl) getGasEstimate(ctx context.Context, chainClient client
 
 		span.AddEvent("could not estimate gas", trace.WithAttributes(attribute.String("error", err.Error())))
 
-		// fallback to default
 		return t.config.GetGasEstimate(chainID), nil
 	}
 

diff --git a/services/rfq/relayer/chain/chain.go b/services/rfq/relayer/chain/chain.go
@@ -95,10 +95,12 @@ func (c Chain) SubmitRelay(ctx context.Context, request reldb.QuoteRequest) (uin
 	nonce, err := c.SubmitTransaction(ctx, func(transactor *bind.TransactOpts) (tx *types.Transaction, err error) {
 		transactor.Value = core.CopyBigInt(gasAmount)
 
+		//tmpdebug
 		callType := "exec"
 		if transactor.GasLimit == 0 {
 			callType = "sim"
 		}
+
 		//tmpdebug
 		fmt.Println(callType, "SubmitTransaction>RelayV2: ", request.OriginTxHash)