@towns-protocol/contracts 0.0.359 → 0.0.361

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towns-protocol/contracts",
-  "version": "0.0.359",
+  "version": "0.0.361",
   "packageManager": "yarn@3.8.0",
   "scripts": {
     "build-types": "bash scripts/build-contract-types.sh",
@@ -23,10 +23,10 @@
     "@openzeppelin/contracts-upgradeable": "^5.4.0",
     "@prb/math": "^4.1.0",
     "@towns-protocol/diamond": "^0.6.3",
-    "@uniswap/permit2": "https://github.com/towns-protocol/permit2/archive/refs/tags/v1.0.0.tar.gz",
-    "account-abstraction": "https://github.com/eth-infinitism/account-abstraction/archive/refs/tags/v0.7.0.tar.gz",
-    "crypto-lib": "https://github.com/towns-protocol/crypto-lib/archive/refs/tags/v1.0.0.tar.gz",
-    "modular-account": "https://github.com/towns-protocol/modular-account/archive/refs/tags/v1.0.0.tar.gz",
+    "@uniswap/permit2": "github:towns-protocol/permit2#v1.0.0",
+    "account-abstraction": "github:eth-infinitism/account-abstraction#v0.7.0",
+    "crypto-lib": "github:towns-protocol/crypto-lib#v1.0.1",
+    "modular-account": "github:towns-protocol/modular-account#v1.0.0",
     "solady": "^0.1.24"
   },
   "devDependencies": {
@@ -35,15 +35,15 @@
     "@layerzerolabs/oapp-evm": "^0.3.2",
     "@openzeppelin/merkle-tree": "^1.0.8",
     "@prb/test": "^0.6.4",
-    "@towns-protocol/prettier-config": "^0.0.359",
-    "@typechain/ethers-v5": "^10.1.1",
+    "@towns-protocol/prettier-config": "^0.0.361",
+    "@typechain/ethers-v5": "^11.1.2",
     "@wagmi/cli": "^2.2.0",
     "forge-std": "github:foundry-rs/forge-std#v1.10.0",
     "prettier": "^3.5.3",
     "prettier-plugin-solidity": "^1.4.2",
     "solhint": "^5.0.5",
     "solidity-bytes-utils": "^0.8.4",
-    "typechain": "^8.1.1"
+    "typechain": "^8.3.2"
   },
   "files": [
     "docs/**/*",
@@ -57,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eaa0db40087afae546708c9a8846d9e5b35cda9a"
+  "gitHead": "601c0fa728a8738f2fd558d7084a78f477af1c08"
 }

package/scripts/deployments/diamonds/DeploySubscriptionModule.s.sol

@@ -1,6 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.23;
 
+// interfaces
+import {IDiamondInitHelper} from "./IDiamondInitHelper.sol";
+
 // libraries
 import {DeployDiamondCut} from "@towns-protocol/diamond/scripts/deployments/facets/DeployDiamondCut.sol";
 import {DeployDiamondLoupe} from "@towns-protocol/diamond/scripts/deployments/facets/DeployDiamondLoupe.sol";
@@ -19,7 +22,7 @@ import {DiamondHelper} from "@towns-protocol/diamond/scripts/common/helpers/Diam
 import {DeployFacet} from "../../common/DeployFacet.s.sol";
 import {Deployer} from "../../common/Deployer.s.sol";
 
