Skip to content

Read contract from commit. #127

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

Open
Mandzikyan wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Read contract from commit. #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
973cedd
Read contract from commit.
Aug 21, 2025
a6aa24f
Some simplifiing.
Aug 21, 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
2 changes: 2 additions & 0 deletions csharp/src/Workflow.Abstractions/Models/HTLCCommitEventMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ public class HTLCCommitEventMessage
public required string DestinationAsset { get; set; } = null!;

public required long TimeLock { get; set; }

public string? TokenContract { get; set; }
}
65 changes: 43 additions & 22 deletions csharp/src/Workflow.EVM/Activities/EVMBlockchainActivities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public virtual async Task<TransactionResponse> GetBatchTransactionAsync(GetBatch
}

return transaction;
}
}

[Activity]
public virtual Task<PrepareTransactionDto> BuildTransactionAsync(TransactionBuilderRequest request)
Expand Down Expand Up @@ -220,37 +220,34 @@ public virtual async Task<HTLCBlockEventResponse> GetEventsAsync(EventRequest re

var (eventType, typedEvent) = decodedEvent.Value;

if (eventType == typeof(EtherTokenCommittedEvent) ||
decodedEvent.Value.eventType == typeof(ERC20TokenCommitedEvent))
if (eventType == typeof(EtherTokenCommittedEvent))
{
var commitedEvent = (EtherTokenCommittedEvent)typedEvent;
var etherEvent = (EtherTokenCommittedEvent)typedEvent;

var wallet = request.WalletAddresses.Where(x =>
FormatAddress(x) == FormatAddress(commitedEvent.Receiver)).FirstOrDefault();
var wallet = request.WalletAddresses
.FirstOrDefault(x => FormatAddress(x) == FormatAddress(etherEvent.Receiver));

if (wallet == null)
{
continue;
}

var commitId = commitedEvent.Id.ToHex(prefix: true);

var message = new HTLCCommitEventMessage
// ERC20 special handling
if (etherEvent is ERC20TokenCommitedEvent ercEvent)
{
TxId = log.TransactionHash,
CommitId = commitId,
Amount = commitedEvent.Amount,
SourceAsset = commitedEvent.SourceAsset,
SenderAddress = commitedEvent.Sender,
SourceNetwork = request.Network.Name,
DestinationAddress = commitedEvent.DestinationAddress,
DestinationNetwork = commitedEvent.DestinationChain,
DestinationAsset = commitedEvent.DestinationAsset,
TimeLock = (long)commitedEvent.Timelock,
ReceiverAddress = FormatAddress(wallet),
};
if (!request.Network.Tokens.Any(x => x.Contract == ercEvent.TokenContract))
{
continue;
}

result.HTLCCommitEventMessages.Add(message);
result.HTLCCommitEventMessages.Add(
MapCommitEvent(ercEvent, wallet, log.TransactionHash, request.Network.Name, ercEvent.TokenContract));
}
else
{
result.HTLCCommitEventMessages.Add(
MapCommitEvent(etherEvent, wallet, log.TransactionHash, request.Network.Name));
}
}
else if (eventType == typeof(EtherTokenLockAddedEvent))
{
Expand Down Expand Up @@ -747,4 +744,28 @@ private async Task<TransactionResponse> GetTransactionAsync(DetailedNetworkDto n

return transactionModel;
}

private HTLCCommitEventMessage MapCommitEvent(
EtherTokenCommittedEvent evevnt,
string wallet,
string txId,
string networkName,
string? tokenContract = null)
{
return new HTLCCommitEventMessage
{
TxId = txId,
CommitId = evevnt.Id.ToHex(prefix: true),
Amount = evevnt.Amount,
SourceAsset = evevnt.SourceAsset,
SenderAddress = evevnt.Sender,
SourceNetwork = networkName,
DestinationAddress = evevnt.DestinationAddress,
DestinationNetwork = evevnt.DestinationChain,
DestinationAsset = evevnt.DestinationAsset,
TimeLock = (long)evevnt.Timelock,
ReceiverAddress = FormatAddress(wallet),
TokenContract = tokenContract
};
}
}
Loading