Skip to content

Commit a4324db

Browse files
fusmaniifusmanii
committed
chore: Remove .toNative() from logger calls
1 parent af0e6ee commit a4324db

File tree

7 files changed

+40
-92
lines changed

7 files changed

+40
-92
lines changed

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
"deposit": "yarn ts-node ./scripts/spokepool.ts deposit",
7777
"dispute": "yarn ts-node ./scripts/hubpool.ts dispute",
7878
"update": "git pull && yarn reinstall && yarn version --non-interactive && git show --quiet",
79-
"update-addresses": "yarn ts-node ./scripts/fetch-addresses.ts"
79+
"update-addresses": "yarn ts-node ./scripts/fetch-addresses.ts",
80+
"validate-root-bundle": "yarn ts-node src/scripts/validateRootBundle.ts"
8081
},
8182
"devDependencies": {
8283
"@nomiclabs/hardhat-ethers": "^2.2.3",

‎src/adapter/BaseChainAdapter.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,12 @@ export class BaseChainAdapter {
186186

187187
if (unavailableTokens.length > 0) {
188188
this.log("Some tokens do not have a bridge contract for L2 -> L1 bridging", {
189-
unavailableTokens: unavailableTokens.map((token) => token.toNative()),
189+
unavailableTokens,
190190
});
191191
}
192192

193193
if (tokensToApprove.length === 0) {
194-
this.log("No L2 token bridge approvals needed", { l1Tokens: l1Tokens.map((token) => token.toNative()) });
194+
this.log("No L2 token bridge approvals needed", { l1Tokens });
195195
return;
196196
}
197197

@@ -254,11 +254,11 @@ export class BaseChainAdapter {
254254
.filter(({ bridges }) => bridges.length > 0);
255255
if (unavailableTokens.length > 0) {
256256
this.log("Some tokens do not have a bridge contract", {
257-
unavailableTokens: unavailableTokens.map((token) => token.toNative()),
257+
unavailableTokens,
258258
});
259259
}
260260
if (tokensToApprove.length === 0) {
261-
this.log("No token bridge approvals needed", { l1Tokens: l1Tokens.map((token) => token.toNative()) });
261+
this.log("No token bridge approvals needed", { l1Tokens });
262262
return;
263263
}
264264
const mrkdwn = await approveTokens(tokensToApprove, this.chainId, this.hubChainId, this.logger);
@@ -288,8 +288,8 @@ export class BaseChainAdapter {
288288
"Failed to constructWithdrawToL1Txns",
289289
{
290290
toAddress: address,
291-
l2Token: l2Token.toNative(),
292-
l1Token: l1Token.toNative(),
291+
l2Token: l2Token,
292+
l1Token: l1Token,
293293
amount: amount.toString(),
294294
srcChainId: this.chainId,
295295
dstChainId: this.hubChainId,
@@ -351,9 +351,9 @@ export class BaseChainAdapter {
351351
this.log(
352352
"Failed to construct L1 to L2 transaction",
353353
{
354-
address: address.toNative(),
355-
l1Token: l1Token.toNative(),
356-
l2Token: l2Token.toNative(),
354+
address: address,
355+
l1Token: l1Token,
356+
l2Token: l2Token,
357357
amount: amount.toString(),
358358
srcChainId: this.hubChainId,
359359
dstChainId: this.chainId,
@@ -388,8 +388,8 @@ export class BaseChainAdapter {
388388
this.log(
389389
message,
390390
{
391-
l1Token: l1Token.toNative(),
392-
l2Token: l2Token.toNative(),
391+
l1Token: l1Token,
392+
l2Token: l2Token,
393393
amount,
394394
contract: contract.address,
395395
txnRequestData,

‎src/clients/InventoryClient.ts‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -983,8 +983,8 @@ export class InventoryClient {
983983
log({
984984
at: "InventoryClient",
985985
message,
986-
l1Token: l1Token.toNative(),
987-
l2Token: l2Token.toNative(),
986+
l1Token,
987+
l2Token,
988988
l2ChainId: chainId,
989989
balance,
990990
currentBalance,
@@ -1004,20 +1004,8 @@ export class InventoryClient {
10041004
// Extract unexecutable rebalances for logging.
10051005

10061006
this.log("Considered inventory rebalances", {
1007-
rebalancesRequired: rebalancesRequired.map((rebalance) => {
1008-
return {
1009-
...rebalance,
1010-
l1Token: rebalance.l1Token.toNative(),
1011-
l2Token: rebalance.l2Token.toNative(),
1012-
};
1013-
}),
1014-
possibleRebalances: possibleRebalances.map((rebalance) => {
1015-
return {
1016-
...rebalance,
1017-
l1Token: rebalance.l1Token.toNative(),
1018-
l2Token: rebalance.l2Token.toNative(),
1019-
};
1020-
}),
1007+
rebalancesRequired,
1008+
possibleRebalances,
10211009
});
10221010

10231011
// Finally, execute the rebalances.

‎src/clients/bridges/AdapterManager.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ export class AdapterManager {
156156
this.logger.debug({
157157
at: "AdapterManager",
158158
message: `Getting outstandingCrossChainTransfers for ${chainId}`,
159-
adapterSupportedL1Tokens: adapterSupportedL1Tokens.map((l1Token) => l1Token.toNative()),
159+
adapterSupportedL1Tokens,
160160
searchConfigs: adapter.getUpdatedSearchConfigs(),
161161
});
162162
return this.adapters[chainId].getOutstandingCrossChainTransfers(adapterSupportedL1Tokens);
@@ -174,7 +174,7 @@ export class AdapterManager {
174174
at: "AdapterManager",
175175
message: "Sending token cross-chain",
176176
chainId,
177-
l1Token: l1Token.toNative(),
177+
l1Token,
178178
amount,
179179
});
180180
l2Token ??= this.l2TokenForL1Token(l1Token, chainId);
@@ -193,7 +193,7 @@ export class AdapterManager {
193193
at: "AdapterManager",
194194
message: "Withdrawing token from L2",
195195
chainId,
196-
l2Token: l2Token.toNative(),
196+
l2Token,
197197
amount,
198198
});
199199
const txnReceipts = this.adapters[chainId].withdrawTokenFromL2(address, l2Token, amount, simMode);

‎src/dataworker/Dataworker.ts‎

Lines changed: 16 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -602,10 +602,7 @@ export class Dataworker {
602602
this.logger.debug({
603603
at: "Dataworker#validate",
604604
message: "Found pending proposal",
605-
pendingRootBundle: {
606-
...pendingRootBundle,
607-
proposer: pendingRootBundle.proposer.toNative(),
608-
},
605+
pendingRootBundle,
609606
});
610607

611608
// Exit early if challenge period timestamp has passed:
@@ -832,10 +829,7 @@ export class Dataworker {
832829
this.logger.debug({
833830
at: "Dataworker#validate",
834831
message: "Empty pool rebalance root, submitting dispute",
835-
rootBundle: {
836-
...rootBundle,
837-
proposer: rootBundle.proposer.toNative(),
838-
},
832+
rootBundle,
839833
});
840834
return {
841835
valid: false,
@@ -1036,31 +1030,11 @@ export class Dataworker {
10361030
at: "Dataworker#validate",
10371031
message: "Unexpected pool rebalance root, submitting dispute",
10381032
expectedBlockRanges: blockRangesImpliedByBundleEndBlocks,
1039-
expectedPoolRebalanceLeaves: expectedPoolRebalanceRoot.leaves.map((leaf) => {
1040-
return {
1041-
...leaf,
1042-
l1Tokens: leaf.l1Tokens.map((l1Token) => l1Token.toNative()),
1043-
};
1044-
}),
1033+
expectedPoolRebalanceLeaves: expectedPoolRebalanceRoot.leaves,
10451034
expectedPoolRebalanceRoot: expectedPoolRebalanceRoot.tree.getHexRoot(),
1046-
expectedRelayerRefundLeaves: expectedRelayerRefundRoot.leaves.map((leaf) => {
1047-
return {
1048-
...leaf,
1049-
l2TokenAddress: leaf.l2TokenAddress.toNative(),
1050-
refundAddresses: leaf.refundAddresses.map((refundAddress) => refundAddress.toNative()),
1051-
};
1052-
}),
1035+
expectedRelayerRefundLeaves: expectedRelayerRefundRoot.leaves,
10531036
expectedRelayerRefundRoot: expectedRelayerRefundRoot.tree.getHexRoot(),
1054-
expectedSlowRelayLeaves: expectedSlowRelayRoot.leaves.map((leaf) => {
1055-
return {
1056-
...leaf,
1057-
depositor: leaf.relayData.depositor.toNative(),
1058-
recipient: leaf.relayData.recipient.toNative(),
1059-
inputToken: leaf.relayData.inputToken.toNative(),
1060-
outputToken: leaf.relayData.outputToken.toNative(),
1061-
exclusiveRelayer: leaf.relayData.exclusiveRelayer.toNative(),
1062-
};
1063-
}),
1037+
expectedSlowRelayLeaves: expectedSlowRelayRoot.leaves,
10641038
expectedSlowRelayRoot: expectedSlowRelayRoot.tree.getHexRoot(),
10651039
pendingRoot: rootBundle.poolRebalanceRoot,
10661040
pendingPoolRebalanceLeafCount: rootBundle.unclaimedPoolRebalanceLeafCount,
@@ -1309,7 +1283,7 @@ export class Dataworker {
13091283
this.logger.warn({
13101284
at: "Dataworker#_executeSlowFillLeaf",
13111285
message: "Ignoring slow fill.",
1312-
leafExecutionArgs: [depositor.toNative(), recipient.toNative()],
1286+
leafExecutionArgs: [depositor, recipient],
13131287
});
13141288
return false;
13151289
}
@@ -1390,7 +1364,7 @@ export class Dataworker {
13901364
depositId: slowFill.relayData.depositId,
13911365
fromChain: slowFill.relayData.originChainId,
13921366
chainId: destinationChainId,
1393-
token: outputToken.toNative(),
1367+
token: outputToken,
13941368
amount: outputAmount,
13951369
spokeBalance: await this._getSpokeBalanceForL2Tokens(
13961370
balanceAllocator,
@@ -1520,10 +1494,7 @@ export class Dataworker {
15201494
at: "Dataworker#executePoolRebalanceLeaves",
15211495
message: "Found pending proposal",
15221496
hubPoolCurrentTime: this.clients.hubPoolClient.currentTime,
1523-
pendingRootBundle: {
1524-
...pendingRootBundle,
1525-
proposer: pendingRootBundle.proposer.toNative(),
1526-
},
1497+
pendingRootBundle,
15271498
});
15281499

15291500
const nextBundleMainnetStartBlock = this.getNextHubChainBundleStartBlock();
@@ -1768,7 +1739,7 @@ export class Dataworker {
17681739
this.logger.error({
17691740
at: "Dataworker#_getExecutablePoolRebalanceLeaves",
17701741
message: `Not enough funds to execute pool rebalance leaf for chain ${leaf.chainId}`,
1771-
l1Tokens: leaf.l1Tokens.map((l1Token) => l1Token.toNative()),
1742+
l1Tokens: leaf.l1Tokens,
17721743
netSendAmounts: leaf.netSendAmounts,
17731744
});
17741745
}
@@ -1817,11 +1788,8 @@ export class Dataworker {
18171788
message: `Loading more orbit gas token to pay for L1->L2 message submission fees to ${getNetworkName(
18181789
leaf.chainId
18191790
)} 📨!`,
1820-
leaf: {
1821-
...leaf,
1822-
l1Tokens: leaf.l1Tokens.map((l1Token) => l1Token.toNative()),
1823-
},
1824-
feeToken: feeToken.toNative(),
1791+
leaf,
1792+
feeToken,
18251793
requiredAmount,
18261794
});
18271795
if (submitExecution) {
@@ -1869,7 +1837,7 @@ export class Dataworker {
18691837
message: `feePayer ${holder} has sufficient orbit gas token to pay for L1->L2 message submission fees to ${getNetworkName(
18701838
leaf.chainId
18711839
)}`,
1872-
feeToken: feeToken.toNative(),
1840+
feeToken,
18731841
requiredAmount,
18741842
feePayerBalance: await balanceAllocator.getBalanceSubUsed(hubPoolChainId, feeToken, holder),
18751843
});
@@ -1950,7 +1918,7 @@ export class Dataworker {
19501918
message: `Skipping exchange rate update for ${tokenSymbol} because current liquid reserves > netSendAmount for hubChain`,
19511919
currentLiquidReserves,
19521920
netSendAmount: netSendAmounts[idx],
1953-
l1Token: l1Token.toNative(),
1921+
l1Token,
19541922
});
19551923
updatedLiquidReserves[l1Token.toEvmAddress()] = currentLiquidReserves.sub(netSendAmounts[idx]);
19561924
return;
@@ -2192,7 +2160,7 @@ export class Dataworker {
21922160
lastUpdateTime: latestFeesCompoundedTime,
21932161
currentLiquidReserves,
21942162
updatedLiquidReserves,
2195-
l1Token: l1Token.toNative(),
2163+
l1Token,
21962164
});
21972165
if (submitExecution) {
21982166
this.clients.multiCallerClient.enqueueTransaction({
@@ -2633,12 +2601,7 @@ export class Dataworker {
26332601
key,
26342602
root: {
26352603
...this.rootCache[key],
2636-
leaves: this.rootCache[key].leaves.map((leaf) => {
2637-
return {
2638-
...leaf,
2639-
l1Tokens: leaf.l1Tokens.map((l1Token) => l1Token.toNative()),
2640-
};
2641-
}),
2604+
leaves: this.rootCache[key].leaves,
26422605
tree: this.rootCache[key].tree.getHexRoot(),
26432606
},
26442607
});
@@ -2820,11 +2783,7 @@ export class Dataworker {
28202783
this.logger.debug({
28212784
at: "Dataworker#executeRelayerRefundLeafSvm",
28222785
message: "Relayer refund leaf accounts",
2823-
leaf: {
2824-
...leaf,
2825-
l2TokenAddress: leaf.l2TokenAddress.toNative(),
2826-
refundAddresses: leaf.refundAddresses.map((address) => address.toNative()),
2827-
},
2786+
leaf,
28282787
rootBundleId,
28292788
eventAuthority,
28302789
statePda,

‎src/dataworker/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ export async function runDataworker(_logger: winston.Logger, baseSigner: Signer)
217217
logger[startupLogLevel(config)]({
218218
at: "Dataworker#index",
219219
message: "Dataworker addresses",
220-
evmAddress: tokenClient.relayerEvmAddress.toNative(),
221-
svmAddress: tokenClient.relayerSvmAddress.toNative(),
220+
evmAddress: tokenClient.relayerEvmAddress,
221+
svmAddress: tokenClient.relayerSvmAddress,
222222
});
223223
await tokenClient.update();
224224
// Run approval on hub pool.

‎src/relayer/Relayer.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ export class Relayer {
111111
this.logger.debug({
112112
at: "Relayer::init",
113113
message: "Completed one-time init.",
114-
relayerEvmAddress: this.relayerEvmAddress.toNative(),
115-
relayerSvmAddress: tokenClient.relayerSvmAddress.toNative(),
114+
relayerEvmAddress: this.relayerEvmAddress,
115+
relayerSvmAddress: tokenClient.relayerSvmAddress,
116116
});
117117
}
118118

0 commit comments

Comments
 (0)