Skip to content

Commit f80e188

Browse files
authored
Revert "feat: update depositor to bytes32" (#764)
This reverts commit 85f0001.
1 parent 5c566fb commit f80e188

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
@@ -815,7 +815,7 @@ abstract contract SpokePool is
815815
bytes calldata depositorSignature
816816
) public override nonReentrant {
817817
_verifyUpdateV3DepositMessage(
818-
depositor,
818+
depositor.toAddress(),
819819
depositId,
820820
chainId(),
821821
updatedOutputAmount,
@@ -869,7 +869,7 @@ abstract contract SpokePool is
869869
bytes calldata depositorSignature
870870
) public {
871871
_verifyUpdateV3DepositMessage(
872-
depositor.toBytes32(),
872+
depositor,
873873
depositId,
874874
chainId(),
875875
updatedOutputAmount,
@@ -1009,7 +1009,7 @@ abstract contract SpokePool is
10091009
});
10101010

10111011
_verifyUpdateV3DepositMessage(
1012-
relayData.depositor,
1012+
relayData.depositor.toAddress(),
10131013
relayData.depositId,
10141014
relayData.originChainId,
10151015
updatedOutputAmount,
@@ -1496,7 +1496,7 @@ abstract contract SpokePool is
14961496
}
14971497

14981498
function _verifyUpdateV3DepositMessage(
1499-
bytes32 depositor,
1499+
address depositor,
15001500
uint32 depositId,
15011501
uint256 originChainId,
15021502
uint256 updatedOutputAmount,
@@ -1521,7 +1521,7 @@ abstract contract SpokePool is
15211521
),
15221522
originChainId
15231523
);
1524-
_verifyDepositorSignature(depositor.toAddress(), expectedTypedDataV4Hash, depositorSignature);
1524+
_verifyDepositorSignature(depositor, expectedTypedDataV4Hash, depositorSignature);
15251525
}
15261526

15271527
// 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,
99+
depositor.toAddress(),
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.toBytes32(),
121+
depositor,
122122
depositId,
123123
originChainId,
124124
updatedOutputAmount,

0 commit comments

Comments
 (0)