more test around address being correct

ourzora · Sep 29, 2023 · 2d423f5 · 2d423f5
1 parent b55030e
commit 2d423f5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/src/delegation/ZoraCreator1155Attribution.sol b/src/delegation/ZoraCreator1155Attribution.sol
@@ -51,10 +51,10 @@ struct PremintConfig {
     bool deleted;
 }
 
-/// @title Enables a creator to signal intent to create a Zora erc1155 contract or new token on that
+/// @title Library for enables a creator to signal intent to create a Zora erc1155 contract or new token on that
 /// contract by signing a transaction but not paying gas, and have a third party/collector pay the gas
-/// by executing the transaction.  Incentivizes the third party to execute the transaction by offering
-/// a reward in the form of minted tokens.
+/// by executing the transaction.  Functions are exposed as external to allow contracts to import this lib and not increase their
+/// size.
 /// @author @oveddan
 library ZoraCreator1155Attribution {
     /* start eip712 functionality */
@@ -158,7 +158,8 @@ library ZoraCreator1155Attribution {
     }
 }
 
-// todo: make it consistent.
+/// @notice Utilitiy library to setup tokens created via premint.  Functions exposed as external to not increase contract size in calling contract.
+/// @author oveddan
 library PremintTokenSetup {
     uint256 constant PERMISSION_BIT_MINTER = 2 ** 2;
 

diff --git a/src/deployment/DeterministicDeployerScript.sol b/src/deployment/DeterministicDeployerScript.sol
@@ -205,16 +205,17 @@ contract DeterministicDeployerScript is Script {
 
         DeterministicProxyDeployer factoryDeployer = getOrCreateProxyDeployer();
 
-        return
-            factoryDeployer.createFactoryProxyDeterministic(
-                params.proxyShimSalt,
-                params.proxySalt,
-                params.proxyCreationCode,
-                params.deterministicProxyAddress,
-                implementation,
-                owner,
-                signature
-            );
+        address resultAddress = factoryDeployer.createFactoryProxyDeterministic(
+            params.proxyShimSalt,
+            params.proxySalt,
+            params.proxyCreationCode,
+            params.deterministicProxyAddress,
+            implementation,
+            owner,
+            signature
+        );
+
+        require(resultAddress == params.deterministicProxyAddress, "DeterministicDeployerScript: proxy address mismatch");
     }
 
     function deployUpgradeGate(uint256 chain, address upgradeGateOwner) internal returns (address) {
@@ -228,12 +229,13 @@ contract DeterministicDeployerScript is Script {
 
         DeterministicProxyDeployer factoryDeployer = getOrCreateProxyDeployer();
 
-        return
-            factoryDeployer.createAndInitGenericContractDeterministic({
-                genericCreationSalt: genericCreationSalt,
-                creationCode: creationCode,
-                initCall: abi.encodeWithSelector(UpgradeGate.initialize.selector, upgradeGateOwner),
-                signature: signature
-            });
+        address resultAddress = factoryDeployer.createAndInitGenericContractDeterministic({
+            genericCreationSalt: genericCreationSalt,
+            creationCode: creationCode,
+            initCall: abi.encodeWithSelector(UpgradeGate.initialize.selector, upgradeGateOwner),
+            signature: signature
+        });
+
+        require(resultAddress == vm.parseJsonAddress(upgradeGateParams, ".upgradeGateAddress"), "DeterministicDeployerScript: upgrade gate address mismatch");
     }
 }