@artblocks/contracts 1.0.4 → 1.1.0

package/contracts/interfaces/v0.8.x/ICoreRegistryV1.sol

@@ -6,22 +6,20 @@ import "./IEngineRegistryV0.sol";
 
 interface ICoreRegistryV1 is IEngineRegistryV0 {
     function registerContracts(
-        address[] calldata _contractAddresses,
-        bytes32[] calldata _coreVersions,
-        bytes32[] calldata _coreTypes
+        address[] calldata contractAddresses,
+        bytes32[] calldata coreVersions,
+        bytes32[] calldata coreTypes
     ) external;
 
-    function unregisterContracts(
-        address[] calldata _contractAddresses
-    ) external;
+    function unregisterContracts(address[] calldata contractAddresses) external;
 
     function getNumRegisteredContracts() external view returns (uint256);
 
     function getRegisteredContractAt(
-        uint256 _index
+        uint256 index
     ) external view returns (address);
 
     function isRegisteredContract(
-        address _contractAddress
+        address contractAddress
     ) external view returns (bool isRegistered);
 }

package/contracts/interfaces/v0.8.x/IDependencyRegistryV0.sol

@@ -18,8 +18,11 @@ interface IDependencyRegistryV0 {
         uint256 indexed _projectId
     );
 
+    event LicenseTypeAdded(bytes32 indexed _licenseType);
+
     event DependencyAdded(
         bytes32 indexed _dependencyType,
+        bytes32 indexed _licenseType,
         string _preferredCDN,
         string _preferredRepository,
         string _referenceWebsite

package/contracts/interfaces/v0.8.x/IMinterFilterV1.sol

@@ -93,55 +93,55 @@ interface IMinterFilterV1 {
     }
 
     function setMinterForProject(
-        uint256 _projectId,
-        address _coreContract,
-        address _minter
+        uint256 projectId,
+        address coreContract,
+        address minter
     ) external;
 
     function removeMinterForProject(
-        uint256 _projectId,
-        address _coreContract
+        uint256 projectId,
+        address coreContract
     ) external;
 
     // @dev function name is optimized for gas
     function mint_joo(
-        address _to,
-        uint256 _projectId,
-        address _coreContract,
-        address _sender
+        address to,
+        uint256 projectId,
+        address coreContract,
+        address sender
     ) external returns (uint256);
 
-    function updateCoreRegistry(address _coreRegistry) external;
+    function updateCoreRegistry(address coreRegistry) external;
 
     /**
-     * @notice Returns if `_sender` is allowed to call function on `_contract`
-     * with `_selector` selector, according to the MinterFilter's Admin ACL.
+     * @notice Returns if `sender` is allowed to call function on `contract`
+     * with `selector` selector, according to the MinterFilter's Admin ACL.
      */
     function adminACLAllowed(
-        address _sender,
-        address _contract,
-        bytes4 _selector
+        address sender,
+        address contract_,
+        bytes4 selector
     ) external returns (bool);
 
     function minterFilterType() external pure returns (string memory);
 
     function getMinterForProject(
-        uint256 _projectId,
-        address _coreContract
+        uint256 projectId,
+        address coreContract
     ) external view returns (address);
 
     function projectHasMinter(
-        uint256 _projectId,
-        address _coreContract
+        uint256 projectId,
+        address coreContract
     ) external view returns (bool);
 
     /**
      * @notice View that returns if a core contract is registered with the
      * core registry, allowing this minter filter to service it.
-     * @param _coreContract core contract address to be checked
+     * @param coreContract core contract address to be checked
      */
     function isRegisteredCoreContract(
-        address _coreContract
+        address coreContract
     ) external view returns (bool);
 
     /// Address of current core registry contract
@@ -152,12 +152,12 @@ interface IMinterFilterV1 {
 
     /// The quantity of projects on a core contract that have assigned minters
     function getNumProjectsOnContractWithMinters(
-        address _coreContract
+        address coreContract
     ) external view returns (uint256);
 
     function getProjectAndMinterInfoOnContractAt(
-        address _coreContract,
-        uint256 _index
+        address coreContract,
+        uint256 index
     )
         external
         view
@@ -173,7 +173,7 @@ interface IMinterFilterV1 {
         returns (MinterWithType[] memory mintersWithTypes);
 
     function getAllContractApprovedMinters(
-        address _coreContract
+        address coreContract
     ) external view returns (MinterWithType[] memory mintersWithTypes);
 
     /**

package/contracts/interfaces/v0.8.x/ISharedMinterDAExpSettlementV0.sol

@@ -5,33 +5,24 @@ pragma solidity ^0.8.0;
 import "./ISharedMinterDAExpV0.sol";
 
 interface ISharedMinterDAExpSettlementV0 is ISharedMinterDAExpV0 {
-    /// receipt has an updated state
-    event ReceiptUpdated(
-        address indexed _purchaser,
-        uint256 indexed _projectId,
-        address indexed _coreContract,
-        uint24 _numPurchased,
-        uint256 _netPosted
-    );
-
-    /// returns latest purchase price for project `_projectId`, or 0 if no
+    /// returns latest purchase price for project `projectId`, or 0 if no
     /// purchases have been made.
     function getProjectLatestPurchasePrice(
-        uint256 _projectId,
-        address _coreContract
+        uint256 projectId,
+        address coreContract
     ) external view returns (uint256 latestPurchasePrice);
 
-    /// returns the number of settleable invocations for project `_projectId`.
+    /// returns the number of settleable invocations for project `projectId`.
     function getNumSettleableInvocations(
-        uint256 _projectId,
-        address _coreContract
+        uint256 projectId,
+        address coreContract
     ) external view returns (uint256 numSettleableInvocations);
 
-    /// Returns the current excess settlement funds on project `_projectId`
-    /// for address `_walletAddress`.
+    /// Returns the current excess settlement funds on project `projectId`
+    /// for address `walletAddress`.
     function getProjectExcessSettlementFunds(
-        uint256 _projectId,
-        address _coreContract,
-        address _walletAddress
+        uint256 projectId,
+        address coreContract,
+        address walletAddress
     ) external view returns (uint256 excessSettlementFundsInWei);
 }

package/contracts/interfaces/v0.8.x/ISharedMinterDAExpV0.sol

@@ -4,22 +4,9 @@
 pragma solidity ^0.8.0;
 
 interface ISharedMinterDAExpV0 {
-    event SetAuctionDetailsExp(
-        uint256 indexed _projectId,
-        address indexed _coreContract,
-        uint40 _auctionTimestampStart,
-        uint40 _priceDecayHalfLifeSeconds,
-        uint256 _startPrice,
-        uint256 _basePrice
-    );
-    /// Minimum allowed price decay half life seconds updated.
-    event AuctionMinHalfLifeSecondsUpdated(
-        uint256 _minimumPriceDecayHalfLifeSeconds
-    );
-
     function minimumPriceDecayHalfLifeSeconds() external view returns (uint256);
 
     function setMinimumPriceDecayHalfLifeSeconds(
-        uint256 _minimumPriceDecayHalfLifeSeconds
+        uint256 minimumPriceDecayHalfLifeSeconds
     ) external;
 }

package/contracts/interfaces/v0.8.x/ISharedMinterDALinV0.sol

@@ -4,23 +4,9 @@
 pragma solidity ^0.8.0;
 
 interface ISharedMinterDALinV0 {
-    event SetAuctionDetailsLin(
-        uint256 indexed _projectId,
-        address indexed _coreContract,
-        uint40 _auctionTimestampStart,
-        uint40 _auctionTimestampEnd,
-        uint256 _startPrice,
-        uint256 _basePrice
-    );
-
-    /// Minimum allowed auction length updated
-    event AuctionMinimumLengthSecondsUpdated(
-        uint256 _minimumAuctionLengthSeconds
-    );
-
     function minimumAuctionLengthSeconds() external view returns (uint256);
 
     function setMinimumAuctionLengthSeconds(
-        uint256 _minimumAuctionLengthSeconds
+        uint256 minimumAuctionLengthSeconds
     ) external;
 }

package/contracts/interfaces/v0.8.x/ISharedMinterDAV0.sol

@@ -4,16 +4,10 @@
 pragma solidity ^0.8.0;
 
 interface ISharedMinterDAV0 {
-    /// Auction details cleared for project `projectId`.
-    event ResetAuctionDetails(
-        uint256 indexed _projectId,
-        address indexed _coreContract
-    );
-
     // @dev return variables left unnamed because specific minter
     // implementations may return different values for the same slots
     function projectAuctionParameters(
-        uint256 _projectId,
-        address _coreContract
+        uint256 projectId,
+        address coreContract
     ) external view returns (uint40, uint40, uint256, uint256);
 }

package/contracts/interfaces/v0.8.x/ISharedMinterHolderERC20V0.sol

@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: LGPL-3.0-only
+// Created By: Art Blocks Inc.
+
+pragma solidity ^0.8.0;
+
+/**
+ * @title This interface adds support for including token holder gating when purchasing with ERC20 tokens.
+ * @author Art Blocks Inc.
+ */
+interface ISharedMinterHolderERC20V0 {
+    // Triggers a purchase of a token from the desired project, to the
+    // TX-sending address, using owned ERC-721 NFT to claim right to purchase.
+    function purchase(
+        uint256 projectId,
+        address coreContract,
+        uint256 maxPricePerToken,
+        address currencyAddress,
+        address ownedNFTAddress,
+        uint256 ownedNFTTokenId
+    ) external returns (uint256 tokenId);
+
+    // Triggers a purchase of a token from the desired project, to the specified
+    // receiving address, using owned ERC-721 NFT to claim right to purchase.
+    function purchaseTo(
+        address to,
+        uint256 projectId,
+        address coreContract,
+        uint256 maxPricePerToken,
+        address currencyAddress,
+        address ownedNFTAddress,
+        uint256 ownedNFTTokenId
+    ) external returns (uint256 tokenId);
+
+    // Triggers a purchase of a token from the desired project, on behalf of
+    // the provided vault, to the specified receiving address, using owned
+    // ERC-721 NFT to claim right to purchase.
+    function purchaseTo(
+        address to,
+        uint256 projectId,
+        address coreContract,
+        uint256 maxPricePerToken,
+        address currencyAddress,
+        address ownedNFTAddress,
+        uint256 ownedNFTTokenId,
+        address vault
+    ) external returns (uint256 tokenId);
+}

package/contracts/interfaces/v0.8.x/ISharedMinterHolderV0.sol

@@ -8,62 +8,34 @@ pragma solidity ^0.8.0;
  * @author Art Blocks Inc.
  */
 interface ISharedMinterHolderV0 {
-    event DelegationRegistryUpdated(address delegationRegistry);
-    /**
-     * @notice Allow holders of NFTs at addresses `_ownedNFTAddresses`, project
-     * IDs `_ownedNFTProjectIds` to mint on project `_projectId`.
-     * `_ownedNFTAddresses` assumed to be aligned with `_ownedNFTProjectIds`.
-     * e.g. Allows holders of project `_ownedNFTProjectIds[0]` on token
-     * contract `_ownedNFTAddresses[0]` to mint.
-     */
-    event AllowedHoldersOfProjects(
-        uint256 indexed _projectId,
-        address indexed _coreContract,
-        address[] _ownedNFTAddresses,
-        uint256[] _ownedNFTProjectIds
-    );
-    /**
-     * @notice Remove holders of NFTs at addresses `_ownedNFTAddresses`,
-     * project IDs `_ownedNFTProjectIds` to mint on project `_projectId`.
-     * `_ownedNFTAddresses` assumed to be aligned with `_ownedNFTProjectIds`.
-     * e.g. Removes holders of project `_ownedNFTProjectIds[0]` on token
-     * contract `_ownedNFTAddresses[0]` from mint allowlist.
-     */
-    event RemovedHoldersOfProjects(
-        uint256 indexed _projectId,
-        address indexed _coreContract,
-        address[] _ownedNFTAddresses,
-        uint256[] _ownedNFTProjectIds
-    );
-
     // Triggers a purchase of a token from the desired project, to the
     // TX-sending address, using owned ERC-721 NFT to claim right to purchase.
     function purchase(
-        uint256 _projectId,
-        address _coreContract,
-        address _ownedNFTAddress,
-        uint256 _ownedNFTTokenId
+        uint256 projectId,
+        address coreContract,
+        address ownedNFTAddress,
+        uint256 ownedNFTTokenId
     ) external payable returns (uint256 tokenId);
 
     // Triggers a purchase of a token from the desired project, to the specified
     // receiving address, using owned ERC-721 NFT to claim right to purchase.
     function purchaseTo(
-        address _to,
-        uint256 _projectId,
-        address _coreContract,
-        address _ownedNFTAddress,
-        uint256 _ownedNFTTokenId
+        address to,
+        uint256 projectId,
+        address coreContract,
+        address ownedNFTAddress,
+        uint256 ownedNFTTokenId
     ) external payable returns (uint256 tokenId);
 
     // Triggers a purchase of a token from the desired project, on behalf of
     // the provided vault, to the specified receiving address, using owned
     // ERC-721 NFT to claim right to purchase.
     function purchaseTo(
-        address _to,
-        uint256 _projectId,
-        address _coreContract,
-        address _ownedNFTAddress,
-        uint256 _ownedNFTTokenId,
-        address _vault
+        address to,
+        uint256 projectId,
+        address coreContract,
+        address ownedNFTAddress,
+        uint256 ownedNFTTokenId,
+        address vault
     ) external payable returns (uint256 tokenId);
 }

package/contracts/interfaces/v0.8.x/ISharedMinterMerkleV0.sol

@@ -8,37 +8,27 @@ pragma solidity ^0.8.0;
  * @author Art Blocks Inc.
  */
 interface ISharedMinterMerkleV0 {
-    /**
-     * @notice Notifies of the contract's default maximum mints allowed per
-     * user for a given project, on this minter. This value can be overridden
-     * by the artist of any project at any time.
-     */
-    event DefaultMaxInvocationsPerAddress(
-        uint256 defaultMaxInvocationsPerAddress
-    );
-    event DelegationRegistryUpdated(address delegationRegistry);
-
     // Triggers a purchase of a token from the desired project, to the
     // TX-sending address. Requires Merkle proof.
     function purchase(
-        uint256 _projectId,
-        address _coreContract,
-        bytes32[] calldata _proof
+        uint256 projectId,
+        address coreContract,
+        bytes32[] calldata proof
     ) external payable returns (uint256 tokenId);
 
     // Triggers a purchase of a token from the desired project, to the specified
     // receiving address. Requires Merkle proof.
     function purchaseTo(
-        address _to,
-        uint256 _projectId,
-        address _coreContract,
-        bytes32[] calldata _proof
+        address to,
+        uint256 projectId,
+        address coreContract,
+        bytes32[] calldata proof
     ) external payable returns (uint256 tokenId);
 
     // Updates the Merkle root for the desired project.
     function updateMerkleRoot(
-        uint256 _projectId,
-        address _coreContract,
-        bytes32 _root
+        uint256 projectId,
+        address coreContract,
+        bytes32 root
     ) external;
 }

package/contracts/interfaces/v0.8.x/ISharedMinterSEAV0.sol

@@ -8,71 +8,8 @@ pragma solidity ^0.8.0;
  * @author Art Blocks Inc.
  */
 interface ISharedMinterSEAV0 {
-    /**
-     * @notice Minimum auction length, in seconds, was updated to be the
-     * provided value.
-     */
-    event MinAuctionDurationSecondsUpdated(uint256 minAuctionDurationSeconds);
-
-    /// Admin-controlled time buffer updated
-    event MinterTimeBufferUpdated(uint32 minterTimeBufferSeconds);
-
-    // Admin-controlled refund gas limit updated
-    event MinterRefundGasLimitUpdated(uint24 refundGasLimit);
-
-    /// Artist configured future auction details
-    event ConfiguredFutureAuctions(
-        uint256 indexed projectId,
-        address indexed coreContract,
-        uint64 timestampStart,
-        uint32 auctionDurationSeconds,
-        uint256 basePrice,
-        uint8 minBidIncrementPercentage
-    );
-
-    /// New token auction created, token created and sent to minter
-    event AuctionInitialized(
-        uint256 indexed tokenId,
-        address indexed coreContract,
-        address indexed bidder,
-        uint256 bidAmount,
-        uint64 endTime,
-        uint8 minBidIncrementPercentage
-    );
-
-    /// Successful bid placed on token auction
-    event AuctionBid(
-        uint256 indexed tokenId,
-        address indexed coreContract,
-        address indexed bidder,
-        uint256 bidAmount
-    );
-
-    /// Token auction was settled (token distributed to winner)
-    event AuctionSettled(
-        uint256 indexed tokenId,
-        address indexed coreContract,
-        address indexed winner,
-        uint256 price
-    );
-
-    /// Future auction details for project `projectId` reset
-    event ResetAuctionDetails(
-        uint256 indexed projectId,
-        address indexed coreContract
-    );
-
-    // Next token ID for project `projectId` updated
-    event ProjectNextTokenUpdated(
-        uint256 indexed projectId,
-        address indexed coreContract,
-        uint256 tokenId
-    );
-
-    // Next token ID for project `projectId` was ejected from the minter
-    // and is no longer populated
-    event ProjectNextTokenEjected(
-        uint256 indexed projectId,
-        address indexed coreContract
-    );
+    function createBid(
+        uint256 projectId,
+        address coreContract
+    ) external payable;
 }

package/contracts/interfaces/v0.8.x/ISharedMinterSimplePurchaseV0.sol

@@ -14,15 +14,15 @@ interface ISharedMinterSimplePurchaseV0 {
     // Triggers a purchase of a token from the desired project, to the
     // TX-sending address.
     function purchase(
-        uint256 _projectId,
-        address _coreContract
+        uint256 projectId,
+        address coreContract
     ) external payable returns (uint256 tokenId);
 
     // Triggers a purchase of a token from the desired project, to the specified
     // receiving address.
     function purchaseTo(
-        address _to,
-        uint256 _projectId,
-        address _coreContract
+        address to,
+        uint256 projectId,
+        address coreContract
     ) external payable returns (uint256 tokenId);
 }