Skip to content

Revert "feat: update depositor to bytes32" #764

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

Merged
merged 1 commit into from
Nov 25, 2024
Merged

Revert "feat: update depositor to bytes32" #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions contracts/SpokePool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ abstract contract SpokePool is
bytes calldata depositorSignature
) public override nonReentrant {
_verifyUpdateV3DepositMessage(
depositor,
depositor.toAddress(),
depositId,
chainId(),
updatedOutputAmount,
Expand Down Expand Up @@ -868,7 +868,7 @@ abstract contract SpokePool is
bytes calldata depositorSignature
) public {
_verifyUpdateV3DepositMessage(
depositor.toBytes32(),
depositor,
depositId,
chainId(),
updatedOutputAmount,
Expand Down Expand Up @@ -1008,7 +1008,7 @@ abstract contract SpokePool is
});

_verifyUpdateV3DepositMessage(
relayData.depositor,
relayData.depositor.toAddress(),
relayData.depositId,
relayData.originChainId,
updatedOutputAmount,
Expand Down Expand Up @@ -1503,7 +1503,7 @@ abstract contract SpokePool is
}

function _verifyUpdateV3DepositMessage(
bytes32 depositor,
address depositor,
uint32 depositId,
uint256 originChainId,
uint256 updatedOutputAmount,
Expand All @@ -1528,7 +1528,7 @@ abstract contract SpokePool is
),
originChainId
);
_verifyDepositorSignature(depositor.toAddress(), expectedTypedDataV4Hash, depositorSignature);
_verifyDepositorSignature(depositor, expectedTypedDataV4Hash, depositorSignature);
}

// This function is isolated and made virtual to allow different L2's to implement chain specific recovery of
Expand Down
4 changes: 2 additions & 2 deletions contracts/test/MockSpokePool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ contract MockSpokePool is SpokePool, MockV2SpokePoolInterface, OwnableUpgradeabl
) public view {
return
_verifyUpdateV3DepositMessage(
depositor,
depositor.toAddress(),
depositId,
originChainId,
updatedOutputAmount,
Expand All @@ -118,7 +118,7 @@ contract MockSpokePool is SpokePool, MockV2SpokePoolInterface, OwnableUpgradeabl
) public view {
return
_verifyUpdateV3DepositMessage(
depositor.toBytes32(),
depositor,
depositId,
originChainId,
updatedOutputAmount,
Expand Down
Loading