Oda/managing-apps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix get Gas fees + position direction list

Browse Source
This commit is contained in:
cryptooda
2025-09-26 12:02:07 +07:00
parent bcfeb693ce
commit 1e19e29cec
7 changed files with 213 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Managing.Application.Abstractions/Services/IWeb3ProxyService.cs
View File

@@ -1,4 +1,5 @@
using Managing.Domain.Accounts;
using Managing.Domain.Evm;
using static Managing.Common.Enums;
namespace Managing.Application.Abstractions.Services
@@ -19,5 +20,7 @@ namespace Managing.Application.Abstractions.Services
Task<List<Balance>> GetWalletBalanceAsync(string address, Ticker[] assets, string[] chains);
Task<decimal> GetEstimatedGasFeeUsdAsync();
Task<GasFeeData> GetGasFeeDataAsync();
}
}

66
src/Managing.Application/Bots/TradingBotBase.cs
View File

@@ -409,7 +409,7 @@ public class TradingBotBase : ITradingBot
{
internalPosition.Open.SetStatus(TradeStatus.Filled);
}
// Also update the position in the bot's positions dictionary
if (positionForSignal.Open != null)
{
@@ -436,7 +436,7 @@ public class TradingBotBase : ITradingBot
{
internalPosition.Open.SetStatus(TradeStatus.Filled);
}
// Also update the position in the bot's positions dictionary
if (positionForSignal.Open != null)
{
@@ -515,19 +515,19 @@ public class TradingBotBase : ITradingBot
// Calculate net PnL after fees for broker position
var brokerNetPnL = brokerPosition.GetNetPnL();
UpdatePositionPnl(positionForSignal.Identifier, brokerNetPnL);
// Update Open trade status when position is found on broker with 2 orders
if (internalPosition.Open != null)
{
internalPosition.Open.SetStatus(TradeStatus.Filled);
}
// Also update the position in the bot's positions dictionary
if (positionForSignal.Open != null)
{
positionForSignal.Open.SetStatus(TradeStatus.Filled);
}
await SetPositionStatus(signal.Identifier, PositionStatus.Filled);
// Notify platform summary about the executed trade
@@ -608,17 +608,18 @@ public class TradingBotBase : ITradingBot
positionForSignal.StopLoss.SetPrice(executionPrice, 2);
positionForSignal.StopLoss.SetDate(lastCandle.Date);
positionForSignal.StopLoss.SetStatus(TradeStatus.Filled);
// Cancel TP trades when SL is hit
if (positionForSignal.TakeProfit1 != null)
{
positionForSignal.TakeProfit1.SetStatus(TradeStatus.Cancelled);
}
if (positionForSignal.TakeProfit2 != null)
{
positionForSignal.TakeProfit2.SetStatus(TradeStatus.Cancelled);
}
await LogInformation(
$"🛑 **Stop Loss Hit**\nClosing LONG position\nPrice: `${executionPrice:F2}` (was `${positionForSignal.StopLoss.Price:F2}`)");
await CloseTrade(signal, positionForSignal, positionForSignal.StopLoss,
@@ -632,13 +633,13 @@ public class TradingBotBase : ITradingBot
positionForSignal.TakeProfit1.SetPrice(executionPrice, 2);
positionForSignal.TakeProfit1.SetDate(lastCandle.Date);
positionForSignal.TakeProfit1.SetStatus(TradeStatus.Filled);
// Cancel SL trade when TP is hit
if (positionForSignal.StopLoss != null)
{
positionForSignal.StopLoss.SetStatus(TradeStatus.Cancelled);
}
await LogInformation(
$"🎯 **Take Profit 1 Hit**\nClosing LONG position\nPrice: `${executionPrice:F2}` (was `${positionForSignal.TakeProfit1.Price:F2}`)");
await CloseTrade(signal, positionForSignal, positionForSignal.TakeProfit1,
@@ -651,13 +652,13 @@ public class TradingBotBase : ITradingBot
positionForSignal.TakeProfit2.SetPrice(executionPrice, 2);
positionForSignal.TakeProfit2.SetDate(lastCandle.Date);
positionForSignal.TakeProfit2.SetStatus(TradeStatus.Filled);
// Cancel SL trade when TP is hit
if (positionForSignal.StopLoss != null)
{
positionForSignal.StopLoss.SetStatus(TradeStatus.Cancelled);
}
await LogInformation(
$"🎯 **Take Profit 2 Hit**\nClosing LONG position\nPrice: `${executionPrice:F2}` (was `${positionForSignal.TakeProfit2.Price:F2}`)");
await CloseTrade(signal, positionForSignal, positionForSignal.TakeProfit2,
@@ -673,17 +674,18 @@ public class TradingBotBase : ITradingBot
positionForSignal.StopLoss.SetPrice(executionPrice, 2);
positionForSignal.StopLoss.SetDate(lastCandle.Date);
positionForSignal.StopLoss.SetStatus(TradeStatus.Filled);
// Cancel TP trades when SL is hit
if (positionForSignal.TakeProfit1 != null)
{
positionForSignal.TakeProfit1.SetStatus(TradeStatus.Cancelled);
}
if (positionForSignal.TakeProfit2 != null)
{
positionForSignal.TakeProfit2.SetStatus(TradeStatus.Cancelled);
}
await LogInformation(
$"🛑 **Stop Loss Hit**\nClosing SHORT position\nPrice: `${executionPrice:F2}` (was `${positionForSignal.StopLoss.Price:F2}`)");
await CloseTrade(signal, positionForSignal, positionForSignal.StopLoss,
@@ -697,13 +699,13 @@ public class TradingBotBase : ITradingBot
positionForSignal.TakeProfit1.SetPrice(executionPrice, 2);
positionForSignal.TakeProfit1.SetDate(lastCandle.Date);
positionForSignal.TakeProfit1.SetStatus(TradeStatus.Filled);
// Cancel SL trade when TP is hit
if (positionForSignal.StopLoss != null)
{
positionForSignal.StopLoss.SetStatus(TradeStatus.Cancelled);
}
await LogInformation(
$"🎯 **Take Profit 1 Hit**\nClosing SHORT position\nPrice: `${executionPrice:F2}` (was `${positionForSignal.TakeProfit1.Price:F2}`)");
await CloseTrade(signal, positionForSignal, positionForSignal.TakeProfit1,
@@ -716,13 +718,13 @@ public class TradingBotBase : ITradingBot
positionForSignal.TakeProfit2.SetPrice(executionPrice, 2);
positionForSignal.TakeProfit2.SetDate(lastCandle.Date);
positionForSignal.TakeProfit2.SetStatus(TradeStatus.Filled);
// Cancel SL trade when TP is hit
if (positionForSignal.StopLoss != null)
{
positionForSignal.StopLoss.SetStatus(TradeStatus.Cancelled);
}
await LogInformation(
$"🎯 **Take Profit 2 Hit**\nClosing SHORT position\nPrice: `${executionPrice:F2}` (was `${positionForSignal.TakeProfit2.Price:F2}`)");
await CloseTrade(signal, positionForSignal, positionForSignal.TakeProfit2,
@@ -795,7 +797,7 @@ public class TradingBotBase : ITradingBot
{
internalPosition.Open.SetStatus(TradeStatus.Filled);
}
// Also update the position in the bot's positions dictionary
if (positionForSignal.Open != null)
{
@@ -1138,7 +1140,8 @@ public class TradingBotBase : ITradingBot
}
else
{
var command = new ClosePositionCommand(position, position.AccountId, lastPrice, isForBacktest: Config.IsForBacktest);
var command = new ClosePositionCommand(position, position.AccountId, lastPrice,
isForBacktest: Config.IsForBacktest);
try
{
Position closedPosition = null;
@@ -1264,19 +1267,20 @@ public class TradingBotBase : ITradingBot
if (wasStopLossHit)
{
// Use actual execution price based on direction
closingPrice = position.OriginDirection == TradeDirection.Long
? minPriceRecent // For LONG, SL hits at the low
closingPrice = position.OriginDirection == TradeDirection.Long
? minPriceRecent // For LONG, SL hits at the low
: maxPriceRecent; // For SHORT, SL hits at the high
position.StopLoss.SetPrice(closingPrice, 2);
position.StopLoss.SetDate(currentCandle.Date);
position.StopLoss.SetStatus(TradeStatus.Filled);
// Cancel TP trades when SL is hit
if (position.TakeProfit1 != null)
{
position.TakeProfit1.SetStatus(TradeStatus.Cancelled);
}
if (position.TakeProfit2 != null)
{
position.TakeProfit2.SetStatus(TradeStatus.Cancelled);
@@ -1291,14 +1295,14 @@ public class TradingBotBase : ITradingBot
else if (wasTakeProfitHit)
{
// Use actual execution price based on direction
closingPrice = position.OriginDirection == TradeDirection.Long
? maxPriceRecent // For LONG, TP hits at the high
closingPrice = position.OriginDirection == TradeDirection.Long
? maxPriceRecent // For LONG, TP hits at the high
: minPriceRecent; // For SHORT, TP hits at the low
position.TakeProfit1.SetPrice(closingPrice, 2);
position.TakeProfit1.SetDate(currentCandle.Date);
position.TakeProfit1.SetStatus(TradeStatus.Filled);
// Cancel SL trade when TP is hit
if (position.StopLoss != null)
{
@@ -1331,7 +1335,7 @@ public class TradingBotBase : ITradingBot
position.TakeProfit1.SetPrice(closingPrice, 2);
position.TakeProfit1.SetDate(currentCandle.Date);
position.TakeProfit1.SetStatus(TradeStatus.Filled);
// Cancel SL trade when TP is used for manual close
if (position.StopLoss != null)
{
@@ -1343,12 +1347,13 @@ public class TradingBotBase : ITradingBot
position.StopLoss.SetPrice(closingPrice, 2);
position.StopLoss.SetDate(currentCandle.Date);
position.StopLoss.SetStatus(TradeStatus.Filled);
// Cancel TP trades when SL is used for manual close
if (position.TakeProfit1 != null)
{
position.TakeProfit1.SetStatus(TradeStatus.Cancelled);
}
if (position.TakeProfit2 != null)
{
position.TakeProfit2.SetStatus(TradeStatus.Cancelled);
@@ -2163,7 +2168,8 @@ public class TradingBotBase : ITradingBot
PositionIdentifier = position.Identifier,
Ticker = position.Ticker,
Volume = position.Open.Price * position.Open.Quantity * position.Open.Leverage,
Fee = position.Open.Fee
Fee = position.GasFees + position.UiFees,
Direction = position.OriginDirection
};
await platformGrain.OnPositionOpenAsync(positionOpenEvent);
break;

70
src/Managing.Domain/Evm/GasFeeData.cs Normal file
View File

@@ -0,0 +1,70 @@
using System.Text.Json.Serialization;
namespace Managing.Domain.Evm
{
/// <summary>
/// Gas fee data model
/// </summary>
public class GasFeeData
{
/// <summary>
/// Estimated gas fee in Wei
/// </summary>
[JsonPropertyName("estimatedGasFeeWei")]
public string? EstimatedGasFeeWei { get; set; }
/// <summary>
/// Estimated gas fee in ETH
/// </summary>
[JsonPropertyName("estimatedGasFeeEth")]
public string? EstimatedGasFeeEth { get; set; }
/// <summary>
/// Estimated gas fee in USD
/// </summary>
[JsonPropertyName("estimatedGasFeeUsd")]
public double? EstimatedGasFeeUsd { get; set; }
/// <summary>
/// ETH balance of the account
/// </summary>
[JsonPropertyName("ethBalance")]
public string? EthBalance { get; set; }
/// <summary>
/// Current ETH price in USD
/// </summary>
[JsonPropertyName("ethPrice")]
public double? EthPrice { get; set; }
/// <summary>
/// Whether the account has sufficient balance for gas fees
/// </summary>
[JsonPropertyName("hasSufficientBalance")]
public bool? HasSufficientBalance { get; set; }
/// <summary>
/// Error message if insufficient balance
/// </summary>
[JsonPropertyName("errorMessage")]
public string? ErrorMessage { get; set; }
/// <summary>
/// Maximum allowed gas fee in USD
/// </summary>
[JsonPropertyName("maxAllowedUsd")]
public double? MaxAllowedUsd { get; set; }
/// <summary>
/// Gas price in Wei
/// </summary>
[JsonPropertyName("gasPrice")]
public string? GasPrice { get; set; }
/// <summary>
/// Gas limit
/// </summary>
[JsonPropertyName("gasLimit")]
public string? GasLimit { get; set; }
}
}

20
src/Managing.Infrastructure.Web3/Models/Proxy/Web3ProxyError.cs
View File

@@ -1,5 +1,6 @@
using System.Text.Json.Serialization;
using Managing.Domain.Accounts;
using Managing.Domain.Evm;
namespace Managing.Infrastructure.Evm.Models.Proxy
{
@@ -158,21 +159,10 @@ namespace Managing.Infrastructure.Evm.Models.Proxy
public class GasFeeResponse : Web3ProxyResponse
{
/// <summary>
/// Estimated gas fee in USD
/// Gas fee data object
/// </summary>
[JsonPropertyName("estimatedGasFeeUsd")]
public double? EstimatedGasFeeUsd { get; set; }
/// <summary>
/// Current ETH price in USD
/// </summary>
[JsonPropertyName("ethPrice")]
public double? EthPrice { get; set; }
/// <summary>
/// Gas price in Gwei
/// </summary>
[JsonPropertyName("gasPriceGwei")]
public double? GasPriceGwei { get; set; }
[JsonPropertyName("data")]
public GasFeeData? Data { get; set; }
}
}

30
src/Managing.Infrastructure.Web3/Services/Web3ProxyService.cs
View File

@@ -7,6 +7,7 @@ using System.Web;
using Managing.Application.Abstractions.Services;
using Managing.Core.Exceptions;
using Managing.Domain.Accounts;
using Managing.Domain.Evm;
using Managing.Infrastructure.Evm.Models.Proxy;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
@@ -408,7 +409,34 @@ namespace Managing.Infrastructure.Evm.Services
throw new Web3ProxyException($"Gas fee request failed: {response.Error}");
}
return (decimal)(response.EstimatedGasFeeUsd ?? 0);
if (response.Data is null)
{
throw new Web3ProxyException("Gas fee data is null");
}
return (decimal)(response.Data.EstimatedGasFeeUsd ?? 0);
}
public async Task<GasFeeData> GetGasFeeDataAsync()
{
var response = await GetGmxServiceAsync<GasFeeResponse>("/gas-fee", null);
if (response == null)
{
throw new Web3ProxyException("Gas fee response is null");
}
if (!response.Success)
{
throw new Web3ProxyException($"Gas fee request failed: {response.Error}");
}
if (response.Data is null)
{
throw new Web3ProxyException("Gas fee data is null");
}
return response.Data;
}
private async Task HandleErrorResponse(HttpResponseMessage response)

9
src/Managing.Web3Proxy/src/plugins/custom/gmx.ts
View File

@@ -82,7 +82,7 @@ function checkMemoryUsage() {
* @param estimatedGasFee The estimated gas fee in wei
* @returns Object with balance check result and details
*/
async function checkGasFeeBalance(
export async function checkGasFeeBalance(
sdk: GmxSdk,
estimatedGasFee: bigint
): Promise<{
@@ -151,9 +151,8 @@ async function checkGasFeeBalance(
* @param params The position increase parameters
* @returns Estimated gas fee in wei
*/
async function estimatePositionGasFee(
export async function estimatePositionGasFee(
sdk: GmxSdk,
params: PositionIncreaseParams
): Promise<bigint> {
try {
// Estimate gas for the position opening transaction
@@ -440,6 +439,7 @@ declare module 'fastify' {
getGmxTrade: typeof getGmxTrade;
getGmxPositions: typeof getGmxPositions;
swapGmxTokens: typeof swapGmxTokens;
estimatePositionGasFee: typeof estimatePositionGasFee;
}
}
@@ -633,7 +633,7 @@ export const openGmxPositionImpl = async (
// Check gas fees before opening position
console.log('⛽ Checking gas fees before opening position...');
const estimatedGasFee = await estimatePositionGasFee(sdk, params);
const estimatedGasFee = await estimatePositionGasFee(sdk);
const gasFeeCheck = await checkGasFeeBalance(sdk, estimatedGasFee);
if (!gasFeeCheck.hasSufficientBalance) {
@@ -1417,6 +1417,7 @@ export default fp(async (fastify) => {
fastify.decorateRequest('claimGmxUiFees', claimGmxUiFees)
fastify.decorateRequest('swapGmxTokens', swapGmxTokens)
fastify.decorateRequest('checkGmxTokenAllowances', checkGmxTokenAllowances)
fastify.decorateRequest('estimatePositionGasFee', estimatePositionGasFee)
// Set up cache refresh without blocking plugin registration
setupCacheRefresh();

65
src/Managing.Web3Proxy/src/routes/api/gmx/index.ts
View File

@@ -2,11 +2,15 @@ import {FastifyPluginAsyncTypebox} from '@fastify/type-provider-typebox'
import {Type} from '@sinclair/typebox'
import {TradeDirection} from '../../../generated/ManagingApiTypes.js'
import {
checkGasFeeBalance,
estimatePositionGasFee,
getClaimableFundingFeesImpl,
getClaimableUiFeesImpl,
getGmxRebateStatsImpl
} from '../../../plugins/custom/gmx.js'
const MAX_GAS_FEE_USD = 1.5; // Maximum gas fee in USD
const plugin: FastifyPluginAsyncTypebox = async (fastify) => {
// Define route to open a position
fastify.post('/open-position', {
@@ -194,6 +198,67 @@ const plugin: FastifyPluginAsyncTypebox = async (fastify) => {
)
})
// Define route to get gas fee estimation for opening a position
fastify.get('/gas-fee', {
schema: {
response: {
200: Type.Object({
success: Type.Boolean(),
data: Type.Optional(Type.Object({
estimatedGasFeeWei: Type.String(),
estimatedGasFeeEth: Type.String(),
estimatedGasFeeUsd: Type.Number(),
ethBalance: Type.String(),
ethPrice: Type.Number(),
hasSufficientBalance: Type.Boolean(),
errorMessage: Type.Optional(Type.String()),
maxAllowedUsd: Type.Number(),
gasPrice: Type.String(),
gasLimit: Type.String()
})),
error: Type.Optional(Type.String())
})
}
}
}, async (request, reply) => {
try {
// Use a default address for gas fee estimation
const defaultAccount = "0x0000000000000000000000000000000000000000"
// Get GMX client for the default account
const sdk = await request.getClientForAddress(defaultAccount)
// Call the two methods as mentioned
const estimatedGasFee = await estimatePositionGasFee(sdk);
const gasFeeCheck = await checkGasFeeBalance(sdk, estimatedGasFee);
// Format the response data
const data = {
estimatedGasFeeWei: estimatedGasFee.toString(),
estimatedGasFeeEth: (Number(estimatedGasFee) / 1e18).toFixed(6),
estimatedGasFeeUsd: gasFeeCheck.estimatedGasFeeUsd,
ethBalance: gasFeeCheck.ethBalance,
ethPrice: gasFeeCheck.ethPrice,
hasSufficientBalance: gasFeeCheck.hasSufficientBalance,
errorMessage: gasFeeCheck.errorMessage,
maxAllowedUsd: MAX_GAS_FEE_USD,
gasPrice: (Number(estimatedGasFee) / 500000).toString(), // Approximate gas price
gasLimit: "500000" // Base gas limit used in estimation
}
return {
success: true,
data
}
} catch (error) {
console.error('Error estimating gas fee:', error)
return {
success: false,
error: `Failed to estimate gas fee: ${error instanceof Error ? error.message : 'Unknown error'}`
}
}
})
// Define route to get all claimable fees and rebate stats
fastify.get('/claimable-summary', {
schema: {