-contract DeploySubscriptionModule is DiamondHelper, Deployer {
+contract DeploySubscriptionModule is DiamondHelper, Deployer, IDiamondInitHelper {
     using LibString for string;
 
     DeployFacet private facetHelper = new DeployFacet();
@@ -30,6 +33,32 @@ contract DeploySubscriptionModule is DiamondHelper, Deployer {
         return "subscriptionModule";
     }
 
+    function diamondInitHelper(
+        address deployer,
+        string[] memory facetNames
+    ) external override returns (FacetCut[] memory) {
+        // Queue up all requested facets for batch deployment
+        for (uint256 i; i < facetNames.length; ++i) {
+            facetHelper.add(facetNames[i]);
+        }
+
+        // Deploy all requested facets in a single batch transaction
+        facetHelper.deployBatch(deployer);
+
+        for (uint256 i; i < facetNames.length; ++i) {
+            string memory facetName = facetNames[i];
+            address facet = facetHelper.getDeployedAddress(facetName);
+
+            if (facetName.eq("SubscriptionModuleFacet")) {
+                addCut(
+                    makeCut(facet, FacetCutAction.Add, DeploySubscriptionModuleFacet.selectors())
+                );
+            }
+        }
+
+        return baseFacets();
+    }
+
     function diamondInitParams(address deployer) public returns (Diamond.InitParams memory) {
         // Queue up feature facets for batch deployment
         facetHelper.add("MultiInit");

package/scripts/interactions/InteractBaseAlpha.s.sol

@@ -12,6 +12,7 @@ import {DeploySpace} from "scripts/deployments/diamonds/DeploySpace.s.sol";
 import {DeploySpaceFactory} from "scripts/deployments/diamonds/DeploySpaceFactory.s.sol";
 import {DeploySpaceOwner} from "scripts/deployments/diamonds/DeploySpaceOwner.s.sol";
 import {DeployAppRegistry} from "scripts/deployments/diamonds/DeployAppRegistry.s.sol";
+import {DeploySubscriptionModule} from "scripts/deployments/diamonds/DeploySubscriptionModule.s.sol";
 import {AlphaHelper} from "scripts/interactions/helpers/AlphaHelper.sol";
 
 contract InteractBaseAlpha is AlphaHelper {
@@ -21,6 +22,7 @@ contract InteractBaseAlpha is AlphaHelper {
     DeploySpaceOwner deploySpaceOwner = new DeploySpaceOwner();
     DeployRiverAirdrop deployRiverAirdrop = new DeployRiverAirdrop();
     DeployAppRegistry deployAppRegistry = new DeployAppRegistry();
+    DeploySubscriptionModule deploySubscriptionModule = new DeploySubscriptionModule();
 
     function __interact(address deployer) internal override {
         vm.pauseGasMetering();
@@ -31,6 +33,7 @@ contract InteractBaseAlpha is AlphaHelper {
         address baseRegistry = getDeployment("baseRegistry");
         address riverAirdrop = getDeployment("riverAirdrop");
         address appRegistry = getDeployment("appRegistry");
+        address subscriptionModule = getDeployment("subscriptionModule");
 
         executeDiamondCutsWithLogging(deployer, space, "Space", deploySpace);
         executeDiamondCutsWithLogging(deployer, spaceOwner, "SpaceOwner", deploySpaceOwner);
@@ -49,6 +52,12 @@ contract InteractBaseAlpha is AlphaHelper {
         executeDiamondCutsWithLogging(deployer, baseRegistry, "BaseRegistry", deployBaseRegistry);
         executeDiamondCutsWithLogging(deployer, riverAirdrop, "RiverAirdrop", deployRiverAirdrop);
         executeDiamondCutsWithLogging(deployer, appRegistry, "AppRegistry", deployAppRegistry);
+        executeDiamondCutsWithLogging(
+            deployer,
+            subscriptionModule,
+            "SubscriptionModule",
+            deploySubscriptionModule
+        );
 
         vm.resumeGasMetering();
     }

package/src/apps/modules/subscription/ISubscriptionModule.sol

@@ -49,7 +49,8 @@ interface ISubscriptionModuleBase {
         uint32 indexed entityId,
         address indexed space,
         uint256 tokenId,
-        uint64 nextRenewalTime
+        uint64 nextRenewalTime,
+        uint256 expiresAt
     );
 
     event SubscriptionDeactivated(address indexed account, uint32 indexed entityId);
@@ -66,7 +67,10 @@ interface ISubscriptionModuleBase {
     event SubscriptionRenewed(
         address indexed account,
         uint32 indexed entityId,
-        uint256 nextRenewalTime
+        address indexed space,
+        uint256 tokenId,
+        uint256 nextRenewalTime,
+        uint256 expiresAt
     );
 
     /// @notice Emitted when a subscription's next renewal time is synced to on-chain expiration

package/src/apps/modules/subscription/SubscriptionModuleFacet.sol

@@ -95,7 +95,14 @@ contract SubscriptionModuleFacet is
         sub.installTime = uint40(block.timestamp);
         sub.nextRenewalTime = _calculateNextRenewalTime(expiresAt, sub.installTime);
 
-        emit SubscriptionConfigured(msg.sender, entityId, space, tokenId, sub.nextRenewalTime);
+        emit SubscriptionConfigured(
+            msg.sender,
+            entityId,
+            space,
+            tokenId,
+            sub.nextRenewalTime,
+            expiresAt
+        );
     }
 
     /// @inheritdoc IModule
@@ -385,7 +392,15 @@ contract SubscriptionModuleFacet is
         sub.lastRenewalTime = uint40(block.timestamp);
         sub.spent += actualRenewalPrice;
 
-        emit SubscriptionRenewed(params.account, params.entityId, sub.nextRenewalTime);
+        emit SubscriptionRenewed(
+            params.account,
+            params.entityId,
+            sub.space,
+            sub.tokenId,
+            sub.nextRenewalTime,
+            newExpiresAt
+        );
+        emit SubscriptionSpent(params.account, params.entityId, actualRenewalPrice, sub.spent);
     }
 
     /// @dev Determines the appropriate renewal buffer time based on original membership duration