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

fix(protocol): fix BridgedERC20V2.sol initializer logic #17823

Merged
merged 9 commits into from
Jul 24, 2024
Merged

fix(protocol): fix BridgedERC20V2.sol initializer logic #17823

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b6c7b70
fix BridgedERC20V2
dantaik Jul 21, 2024
205fee4
Update BridgedERC20V2.sol
dantaik Jul 21, 2024
5a23115
Merge branch 'main' into BridgedERC20V2_fix
dantaik Jul 21, 2024
d7481e8
more
dantaik Jul 21, 2024
e0682ea
Update BridgedERC20V2.sol
dantaik Jul 21, 2024
b9cf6c3
Update gen-layouts.sh
dantaik Jul 21, 2024
0c7cdb7
Update gen-layouts.sh
dantaik Jul 21, 2024
4f0fbdd
forge fmt & update contract layout table
dantaik Jul 21, 2024
71a86c8
Merge branch 'main' into BridgedERC20V2_fix
dantaik Jul 24, 2024
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
Prev Previous commit
Next Next commit
Update BridgedERC20V2.sol
  • Loading branch information
@dantaik
dantaik committed Jul 21, 2024
commit 205fee4414b2b685f37b401b6fab1217c518e3a0
3 changes: 3 additions & 0 deletions packages/protocol/contracts/tokenvault/BridgedERC20V2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
error BTOKEN_INVALID_SIG();

/// @inheritdoc IBridgedERC20Initializable
/// @dev Calling this funciton will change the initliazed version to 2.

Check warning on line 32 in packages/protocol/contracts/tokenvault/BridgedERC20V2.sol

View workflow job for this annotation

GitHub Actions / check-for-typos 

"funciton" should be "function".

Check warning on line 32 in packages/protocol/contracts/tokenvault/BridgedERC20V2.sol

View workflow job for this annotation

GitHub Actions / check-for-typos 

"initliazed" should be "initialized".
function init(
address _owner,
address _sharedAddressManager,
Expand All @@ -55,6 +56,8 @@
__srcDecimals = _decimals;
}

/// @dev This function shall be called when upgrading a deployed contract from {BridgedERC20} to
/// {BridgedERC20V2}.
function init2() external reinitializer(2) {
__EIP712_init_unchained(name(), "1");
}
Expand Down
Loading