Optimize buyer creation (#885)

bosonprotocol · Jan 9, 2024 · d7d16e6 · d7d16e6
1 parent 71e80a8
commit d7d16e6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/contracts/protocol/bases/BuyerBase.sol b/contracts/protocol/bases/BuyerBase.sol
@@ -28,15 +28,9 @@ contract BuyerBase is ProtocolBase, IBosonAccountEvents {
         //Check for zero address
         if (_buyer.wallet == address(0)) revert InvalidAddress();
 
-        //Check active is not set to false
-        if (!_buyer.active) revert MustBeActive();
-
         // Get the next account id and increment the counter
         uint256 buyerId = protocolCounters().nextAccountId++;
 
-        //check that the wallet address is unique to one buyer id
-        if (protocolLookups().buyerIdByWallet[_buyer.wallet] != 0) revert BuyerAddressMustBeUnique();
-
         _buyer.id = buyerId;
         storeBuyer(_buyer);
 

diff --git a/contracts/protocol/facets/BuyerHandlerFacet.sol b/contracts/protocol/facets/BuyerHandlerFacet.sol
@@ -34,6 +34,12 @@ contract BuyerHandlerFacet is BuyerBase {
      * @param _buyer - the fully populated struct with buyer id set to 0x0
      */
     function createBuyer(Buyer memory _buyer) external buyersNotPaused nonReentrant {
+        //Check active is not set to false
+        if (!_buyer.active) revert MustBeActive();
+
+        //check that the wallet address is unique to one buyer id
+        if (protocolLookups().buyerIdByWallet[_buyer.wallet] != 0) revert BuyerAddressMustBeUnique();
+
         createBuyerInternal(_buyer);
     }