Skip to content

Commit 85f0001

Browse files
committed
feat: update depositor to bytes32
Signed-off-by: Pablo Maldonado <pablomaldonadoturci@gmail.com>
1 parent f05c507 commit 85f0001

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

contracts/SpokePool.sol

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ abstract contract SpokePool is
843843
bytes calldata depositorSignature
844844
) public override nonReentrant {
845845
_verifyUpdateV3DepositMessage(
846-
depositor.toAddress(),
846+
depositor,
847847
depositId,
848848
chainId(),
849849
updatedOutputAmount,
@@ -897,7 +897,7 @@ abstract contract SpokePool is
897897
bytes calldata depositorSignature
898898
) public {
899899
_verifyUpdateV3DepositMessage(
900-
depositor,
900+
depositor.toBytes32(),
901901
depositId,
902902
chainId(),
903903
updatedOutputAmount,
@@ -1041,7 +1041,7 @@ abstract contract SpokePool is
10411041
});
10421042

10431043
_verifyUpdateV3DepositMessage(
1044-
relayData.depositor.toAddress(),
1044+
relayData.depositor,
10451045
relayData.depositId,
10461046
relayData.originChainId,
10471047
updatedOutputAmount,
@@ -1442,7 +1442,7 @@ abstract contract SpokePool is
14421442
}
14431443

14441444
function _verifyUpdateV3DepositMessage(
1445-
address depositor,
1445+
bytes32 depositor,
14461446
uint32 depositId,
14471447
uint256 originChainId,
14481448
uint256 updatedOutputAmount,
@@ -1467,7 +1467,7 @@ abstract contract SpokePool is
14671467
),
14681468
originChainId
14691469
);
1470-
_verifyDepositorSignature(depositor, expectedTypedDataV4Hash, depositorSignature);
1470+
_verifyDepositorSignature(depositor.toAddress(), expectedTypedDataV4Hash, depositorSignature);
14711471
}
14721472

14731473
// This function is isolated and made virtual to allow different L2's to implement chain specific recovery of

contracts/test/MockSpokePool.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ contract MockSpokePool is SpokePool, MockV2SpokePoolInterface, OwnableUpgradeabl
9696
) public view {
9797
return
9898
_verifyUpdateV3DepositMessage(
99-
depositor.toAddress(),
99+
depositor,
100100
depositId,
101101
originChainId,
102102
updatedOutputAmount,
@@ -118,7 +118,7 @@ contract MockSpokePool is SpokePool, MockV2SpokePoolInterface, OwnableUpgradeabl
118118
) public view {
119119
return
120120
_verifyUpdateV3DepositMessage(
121-
depositor,
121+
depositor.toBytes32(),
122122
depositId,
123123
originChainId,
124124
updatedOutputAmount,

0 commit comments

Comments
 (0)