Skip to content

improve(spoke-pool): Move some logic to internal virtual methods to support other evms #41

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 3 commits into from
Feb 21, 2022
Merged

improve(spoke-pool): Move some logic to internal virtual methods to support other evms #41

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29aef2d
improve(spoke-pool): Move some logic to internal virtual methods to s…
nicholaspai Feb 18, 2022
0f55dcf
Merge branch 'master' of https://github.com/across-protocol/across-sm…
nicholaspai Feb 19, 2022
7c7b363
fix
nicholaspai Feb 19, 2022
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
29 changes: 20 additions & 9 deletions contracts/SpokePool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,14 +306,7 @@ abstract contract SpokePool is SpokePoolInterface, Testable, Lockable, MultiCall
// above keccak156 hash), then this will revert.
bytes32 ethSignedMessageHash = ECDSA.toEthSignedMessageHash(expectedDepositorMessageHash);

// Note: no need to worry about reentrancy from contract deployed at `depositor` address since
// `SignatureChecker.isValidSignatureNow` is a non state-modifying STATICCALL:
// - https://github.com/OpenZeppelin/openzeppelin-contracts/blob/63b466901fb015538913f811c5112a2775042177/contracts/utils/cryptography/SignatureChecker.sol#L35
// - https://github.com/ethereum/EIPs/pull/214
require(
SignatureChecker.isValidSignatureNow(depositor, ethSignedMessageHash, depositorSignature),
"invalid signature"
);
_verifyDepositorUpdateFeeMessage(depositor, ethSignedMessageHash, depositorSignature);
}

// Now follow the default `fillRelay` flow with the updated fee and the original relay hash.
Expand Down Expand Up @@ -432,7 +425,8 @@ abstract contract SpokePool is SpokePoolInterface, Testable, Lockable, MultiCall
* VIEW FUNCTIONS *
**************************************/

function chainId() public view returns (uint256) {
// Some L2s like ZKSync don't support the CHAIN_ID opcode so we allow the caller to manually set this.
function chainId() public view virtual returns (uint256) {
return block.chainid;
}

Expand All @@ -442,6 +436,23 @@ abstract contract SpokePool is SpokePoolInterface, Testable, Lockable, MultiCall

function _bridgeTokensToHubPool(SpokePoolInterface.RelayerRefundLeaf memory relayerRefundLeaf) internal virtual;

// Allow L2 to implement chain specific recovering of signers from signatures because some L2s might not support
// ecrecover, such as those with account abstraction like ZKSync.
function _verifyDepositorUpdateFeeMessage(
address depositor,
bytes32 ethSignedMessageHash,
bytes memory depositorSignature
) internal view virtual {
// Note: no need to worry about reentrancy from contract deployed at `depositor` address since
// `SignatureChecker.isValidSignatureNow` is a non state-modifying STATICCALL:
// - https://github.com/OpenZeppelin/openzeppelin-contracts/blob/63b466901fb015538913f811c5112a2775042177/contracts/utils/cryptography/SignatureChecker.sol#L35
// - https://github.com/ethereum/EIPs/pull/214
require(
SignatureChecker.isValidSignatureNow(depositor, ethSignedMessageHash, depositorSignature),
"invalid signature"
);
}

function _computeAmountPreFees(uint256 amount, uint64 feesPct) private pure returns (uint256) {
return (1e18 * amount) / (1e18 - feesPct);
}
Expand Down