Merge pull request #171 from gammaswap/fix/address-calculator-salt

publish package
gammaswap · Dec 24, 2023 · 4400b7d · 4400b7d
2 parents df642aa + 4c5e4d5
commit 4400b7d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/contracts/base/AbstractGammaPoolFactory.sol b/contracts/base/AbstractGammaPoolFactory.sol
@@ -109,7 +109,7 @@ abstract contract AbstractGammaPoolFactory is IGammaPoolFactory, TwoStepOwnable
     }
 
     function cloneDeterministic(uint16 protocolId, bytes32 salt) internal virtual returns (address instance) {
-        bytes memory bytecode = AddressCalculator.calcMinimalBeaconProxyBytecode(protocolId, salt, address(this));
+        bytes memory bytecode = AddressCalculator.calcMinimalBeaconProxyBytecode(protocolId, address(this));
 
         assembly {
             instance := create2(0, add(bytecode, 32), mload(bytecode), salt)

diff --git a/contracts/libraries/AddressCalculator.sol b/contracts/libraries/AddressCalculator.sol
@@ -40,12 +40,10 @@ library AddressCalculator {
 
     /// @dev Compute bytecode of a minimal beacon proxy contract, excluding bytecode metadata hash
     /// @param protocolId - id of protocol
-    /// @param salt - salt used in address generation to assure its uniqueness
     /// @param factory - address of factory that instantiated or will instantiate this contract
     /// @return bytecode - the calculated bytecode for minimal beacon proxy contract
     function calcMinimalBeaconProxyBytecode(
         uint16 protocolId,
-        bytes32 salt,
         address factory
     ) internal pure returns(bytes memory) {
         return abi.encodePacked(
@@ -74,7 +72,7 @@ library AddressCalculator {
         bytes32 salt,
         address factory
     ) internal pure returns (address) {
-        bytes memory bytecode = calcMinimalBeaconProxyBytecode(protocolId, salt, factory);
+        bytes memory bytecode = calcMinimalBeaconProxyBytecode(protocolId, factory);
 
         // Compute the hash of the initialization code.
         bytes32 bytecodeHash = keccak256(bytecode);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gammaswap/v1-core",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "description": "Core smart contracts for the GammaSwap V1 protocol",
   "homepage": "https://gammaswap.com",
   "scripts": {