@towns-protocol/contracts 0.0.410 → 0.0.412

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towns-protocol/contracts",
-  "version": "0.0.410",
+  "version": "0.0.412",
   "scripts": {
     "clean": "forge clean",
     "compile": "forge build",
@@ -33,7 +33,7 @@
     "@layerzerolabs/oapp-evm": "^0.3.2",
     "@openzeppelin/merkle-tree": "^1.0.8",
     "@prb/test": "^0.6.4",
-    "@towns-protocol/prettier-config": "^0.0.410",
+    "@towns-protocol/prettier-config": "^0.0.412",
     "@wagmi/cli": "^2.2.0",
     "forge-std": "github:foundry-rs/forge-std#v1.10.0",
     "prettier": "^3.5.3",
@@ -53,5 +53,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "171a29333009f68329eb75bdd4b8d8f4983e4007"
+  "gitHead": "faf36d126bdccd3c15bd910d1021c04627e92961"
 }

package/src/factory/facets/wallet-link/WalletLinkBase.sol

@@ -209,9 +209,10 @@ abstract contract WalletLinkBase is IWalletLinkBase, EIP712Base, Nonces {
             revert WalletLink__NotLinked(walletToRemove, rootWallet.addr);
         }
 
-        // Check that the wallet is not the default wallet
+        // If the wallet is the default wallet, unset it before removal
         if (ds.rootWalletByRootKey[rootWallet.addr].defaultWallet == walletToRemove) {
-            revert WalletLink__CannotRemoveDefaultWallet();
+            ds.rootWalletByRootKey[rootWallet.addr].defaultWallet = address(0);
+            emit SetDefaultWallet(rootWallet.addr, address(0));
         }
 
         // Verify that the root wallet signature contains the correct nonce and the correct wallet
@@ -246,9 +247,10 @@ abstract contract WalletLinkBase is IWalletLinkBase, EIP712Base, Nonces {
             revert WalletLink__NotLinked(walletToRemove, rootWallet);
         }
 
-        // check that the default wallet is not the wallet to remove
+        // If the wallet is the default wallet, unset it before removal
         if (ds.rootWalletByRootKey[rootWallet].defaultWallet == walletToRemove) {
-            revert WalletLink__CannotRemoveDefaultWallet();
+            ds.rootWalletByRootKey[rootWallet].defaultWallet = address(0);
+            emit SetDefaultWallet(rootWallet, address(0));
         }
 
         // Remove the link in the walletToRemove to root keys map

package/src/spaces/facets/membership/MembershipBase.sol

@@ -190,11 +190,18 @@ abstract contract MembershipBase is IMembershipBase {
 
         uint256 minFee = platform.getMembershipFee();
         uint256 renewalPrice = $.renewalPriceByTokenId[tokenId];
+        uint256 currentPrice = _getMembershipPrice(totalSupply);
 
-        if (renewalPrice != 0) return FixedPointMathLib.max(renewalPrice, minFee);
+        // If no stored renewal price, use current price
+        if (renewalPrice == 0) {
+            return FixedPointMathLib.max(currentPrice, minFee);
+        }
 
-        uint256 price = _getMembershipPrice(totalSupply);
-        return FixedPointMathLib.max(price, minFee);
+        // Use the LOWER of stored renewal price or current price
+        // This ensures users benefit from price drops (including free transitions)
+        // while maintaining their locked-in rate if prices increase
+        uint256 effectivePrice = FixedPointMathLib.min(renewalPrice, currentPrice);
+        return FixedPointMathLib.max(effectivePrice, minFee);
     }
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/