Merge remote-tracking branch 'origin/main' into dev

Author: PurpleTheBest

csharp/src/Common/Extensions/BigIntegerExtensions.cs

@@ -95,6 +95,19 @@ public static BigInteger ConvertTokenAmount(
     {
         var amountInDecimal = TokenUnitHelper.FromBaseUnits(amount, fromDecimals);
 
+        amountInDecimal *= rate;
+
+        return TokenUnitHelper.ToBaseUnits(amountInDecimal, toDecimals);
+    }
+
+    public static BigInteger ConvertSendAmount(
+        this BigInteger amount,
+        int fromDecimals,
+        int toDecimals,
+        decimal rate)
+    {
+        var amountInDecimal = TokenUnitHelper.FromBaseUnits(amount, fromDecimals);
+
         amountInDecimal /= rate;
 
         return TokenUnitHelper.ToBaseUnits(amountInDecimal, toDecimals);

csharp/src/Infrastructure/Services/QuoteService.cs

@@ -99,10 +99,13 @@ private async Task<QuoteWithSolverDto> GetQuoteAsync(
         }
 
         var rateProvider = rateProviderResolver.Resolve(route.RateProvider.Name);
+
         var swapRate = await rateProvider.GetRateAsync(route.ToDto());
+
         var amount = request.Amount;
         var (TotalFee, TotalServiceFee, TotalExpenseFee) = await CalculateTotalFeeAsync(route, amount);
         var actualAmountToSwap = amount - TotalFee;
+
         var receiveAmount = actualAmountToSwap.ConvertTokenAmount(            
             route.SourceToken.Decimals,
             route.DestinationToken.Decimals,

csharp/src/Workflow.Swap/Activities/RouteActivities.cs

@@ -64,7 +64,7 @@ public virtual async Task<BigInteger> ConvertToSourceAsync(
             Destination = route.Destination,
         });
 
-        var sourceAmount = destinationAmount.ConvertTokenAmount(
+        var sourceAmount = destinationAmount.ConvertSendAmount(
             route.Destination.Token.Decimals,
             route.Source.Token.Decimals,
             rate);

js/src/Blockchain/Blockchain.Abstraction/Models/BalanceRequestModels/BalanceResponse.ts

@@ -1,3 +1,3 @@
 export interface BalanceResponse {
-    amount: number;
+    amount: string;
 }

js/src/Blockchain/Blockchain.Aztec/Activities/AztecBlockchainActivities.ts

@@ -78,7 +78,7 @@ export class AztecBlockchainActivities implements IAztecBlockchainActivities {
     }
 
     public async GetBalance(request: BalanceRequest): Promise<BalanceResponse> {
-        return { amount: 1000000000000 };
+        return { amount: "1000000000000" };
     }
 
     public async GetLastConfirmedBlockNumber(request: BaseRequest): Promise<BlockNumberResponse> {

js/src/Blockchain/Blockchain.Fuel/Activities/FuelBlockchainActivities.ts

@@ -72,7 +72,7 @@ export class FuelBlockchainActivities implements IFuelBlockchainActivities {
 
         const result: BalanceResponse =
         {
-            amount: Number(balanceResult),
+            amount: balanceResult.toString(),
         }
 
         return result;

js/src/Blockchain/Blockchain.Starknet/Activities/StarknetBlockchainActivities.ts

@@ -109,7 +109,7 @@ export class StarknetBlockchainActivities implements IStarknetBlockchainActiviti
             const balanceInWei = BigNumber.from(uint256.uint256ToBN(balanceResult.balance as any).toString());
 
             let result: BalanceResponse = {
-                amount: Number(balanceInWei)
+                amount: balanceInWei.toString()
             }
 
             return result;