Dev to main.

.dockerignore

@@ -0,0 +1,14 @@
+# Exclude host node_modules and build artifacts from the docker build context
+**/node_modules
+**/dist
+
+# Logs, env files
+npm-debug.log*
+.env
+.env.*
+
+# OS files
+.DS_Store
+
+# Optional: ignore local Dockerfiles if you build from subfolders
+#Dockerfile

.github/workflows/aztec.yml

@@ -0,0 +1,40 @@
+name: Aztec Workflow runner
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ main, dev ]
+    paths:
+      - 'js/**'
+      - '.github/workflows/aztec.yml'
+  pull_request:
+    branches: [ main, dev ]
+    paths:
+      - 'js/**'
+      - '.github/workflows/aztec.yml'
+  release:
+    types: [published, created]
+
+env:
+  DOCKER_IMAGE: trainprotocol/solver-aztec
+  NODE_VERSION: 22
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest    
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Docker build and push
+        id: docker
+        uses: ./.github/actions/docker
+        with:
+          file: js/Dockerfile
+          docker-image: ${{ env.DOCKER_IMAGE }}
+          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
+          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+          build-args: |
+            NODE_VERSION=${{ env.NODE_VERSION }}

.github/workflows/fuel.yml

@@ -17,7 +17,7 @@ on:
 
 env:
   DOCKER_IMAGE: trainprotocol/solver-fuel
-  NODE_VERSION: 20
+  NODE_VERSION: 22
 
 jobs:
   build-and-push:

.github/workflows/solana.yml

@@ -1,13 +1,14 @@
 name: Solana Workflow runner
 
 on:
+  workflow_dispatch:
   push:
-    branches: [ disable ]
+    branches: [ main, dev ]
     paths:
       - 'csharp/**'
       - '.github/workflows/solana.yml'
   pull_request:
-    branches: [ disable ]
+    branches: [ main, dev ]
     paths:
       - 'csharp/**'
       - '.github/workflows/solana.yml'
@@ -21,7 +22,7 @@ env:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-        
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -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 }}

.github/workflows/starknet.yml

@@ -17,7 +17,7 @@ on:
 
 env:
   DOCKER_IMAGE: trainprotocol/solver-starknet
-  NODE_VERSION: 20
+  NODE_VERSION: 22
 
 jobs:
   build-and-push:

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/Workflow.Solana.csproj" />
     <Project Path="src/Workflow.Swap/Workflow.Swap.csproj" />
   </Folder>
   <Folder Name="/tests/">

csharp/src/AdminAPI/Endpoints/FeeEndpoints.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
-using Train.Solver.AdminAPI.Models;
-using Train.Solver.Data.Abstractions.Entities;
+using Train.Solver.Data.Abstractions.Models;
 using Train.Solver.Data.Abstractions.Repositories;
 using Train.Solver.Infrastructure.Abstractions.Models;
 using Train.Solver.Infrastructure.Extensions;
