update merge

service/dashboard_service/dashboard_service.go

@@ -203,44 +203,6 @@ func GetSuitableStrategy(entryPointVersion global_const.EntrypointVersion, chain
 		},
 		Erc20TokenType: gasUseToken,
 	}
-// GetSuitableStrategy get suitable strategy by entryPointVersion, chain,
-//
-//	For Offical StrategyConfig,
-func GetSuitableStrategy(entryPointVersion global_const.EntrypointVersion, chain global_const.Network, gasUseToken global_const.TokenType) (*model.Strategy, error) {
-	if entryPointVersion == "" {
-		entryPointVersion = global_const.EntrypointV06
-	}
-	gasToken := config.GetGasToken(chain)
-	entryPointAddress := config.GetEntrypointAddress(chain, entryPointVersion)
-	paymasterAddress := config.GetPaymasterAddress(chain, entryPointVersion)
-	payType := global_const.PayTypeVerifying
-	isPerc20Enable := false
-	if gasUseToken != "" {
-		payType = global_const.PayTypeERC20
-		if config.IsPErc20Token(gasUseToken) {
-			isPerc20Enable = true
-		}
-	}
-
-	strategy := &model.Strategy{
-		NetWorkInfo: &model.NetWorkInfo{
-			NetWork:  chain,
-			GasToken: gasToken,
-		},
-		EntryPointInfo: &model.EntryPointInfo{
-			EntryPointVersion: entryPointVersion,
-			EntryPointAddress: entryPointAddress,
-		},
-		PaymasterInfo: &model.PaymasterInfo{
-			PayMasterAddress:        paymasterAddress,
-			PayType:                 payType,
-			IsProjectErc20PayEnable: isPerc20Enable,
-		},
-		Erc20TokenType: gasUseToken,
-	}
-	if strategy == nil {
-		return nil, errors.New("strategy not found")
-	}
 	return strategy, nil
 }
 
@@ -261,7 +223,6 @@ func IsPayMasterSupport(address string, chain global_const.Network) bool {
 }
 
 type ApiKeyDbModel struct {
-
 	model.BaseData
 	UserId    int64          `gorm:"column:user_id;type:integer" json:"user_id"`
 	Disable   bool           `gorm:"column:disable;type:bool" json:"disable"`