Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
0273081d
Commit
0273081d
authored
Jun 01, 2022
by
Maurelian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contracts: Fix L-01 use _from instead of msg.sender
parent
9aa8049c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
.gas-snapshot
packages/contracts-bedrock/.gas-snapshot
+3
-3
L2StandardBridge.sol
packages/contracts-bedrock/contracts/L2/L2StandardBridge.sol
+1
-1
StandardBridge.sol
.../contracts-bedrock/contracts/universal/StandardBridge.sol
+1
-1
No files found.
packages/contracts-bedrock/.gas-snapshot
View file @
0273081d
...
@@ -75,8 +75,8 @@ L2StandardBridge_Test:test_finalizeDeposit() (gas: 93169)
...
@@ -75,8 +75,8 @@ L2StandardBridge_Test:test_finalizeDeposit() (gas: 93169)
L2StandardBridge_Test:test_finalizeDeposit_failsToCompleteOutboundTransfer() (gas: 140106)
L2StandardBridge_Test:test_finalizeDeposit_failsToCompleteOutboundTransfer() (gas: 140106)
L2StandardBridge_Test:test_initialize() (gas: 14812)
L2StandardBridge_Test:test_initialize() (gas: 14812)
L2StandardBridge_Test:test_receive() (gas: 136415)
L2StandardBridge_Test:test_receive() (gas: 136415)
L2StandardBridge_Test:test_withdraw() (gas: 3526
26
)
L2StandardBridge_Test:test_withdraw() (gas: 3526
32
)
L2StandardBridge_Test:test_withdrawTo() (gas: 3534
77
)
L2StandardBridge_Test:test_withdrawTo() (gas: 3534
84
)
L2ToL1MessagePasserTest:test_burn() (gas: 112046)
L2ToL1MessagePasserTest:test_burn() (gas: 112046)
L2ToL1MessagePasserTest:test_initiateWithdrawal_fromContract() (gas: 67890)
L2ToL1MessagePasserTest:test_initiateWithdrawal_fromContract() (gas: 67890)
L2ToL1MessagePasserTest:test_initiateWithdrawal_fromEOA() (gas: 74851)
L2ToL1MessagePasserTest:test_initiateWithdrawal_fromEOA() (gas: 74851)
...
@@ -161,4 +161,4 @@ SequencerFeeVault_Test:test_constructor() (gas: 7611)
...
@@ -161,4 +161,4 @@ SequencerFeeVault_Test:test_constructor() (gas: 7611)
SequencerFeeVault_Test:test_minWithdrawalAmount() (gas: 5429)
SequencerFeeVault_Test:test_minWithdrawalAmount() (gas: 5429)
SequencerFeeVault_Test:test_receive() (gas: 17280)
SequencerFeeVault_Test:test_receive() (gas: 17280)
SequencerFeeVault_Test:test_revertWithdraw() (gas: 9245)
SequencerFeeVault_Test:test_revertWithdraw() (gas: 9245)
SequencerFeeVault_Test:test_withdraw() (gas: 14727
4
)
SequencerFeeVault_Test:test_withdraw() (gas: 14727
5
)
packages/contracts-bedrock/contracts/L2/L2StandardBridge.sol
View file @
0273081d
...
@@ -172,6 +172,6 @@ contract L2StandardBridge is StandardBridge {
...
@@ -172,6 +172,6 @@ contract L2StandardBridge is StandardBridge {
} else {
} else {
_initiateBridgeERC20(_l2Token, l1Token, _from, _to, _amount, _minGasLimit, _data);
_initiateBridgeERC20(_l2Token, l1Token, _from, _to, _amount, _minGasLimit, _data);
}
}
emit WithdrawalInitiated(l1Token, _l2Token,
msg.sender
, _to, _amount, _data);
emit WithdrawalInitiated(l1Token, _l2Token,
_from
, _to, _amount, _data);
}
}
}
}
packages/contracts-bedrock/contracts/universal/StandardBridge.sol
View file @
0273081d
...
@@ -318,7 +318,7 @@ abstract contract StandardBridge {
...
@@ -318,7 +318,7 @@ abstract contract StandardBridge {
"Wrong remote token for Optimism Mintable ERC20 local token"
"Wrong remote token for Optimism Mintable ERC20 local token"
);
);
OptimismMintableERC20(_localToken).burn(
msg.sender
, _amount);
OptimismMintableERC20(_localToken).burn(
_from
, _amount);
} else {
} else {
// TODO: Do we need to confirm that the transfer was successful?
// TODO: Do we need to confirm that the transfer was successful?
IERC20(_localToken).safeTransferFrom(_from, address(this), _amount);
IERC20(_localToken).safeTransferFrom(_from, address(this), _amount);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment