@towns-protocol/contracts 0.0.306 → 0.0.307

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towns-protocol/contracts",
-  "version": "0.0.306",
+  "version": "0.0.307",
   "packageManager": "yarn@3.8.0",
   "scripts": {
     "build": "forge build",
@@ -32,7 +32,7 @@
     "@layerzerolabs/oapp-evm": "^0.3.2",
     "@openzeppelin/merkle-tree": "^1.0.8",
     "@prb/test": "^0.6.4",
-    "@towns-protocol/prettier-config": "^0.0.306",
+    "@towns-protocol/prettier-config": "^0.0.307",
     "@wagmi/cli": "^2.2.0",
     "account-abstraction": "https://github.com/eth-infinitism/account-abstraction/archive/refs/tags/v0.7.0.tar.gz",
     "forge-std": "github:foundry-rs/forge-std#v1.10.0",
@@ -53,5 +53,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "439633cf1571af6312b1cda88b578853be38afc4"
+  "gitHead": "43c43f1806bf74ad2836210d93b7e007d8a607ce"
 }

package/scripts/deployments/utils/DeployTownsBase.s.sol

@@ -11,7 +11,6 @@ import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.s
 import {Deployer} from "scripts/common/Deployer.s.sol";
 import {Towns} from "src/tokens/towns/base/Towns.sol";
 import {TownsDeployer} from "src/tokens/towns/base/TownsDeployer.sol";
-import {TownsDeployer} from "src/tokens/towns/base/TownsDeployer.sol";
 import {MockTowns} from "test/mocks/MockTowns.sol";
 import {MockTownsDeployer} from "test/mocks/MockTownsDeployer.sol";
 
@@ -24,21 +23,23 @@ contract DeployTownsBase is Deployer {
         return "utils/towns";
     }
 
-    function __deploy(address deployer) internal override returns (address) {
+    function __deploy(address deployer) internal override returns (address proxy) {
         (implSalt, proxySalt) = _getSalts();
 
         address vault = _getVault(deployer);
-        address proxy = _proxyAddress(_implAddress(implSalt), proxySalt, l1Token, vault);
-
-        vm.startBroadcast(deployer);
-        if (isAnvil()) {
-            new MockTownsDeployer(l1Token, vault, implSalt, proxySalt);
+        proxy = _proxyAddress(_implAddress(implSalt), proxySalt, l1Token, vault);
+
+        if (!isTesting()) {
+            vm.broadcast(deployer);
+            if (isAnvil()) {
+                new MockTownsDeployer(l1Token, vault, implSalt, proxySalt);
+            } else {
+                new TownsDeployer(l1Token, vault, implSalt, proxySalt);
+            }
         } else {
-            new TownsDeployer(l1Token, vault, implSalt, proxySalt);
+            vm.prank(deployer);
+            new MockTownsDeployer(l1Token, vault, implSalt, proxySalt);
         }
-        vm.stopBroadcast();
-
-        return proxy;
     }
 
     function _implAddress(bytes32 salt) internal view returns (address impl) {
@@ -55,12 +56,9 @@ contract DeployTownsBase is Deployer {
         address remoteToken,
         address owner
     ) internal pure returns (address proxy) {
-        bytes memory byteCode = abi.encodePacked(
+        bytes memory byteCode = bytes.concat(
             type(ERC1967Proxy).creationCode,
-            abi.encode(
-                impl,
-                abi.encodePacked(Towns.initialize.selector, abi.encode(remoteToken, owner))
-            )
+            abi.encode(impl, abi.encodeCall(Towns.initialize, (remoteToken, owner)))
         );
 
         proxy = Create2Utils.computeCreate2Address(salt, byteCode);

package/scripts/interactions/InteractBaseAlpha.s.sol

@@ -22,7 +22,6 @@ contract InteractBaseAlpha is AlphaHelper {
     DeployRiverAirdrop deployRiverAirdrop = new DeployRiverAirdrop();
 
     function __interact(address deployer) internal override {
-        vm.setEnv("OVERRIDE_DEPLOYMENTS", "1");
         address space = getDeployment("space");
         address spaceOwner = getDeployment("spaceOwner");
         address spaceFactory = getDeployment("spaceFactory");

package/src/tokens/towns/base/TownsDeployer.sol

@@ -8,7 +8,7 @@ import {Create2Utils} from "../../../utils/libraries/Create2Utils.sol";
 
 // contracts
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
-import {Towns} from "src/tokens/towns/base/Towns.sol";
+import {Towns} from "./Towns.sol";
 
 contract TownsDeployer {
     constructor(address l1Token, address owner, bytes32 implementationSalt, bytes32 proxySalt) {
@@ -18,12 +18,9 @@ contract TownsDeployer {
         );
 
         // Create proxy initialization bytecode
-        bytes memory proxyBytecode = abi.encodePacked(
+        bytes memory proxyBytecode = bytes.concat(
             type(ERC1967Proxy).creationCode,
-            abi.encode(
-                implementation,
-                abi.encodePacked(Towns.initialize.selector, abi.encode(l1Token, owner))
-            )
+            abi.encode(implementation, abi.encodeCall(Towns.initialize, (l1Token, owner)))
         );
 
         // Deploy proxy using create2