@@ -35,7 +34,7 @@ private static async Task<IResult> CreateServiceFeeAsync(
         IFeeRepository repository,
         [FromBody] CreateServiceFeeRequest request)
     {
-        var fee = await repository.CreateServiceFeeAsync(request.Name, request.FeeInUsd, request.PercentageFee);
+        var fee = await repository.CreateServiceFeeAsync(request);
         return fee is null
             ? Results.BadRequest("Failed to create service fee")
             : Results.Ok();
@@ -46,7 +45,7 @@ private static async Task<IResult> UpdateServiceFeeAsync(
       string name,
       [FromBody] UpdateServiceFeeRequest request)
     {
-        var fee = await repository.UpdateServiceFeeAsync(name, request.FeeInUsd, request.PercentageFee);
+        var fee = await repository.UpdateServiceFeeAsync(name, request);
 
         return fee is null
             ? Results.BadRequest("Failed to create service fee")

csharp/src/AdminAPI/Endpoints/NetworkEndpoints.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json.Linq;
 using System.Xml.Linq;
-using Train.Solver.AdminAPI.Models;
 using Train.Solver.Common.Enums;
 using Train.Solver.Common.Extensions;
 using Train.Solver.Data.Abstractions.Entities;
+using Train.Solver.Data.Abstractions.Models;
 using Train.Solver.Data.Abstractions.Repositories;
 using Train.Solver.Infrastructure.Abstractions.Models;
 using Train.Solver.Infrastructure.Extensions;
@@ -66,21 +66,7 @@ private static async Task<IResult> CreateAsync(
         INetworkRepository repository,
         [FromBody] CreateNetworkRequest request)
     {
-        var network = await repository.CreateAsync(
-            request.NetworkName,
-            request.DisplayName,
-            request.Type,
-            request.FeeType,
-            request.ChainId,
-            request.FeePercentageIncrease,
-            request.HtlcNativeContractAddress,
-            request.HtlcTokenContractAddress,
-            request.NativeTokenSymbol,
-            request.NativeTokenPriceSymbol,
-            request.NativeTokenContract,
-            request.NativeTokenDecimals,
-            request.NodeUrl,
-            request.NodeProvider);
+        var network = await repository.CreateAsync(request);
 
         return network is null
            ? Results.BadRequest("Failed to create network")
@@ -94,11 +80,7 @@ private static async Task<IResult> UpdateAsync(
     {
         var network = await repository.UpdateAsync(
             networkName,
-            request.DisplayName,
-            request.FeeType,
-            request.FeePercentageIncrease,
-            request.HtlcNativeContractAddress,
-            request.HtlcTokenContractAddress);
+            request);
 
         return network is null
            ? Results.BadRequest("Failed to update network")
@@ -111,7 +93,7 @@ private static async Task<IResult> CreateNodeAsync(
         [FromBody] CreateNodeRequest request)
     {
         var node = await repository.CreateNodeAsync(
-            networkName, request.ProviderName, request.Url);
+            networkName, request);
 
         return node is null
            ? Results.BadRequest("Failed to create node")
@@ -134,10 +116,7 @@ private static async Task<IResult> CreateTokenAsync(
     {
         var token = await repository.CreateTokenAsync(
             networkName,
-            request.Symbol,
-            request.PriceSymbol,
-            request.Contract,
-            request.Decimals);
+            request);
 
         return token is null
            ? Results.BadRequest("Failed to create token")

csharp/src/AdminAPI/Endpoints/RouteEndpoints.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
-using Train.Solver.AdminAPI.Models;
 using Train.Solver.Common.Enums;
 using Train.Solver.Common.Extensions;
 using Train.Solver.Data.Abstractions.Entities;
+using Train.Solver.Data.Abstractions.Models;
 using Train.Solver.Data.Abstractions.Repositories;
 using Train.Solver.Infrastructure.Abstractions.Models;
 using Train.Solver.Infrastructure.Extensions;
@@ -40,19 +40,7 @@ private static async Task<IResult> CreateRouteAsync(
         [FromBody] CreateRouteRequest request)
     {
         var route = await repository.CreateAsync(
-            request.SourceNetworkName,
-            request.SourceToken,
-            request.SourceWalletAddress,
-            request.SourceWalletType,
-            request.DestinationNetworkName,
-            request.DestinationToken,
-            request.DestinationWalletAddress,
-            request.DestinationWalletType,
-            request.RateProvider,
-            request.MinAmount,
-            request.MaxAmount,
-            request.IgnoreExpenseFee,
-            request.ServiceFee);
+            request);
 
         return route is null
             ? Results.BadRequest("Failed to create route")
@@ -72,12 +60,7 @@ private static async Task<IResult> UpdateRouteAsync(
             sourceToken,
             destinationNetwork,
             destinationToken,
-            request.RateProvider,
-            request.MinAmount,
-            request.MaxAmount,
-            request.Status,
-            request.IgnoreExpenseFee,
-            request.ServiceFee);
+            request);
 
         return route is null
             ? Results.BadRequest("Failed to update route")

csharp/src/AdminAPI/Endpoints/SignerAgentEndpoints.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
-using Train.Solver.AdminAPI.Models;
 using Train.Solver.Common.Enums;
 using Train.Solver.Common.Extensions;
 using Train.Solver.Data.Abstractions.Entities;
+using Train.Solver.Data.Abstractions.Models;
 using Train.Solver.Data.Abstractions.Repositories;
 using Train.Solver.Infrastructure.Abstractions.Models;
 using Train.Solver.Infrastructure.Extensions;
@@ -34,10 +34,7 @@ private static async Task<IResult> CreateAsync(
         ISignerAgentRepository repository,
         [FromBody] CreateSignerAgentRequest request)
     {
-        var signerAgent = await repository.CreateAsync(
-            request.Name,
-            request.Url,
-            request.SupportedTypes);
+        var signerAgent = await repository.CreateAsync(request);
 
         return signerAgent is null
             ? Results.BadRequest("Failed to create signer wallet")

csharp/src/AdminAPI/Endpoints/SwapMetricEndpoints.cs

@@ -8,9 +8,6 @@ public static class SwapMetricEndpoints
 {
     public static RouteGroupBuilder MapSwapMetricEndpoints(this RouteGroupBuilder group)
     {
-        group.MapGet("/swap-metrics/totals", GetTotalVolumeAndProfitAsync)
-            .Produces<TotalSwapMetrics>();
-
         group.MapGet("/swap-metrics/daily-volume", GetDailyVolumeAsync)
             .Produces<List<TimeSeriesMetric<decimal>>>();
 
@@ -23,19 +20,6 @@ public static RouteGroupBuilder MapSwapMetricEndpoints(this RouteGroupBuilder gr
         return group;
     }
 
-    private static async Task<IResult> GetTotalVolumeAndProfitAsync(
-        ISwapMetricRepository repository,
-        [FromQuery] DateTime? startFrom)
-    {
-        var (volume, profit, count) = await repository.GetTotalVolumeAndProfitAsync(startFrom ?? DateTime.UtcNow.AddDays(-30));
-        return Results.Ok(new TotalSwapMetrics
-        {
-            TotalVolumeInUsd = volume,
-            TotalProfitInUsd = profit,
-            TotalCount = count
-        });
-    }
-
     private static async Task<IResult> GetDailyVolumeAsync(
         ISwapMetricRepository repository,
         [FromQuery] DateTime? startFrom)

csharp/src/AdminAPI/Endpoints/TokenPriceEndpoints.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
-using Train.Solver.AdminAPI.Models;
 using Train.Solver.Common.Enums;
 using Train.Solver.Data.Abstractions.Entities;
+using Train.Solver.Data.Abstractions.Models;
 using Train.Solver.Data.Abstractions.Repositories;
 using Train.Solver.Infrastructure.Abstractions.Models;
 using Train.Solver.Infrastructure.Extensions;
@@ -31,7 +31,7 @@ private static async Task<IResult> CreateTokenPriceAsync(
         ITokenPriceRepository repository,
         CreateTokenPriceRequest request)
     {
-        var tokenPrice = await repository.CreateAsync(request.Symbol, request.ExternalId);
+        var tokenPrice = await repository.CreateAsync(request);
 
         return tokenPrice is null
            ? Results.BadRequest("Failed to create token price")

csharp/src/AdminAPI/Endpoints/TrustedWalletEndpoints.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
-using Train.Solver.AdminAPI.Models;
 using Train.Solver.Common.Enums;
 using Train.Solver.Common.Extensions;
 using Train.Solver.Data.Abstractions.Entities;
+using Train.Solver.Data.Abstractions.Models;
 using Train.Solver.Data.Abstractions.Repositories;
 using Train.Solver.Infrastructure.Abstractions.Models;
 using Train.Solver.Infrastructure.Extensions;
@@ -43,9 +43,7 @@ private static async Task<IResult> CreateAsync(
         [FromBody] CreateTrustedWalletRequest request)
     {
         var wallet = await repository.CreateAsync(
-            request.NetworkType,
-            request.Address,
-            request.Name);
+            request);
 
         return wallet is null
             ? Results.BadRequest("Failed to create trusted wallet")
@@ -61,7 +59,7 @@ private static async Task<IResult> UpdateAsync(
         var wallet = await repository.UpdateAsync(
             networkType,
             address,
-            request.Name);
+            request);
 
         return wallet is null
             ? Results.NotFound($"Trusted wallet '{address}' not found on network '{networkType}'")

csharp/src/AdminAPI/Endpoints/WalletEndpoints.cs

@@ -1,8 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
-using Train.Solver.AdminAPI.Models;
 using Train.Solver.Common.Enums;
 using Train.Solver.Common.Extensions;
-using Train.Solver.Data.Abstractions.Entities;
+using Train.Solver.Data.Abstractions.Models;
 using Train.Solver.Data.Abstractions.Repositories;
 using Train.Solver.Infrastructure.Abstractions;
 using Train.Solver.Infrastructure.Abstractions.Models;
@@ -56,7 +55,7 @@ private static async Task<IResult> CreateAsync(
 
         var generatedAddress = await privateKeyProvider.GenerateAsync(signerAgent.Url, request.NetworkType);
 
-        var wallet = await repository.CreateAsync(request.SignerAgent, request.NetworkType, generatedAddress, request.Name);
+        var wallet = await repository.CreateAsync(generatedAddress, request);
         return wallet is null
             ? Results.BadRequest("Could not create wallet")
             : Results.Ok();
@@ -71,7 +70,7 @@ private static async Task<IResult> UpdateAsync(
         var wallet = await repository.UpdateAsync(
             networkType,
             address,
-            request.Name);
+            request);
 
         return wallet is null
             ? Results.NotFound($"Trusted wallet '{address}' not found on network '{networkType}'")