remove referrals from membership and space (#281)

Proposal: https://testnets.llama.xyz/orgs/river/base-sepolia/actions/138
river-build · Jun 28, 2024 · 29c7687 · 29c7687
1 parent 6ef5d47
commit 29c7687
Show file tree

Hide file tree

Showing 29 changed files with 28 additions and 695 deletions.
diff --git a/contracts/scripts/deployments/facets/DeployMembership.s.sol b/contracts/scripts/deployments/facets/DeployMembership.s.sol
@@ -18,7 +18,6 @@ contract DeployMembership is Deployer, FacetHelper {
 
     // Minting
     addSelector(IMembership.joinSpace.selector);
-    addSelector(IMembership.joinSpaceWithReferral.selector);
     addSelector(IMembership.renewMembership.selector);
 
     addSelector(IMembership.expiresAt.selector);

diff --git a/contracts/src/spaces/facets/membership/IMembership.sol b/contracts/src/spaces/facets/membership/IMembership.sol
@@ -75,18 +75,6 @@ interface IMembership is IMembershipBase {
    */
   function joinSpace(address receiver) external payable;
 
-  /**
-   * @notice Join a space with a referral
-   * @param receiver The address of the receiver
-   * @param referrer The address of the referrer
-   * @param referralCode The referral code
-   */
-  function joinSpaceWithReferral(
-    address receiver,
-    address referrer,
-    uint256 referralCode
-  ) external payable;
-
   /**
    * @notice Renew a space membership
    * @param tokenId The token id of the membership

diff --git a/contracts/src/spaces/facets/membership/MembershipFacet.sol b/contracts/src/spaces/facets/membership/MembershipFacet.sol
@@ -29,7 +29,6 @@ import {EntitlementGated} from "contracts/src/spaces/facets/gated/EntitlementGat
 contract MembershipFacet is
   IMembership,
   MembershipBase,
-  MembershipReferralBase,
   ERC5643Base,
   ReentrancyGuard,
   ERC721A,
@@ -196,51 +195,6 @@ contract MembershipFacet is
     emit MembershipTokenIssued(receiver, tokenId);
   }
 
-  /// @inheritdoc IMembership
-  function joinSpaceWithReferral(
-    address receiver,
-    address referrer,
-    uint256 referralCode
-  ) external payable nonReentrant {
-    _validateJoinSpace(receiver);
-
-    // get token id
-    uint256 tokenId = _nextTokenId();
-
-    // allocate protocol, membership and referral fees
-    uint256 membershipPrice = _getMembershipPrice(_totalSupply());
-
-    if (membershipPrice > 0) {
-      // set renewal price for referral
-      _setMembershipRenewalPrice(tokenId, membershipPrice);
-
-      uint256 protocolFee = _collectProtocolFee(receiver, membershipPrice);
-      uint256 surplus = membershipPrice - protocolFee;
-      address currency = _getMembershipCurrency();
-
-      if (surplus > 0) {
-        // calculate referral fee from net membership price
-        uint256 referralFee = _calculateReferralAmount(surplus, referralCode);
-        CurrencyTransfer.transferCurrency(
-          currency,
-          receiver,
-          referrer,
-          referralFee
-        );
-
-        // transfer remaining amount to fee recipient
-        uint256 recipientFee = surplus - referralFee;
-        if (recipientFee > 0) _transferIn(receiver, recipientFee);
-      }
-    }
-
-    // mint membership
-    _safeMint(receiver, 1);
-
-    // set expiration of membership
-    _renewSubscription(tokenId, _getMembershipDuration());
-  }
-
   // =============================================================
   //                           Renewal
   // =============================================================

diff --git a/contracts/test/spaces/membership/MembershipBaseSetup.sol b/contracts/test/spaces/membership/MembershipBaseSetup.sol
@@ -168,21 +168,4 @@ contract MembershipBaseSetup is
     referrals.createReferralCode(REFERRAL_CODE, REFERRAL_BPS);
     _;
   }
-
-  modifier givenAliceHasMintedReferralMembership() {
-    vm.prank(alice);
-    membership.joinSpaceWithReferral(alice, bob, REFERRAL_CODE);
-    _;
-  }
-
-  modifier givenAliceHasPaidReferralMembership() {
-    vm.prank(alice);
-    vm.deal(alice, MEMBERSHIP_PRICE);
-    membership.joinSpaceWithReferral{value: MEMBERSHIP_PRICE}(
-      alice,
-      bob,
-      REFERRAL_CODE
-    );
-    _;
-  }
 }
diff --git a/contracts/test/spaces/membership/unit/MembershipJoinSpaceReferral.t.sol b/contracts/test/spaces/membership/unit/MembershipJoinSpaceReferral.t.sol
diff --git a/packages/generated/dev/abis/Architect.bin b/packages/generated/dev/abis/Architect.bin
diff --git a/packages/generated/dev/abis/Architect.json b/packages/generated/dev/abis/Architect.json
diff --git a/packages/generated/dev/abis/Architect.metadata.json b/packages/generated/dev/abis/Architect.metadata.json
@@ -928,10 +928,10 @@
       "license": "MIT"
     },
     "contracts/src/spaces/facets/membership/IMembership.sol": {
-      "keccak256": "0x6412840e6051b909892e0ac881214235a18a290a39394a5462b54e0e0ab09a46",
+      "keccak256": "0x7fbf37c681ae95610ed376a30d68808b9da602a3225dbe1724dfe7c1c82de672",
       "urls": [
-        "bzz-raw://0a9a2be307336fd760d84d2adddf25a8ea10398672fb1447a299118649a9a544",
-        "dweb:/ipfs/QmR9553MSLHUw7mSN6M5dEuLBVfUb5g6tGoY6Xv7sGWaRs"
+        "bzz-raw://afa8d56cca2d01883595cfbd1a6aa3b63202ed25fb56ac1e57d3cf645665dd77",
+        "dweb:/ipfs/QmbLF87ZZCovJn3enbs78mcJu39zXi8FYum72fTufZt3e4"
       ],
       "license": "MIT"
     },

diff --git a/packages/generated/dev/abis/Channels.json b/packages/generated/dev/abis/Channels.json
diff --git a/packages/generated/dev/abis/EntitlementsManager.json b/packages/generated/dev/abis/EntitlementsManager.json