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): revert impl deployment V2 #14621

Merged
merged 10 commits into from
Sep 3, 2023
Merged

fix(protocol): revert impl deployment V2 #14621

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
55d9c47
Combine new and old to make upgradeable
adaki2004 Aug 31, 2023
f36f9d3
indentation
adaki2004 Aug 31, 2023
f577564
Merge branch 'main' into revert_to_Create2Upgradeable_v2
adaki2004 Sep 1, 2023
6f3d60b
Adjust to integration tests
adaki2004 Sep 1, 2023
a290366
Update ERC721Vault.sol
dantaik Sep 1, 2023
cf5e11e
Update ERC20Vault.sol
dantaik Sep 1, 2023
e1d9e06
Update ERC1155Vault.sol
dantaik Sep 1, 2023
fff496e
Update LibProving.sol
dong77 Sep 2, 2023
05aef61
Update ERC20Vault.sol
dong77 Sep 2, 2023
f7d485c
Merge branch 'main' into revert_to_Create2Upgradeable_v2
dantaik Sep 2, 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
12 changes: 10 additions & 2 deletions packages/protocol/contracts/tokenvault/ERC20Vault.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,13 +330,21 @@ contract ERC20Vault is
private
returns (address btoken)
{
ProxiedBridgedERC20 bridgedToken = new ProxiedBridgedERC20();
address bridgedToken = Create2Upgradeable.deploy({
amount: 0, // amount of Ether to send
salt: keccak256(
dantaik marked this conversation as resolved.
Show resolved Hide resolved
bytes.concat(
bytes32(ctoken.chainId), bytes32(uint256(uint160(ctoken.addr)))
)
),
bytecode: type(ProxiedBridgedERC20).creationCode
});

btoken = LibVaultUtils.deployProxy(
address(bridgedToken),
owner(),
bytes.concat(
bridgedToken.init.selector,
ProxiedBridgedERC20(bridgedToken).init.selector,
abi.encode(
address(_addressManager),
ctoken.addr,
Expand Down