Skip to content

Merge dev into main #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PurpleTheBest merged 3 commits into from
Sep 8, 2025
Merged

Merge dev into main #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5716593
Temp disable user fund release if aztec
PurpleTheBest Sep 5, 2025
3737c2a
Add missing order by in swap metric repo
PurpleTheBest Sep 8, 2025
d67e686
Merge remote-tracking branch 'origin/main' into dev
PurpleTheBest Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions csharp/src/Data.Npgsql/EFSwapMetricRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ internal class EFSwapMetricRepository(SolverDbContext dbContext) : ISwapMetricRe
{
Date = g.Key,
Value = g.Sum(x => x.VolumeInUsd)
}).ToListAsync();
})
.OrderBy(x => x.Date)
.ToListAsync();

return result.Select(x => (x.Date, x.Value)).ToList();
}
Expand All @@ -47,7 +49,9 @@ internal class EFSwapMetricRepository(SolverDbContext dbContext) : ISwapMetricRe
{
Date = g.Key,
Value = g.Sum(x => x.ProfitInUsd)
}).ToListAsync();
})
.OrderBy(x => x.Date)
.ToListAsync();

return result.Select(x => (x.Date, x.Value)).ToList();
}
Expand Down
43 changes: 25 additions & 18 deletions csharp/src/Workflow.Swap/Workflows/SwapWorkflow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,23 +232,30 @@ await ExecuteTransactionAsync(new TransactionRequest()
return;
}

// Redeem user funds
var redeemInDestinationTask = ExecuteTransactionAsync(new TransactionRequest()
var tasks = new List<Task>();

if (_destinationNetwork.Type != NetworkType.Aztec)
{
PrepareArgs = new HTLCRedeemTransactionPrepareRequest
// Redeem user funds
var redeemInDestinationTask = ExecuteTransactionAsync(new TransactionRequest()
{
CommitId = _htlcCommitMessage!.CommitId,
Asset = _htlcCommitMessage.DestinationAsset,
Secret = hashlock.Secret,
DestinationAddress = _htlcCommitMessage.DestinationAddress,
SenderAddress = _destinationWalletAddress
}.ToJson(),
Type = TransactionType.HTLCRedeem,
Network = _destinationNetwork,
FromAddress = _destinationWalletAddress!,
SignerAgentUrl = _sourceWalletAgentUrl!,
SwapId = _swapId
});
PrepareArgs = new HTLCRedeemTransactionPrepareRequest
{
CommitId = _htlcCommitMessage!.CommitId,
Asset = _htlcCommitMessage.DestinationAsset,
Secret = hashlock.Secret,
DestinationAddress = _htlcCommitMessage.DestinationAddress,
SenderAddress = _destinationWalletAddress
}.ToJson(),
Type = TransactionType.HTLCRedeem,
Network = _destinationNetwork,
FromAddress = _destinationWalletAddress!,
SignerAgentUrl = _sourceWalletAgentUrl!,
SwapId = _swapId
});

tasks.Add(redeemInDestinationTask);
}

// Redeem LP funds
var redeemInSourceTask = ExecuteTransactionAsync(new TransactionRequest()
Expand All @@ -268,9 +275,9 @@ await ExecuteTransactionAsync(new TransactionRequest()
SwapId = _swapId
});

await Task.WhenAll(
redeemInDestinationTask,
redeemInSourceTask);
tasks.Add(redeemInSourceTask);

await Task.WhenAll(tasks);

}
catch (Exception e) when (TemporalException.IsCanceledException(e))
Expand Down