Dev solana remove revert

.github/workflows/solana.yml

@@ -1,6 +1,7 @@
 name: Solana Workflow runner
 
 on:
+  workflow_dispatch:
   push:
     branches: [ disable ]
     paths:
@@ -37,4 +38,4 @@ jobs:
           dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
           dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
           build-args: |
-            DOTNET_VERSION=${{ env.DOTNET_VERSION }}
+            DOTNET_VERSION=${{ env.DOTNET_VERSION }}

csharp/TrainSolver.slnx

@@ -33,6 +33,7 @@
     <Project Path="src/Workflow.Abstractions/Workflow.Abstractions.csproj" />
     <Project Path="src/Workflow.Common/Workflow.Common.csproj" />
     <Project Path="src/Workflow.EVM/Workflow.EVM.csproj" />
+    <Project Path="src/Workflow.Solana/Workflows.Solana.csproj" />
     <Project Path="src/Workflow.Swap/Workflow.Swap.csproj" />
   </Folder>
   <Folder Name="/tests/">

csharp/src/Infrastructure.Abstractions/Models/DetailedNetworkDto.cs

@@ -1,6 +1,4 @@
-using Train.Solver.Common.Enums;
-
-namespace Train.Solver.Infrastructure.Abstractions.Models;
+namespace Train.Solver.Infrastructure.Abstractions.Models;
 
 public class DetailedNetworkDto : ExtendedNetworkDto
 {

csharp/src/Infrastructure.Abstractions/Models/ExtendedNetworkDto.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Train.Solver.Common.Enums;
+using Train.Solver.Common.Enums;
 
 namespace Train.Solver.Infrastructure.Abstractions.Models;
 

csharp/src/SmartNodeInvoker/ISmartNodeInvoker.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Train.Solver.Common.Enums;
-
-namespace Train.Solver.SmartNodeInvoker;
+namespace Train.Solver.SmartNodeInvoker;
 
 public interface ISmartNodeInvoker
 {

csharp/src/SmartNodeInvoker/SmartNodeInvoker.cs

@@ -1,13 +1,5 @@
-using Microsoft.Extensions.Logging;
-using StackExchange.Redis;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
+using StackExchange.Redis;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Train.Solver.Common.Enums;
 using Train.Solver.Common.Helpers;
 
 namespace Train.Solver.SmartNodeInvoker;
@@ -78,7 +70,6 @@ private async Task<List<string>> OrderNodesByScoreAsync(string redisKey, IEnumer
             .ToList();
     }
 
-
     private async Task IncrementScoreAsync(string redisKey, string node, int delta)
     {
         var newScore = await cache.SortedSetIncrementAsync(redisKey, node, delta);

csharp/src/Workflow.EVM/Models/EstimateFeeRequest.cs → csharp/src/Workflow.Abstractions/Models/EstimateFeeRequest.cs

@@ -1,7 +1,6 @@
 using System.Numerics;
-using Train.Solver.Workflow.Abstractions.Models;
 
-namespace Train.Solver.Workflow.EVM.Models;
+namespace Train.Solver.Workflow.Abstractions.Models;
 
 public class EstimateFeeRequest : BaseRequest
 {

csharp/src/Workflow.EVM/Models/NextNonceRequest.cs → csharp/src/Workflow.Abstractions/Models/NextNonceRequest.cs

@@ -1,6 +1,4 @@
-using Train.Solver.Workflow.Abstractions.Models;
-
-namespace Train.Solver.Workflow.EVM.Models;
+namespace Train.Solver.Workflow.Abstractions.Models;
 
 public class NextNonceRequest : BaseRequest
 {

csharp/src/Workflow.Abstractions/Models/TransactionBuilderRequest.cs

@@ -7,4 +7,6 @@ public class TransactionBuilderRequest : BaseRequest
     public TransactionType Type { get; set; }
 
     public string PrepareArgs { get; set; } = null!;
+
+    public string? FromAddress { get; set; }
 }

csharp/src/Workflow.EVM/Activities/EVMBlockchainActivities.cs

@@ -109,7 +109,7 @@ public virtual async Task<TransactionResponse> GetBatchTransactionAsync(GetBatch
     [Activity]
     public virtual Task<PrepareTransactionDto> BuildTransactionAsync(TransactionBuilderRequest request)
     {
-        PrepareTransactionDto result = request.Type switch
+        var result = request.Type switch
         {
             TransactionType.Transfer => EVMTransactionBuilder.BuildTransferTransaction(request.Network, request.PrepareArgs),
             TransactionType.Approve => EVMTransactionBuilder.BuildApproveTransaction(request.Network, request.PrepareArgs),

csharp/src/Workflow.EVM/Program.cs

@@ -1,7 +1,6 @@
 using Train.Solver.Infrastructure.DependencyInjection;
 using Train.Solver.Infrastructure.Logging.OpenTelemetry;
 using Train.Solver.Infrastrucutre.Secret.Treasury.Extensions;
-using Train.Solver.Workflow.EVM.Activities;
 using Train.Solver.Workflow.EVM.Extensions;
 
 IHost host = Host.CreateDefaultBuilder(args)

csharp/src/Workflow.Solana/Activities/ISolanaBlockchainActivities.cs

@@ -1,29 +1,28 @@
 using Temporalio.Activities;
-using Train.Solver.Blockchain.Abstractions.Models;
 using Train.Solver.Blockchain.Solana.Models;
+using Train.Solver.Infrastructure.Abstractions.Models;
+using Train.Solver.Workflow.Abstractions.Models;
+using Train.Solver.Workflow.Solana.Models;
 
-namespace Train.Solver.Blockchain.Solana.Activities;
+namespace Train.Solver.Workflow.Solana.Activities;
 
 public interface ISolanaBlockchainActivities
 {
     [Activity]
-    Task<Fee> EstimateFeeAsync(EstimateFeeRequest request);
+    Task<PrepareTransactionDto> BuildTransactionAsync(TransactionBuilderRequest request);
 
     [Activity]
-    Task<string> GetNextNonceAsync(NextNonceRequest request);
-
-    [Activity]
-    Task<PrepareTransactionResponse> BuildTransactionAsync(TransactionBuilderRequest request);
-
-    [Activity]
-    Task<TransactionResponse> GetTransactionAsync(GetTransactionRequest request);
+    Task<TransactionResponse> GetTransactionAsync(SolanaGetReceiptRequest request);
 
     [Activity]
     Task SimulateTransactionAsync(SolanaPublishTransactionRequest request);
 
     [Activity]
-    Task<byte[]> ComposeSolanaTranscationAsync(SolanaComposeTransactionRequest request);
+    Task<SolanaComposeTransactionResponse> ComposeSolanaTranscationAsync(SolanaComposeTransactionRequest request);
 
     [Activity]
     Task<string> PublishTransactionAsync(SolanaPublishTransactionRequest request);
+
+    [Activity]
+    Task<string> SignTransactionAsync(SolanaSignTransactionRequest request);
 }