Dev to main.

csharp/src/API/Endpoints/SolverV1Endpoints.cs

@@ -23,7 +23,7 @@ public static RouteGroupBuilder MapV1Endpoints(this RouteGroupBuilder group)
             .Produces<ApiResponse<QuoteWithSolverDto>>();
 
         group.MapGet("/swaps/{commitId}", GetSwapAsync)
-            .Produces<ApiResponse<SwapDto>>();
+            .Produces<ApiResponse<DetailedSwapDto>>();
 
         group.MapPost("/transactions/build", BuildTransactionAsync)
             .Produces<ApiResponse<PrepareTransactionDto>>();
@@ -121,7 +121,7 @@ private static async Task<IResult> GetSwapAsync(
             });
         }
 
-        return Results.Ok(new ApiResponse<SwapDto> { Data = swap.ToDto() });
+        return Results.Ok(new ApiResponse<DetailedSwapDto> { Data = swap.ToDetailedDto() });
     }
     private static async Task<IResult> GetRoutesAsync(
         HttpContext httpContext,

csharp/src/Workflow.Solana/Helpers/EventDecoder.cs

@@ -5,9 +5,10 @@
 using System.Numerics;
 using Train.Solver.Blockchain.Solana.Extensions;
 using Train.Solver.Blockchain.Solana.Models;
-using Train.Solver.Blockchain.Solana.Programs.HTLCProgram;
 using Train.Solver.Infrastructure.Abstractions.Models;
 using Train.Solver.Workflow.Abstractions.Models;
+using Train.Solver.Workflow.Solana.Programs.HTLCProgram;
+using Train.Solver.Workflow.Solana.Programs.HtlcSolProgram;
 
 namespace Train.Solver.Blockchain.Solana.Helpers;
 
@@ -34,9 +35,11 @@ public static async Task<HTLCBlockEventResponse> GetBlockEventsAsync(
         {
             var htlcTokenContractAddress = network.HTLCTokenContractAddress;
 
+            var htlcNativeContractAddress = network.HTLCNativeContractAddress;
+
             var trackedBlockEvents = blockResponseResult.Result.Transactions
                 .Where(transaction => transaction.Transaction.Message.Instructions
-                    .Any(instruction => instruction.ProgramId == htlcTokenContractAddress))
+                    .Any(instruction => instruction.ProgramId == htlcTokenContractAddress || instruction.ProgramId == htlcNativeContractAddress))
                 .ToList();
 
             foreach (var transaction in trackedBlockEvents)
@@ -47,11 +50,15 @@ public static async Task<HTLCBlockEventResponse> GetBlockEventsAsync(
                 var isLockEvent = transaction.Meta.LogMessages
                     .Any(x => x.Contains(SolanaConstants.HtlcConstants.addLockEventPrefixPattern));
 
+                var contractAddress = transaction.Transaction.Message.Instructions.Any(x => x.ProgramId == htlcTokenContractAddress) ?
+                    htlcTokenContractAddress :
+                    htlcNativeContractAddress;
+
                 var accountForSimulation = solverAccounts.First();
 
                 if (isCommitEvent)
                 {
-                    var prefixPattern = "Program return: " + htlcTokenContractAddress + " ";
+                    var prefixPattern = "Program return: " + contractAddress + " ";
 
                     var logResult = transaction.Meta.LogMessages.Where(s => s.StartsWith(prefixPattern))
                         .Select(s => s.Substring(prefixPattern.Length))
@@ -63,6 +70,7 @@ public static async Task<HTLCBlockEventResponse> GetBlockEventsAsync(
                     var commitEvent = await DeserializeCommitEventDataAsync(
                         rpcClient,
                         network,
+                        contractAddress,
                         id,
                         accountForSimulation);
 
@@ -106,7 +114,7 @@ public static async Task<HTLCBlockEventResponse> GetBlockEventsAsync(
 
                 if (isLockEvent)
                 {
-                    var prefixPattern = "Program return: " + htlcTokenContractAddress + " ";
+                    var prefixPattern = "Program return: " + contractAddress + " ";
 
                     var logResult = transaction.Meta.LogMessages.Where(s => s.StartsWith(prefixPattern))
                         .Select(s => s.Substring(prefixPattern.Length))
@@ -118,6 +126,7 @@ public static async Task<HTLCBlockEventResponse> GetBlockEventsAsync(
                     var addLockMessageResult = await DeserializeAddLockEventDataAsync(
                         rpcClient,
                         network,
+                        contractAddress,
                         id,
                         accountForSimulation);
 
@@ -139,6 +148,7 @@ public static async Task<HTLCBlockEventResponse> GetBlockEventsAsync(
     private static async Task<SolanaHTLCCommitEventModel> DeserializeCommitEventDataAsync(
         IRpcClient rpcClient,
         DetailedNetworkDto network,
+        string contractAddress,
         string commitId,
         string solverAccount)
     {
@@ -152,7 +162,7 @@ private static async Task<SolanaHTLCCommitEventModel> DeserializeCommitEventData
             .SetFeePayer(new PublicKey(solverAccount));
 
         builder.SetGetDetailsInstruction(
-            new PublicKey(network.HTLCTokenContractAddress),
+            new PublicKey(contractAddress),
             commitId.HexToByteArray());
 
         var latestBlockHashResponse = await rpcClient.GetLatestBlockHashAsync();
@@ -191,6 +201,7 @@ private static async Task<SolanaHTLCCommitEventModel> DeserializeCommitEventData
     private static async Task<HTLCLockEventMessage?> DeserializeAddLockEventDataAsync(
         IRpcClient rpcClient,
         DetailedNetworkDto network,
+        string contractAddress,
         string commitId,
         string solverAccount)
     {
@@ -205,10 +216,8 @@ private static async Task<SolanaHTLCCommitEventModel> DeserializeCommitEventData
             var builder = new TransactionBuilder()
                 .SetFeePayer(new PublicKey(solverAccount));
 
-            var htlcContractAddress = network.HTLCTokenContractAddress;
-
             builder.SetGetDetailsInstruction(
-                new PublicKey(htlcContractAddress),
+                new PublicKey(contractAddress),
                 commitId.HexToByteArray());
 
             var latestBlockHashResponse = await rpcClient.GetLatestBlockHashAsync();

csharp/src/Workflow.Solana/Helpers/SolanaTransactionBuilder.cs

@@ -8,12 +8,15 @@
 using Solnet.Rpc.Builders;
 using Solnet.Wallet;
 using System.Numerics;
-using Train.Solver.Blockchain.Solana.Programs.HTLCProgram;
 using Train.Solver.Blockchain.Solana.Programs.HTLCProgram.Models;
 using Train.Solver.Common.Extensions;
-using Train.Solver.Data.Abstractions.Entities;
 using Train.Solver.Infrastructure.Abstractions.Models;
 using Train.Solver.Workflow.Abstractions.Models;
+using Train.Solver.Workflow.Solana.Programs.HTLCProgram;
+using Train.Solver.Workflow.Solana.Programs.HTLCProgram.Models;
+using Train.Solver.Workflow.Solana.Programs.HtlcSolProgram;
+using Train.Solver.Workflow.Solana.Programs.HtlcSolProgram.Models;
+using Train.Solver.Workflow.Solana.Programs.HtlcSplProgram.Models;
 
 namespace Train.Solver.Workflow.Solana.Helpers;
 
@@ -59,37 +62,60 @@ public static async Task<PrepareTransactionDto> BuildHTLCLockTransactionAsync(
         var builder = new TransactionBuilder()
             .SetFeePayer(new PublicKey(solverAccount));
 
-        await GetOrCreateAssociatedTokenAccount(
-            rpcClient,
-            builder,
-            currency,
-            new PublicKey(solverAccount),
-            new PublicKey(solverAccount));
+        if (isNative)
+        {
+            builder.SetSolLockTransactionInstruction(
+                new PublicKey(htlcContractAddress),
+                new HTLCSolLockRequest
+                {
+                    Id = request.CommitId.HexToByteArray(),
+                    Hashlock = request.Hashlock.HexToByteArray(),
+                    Timelock = new BigInteger(request.Timelock),
+                    Amount = request.Amount,
+                    DestinationNetwork = request.DestinationNetwork,
+                    DestinationAsset = request.DestinationAsset,
+                    SourceAsset = currency.Symbol,
+                    SignerPublicKey = new PublicKey(solverAccount),
+                    ReceiverPublicKey = new PublicKey(request.Receiver),
+                    DestinationAddress = request.DestinationAddress,
+                    Reward = request.Reward,
+                    RewardTimelock = new BigInteger(request.RewardTimelock),
+                });
+        }
+        else
+        {
+            await GetOrCreateAssociatedTokenAccount(
+                rpcClient,
+                builder,
+                currency,
+                new PublicKey(solverAccount),
+                new PublicKey(solverAccount));
 
-        builder.SetLockTransactionInstruction(
-            new PublicKey(htlcContractAddress),
-            new HTLCLockRequest
-            {
-                Hashlock = request.Hashlock.HexToByteArray(),
-                Id = request.CommitId.HexToByteArray(),
-                SignerPublicKey = new PublicKey(solverAccount),
-                ReceiverPublicKey = new PublicKey(request.Receiver),
-                Amount = request.Amount,
-                Timelock = new BigInteger(request.Timelock),
-                SourceAsset = currency.Symbol,
-                DestinationNetwork = request.DestinationNetwork,
-                SourceAddress = request.DestinationAddress,
-                DestinationAsset = request.DestinationAsset,
-                SourceTokenPublicKey = new PublicKey(currency.Contract),
-                Reward = request.Reward,
-                RewardTimelock = new BigInteger(request.RewardTimelock),
-            });
+            builder.SetSplLockTransactionInstruction(
+                new PublicKey(htlcContractAddress),
+                new HTLCSplLockRequest
+                {
+                    Id = request.CommitId.HexToByteArray(),
+                    Hashlock = request.Hashlock.HexToByteArray(),
+                    Timelock = new BigInteger(request.Timelock),
+                    Amount = request.Amount,
+                    DestinationNetwork = request.DestinationNetwork,
+                    DestinationAsset = request.DestinationAsset,
+                    SourceAsset = currency.Symbol,
+                    SignerPublicKey = new PublicKey(solverAccount),
+                    ReceiverPublicKey = new PublicKey(request.Receiver),
+                    DestinationAddress = request.DestinationAddress,
+                    SourceTokenPublicKey = new PublicKey(currency.Contract),
+                    Reward = request.Reward,
+                    RewardTimelock = new BigInteger(request.RewardTimelock),
+                });
+        }
 
         var latestBlockResult = await rpcClient.GetLatestBlockHashAsync();
 
         if (!latestBlockResult.WasSuccessful)
         {
-            throw new ($"Failed to get last valid block");
+            throw new($"Failed to get last valid block");
         }
 
         builder.SetRecentBlockHash(latestBlockResult.Result.Value.Blockhash);
@@ -133,7 +159,7 @@ public static async Task<PrepareTransactionDto> BuildHTLCRedeemTransactionAsync(
         {
             throw new ArgumentNullException(nameof(request.SenderAddress), "Sender address is required");
         }
-       
+
         var currency = network.Tokens.SingleOrDefault(x => x.Symbol.ToUpper() == request.Asset.ToUpper());
 
         if (currency is null)
@@ -160,27 +186,43 @@ public static async Task<PrepareTransactionDto> BuildHTLCRedeemTransactionAsync(
         var builder = new TransactionBuilder()
             .SetFeePayer(new PublicKey(solverAccount));
 
-         await GetOrCreateAssociatedTokenAccount(
-            rpcClient,
-            builder,
-            currency,
-            new PublicKey(solverAccount),
-            new PublicKey(solverAccount));
+        if (isNative)
+        {
+            builder.SetSolRedeemTransactionInstruction(
+                new PublicKey(htlcContractAddress),
+                new HTLCSolRedeemRequest
+                {
+                    Id = request.CommitId.HexToByteArray(),
+                    Secret = BigInteger.Parse(request.Secret).ToHexBigInteger().HexValue.HexToByteArray(),
+                    SignerPublicKey = new PublicKey(solverAccount),
+                    ReceiverPublicKey = new PublicKey(request.DestinationAddress),
+                    SenderPublicKey = new PublicKey(request.SenderAddress),
+                });
+        }
+        else
+        {
+            await GetOrCreateAssociatedTokenAccount(
+                rpcClient,
+                builder,
+                currency,
+                new PublicKey(solverAccount),
+                new PublicKey(solverAccount));
 
-        builder.SetRedeemTransactionInstruction(
-            new PublicKey(htlcContractAddress),
-            new HTLCRedeemRequest
-            {
-                Id = request.CommitId.HexToByteArray(),
-                Secret = BigInteger.Parse(request.Secret).ToHexBigInteger().HexValue.HexToByteArray(),
-                SourceTokenPublicKey = new PublicKey(currency.Contract),
-                SignerPublicKey = new PublicKey(solverAccount),
-                ReceiverPublicKey = new PublicKey(request.DestinationAddress),
-                SenderPublicKey = new PublicKey(request.SenderAddress),
-                RewardPublicKey = request.DestinationAddress == solverAccount?
-                    new PublicKey(request.DestinationAddress) :
-                    new PublicKey(request.SenderAddress),
-            });
+            builder.SetSplRedeemTransactionInstruction(
+                new PublicKey(htlcContractAddress),
+                new HTLCSplRedeemRequest
+                {
+                    Id = request.CommitId.HexToByteArray(),
+                    Secret = BigInteger.Parse(request.Secret).ToHexBigInteger().HexValue.HexToByteArray(),
+                    SourceTokenPublicKey = new PublicKey(currency.Contract),
+                    SignerPublicKey = new PublicKey(solverAccount),
+                    ReceiverPublicKey = new PublicKey(request.DestinationAddress),
+                    SenderPublicKey = new PublicKey(request.SenderAddress),
+                    RewardPublicKey = request.DestinationAddress == solverAccount ?
+                        new PublicKey(request.DestinationAddress) :
+                        new PublicKey(request.SenderAddress),
+                });
+        }
 
         var latestBlockResult = await rpcClient.GetLatestBlockHashAsync();
 
@@ -245,22 +287,36 @@ public static async Task<PrepareTransactionDto> BuildHTLCRefundTransactionAsync(
         var builder = new TransactionBuilder()
             .SetFeePayer(new PublicKey(solverAccount));
 
-        await GetOrCreateAssociatedTokenAccount(
-            rpcClient,
-            builder,
-            currency,
-            new PublicKey(request.DestinationAddress),
-            new PublicKey(solverAccount));
+        if (isNative)
+        {
+            builder.SetSolRefundTransactionInstruction(
+                new PublicKey(htlcContractAddress),
+                new HtlcSolRefundRequest
+                {
+                    Id = request.CommitId.HexToByteArray(),
+                    SignerPublicKey = new PublicKey(solverAccount),
+                    ReceiverPublicKey = new PublicKey(request.DestinationAddress)
+                });
+        }
+        else
+        {
+            await GetOrCreateAssociatedTokenAccount(
+                rpcClient,
+                builder,
+                currency,
+                new PublicKey(request.DestinationAddress),
+                new PublicKey(solverAccount));
 
-        builder.SetRefundTransactionInstruction(
-            new PublicKey(htlcContractAddress),
-            new HTLCRefundRequest
-            {
-                Id = request.CommitId.HexToByteArray(),
-                SourceTokenPublicKey = new PublicKey(currency.Contract),
-                SignerPublicKey = new PublicKey(solverAccount),
-                ReceiverPublicKey = new PublicKey(request.DestinationAddress)
-            });
+            builder.SetSplRefundTransactionInstruction(
+                new PublicKey(htlcContractAddress),
+                new HtlcSplRefundRequest
+                {
+                    Id = request.CommitId.HexToByteArray(),
+                    SourceTokenPublicKey = new PublicKey(currency.Contract),
+                    SignerPublicKey = new PublicKey(solverAccount),
+                    ReceiverPublicKey = new PublicKey(request.DestinationAddress)
+                });
+        }
 
         var latestBlockHashResponse = await rpcClient.GetLatestBlockHashAsync();
 
@@ -399,7 +455,7 @@ public static async Task<PrepareTransactionDto> BuildHTLCAddlockSigTransactionAs
 
         builder.SetAddLockSigInstruction(
             new PublicKey(htlcContractAddress),
-            new HTLCAddlocksigRequest
+            new HtlcAddlocksigRequest
             {
                 AddLockSigMessageRequest = new()
                 {
@@ -535,5 +591,5 @@ private static async Task GetOrCreateAssociatedTokenAccount(
         {
             throw new Exception("Failed to load token wallet", ex);
         }
-    }    
+    }
 }