fix: re added create2 methods

bgd-labs · Jul 29, 2024 · 78bd3b6 · 78bd3b6
1 parent 5a9a33a
commit 78bd3b6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/lib/solidity-utils b/lib/solidity-utils
diff --git a/scripts/BaseScript.sol b/scripts/BaseScript.sol
@@ -2,21 +2,23 @@
 pragma solidity ^0.8.0;
 
 import {ChainIds, TestNetChainIds} from 'solidity-utils/contracts/utils/ChainHelpers.sol';
+import {Create2Utils} from 'solidity-utils/contracts/utils/ScriptUtils.sol';
 
 abstract contract BaseScript {
   function TRANSACTION_NETWORK() internal view virtual returns (uint256);
 
-  // Should only implement as:
-  // return Create2Utils.create2Deploy(keccak256(abi.encode(salt)), byteCode);
   function _deployByteCode(
     bytes memory byteCode,
     string memory salt
-  ) internal virtual returns (address);
+  ) internal virtual returns (address) {
+    return Create2Utils.create2Deploy(keccak256(abi.encode(salt)), byteCode);
+  }
 
-  // Should only implement as:
-  // return Create2Utils.computeCreate2Address(salt, adapterCode);
   function _computeByteCodeAddress(
     bytes memory byteCode,
     string memory salt
-  ) internal virtual returns (address);
+  ) internal virtual returns (address) {
+    bytes32 encodedSalt = keccak256(abi.encode(salt));
+    return Create2Utils.computeCreate2Address(salt, byteCode);
+  }
 }