Skip to content

fix: precompute address deployment #247

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

Open
DevPelz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: precompute address deployment #247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 28 additions & 3 deletions apps/blockchain/ethereum/src/token/Deployer.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@
pragma solidity ^0.8.0;

import "openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import "openzeppelin-contracts/contracts/utils/Create2.sol";
import "openzeppelin-contracts/contracts/utils/Address.sol";

import "./ERC721Bridgeable.sol";
import "./ERC1155Bridgeable.sol";

/**
@title Collection contract deployer.
*/
library Deployer {
library Deployer {

// Error message
error AlreadyDeployed();
/**
@notice Deploys a UUPS proxied ERC721 contract.

Expand All @@ -20,14 +24,24 @@ library Deployer {

@return Address of the proxy.
*/

function deployERC721Bridgeable(
string memory name,
string memory symbol
)
public
returns (address)
{
address impl = address(new ERC721Bridgeable());
bytes32 salt = keccak256(abi.encodePacked(name, symbol));
bytes memory bytecode = type(ERC721Bridgeable).creationCode;
address precomputedImpl = Create2.computeAddress(salt, keccak256(bytecode));

if (Address.isContract(precomputedImpl)) {
revert AlreadyDeployed();
}

address impl = address(new ERC721Bridgeable{salt: salt}());


bytes memory dataInit = abi.encodeWithSelector(
ERC721Bridgeable.initialize.selector,
Expand All @@ -50,7 +64,15 @@ library Deployer {
public
returns (address)
{
address impl = address(new ERC1155Bridgeable());
bytes32 salt = keccak256(abi.encodePacked(uri));
bytes memory bytecode = type(ERC721Bridgeable).creationCode;
address precomputedImpl = Create2.computeAddress(salt, keccak256(bytecode));

if (Address.isContract(precomputedImpl)) {
revert AlreadyDeployed();
}
address impl = address(new ERC1155Bridgeable{salt: salt}());


bytes memory dataInit = abi.encodeWithSelector(
ERC1155Bridgeable.initialize.selector,
Expand All @@ -59,4 +81,7 @@ library Deployer {

return address(new ERC1967Proxy(impl, dataInit));
}



}