Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
Update contract deployment to fix returndata ignoring
  • Loading branch information
dimitriospapathanasiou committed May 22, 2024
commit fbcf8decb3add5952a33e10f675c3ef9ad463e46
5 changes: 5 additions & 0 deletions .changeset/nervous-eyes-teach.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'openzeppelin-solidity': minor
---

`Create2`: Capture and Utilization of returndata from failed deployment
19 changes: 18 additions & 1 deletion contracts/utils/Create2.sol
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,29 @@ library Create2 {
if (bytecode.length == 0) {
revert Create2EmptyBytecode();
}

uint256 returndataSize;
bytes memory returndata;

/// @solidity memory-safe-assembly
assembly {
addr := create2(amount, add(bytecode, 0x20), mload(bytecode), salt)
if iszero(addr) {
returndataSize := returndatasize()
returndata := mload(0x40)
mstore(0x40, add(returndata, add(returndataSize, 0x20)))
returndatacopy(returndata, 0, returndataSize)
}
}

if (addr == address(0)) {
revert Errors.FailedDeployment();
if (returndataSize > 0) {
assembly {
revert(add(returndata, 0x20), returndataSize)
}
} else {
revert Errors.FailedDeployment();
}
}
}

Expand Down