Skip to content

improve(proposer): Update proposal log format #2607

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
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

improve(proposer): Update proposal log format #2607

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3cd7ce5
improve(proposer): Update proposal log format
pxrl Sep 20, 2025
bdb43b0
Use toNative() for logging
pxrl Sep 20, 2025
21174fb
Merge remote-tracking branch 'origin/master' into pxrl/proposerLog
pxrl Sep 24, 2025
4426aec
Merge branch 'master' into pxrl/proposerLog
pxrl Sep 25, 2025
21ba2c1
Reformat
pxrl Sep 29, 2025
2d26c03
Merge branch 'master' into pxrl/proposerLog
pxrl Sep 29, 2025
a4760ff
Merge branch 'master' into pxrl/proposerLog
pxrl Sep 29, 2025
3623945
feat: add atomic depositor entrypoint for OFT bridges (#2617)
bmzig Sep 29, 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
60 changes: 39 additions & 21 deletions src/dataworker/PoolRebalanceUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,23 +106,32 @@ export function generateMarkdownForRootBundle(
};
let poolRebalanceLeavesPretty = "";
poolRebalanceLeaves.forEach((leaf, index) => {
// Shorten keys for ease of reading from Slack.
delete leaf.leafId;
leaf.groupId = leaf.groupIndex;
delete leaf.groupIndex;
leaf.bundleLpFees = convertTokenListFromWei(hubPoolChainId, leaf.l1Tokens, leaf.bundleLpFees);
leaf.runningBalances = convertTokenListFromWei(hubPoolChainId, leaf.l1Tokens, leaf.runningBalances);
leaf.netSendAmounts = convertTokenListFromWei(hubPoolChainId, leaf.l1Tokens, leaf.netSendAmounts);
leaf.l1Tokens = convertL1TokenAddressesToSymbols(leaf.l1Tokens);
poolRebalanceLeavesPretty += `\n\t\t\t${index}: ${JSON.stringify(leaf)}`;
const { chainId, refundAmounts, refundAddresses, groupIndex: groupId } = leaf;
const l1Tokens = convertL1TokenAddressesToSymbols(leaf.l1Tokens);
const bundleLpFees = convertTokenListFromWei(hubPoolChainId, leaf.l1Tokens, leaf.bundleLpFees);
const runningBalances = convertTokenListFromWei(hubPoolChainId, leaf.l1Tokens, leaf.runningBalances);
const netSendAmounts = convertTokenListFromWei(hubPoolChainId, leaf.l1Tokens, leaf.netSendAmounts);

// Explicitly set leaf ordering for ease of reability in logs.
const orderedLeaf = {
chainId,
l1Tokens,
netSendAmounts,
runningBalances,
refundAddresses,
refundAmounts,
bundleLpFees,
groupId,
};
poolRebalanceLeavesPretty += `\n\t\t\t${index}: ${JSON.stringify(orderedLeaf)}`;
Copy link
Collaborator Author

@pxrl pxrl Sep 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm mulling over some ideas about how this might be improved even further. I'd like to get this in as-is, but we might circle back with another change too.

});

let relayerRefundLeavesPretty = "";
relayerRefundLeaves.forEach((leaf, index) => {
// Shorten keys for ease of reading from Slack.
delete leaf.leafId;
const { chainId } = leaf;
let amountToReturn = "";
try {
leaf.amountToReturn = convertFromWei(
amountToReturn = convertFromWei(
leaf.amountToReturn,
hubPoolClient.getTokenInfoForAddress(leaf.l2TokenAddress, leaf.chainId).decimals
);
Expand All @@ -132,17 +141,26 @@ export function generateMarkdownForRootBundle(
message: `Error getting token info for address ${leaf.l2TokenAddress} on chain ${leaf.chainId}`,
error,
});
leaf.amountToReturn = leaf.amountToReturn.toString();
amountToReturn = leaf.amountToReturn.toString();
}
leaf.refundAmounts = convertTokenListFromWei(
leaf.chainId,

const l2Token = convertTokenAddressToSymbol(leaf.chainId, leaf.l2TokenAddress);
const refundAddresses = shortenHexStrings(leaf.refundAddresses.map((addr) => addr.toNative()));
const refundAmounts = convertTokenListFromWei(
chainId,
Array(leaf.refundAmounts.length).fill(leaf.l2TokenAddress),
leaf.refundAmounts
);
leaf.l2Token = convertTokenAddressToSymbol(leaf.chainId, leaf.l2TokenAddress);
delete leaf.l2TokenAddress;
leaf.refundAddresses = shortenHexStrings(leaf.refundAddresses.map((refundAddress) => refundAddress.toBytes32()));
relayerRefundLeavesPretty += `\n\t\t\t${index}: ${JSON.stringify(leaf)}`;

// Explicitly set leaf ordering for ease of reability in logs.
const orderedLeaf = {
chainId,
l2Token,
amountToReturn,
refundAddresses,
refundAmounts,
};
relayerRefundLeavesPretty += `\n\t\t\t${index}: ${JSON.stringify(orderedLeaf)}`;
});

let slowRelayLeavesPretty = "";
Expand All @@ -167,8 +185,8 @@ export function generateMarkdownForRootBundle(
// @todo: When v2 types are removed, update the slowFill definition to be more precise about the member fields.
const slowFill = {
// Shorten select keys for ease of reading from Slack.
depositor: shortenHexString(leaf.relayData.depositor.toBytes32()),
recipient: shortenHexString(leaf.relayData.recipient.toBytes32()),
depositor: shortenHexString(leaf.relayData.depositor.toNative()),
recipient: shortenHexString(leaf.relayData.recipient.toNative()),
originChainId: leaf.relayData.originChainId.toString(),
destinationChainId: destinationChainId.toString(),
depositId: leaf.relayData.depositId.toString(),
Expand Down