Skip to content
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

feat(protocol): restrict receive()'s msg.sender to vaults #13110

Merged
merged 20 commits into from
Feb 9, 2023
Merged

feat(protocol): restrict receive()'s msg.sender to vaults #13110

Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bd5fa2f
docs(protocol): enhance bridge documentation
dionysuzx Feb 7, 2023
2ebec03
style
dionysuzx Feb 7, 2023
822cc0f
add autodocs
dionysuzx Feb 7, 2023
40c3437
remove private getter
dionysuzx Feb 7, 2023
4fc4ade
overloaded function naming convention
dionysuzx Feb 7, 2023
df048ee
remove todo for encodepacked
dionysuzx Feb 7, 2023
2685f3a
resolve gaslimit comment
dionysuzx Feb 7, 2023
7f72418
private state variables
dionysuzx Feb 7, 2023
548e22f
update
dionysuzx Feb 7, 2023
56cb190
releaseEtherTo
dionysuzx Feb 7, 2023
1b55d09
update docs
dionysuzx Feb 7, 2023
b3719dd
leave pr in todo
dionysuzx Feb 7, 2023
0d1c6cb
remove todo
dionysuzx Feb 7, 2023
8da00cf
dirty save
dionysuzx Feb 7, 2023
d6cbdeb
dan comments
dionysuzx Feb 7, 2023
d1d3e97
Update Bridge.sol
dantaik Feb 8, 2023
1c5fbd6
Update Bridge.sol
dantaik Feb 8, 2023
e469864
Update Bridge.sol
dantaik Feb 8, 2023
a746483
Merge branch 'main' into save-bridge-docs
dionysuzx Feb 8, 2023
4164c5c
remove tests
dionysuzx Feb 8, 2023
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
6 changes: 5 additions & 1 deletion packages/protocol/contracts/bridge/Bridge.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ contract Bridge is EssentialContract, IBridge {

/// Allow Bridge to receive ETH from the TokenVault or EtherVault.
receive() external payable {
// TODO(dave,PR#13110): require the sender is the TokenVault or EtherVault
// Ensure the sender is either the Ether vault or the token vault.
dionysuzx marked this conversation as resolved.
Show resolved Hide resolved
require(
msg.sender == this.resolve("token_vault", false) ||
msg.sender == this.resolve("ether_vault", true)
);
}

/// @dev Initializer to be called after being deployed behind a proxy.
Expand Down