@artblocks/contracts 1.0.3 → 1.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +32 -25
- package/artifacts/contracts/AdminACLV0.sol/AdminACLV0.json +2 -2
- package/artifacts/contracts/AdminACLV1.sol/AdminACLV1.json +2 -2
- package/artifacts/contracts/DependencyRegistryV0.sol/DependencyRegistryV0.json +212 -17
- package/artifacts/contracts/GenArt721CoreV3.sol/GenArt721CoreV3.json +6 -6
- package/artifacts/contracts/archive/minter-suite/Minters/MinterDAExp/MinterDAExpV0.sol/MinterDAExpV0.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterDAExp/MinterDAExpV1.sol/MinterDAExpV1.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterDAExp/MinterDAExpV2.sol/MinterDAExpV2.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterDAExp/MinterDAExpV3.sol/MinterDAExpV3.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterDAExpSettlement/MinterDAExpSettlementV0.sol/MinterDAExpSettlementV0.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterDAExpSettlement/MinterDAExpSettlementV1.sol/MinterDAExpSettlementV1.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterDALin/MinterDALinV0.sol/MinterDALinV0.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterDALin/MinterDALinV1.sol/MinterDALinV1.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterDALin/MinterDALinV2.sol/MinterDALinV2.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterDALin/MinterDALinV3.sol/MinterDALinV3.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterHolder/MinterHolderV0.sol/MinterHolderV0.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterHolder/MinterHolderV1.sol/MinterHolderV1.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterHolder/MinterHolderV2.sol/MinterHolderV2.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterHolder/MinterHolderV3.sol/MinterHolderV3.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterMerkle/MinterMerkleV0.sol/MinterMerkleV0.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterMerkle/MinterMerkleV1.sol/MinterMerkleV1.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterMerkle/MinterMerkleV2.sol/MinterMerkleV2.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterMerkle/MinterMerkleV3.sol/MinterMerkleV3.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterMerkle/MinterMerkleV4.sol/MinterMerkleV4.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterSetPrice/MinterSetPriceV0.sol/MinterSetPriceV0.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterSetPrice/MinterSetPriceV1.sol/MinterSetPriceV1.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterSetPrice/MinterSetPriceV2.sol/MinterSetPriceV2.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterSetPrice/MinterSetPriceV3.sol/MinterSetPriceV3.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterSetPriceERC20/MinterSetPriceERC20V0.sol/MinterSetPriceERC20V0.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterSetPriceERC20/MinterSetPriceERC20V1.sol/MinterSetPriceERC20V1.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterSetPriceERC20/MinterSetPriceERC20V2.sol/MinterSetPriceERC20V2.json +2 -2
- package/artifacts/contracts/archive/minter-suite/Minters/MinterSetPriceERC20/MinterSetPriceERC20V3.sol/MinterSetPriceERC20V3.json +2 -2
- package/artifacts/contracts/engine/V2/GenArt721CoreV2_ENGINE_FLEX.sol/GenArt721CoreV2_ENGINE_FLEX.json +2 -2
- package/artifacts/contracts/engine/V2/GenArt721CoreV2_PBAB.sol/GenArt721CoreV2_PBAB.json +2 -2
- package/artifacts/contracts/engine/V2/GenArt721CoreV2_PRTNR.sol/GenArt721CoreV2_PRTNR.json +2 -2
- package/artifacts/contracts/engine/V2/GenArt721MinterBurner_PBAB.sol/GenArt721MinterBurner_PBAB.json +2 -2
- package/artifacts/contracts/engine/V2/GenArt721MinterDAExp_PBAB.sol/GenArt721MinterDAExp_PBAB.json +2 -2
- package/artifacts/contracts/engine/V2/GenArt721Minter_PBAB.sol/GenArt721Minter_PBAB.json +2 -2
- package/artifacts/contracts/engine/V3/GenArt721CoreV3_Engine.sol/GenArt721CoreV3_Engine.json +6 -11
- package/artifacts/contracts/engine/V3/GenArt721CoreV3_Engine_Flex.sol/GenArt721CoreV3_Engine_Flex.json +6 -11
- package/artifacts/contracts/engine/V3/forks/GenArt721CoreV3_Engine_Flex_PROOF.sol/GenArt721CoreV3_Engine_Flex_PROOF.json +6 -11
- package/artifacts/contracts/engine/V3/forks/PROHIBITION/AdminACLV0_PROHIBITION.sol/AdminACLV0_PROHIBITION.json +2 -2
- package/artifacts/contracts/engine/V3/forks/PROHIBITION/GenArt721CoreV3_Engine_Flex_PROHIBITION.sol/GenArt721CoreV3_Engine_Flex_PROHIBITION.json +6 -11
- package/artifacts/contracts/engine-registry/CoreRegistryV1.sol/CoreRegistryV1.json +12 -12
- package/artifacts/contracts/engine-registry/EngineRegistryV0.sol/EngineRegistryV0.json +2 -2
- package/artifacts/contracts/explorations/GenArt721CoreV3_Explorations.sol/GenArt721CoreV3_Explorations.json +6 -6
- package/artifacts/contracts/interfaces/{0.5.x → v0.5.x}/IBonusContract.sol/IBonusContract.json +1 -1
- package/artifacts/contracts/interfaces/{0.5.x → v0.5.x}/IGenArt721CoreContractV1.sol/IGenArt721CoreContractV1.json +1 -1
- package/artifacts/contracts/interfaces/{0.5.x → v0.5.x}/IGenArt721CoreV2_PBAB.sol/IGenArt721CoreV2_PBAB.json +1 -1
- package/artifacts/contracts/interfaces/{0.5.x → v0.5.x}/IRandomizer.sol/IRandomizer.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IAdminACLV0.sol/IAdminACLV0.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IArtblocksRoyaltyOverride.sol/IArtblocksRoyaltyOverride.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IBonusContract.sol/IBonusContract.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IBytecodeStorageReader.sol/IBytecodeStorageReader.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/ICoreRegistryV1.sol/ICoreRegistryV1.json +7 -7
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IDelegationRegistry.sol/IDelegationRegistry.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IDependencyRegistryCompatibleV0.sol/IDependencyRegistryCompatibleV0.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IDependencyRegistryV0.sol/IDependencyRegistryV0.json +22 -3
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IEngineRegistryV0.sol/IEngineRegistryV0.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterDAExpSettlementV0.sol/IFilteredMinterDAExpSettlementV0.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterDAExpSettlementV1.sol/IFilteredMinterDAExpSettlementV1.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterDAExpSettlement_Mixin.sol/IFilteredMinterDAExpSettlement_Mixin.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterDAExpV0.sol/IFilteredMinterDAExpV0.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterDAExpV1.sol/IFilteredMinterDAExpV1.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterDALinV0.sol/IFilteredMinterDALinV0.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterDALinV1.sol/IFilteredMinterDALinV1.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterHolderV0.sol/IFilteredMinterHolderV0.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterHolderV1.sol/IFilteredMinterHolderV1.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterHolderV2.sol/IFilteredMinterHolderV2.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterMerkleV0.sol/IFilteredMinterMerkleV0.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterMerkleV1.sol/IFilteredMinterMerkleV1.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterMerkleV2.sol/IFilteredMinterMerkleV2.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterSEAV0.sol/IFilteredMinterSEAV0.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterV0.sol/IFilteredMinterV0.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterV1.sol/IFilteredMinterV1.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterV2.sol/IFilteredMinterV2.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IGenArt721CoreContractExposesHashSeed.sol/IGenArt721CoreContractExposesHashSeed.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IGenArt721CoreContractV1.sol/IGenArt721CoreContractV1.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IGenArt721CoreContractV3.sol/IGenArt721CoreContractV3.json +1 -1
- package/artifacts/contracts/interfaces/v0.8.x/IGenArt721CoreContractV3WithSharedRandomizer.sol/IGenArt721CoreContractV3WithSharedRandomizer.json +24 -0
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IGenArt721CoreContractV3_Base.sol/IGenArt721CoreContractV3_Base.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IGenArt721CoreContractV3_Engine.sol/IGenArt721CoreContractV3_Engine.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IGenArt721CoreContractV3_Engine_Flex.sol/IGenArt721CoreContractV3_Engine_Flex.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IGenArt721CoreV2_PBAB.sol/IGenArt721CoreV2_PBAB.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IManifold.sol/IManifold.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IMinterBaseV0.sol/IMinterBaseV0.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IMinterFilterV0.sol/IMinterFilterV0.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IMinterFilterV1.sol/IMinterFilterV1.json +104 -19
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IMintingAPICoreV0.sol/IMintingAPICoreV0.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IMintingAPIMinterV0.sol/IMintingAPIMinterV0.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IPseudorandomAtomic.sol/IPseudorandomAtomic.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IRandomizer.sol/IRandomizer.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IRandomizerPolyptychV0.sol/IRandomizerPolyptychV0.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IRandomizerV2.sol/IRandomizerV2.json +1 -1
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IRandomizer_V3CoreBase.sol/IRandomizer_V3CoreBase.json +1 -1
- package/artifacts/contracts/interfaces/v0.8.x/ISharedMinterDAExpSettlementV0.sol/ISharedMinterDAExpSettlementV0.json +114 -0
- package/artifacts/contracts/interfaces/v0.8.x/ISharedMinterDAExpV0.sol/ISharedMinterDAExpV0.json +37 -0
- package/artifacts/contracts/interfaces/v0.8.x/ISharedMinterDALinV0.sol/ISharedMinterDALinV0.json +37 -0
- package/artifacts/contracts/interfaces/v0.8.x/ISharedMinterDAV0.sol/ISharedMinterDAV0.json +50 -0
- package/artifacts/contracts/interfaces/v0.8.x/ISharedMinterHolderERC20V0.sol/ISharedMinterHolderERC20V0.json +158 -0
- package/artifacts/contracts/interfaces/v0.8.x/ISharedMinterHolderV0.sol/ISharedMinterHolderV0.json +128 -0
- package/artifacts/contracts/interfaces/v0.8.x/ISharedMinterMerkleV0.sol/ISharedMinterMerkleV0.json +97 -0
- package/artifacts/contracts/interfaces/v0.8.x/ISharedMinterSEAV0.sol/ISharedMinterSEAV0.json +29 -0
- package/artifacts/contracts/interfaces/v0.8.x/ISharedMinterSimplePurchaseV0.sol/ISharedMinterSimplePurchaseV0.json +64 -0
- package/artifacts/contracts/interfaces/v0.8.x/ISharedMinterV0.sol/ISharedMinterV0.json +117 -0
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/ISharedRandomizerV0.sol/ISharedRandomizerV0.json +52 -36
- package/artifacts/contracts/interfaces/{0.8.x → v0.8.x}/IWETH.sol/IWETH.json +1 -1
- package/artifacts/contracts/legacy/GenArt721CoreV1.sol/Address.json +2 -2
- package/artifacts/contracts/legacy/GenArt721CoreV1.sol/Counters.json +2 -2
- package/artifacts/contracts/legacy/GenArt721CoreV1.sol/CustomERC721Metadata.json +2 -2
- package/artifacts/contracts/legacy/GenArt721CoreV1.sol/ERC721.json +2 -2
- package/artifacts/contracts/legacy/GenArt721CoreV1.sol/ERC721Enumerable.json +2 -2
- package/artifacts/contracts/legacy/GenArt721CoreV1.sol/GenArt721CoreV1.json +2 -2
- package/artifacts/contracts/legacy/GenArt721CoreV1.sol/SafeMath.json +2 -2
- package/artifacts/contracts/legacy/GenArt721CoreV1.sol/Strings.json +2 -2
- package/artifacts/contracts/legacy/GenArt721LegacyMinter.sol/GenArt721LegacyMinter.json +2 -2
- package/artifacts/contracts/libs/integration-refs/delegation-registry/DelegationRegistry.sol/DelegationRegistry.json +2 -2
- package/artifacts/contracts/libs/{0.5.x → v0.5.x}/CustomERC721Metadata.sol/CustomERC721Metadata.json +3 -3
- package/artifacts/contracts/libs/{0.5.x → v0.5.x}/IERC20.sol/IERC20.json +1 -1
- package/artifacts/contracts/libs/{0.5.x → v0.5.x}/SafeMath.sol/SafeMath.json +3 -3
- package/artifacts/contracts/libs/{0.5.x → v0.5.x}/Strings.sol/Strings.json +3 -3
- package/artifacts/contracts/libs/v0.8.x/ABHelpers.sol/ABHelpers.json +10 -0
- package/artifacts/contracts/libs/v0.8.x/AuthLib.sol/AuthLib.json +10 -0
- package/artifacts/contracts/libs/{0.8.x → v0.8.x}/BytecodeStorageV0.sol/BytecodeStorage.json +3 -3
- package/artifacts/contracts/libs/{0.8.x → v0.8.x}/BytecodeStorageV1.sol/BytecodeStorageReader.json +3 -3
- package/artifacts/contracts/libs/{0.8.x → v0.8.x}/BytecodeStorageV1.sol/BytecodeStorageWriter.json +3 -3
- package/artifacts/contracts/libs/{0.8.x → v0.8.x}/Bytes32Strings.sol/Bytes32Strings.json +3 -3
- package/artifacts/contracts/libs/{0.8.x → v0.8.x}/ERC721_PackedHashSeed.sol/ERC721_PackedHashSeed.json +3 -3
- package/artifacts/contracts/libs/{0.8.x → v0.8.x}/SSTORE2.sol/SSTORE2.json +3 -3
- package/artifacts/contracts/libs/v0.8.x/minter-libs/DAExpLib.sol/DAExpLib.json +67 -0
- package/artifacts/contracts/libs/v0.8.x/minter-libs/DALib.sol/DALib.json +30 -0
- package/artifacts/contracts/libs/v0.8.x/minter-libs/DALinLib.sol/DALinLib.json +67 -0
- package/artifacts/contracts/libs/v0.8.x/minter-libs/GenericMinterEventsLib.sol/GenericMinterEventsLib.json +346 -0
- package/artifacts/contracts/libs/v0.8.x/minter-libs/MaxInvocationsLib.sol/MaxInvocationsLib.json +36 -0
- package/artifacts/contracts/libs/v0.8.x/minter-libs/MerkleLib.sol/MerkleLib.json +37 -0
- package/artifacts/contracts/libs/v0.8.x/minter-libs/PolyptychLib.sol/PolyptychLib.json +10 -0
- package/artifacts/contracts/libs/v0.8.x/minter-libs/SEALib.sol/SEALib.json +261 -0
- package/artifacts/contracts/libs/v0.8.x/minter-libs/SetPriceLib.sol/SetPriceLib.json +55 -0
- package/artifacts/contracts/libs/v0.8.x/minter-libs/SettlementExpLib.sol/SettlementExpLib.json +48 -0
- package/artifacts/contracts/libs/v0.8.x/minter-libs/SplitFundsLib.sol/SplitFundsLib.json +42 -0
- package/artifacts/contracts/libs/v0.8.x/minter-libs/TokenHolderLib.sol/TokenHolderLib.json +86 -0
- package/artifacts/contracts/minter-suite/MinterFilter/MinterFilterV0.sol/MinterFilterV0.json +2 -2
- package/artifacts/contracts/minter-suite/MinterFilter/MinterFilterV1.sol/MinterFilterV1.json +2 -2
- package/artifacts/contracts/minter-suite/MinterFilter/MinterFilterV2.sol/MinterFilterV2.json +96 -40
- package/artifacts/contracts/minter-suite/Minters/MinterDAExpHolderV5.sol/MinterDAExpHolderV5.json +662 -0
- package/artifacts/contracts/minter-suite/Minters/MinterDAExpSettlementV2.sol/MinterDAExpSettlementV2.json +2 -20
- package/artifacts/contracts/minter-suite/Minters/MinterDAExpSettlementV3.sol/MinterDAExpSettlementV3.json +619 -0
- package/artifacts/contracts/minter-suite/Minters/MinterDAExpV4.sol/MinterDAExpV4.json +2 -2
- package/artifacts/contracts/minter-suite/Minters/MinterDAExpV5.sol/MinterDAExpV5.json +418 -0
- package/artifacts/contracts/minter-suite/Minters/MinterDALinHolderV5.sol/MinterDALinHolderV5.json +662 -0
- package/artifacts/contracts/minter-suite/Minters/MinterDALinV4.sol/MinterDALinV4.json +2 -2
- package/artifacts/contracts/minter-suite/Minters/MinterDALinV5.sol/MinterDALinV5.json +418 -0
- package/artifacts/contracts/minter-suite/Minters/MinterHolderV4.sol/MinterHolderV4.json +2 -2
- package/artifacts/contracts/minter-suite/Minters/MinterMerkleV5.sol/MinterMerkleV5.json +2 -2
- package/artifacts/contracts/minter-suite/Minters/MinterPolyptychV0.sol/MinterPolyptychV0.json +2 -2
- package/artifacts/contracts/minter-suite/Minters/MinterSEAV0.sol/MinterSEAV0.json +2 -2
- package/artifacts/contracts/minter-suite/Minters/MinterSEAV1.sol/MinterSEAV1.json +659 -0
- package/artifacts/contracts/minter-suite/Minters/MinterSetPriceERC20V4.sol/MinterSetPriceERC20V4.json +2 -2
- package/artifacts/contracts/minter-suite/Minters/MinterSetPriceERC20V5.sol/MinterSetPriceERC20V5.json +452 -0
- package/artifacts/contracts/minter-suite/Minters/MinterSetPriceHolderV5.sol/MinterSetPriceHolderV5.json +600 -0
- package/artifacts/contracts/minter-suite/Minters/MinterSetPriceMerkleV5.sol/MinterSetPriceMerkleV5.json +633 -0
- package/artifacts/contracts/minter-suite/Minters/MinterSetPricePolyptychERC20V5.sol/MinterSetPricePolyptychERC20V5.json +782 -0
- package/artifacts/contracts/minter-suite/Minters/MinterSetPricePolyptychV5.sol/MinterSetPricePolyptychV5.json +676 -0
- package/artifacts/contracts/minter-suite/Minters/MinterSetPriceV4.sol/MinterSetPriceV4.json +2 -2
- package/artifacts/contracts/minter-suite/Minters/MinterSetPriceV5.sol/MinterSetPriceV5.json +356 -0
- package/artifacts/contracts/mock/BytecodeV0TextCR_DMock.sol/BytecodeV0TextCR_DMock.json +2 -2
- package/artifacts/contracts/mock/BytecodeV1LibCallsMock.sol/BytecodeV1LibCallsMock.json +2 -2
- package/artifacts/contracts/mock/BytecodeV1TextCR_DMock.sol/BytecodeV1TextCR_DMock.json +4 -4
- package/artifacts/contracts/mock/DeadReceiverBidderMock.sol/DeadReceiverBidderMock.json +25 -2
- package/artifacts/contracts/mock/DummySharedMinter.sol/DummySharedMinter.json +2 -2
- package/artifacts/contracts/mock/ERC20Mock.sol/ERC20Mock.json +28 -2
- package/artifacts/contracts/mock/GenArt721CoreV3_Engine_IncorrectCoreType.sol/GenArt721CoreV3_Engine_IncorrectCoreType.json +6 -11
- package/artifacts/contracts/mock/MockAdminACLV0.sol/MockAdminACLV0Events.json +2 -2
- package/artifacts/contracts/mock/MockAdminACLV0_PROHIBITION.sol/MockAdminACLV0Events_PROHIBITION.json +2 -2
- package/artifacts/contracts/mock/OriginRegisterMock.sol/OriginRegisterMock.json +2 -2
- package/artifacts/contracts/mock/RandomizerV2_NoAssignMock.sol/RandomizerV2_NoAssignMock.json +2 -2
- package/artifacts/contracts/mock/ReentrancyHolderMock.sol/ReentrancyHolderMock.json +2 -2
- package/artifacts/contracts/mock/ReentrancyHolderMockShared.sol/ReentrancyHolderMockShared.json +136 -0
- package/artifacts/contracts/mock/ReentrancyMerkleMock.sol/ReentrancyMerkleMock.json +2 -2
- package/artifacts/contracts/mock/ReentrancyMerkleMockShared.sol/ReentrancyMerkleMockShared.json +105 -0
- package/artifacts/contracts/mock/ReentrancyMock.sol/ReentrancyMock.json +2 -2
- package/artifacts/contracts/mock/ReentrancyMockShared.sol/ReentrancyMockShared.json +100 -0
- package/artifacts/contracts/mock/ReentrancySEAMock.sol/ReentrancySEAAutoBidderMock.json +2 -2
- package/artifacts/contracts/mock/ReentrancySEAMockShared.sol/ReentrancySEAAutoBidderMockShared.json +69 -0
- package/artifacts/contracts/mock/SSTORE2Mock.sol/SSTORE2Mock.json +2 -2
- package/artifacts/contracts/randomizer/deprecated/BasicRandomizer.sol/BasicRandomizer.json +2 -2
- package/artifacts/contracts/randomizer/deprecated/PolyptychRandomizerV0.sol/BasicPolyptychRandomizerV0.json +2 -2
- package/artifacts/contracts/randomizer/deprecated/RandomizerV2.sol/BasicRandomizerV2.json +2 -2
- package/artifacts/contracts/randomizer/primitive/PseudorandomAtomicBasic.sol/PseudorandomAtomic.json +2 -2
- package/artifacts/contracts/randomizer/shared/SharedRandomizerV0.sol/SharedRandomizerV0.json +58 -42
- package/artifacts/contracts/royalty-registry/GenArt721RoyaltyOverride.sol/GenArt721RoyaltyOverride.json +2 -2
- package/artifacts/contracts/royalty-registry/GenArt721RoyaltyOverride_PBAB.sol/GenArt721RoyaltyOverride_PBAB.json +2 -2
- package/contracts/AdminACLV0.sol +1 -1
- package/contracts/AdminACLV1.sol +1 -1
- package/contracts/DependencyRegistryV0.sol +300 -123
- package/contracts/GenArt721CoreV3.sol +27 -12
- package/contracts/archive/minter-suite/Minters/MinterDAExp/MinterDAExpV0.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterDAExp/MinterDAExpV1.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterDAExp/MinterDAExpV2.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterDAExp/MinterDAExpV3.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterDAExpSettlement/MinterDAExpSettlementV0.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterDAExpSettlement/MinterDAExpSettlementV1.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterDALin/MinterDALinV0.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterDALin/MinterDALinV1.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterDALin/MinterDALinV2.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterDALin/MinterDALinV3.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterHolder/MinterHolderV0.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterHolder/MinterHolderV1.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterHolder/MinterHolderV2.sol +4 -4
- package/contracts/archive/minter-suite/Minters/MinterHolder/MinterHolderV3.sol +4 -4
- package/contracts/archive/minter-suite/Minters/MinterMerkle/MinterMerkleV0.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterMerkle/MinterMerkleV1.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterMerkle/MinterMerkleV2.sol +4 -4
- package/contracts/archive/minter-suite/Minters/MinterMerkle/MinterMerkleV3.sol +4 -4
- package/contracts/archive/minter-suite/Minters/MinterMerkle/MinterMerkleV4.sol +4 -4
- package/contracts/archive/minter-suite/Minters/MinterSetPrice/MinterSetPriceV0.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterSetPrice/MinterSetPriceV1.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterSetPrice/MinterSetPriceV2.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterSetPrice/MinterSetPriceV3.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterSetPriceERC20/MinterSetPriceERC20V0.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterSetPriceERC20/MinterSetPriceERC20V1.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterSetPriceERC20/MinterSetPriceERC20V2.sol +3 -3
- package/contracts/archive/minter-suite/Minters/MinterSetPriceERC20/MinterSetPriceERC20V3.sol +3 -3
- package/contracts/archive/readme.md +16 -0
- package/contracts/engine/README.md +21 -0
- package/contracts/engine/V2/GenArt721CoreV2_ENGINE_FLEX.sol +2 -2
- package/contracts/engine/V2/GenArt721CoreV2_PBAB.sol +2 -2
- package/contracts/engine/V2/GenArt721CoreV2_PRTNR.sol +3 -3
- package/contracts/engine/V2/GenArt721MinterBurner_PBAB.sol +2 -2
- package/contracts/engine/V2/GenArt721MinterDAExp_PBAB.sol +1 -1
- package/contracts/engine/V2/GenArt721Minter_PBAB.sol +2 -2
- package/contracts/engine/V3/GenArt721CoreV3_Engine.sol +31 -22
- package/contracts/engine/V3/GenArt721CoreV3_Engine_Flex.sol +31 -22
- package/contracts/engine/V3/forks/GenArt721CoreV3_Engine_Flex_PROOF.sol +12 -18
- package/contracts/engine/V3/forks/PROHIBITION/AdminACLV0_PROHIBITION.sol +1 -1
- package/contracts/engine/V3/forks/PROHIBITION/GenArt721CoreV3_Engine_Flex_PROHIBITION.sol +23 -24
- package/contracts/engine/V3/forks/PROHIBITION/interfaces/IAdminACLV0_PROHIBITION.sol +1 -1
- package/contracts/engine/V3/forks/PROHIBITION/interfaces/IGenArt721CoreContractV3_Engine_Flex_PROHIBITION.sol +1 -1
- package/contracts/engine-registry/CoreRegistryV1.sol +58 -65
- package/contracts/engine-registry/EngineRegistryV0.sol +1 -1
- package/contracts/explorations/GenArt721CoreV3_Explorations.sol +27 -12
- package/contracts/interfaces/{0.8.x → v0.8.x}/ICoreRegistryV1.sol +6 -8
- package/contracts/interfaces/{0.8.x → v0.8.x}/IDependencyRegistryV0.sol +5 -2
- package/contracts/interfaces/v0.8.x/IGenArt721CoreContractV3WithSharedRandomizer.sol +23 -0
- package/contracts/interfaces/{0.8.x → v0.8.x}/IMinterFilterV1.sol +45 -19
- package/contracts/interfaces/v0.8.x/IRandomizer_V3CoreBase.sol +23 -0
- package/contracts/interfaces/v0.8.x/ISharedMinterDAExpSettlementV0.sol +28 -0
- package/contracts/interfaces/v0.8.x/ISharedMinterDAExpV0.sol +12 -0
- package/contracts/interfaces/v0.8.x/ISharedMinterDALinV0.sol +12 -0
- package/contracts/interfaces/v0.8.x/ISharedMinterDAV0.sol +13 -0
- package/contracts/interfaces/v0.8.x/ISharedMinterHolderERC20V0.sol +47 -0
- package/contracts/interfaces/v0.8.x/ISharedMinterHolderV0.sol +41 -0
- package/contracts/interfaces/v0.8.x/ISharedMinterMerkleV0.sol +34 -0
- package/contracts/interfaces/v0.8.x/ISharedMinterSEAV0.sol +15 -0
- package/contracts/interfaces/v0.8.x/ISharedMinterSimplePurchaseV0.sol +28 -0
- package/contracts/interfaces/v0.8.x/ISharedMinterV0.sol +43 -0
- package/contracts/interfaces/v0.8.x/ISharedRandomizerV0.sol +123 -0
- package/contracts/legacy/GenArt721CoreV1.sol +2 -2
- package/contracts/legacy/GenArt721LegacyMinter.sol +5 -5
- package/contracts/libs/integration-refs/delegation-registry/DelegationRegistry.sol +1 -1
- package/contracts/libs/v0.8.x/ABHelpers.sol +55 -0
- package/contracts/libs/v0.8.x/AuthLib.sol +196 -0
- package/contracts/libs/{0.8.x → v0.8.x}/Bytes32Strings.sol +5 -5
- package/contracts/libs/v0.8.x/minter-libs/DAExpLib.sol +250 -0
- package/contracts/libs/v0.8.x/minter-libs/DALib.sol +26 -0
- package/contracts/libs/v0.8.x/minter-libs/DALinLib.sol +216 -0
- package/contracts/libs/v0.8.x/minter-libs/GenericMinterEventsLib.sol +171 -0
- package/contracts/libs/v0.8.x/minter-libs/MaxInvocationsLib.sol +488 -0
- package/contracts/libs/v0.8.x/minter-libs/MerkleLib.sol +384 -0
- package/contracts/libs/v0.8.x/minter-libs/PolyptychLib.sol +240 -0
- package/contracts/libs/v0.8.x/minter-libs/SEALib.sol +995 -0
- package/contracts/libs/v0.8.x/minter-libs/SetPriceLib.sol +166 -0
- package/contracts/libs/v0.8.x/minter-libs/SettlementExpLib.sol +770 -0
- package/contracts/libs/v0.8.x/minter-libs/SplitFundsLib.sol +741 -0
- package/contracts/libs/v0.8.x/minter-libs/TokenHolderLib.sol +291 -0
- package/contracts/minter-suite/MinterFilter/MinterFilterV0.sol +3 -3
- package/contracts/minter-suite/MinterFilter/MinterFilterV1.sol +5 -5
- package/contracts/minter-suite/MinterFilter/MinterFilterV2.sol +414 -297
- package/contracts/minter-suite/Minters/MinterBase_v0_1_1.sol +4 -4
- package/contracts/minter-suite/Minters/MinterDAExpHolderV5.sol +866 -0
- package/contracts/minter-suite/Minters/MinterDAExpSettlementV2.sol +4 -57
- package/contracts/minter-suite/Minters/MinterDAExpSettlementV3.sol +886 -0
- package/contracts/minter-suite/Minters/MinterDAExpV4.sol +3 -3
- package/contracts/minter-suite/Minters/MinterDAExpV5.sol +545 -0
- package/contracts/minter-suite/Minters/MinterDALinHolderV5.sol +857 -0
- package/contracts/minter-suite/Minters/MinterDALinV4.sol +3 -3
- package/contracts/minter-suite/Minters/MinterDALinV5.sol +534 -0
- package/contracts/minter-suite/Minters/MinterHolderV4.sol +4 -4
- package/contracts/minter-suite/Minters/MinterMerkleV5.sol +4 -4
- package/contracts/minter-suite/Minters/MinterPolyptychV0.sol +6 -6
- package/contracts/minter-suite/Minters/MinterSEAV0.sol +3 -3
- package/contracts/minter-suite/Minters/MinterSEAV1.sol +853 -0
- package/contracts/minter-suite/Minters/MinterSetPriceERC20V4.sol +5 -5
- package/contracts/minter-suite/Minters/MinterSetPriceERC20V5.sol +545 -0
- package/contracts/minter-suite/Minters/MinterSetPriceHolderV5.sol +730 -0
- package/contracts/minter-suite/Minters/MinterSetPriceMerkleV5.sol +714 -0
- package/contracts/minter-suite/Minters/MinterSetPricePolyptychERC20V5.sol +1012 -0
- package/contracts/minter-suite/Minters/MinterSetPricePolyptychV5.sol +868 -0
- package/contracts/minter-suite/Minters/MinterSetPriceV4.sol +3 -3
- package/contracts/minter-suite/Minters/MinterSetPriceV5.sol +414 -0
- package/contracts/mock/BytecodeV0TextCR_DMock.sol +1 -1
- package/contracts/mock/BytecodeV1LibCallsMock.sol +1 -1
- package/contracts/mock/BytecodeV1TextCR_DMock.sol +1 -1
- package/contracts/mock/DeadReceiverBidderMock.sol +15 -0
- package/contracts/mock/DummySharedMinter.sol +2 -2
- package/contracts/mock/ERC20Mock.sol +16 -0
- package/contracts/mock/GenArt721CoreV3_Engine_IncorrectCoreType.sol +11 -18
- package/contracts/mock/MockAdminACLV0.sol +1 -1
- package/contracts/mock/MockAdminACLV0_PROHIBITION.sol +1 -1
- package/contracts/mock/OriginRegisterMock.sol +1 -1
- package/contracts/mock/ReentrancyHolderMock.sol +1 -1
- package/contracts/mock/ReentrancyHolderMockShared.sol +59 -0
- package/contracts/mock/ReentrancyMerkleMock.sol +1 -1
- package/contracts/mock/ReentrancyMerkleMockShared.sol +58 -0
- package/contracts/mock/ReentrancyMock.sol +1 -1
- package/contracts/mock/ReentrancyMockShared.sol +48 -0
- package/contracts/mock/ReentrancySEAMock.sol +1 -1
- package/contracts/mock/ReentrancySEAMockShared.sol +40 -0
- package/contracts/mock/SSTORE2Mock.sol +1 -1
- package/contracts/randomizer/deprecated/BasicRandomizer.sol +1 -1
- package/contracts/randomizer/deprecated/PolyptychRandomizerV0.sol +2 -2
- package/contracts/randomizer/deprecated/RandomizerV2.sol +2 -2
- package/contracts/randomizer/primitive/PseudorandomAtomicBasic.sol +1 -1
- package/contracts/randomizer/shared/SharedRandomizerV0.sol +134 -111
- package/contracts/royalty-registry/GenArt721RoyaltyOverride.sol +2 -2
- package/contracts/royalty-registry/GenArt721RoyaltyOverride_PBAB.sol +2 -2
- package/package.json +57 -36
- package/LICENSE +0 -165
- package/contracts/interfaces/0.8.x/IRandomizer_V3CoreBase.sol +0 -10
- package/contracts/interfaces/0.8.x/ISharedRandomizerV0.sol +0 -105
- /package/contracts/interfaces/{0.5.x → v0.5.x}/IBonusContract.sol +0 -0
- /package/contracts/interfaces/{0.5.x → v0.5.x}/IGenArt721CoreContractV1.sol +0 -0
- /package/contracts/interfaces/{0.5.x → v0.5.x}/IGenArt721CoreV2_PBAB.sol +0 -0
- /package/contracts/interfaces/{0.5.x → v0.5.x}/IRandomizer.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IAdminACLV0.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IArtblocksRoyaltyOverride.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IBonusContract.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IBytecodeStorageReader.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IDelegationRegistry.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IDependencyRegistryCompatibleV0.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IEngineRegistryV0.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterDAExpSettlementV0.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterDAExpSettlementV1.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterDAExpSettlement_Mixin.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterDAExpV0.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterDAExpV1.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterDALinV0.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterDALinV1.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterHolderV0.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterHolderV1.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterHolderV2.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterMerkleV0.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterMerkleV1.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterMerkleV2.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterSEAV0.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterV0.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterV1.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IFilteredMinterV2.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IGenArt721CoreContractExposesHashSeed.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IGenArt721CoreContractV1.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IGenArt721CoreContractV3.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IGenArt721CoreContractV3_Base.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IGenArt721CoreContractV3_Engine.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IGenArt721CoreContractV3_Engine_Flex.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IGenArt721CoreV2_PBAB.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IManifold.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IMinterBaseV0.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IMinterFilterV0.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IMintingAPICoreV0.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IMintingAPIMinterV0.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IPseudorandomAtomic.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IRandomizer.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IRandomizerPolyptychV0.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IRandomizerV2.sol +0 -0
- /package/contracts/interfaces/{0.8.x → v0.8.x}/IWETH.sol +0 -0
- /package/contracts/libs/{0.5.x → v0.5.x}/CustomERC721Metadata.sol +0 -0
- /package/contracts/libs/{0.5.x → v0.5.x}/IERC20.sol +0 -0
- /package/contracts/libs/{0.5.x → v0.5.x}/SafeMath.sol +0 -0
- /package/contracts/libs/{0.5.x → v0.5.x}/Strings.sol +0 -0
- /package/contracts/libs/{0.8.x → v0.8.x}/BytecodeStorageV0.sol +0 -0
- /package/contracts/libs/{0.8.x → v0.8.x}/BytecodeStorageV1.sol +0 -0
- /package/contracts/libs/{0.8.x → v0.8.x}/ERC721_PackedHashSeed.sol +0 -0
- /package/contracts/libs/{0.8.x → v0.8.x}/SSTORE2.sol +0 -0
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
// SPDX-License-Identifier: LGPL-3.0-only
|
|
2
2
|
// Created By: Art Blocks Inc.
|
|
3
3
|
|
|
4
|
-
import "../../interfaces/
|
|
5
|
-
import "../../interfaces/
|
|
6
|
-
import "../../interfaces/
|
|
4
|
+
import "../../interfaces/v0.8.x/IGenArt721CoreContractV3_Base.sol";
|
|
5
|
+
import "../../interfaces/v0.8.x/IMinterFilterV0.sol";
|
|
6
|
+
import "../../interfaces/v0.8.x/IFilteredMinterV2.sol";
|
|
7
7
|
import "./MinterBase_v0_1_1.sol";
|
|
8
8
|
|
|
9
9
|
import "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";
|
|
@@ -0,0 +1,414 @@
|
|
|
1
|
+
// SPDX-License-Identifier: LGPL-3.0-only
|
|
2
|
+
// Created By: Art Blocks Inc.
|
|
3
|
+
|
|
4
|
+
// @dev fixed to specific solidity version for clarity and for more clear
|
|
5
|
+
// source code verification purposes.
|
|
6
|
+
pragma solidity 0.8.19;
|
|
7
|
+
|
|
8
|
+
import {ISharedMinterSimplePurchaseV0} from "../../interfaces/v0.8.x/ISharedMinterSimplePurchaseV0.sol";
|
|
9
|
+
import {ISharedMinterV0} from "../../interfaces/v0.8.x/ISharedMinterV0.sol";
|
|
10
|
+
import {IMinterFilterV1} from "../../interfaces/v0.8.x/IMinterFilterV1.sol";
|
|
11
|
+
|
|
12
|
+
import {AuthLib} from "../../libs/v0.8.x/AuthLib.sol";
|
|
13
|
+
import {SplitFundsLib} from "../../libs/v0.8.x/minter-libs/SplitFundsLib.sol";
|
|
14
|
+
import {MaxInvocationsLib} from "../../libs/v0.8.x/minter-libs/MaxInvocationsLib.sol";
|
|
15
|
+
import {SetPriceLib} from "../../libs/v0.8.x/minter-libs/SetPriceLib.sol";
|
|
16
|
+
|
|
17
|
+
import {ReentrancyGuard} from "@openzeppelin-4.5/contracts/security/ReentrancyGuard.sol";
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* @title Shared, filtered Minter contract that allows tokens to be minted with
|
|
21
|
+
* ETH.
|
|
22
|
+
* This is designed to be used with GenArt721CoreContractV3 flagship or
|
|
23
|
+
* engine contracts.
|
|
24
|
+
* @author Art Blocks Inc.
|
|
25
|
+
* @notice Privileged Roles and Ownership:
|
|
26
|
+
* This contract is designed to be managed, with limited powers.
|
|
27
|
+
* Privileged roles and abilities are controlled by the project's artist, which
|
|
28
|
+
* can be modified by the core contract's Admin ACL contract. Both of these
|
|
29
|
+
* roles hold extensive power and can modify minter details.
|
|
30
|
+
* Care must be taken to ensure that the admin ACL contract and artist
|
|
31
|
+
* addresses are secure behind a multi-sig or other access control mechanism.
|
|
32
|
+
* ----------------------------------------------------------------------------
|
|
33
|
+
* The following functions are restricted to a project's artist:
|
|
34
|
+
* - updatePricePerTokenInWei
|
|
35
|
+
* - syncProjectMaxInvocationsToCore
|
|
36
|
+
* - manuallyLimitProjectMaxInvocations
|
|
37
|
+
* ----------------------------------------------------------------------------
|
|
38
|
+
* Additional admin and artist privileged roles may be described on other
|
|
39
|
+
* contracts that this minter integrates with.
|
|
40
|
+
* ----------------------------------------------------------------------------
|
|
41
|
+
* @notice Caution: While Engine projects must be registered on the Art Blocks
|
|
42
|
+
* Core Registry to assign this minter, this minter does not enforce that a
|
|
43
|
+
* project is registered when configured or queried. This is primarily for gas
|
|
44
|
+
* optimization purposes. It is, therefore, possible that fake projects may be
|
|
45
|
+
* configured on this minter, but they will not be able to mint tokens due to
|
|
46
|
+
* checks performed by this minter's Minter Filter.
|
|
47
|
+
*/
|
|
48
|
+
contract MinterSetPriceV5 is
|
|
49
|
+
ReentrancyGuard,
|
|
50
|
+
ISharedMinterSimplePurchaseV0,
|
|
51
|
+
ISharedMinterV0
|
|
52
|
+
{
|
|
53
|
+
/// Minter filter address this minter interacts with
|
|
54
|
+
address public immutable minterFilterAddress;
|
|
55
|
+
|
|
56
|
+
/// Minter filter this minter may interact with.
|
|
57
|
+
IMinterFilterV1 private immutable _minterFilter;
|
|
58
|
+
|
|
59
|
+
/// minterType for this minter
|
|
60
|
+
string public constant minterType = "MinterSetPriceV5";
|
|
61
|
+
|
|
62
|
+
/// minter version for this minter
|
|
63
|
+
string public constant minterVersion = "v5.0.0";
|
|
64
|
+
|
|
65
|
+
// MODIFIERS
|
|
66
|
+
// @dev contract uses modifier-like internal functions instead of modifiers
|
|
67
|
+
// to reduce contract bytecode size
|
|
68
|
+
// @dev contract uses AuthLib for some modifier-like functions
|
|
69
|
+
|
|
70
|
+
/**
|
|
71
|
+
* @notice Initializes contract to be a Filtered Minter for
|
|
72
|
+
* `minterFilter` minter filter.
|
|
73
|
+
* @param minterFilter Minter filter for which this will be a
|
|
74
|
+
* filtered minter.
|
|
75
|
+
*/
|
|
76
|
+
constructor(address minterFilter) ReentrancyGuard() {
|
|
77
|
+
minterFilterAddress = minterFilter;
|
|
78
|
+
_minterFilter = IMinterFilterV1(minterFilter);
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
/**
|
|
82
|
+
* @notice Manually sets the local maximum invocations of project `projectId`
|
|
83
|
+
* with the provided `maxInvocations`, checking that `maxInvocations` is less
|
|
84
|
+
* than or equal to the value of project `project_id`'s maximum invocations that is
|
|
85
|
+
* set on the core contract.
|
|
86
|
+
* @dev Note that a `maxInvocations` of 0 can only be set if the current `invocations`
|
|
87
|
+
* value is also 0 and this would also set `maxHasBeenInvoked` to true, correctly short-circuiting
|
|
88
|
+
* this minter's purchase function, avoiding extra gas costs from the core contract's maxInvocations check.
|
|
89
|
+
* @param projectId Project ID to set the maximum invocations for.
|
|
90
|
+
* @param coreContract Core contract address for the given project.
|
|
91
|
+
* @param maxInvocations Maximum invocations to set for the project.
|
|
92
|
+
*/
|
|
93
|
+
function manuallyLimitProjectMaxInvocations(
|
|
94
|
+
uint256 projectId,
|
|
95
|
+
address coreContract,
|
|
96
|
+
uint24 maxInvocations
|
|
97
|
+
) external {
|
|
98
|
+
AuthLib.onlyArtist({
|
|
99
|
+
projectId: projectId,
|
|
100
|
+
coreContract: coreContract,
|
|
101
|
+
sender: msg.sender
|
|
102
|
+
});
|
|
103
|
+
MaxInvocationsLib.manuallyLimitProjectMaxInvocations({
|
|
104
|
+
projectId: projectId,
|
|
105
|
+
coreContract: coreContract,
|
|
106
|
+
maxInvocations: maxInvocations
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
/**
|
|
111
|
+
* @notice Updates this minter's price per token of project `projectId`
|
|
112
|
+
* to be '_pricePerTokenInWei`, in Wei.
|
|
113
|
+
* @dev Note that it is intentionally supported here that the configured
|
|
114
|
+
* price may be explicitly set to `0`.
|
|
115
|
+
* @param projectId Project ID to set the price per token for.
|
|
116
|
+
* @param coreContract Core contract address for the given project.
|
|
117
|
+
* @param pricePerTokenInWei Price per token to set for the project, in Wei.
|
|
118
|
+
*/
|
|
119
|
+
function updatePricePerTokenInWei(
|
|
120
|
+
uint256 projectId,
|
|
121
|
+
address coreContract,
|
|
122
|
+
uint248 pricePerTokenInWei
|
|
123
|
+
) external {
|
|
124
|
+
AuthLib.onlyArtist({
|
|
125
|
+
projectId: projectId,
|
|
126
|
+
coreContract: coreContract,
|
|
127
|
+
sender: msg.sender
|
|
128
|
+
});
|
|
129
|
+
SetPriceLib.updatePricePerToken({
|
|
130
|
+
projectId: projectId,
|
|
131
|
+
coreContract: coreContract,
|
|
132
|
+
pricePerToken: pricePerTokenInWei
|
|
133
|
+
});
|
|
134
|
+
|
|
135
|
+
// for convenience, sync local max invocations to the core contract if
|
|
136
|
+
// and only if max invocations have not already been synced.
|
|
137
|
+
// @dev do not sync if max invocations have already been synced, as
|
|
138
|
+
// local max invocations could have been manually set to be
|
|
139
|
+
// intentionally less than the core contract's max invocations.
|
|
140
|
+
// @dev if local maxInvocations and maxHasBeenInvoked are both
|
|
141
|
+
// initial values, we know they have not been populated on this minter
|
|
142
|
+
if (
|
|
143
|
+
MaxInvocationsLib.maxInvocationsIsUnconfigured({
|
|
144
|
+
projectId: projectId,
|
|
145
|
+
coreContract: coreContract
|
|
146
|
+
})
|
|
147
|
+
) {
|
|
148
|
+
syncProjectMaxInvocationsToCore({
|
|
149
|
+
projectId: projectId,
|
|
150
|
+
coreContract: coreContract
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
/**
|
|
156
|
+
* @notice Purchases a token from project `projectId`.
|
|
157
|
+
* @param projectId Project ID to mint a token on.
|
|
158
|
+
* @param coreContract Core contract address for the given project.
|
|
159
|
+
* @return tokenId Token ID of minted token
|
|
160
|
+
*/
|
|
161
|
+
function purchase(
|
|
162
|
+
uint256 projectId,
|
|
163
|
+
address coreContract
|
|
164
|
+
) external payable returns (uint256 tokenId) {
|
|
165
|
+
tokenId = purchaseTo({
|
|
166
|
+
to: msg.sender,
|
|
167
|
+
projectId: projectId,
|
|
168
|
+
coreContract: coreContract
|
|
169
|
+
});
|
|
170
|
+
return tokenId;
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
// public getter functions
|
|
174
|
+
/**
|
|
175
|
+
* @notice Gets the maximum invocations project configuration.
|
|
176
|
+
* @param projectId The ID of the project whose data needs to be fetched.
|
|
177
|
+
* @param coreContract The address of the core contract.
|
|
178
|
+
* @return MaxInvocationsLib.MaxInvocationsProjectConfig instance with the
|
|
179
|
+
* configuration data.
|
|
180
|
+
*/
|
|
181
|
+
function maxInvocationsProjectConfig(
|
|
182
|
+
uint256 projectId,
|
|
183
|
+
address coreContract
|
|
184
|
+
)
|
|
185
|
+
external
|
|
186
|
+
view
|
|
187
|
+
returns (MaxInvocationsLib.MaxInvocationsProjectConfig memory)
|
|
188
|
+
{
|
|
189
|
+
return
|
|
190
|
+
MaxInvocationsLib.getMaxInvocationsProjectConfig({
|
|
191
|
+
projectId: projectId,
|
|
192
|
+
coreContract: coreContract
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
/**
|
|
197
|
+
* @notice Gets the set price project configuration.
|
|
198
|
+
* @param projectId The ID of the project whose data needs to be fetched.
|
|
199
|
+
* @param coreContract The address of the core contract.
|
|
200
|
+
* @return SetPriceProjectConfig struct with the fixed price project
|
|
201
|
+
* configuration data.
|
|
202
|
+
*/
|
|
203
|
+
function setPriceProjectConfig(
|
|
204
|
+
uint256 projectId,
|
|
205
|
+
address coreContract
|
|
206
|
+
) external view returns (SetPriceLib.SetPriceProjectConfig memory) {
|
|
207
|
+
return
|
|
208
|
+
SetPriceLib.getSetPriceProjectConfig({
|
|
209
|
+
projectId: projectId,
|
|
210
|
+
coreContract: coreContract
|
|
211
|
+
});
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
/**
|
|
215
|
+
* @notice Checks if the specified `coreContract` is a valid engine contract.
|
|
216
|
+
* @dev This function retrieves the cached value of `isEngine` from
|
|
217
|
+
* the `isEngineCache` mapping. If the cached value is already set, it
|
|
218
|
+
* returns the cached value. Otherwise, it calls the `getV3CoreIsEngineView`
|
|
219
|
+
* function from the `SplitFundsLib` library to check if `coreContract`
|
|
220
|
+
* is a valid engine contract.
|
|
221
|
+
* @dev This function will revert if the provided `coreContract` is not
|
|
222
|
+
* a valid Engine or V3 Flagship contract.
|
|
223
|
+
* @param coreContract The address of the contract to check.
|
|
224
|
+
* @return bool indicating if `coreContract` is a valid engine contract.
|
|
225
|
+
*/
|
|
226
|
+
function isEngineView(address coreContract) external view returns (bool) {
|
|
227
|
+
SplitFundsLib.IsEngineCache storage isEngineCache = SplitFundsLib
|
|
228
|
+
.getIsEngineCacheConfig(coreContract);
|
|
229
|
+
if (isEngineCache.isCached) {
|
|
230
|
+
return isEngineCache.isEngine;
|
|
231
|
+
} else {
|
|
232
|
+
// @dev this calls the non-state-modifying variant of isEngine
|
|
233
|
+
return SplitFundsLib.getV3CoreIsEngineView(coreContract);
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
/**
|
|
238
|
+
* @notice projectId => has project reached its maximum number of
|
|
239
|
+
* invocations? Note that this returns a local cache of the core contract's
|
|
240
|
+
* state, and may be out of sync with the core contract. This is
|
|
241
|
+
* intentional, as it only enables gas optimization of mints after a
|
|
242
|
+
* project's maximum invocations has been reached. A false negative will
|
|
243
|
+
* only result in a gas cost increase, since the core contract will still
|
|
244
|
+
* enforce a maxInvocation check during minting. A false positive is not
|
|
245
|
+
* possible because the V3 core contract only allows maximum invocations
|
|
246
|
+
* to be reduced, not increased. Based on this rationale, we intentionally
|
|
247
|
+
* do not do input validation in this method as to whether or not the input
|
|
248
|
+
* @param projectId is an existing project ID.
|
|
249
|
+
* @param coreContract is an existing core contract address.
|
|
250
|
+
*/
|
|
251
|
+
function projectMaxHasBeenInvoked(
|
|
252
|
+
uint256 projectId,
|
|
253
|
+
address coreContract
|
|
254
|
+
) external view returns (bool) {
|
|
255
|
+
return
|
|
256
|
+
MaxInvocationsLib.getMaxHasBeenInvoked({
|
|
257
|
+
projectId: projectId,
|
|
258
|
+
coreContract: coreContract
|
|
259
|
+
});
|
|
260
|
+
}
|
|
261
|
+
|
|
262
|
+
/**
|
|
263
|
+
* @notice projectId => project's maximum number of invocations.
|
|
264
|
+
* Optionally synced with core contract value, for gas optimization.
|
|
265
|
+
* Note that this returns a local cache of the core contract's
|
|
266
|
+
* state, and may be out of sync with the core contract. This is
|
|
267
|
+
* intentional, as it only enables gas optimization of mints after a
|
|
268
|
+
* project's maximum invocations has been reached.
|
|
269
|
+
* @dev A number greater than the core contract's project max invocations
|
|
270
|
+
* will only result in a gas cost increase, since the core contract will
|
|
271
|
+
* still enforce a maxInvocation check during minting. A number less than
|
|
272
|
+
* the core contract's project max invocations is only possible when the
|
|
273
|
+
* project's max invocations have not been synced on this minter, since the
|
|
274
|
+
* V3 core contract only allows maximum invocations to be reduced, not
|
|
275
|
+
* increased. When this happens, the minter will enable minting, allowing
|
|
276
|
+
* the core contract to enforce the max invocations check. Based on this
|
|
277
|
+
* rationale, we intentionally do not do input validation in this method as
|
|
278
|
+
* to whether or not the input `projectId` is an existing project ID.
|
|
279
|
+
* @param projectId is an existing project ID.
|
|
280
|
+
* @param coreContract is an existing core contract address.
|
|
281
|
+
*/
|
|
282
|
+
function projectMaxInvocations(
|
|
283
|
+
uint256 projectId,
|
|
284
|
+
address coreContract
|
|
285
|
+
) external view returns (uint256) {
|
|
286
|
+
return
|
|
287
|
+
MaxInvocationsLib.getMaxInvocations({
|
|
288
|
+
projectId: projectId,
|
|
289
|
+
coreContract: coreContract
|
|
290
|
+
});
|
|
291
|
+
}
|
|
292
|
+
|
|
293
|
+
/**
|
|
294
|
+
* @notice Gets if price of token is configured, price of minting a
|
|
295
|
+
* token on project `projectId`, and currency symbol and address to be
|
|
296
|
+
* used as payment.
|
|
297
|
+
* @param projectId Project ID to get price information for
|
|
298
|
+
* @param coreContract Contract address of the core contract
|
|
299
|
+
* @return isConfigured true only if token price has been configured on
|
|
300
|
+
* this minter
|
|
301
|
+
* @return tokenPriceInWei current price of token on this minter - invalid
|
|
302
|
+
* if price has not yet been configured
|
|
303
|
+
* @return currencySymbol currency symbol for purchases of project on this
|
|
304
|
+
* minter. This minter always returns "ETH"
|
|
305
|
+
* @return currencyAddress currency address for purchases of project on
|
|
306
|
+
* this minter. This minter always returns null address, reserved for ether
|
|
307
|
+
*/
|
|
308
|
+
function getPriceInfo(
|
|
309
|
+
uint256 projectId,
|
|
310
|
+
address coreContract
|
|
311
|
+
)
|
|
312
|
+
external
|
|
313
|
+
view
|
|
314
|
+
returns (
|
|
315
|
+
bool isConfigured,
|
|
316
|
+
uint256 tokenPriceInWei,
|
|
317
|
+
string memory currencySymbol,
|
|
318
|
+
address currencyAddress
|
|
319
|
+
)
|
|
320
|
+
{
|
|
321
|
+
SetPriceLib.SetPriceProjectConfig
|
|
322
|
+
storage setPriceProjectConfig_ = SetPriceLib
|
|
323
|
+
.getSetPriceProjectConfig({
|
|
324
|
+
projectId: projectId,
|
|
325
|
+
coreContract: coreContract
|
|
326
|
+
});
|
|
327
|
+
isConfigured = setPriceProjectConfig_.priceIsConfigured;
|
|
328
|
+
tokenPriceInWei = setPriceProjectConfig_.pricePerToken;
|
|
329
|
+
currencySymbol = "ETH";
|
|
330
|
+
currencyAddress = address(0);
|
|
331
|
+
}
|
|
332
|
+
|
|
333
|
+
/**
|
|
334
|
+
* @notice Syncs local maximum invocations of project `projectId` based on
|
|
335
|
+
* the value currently defined in the core contract.
|
|
336
|
+
* @param projectId Project ID to set the maximum invocations for.
|
|
337
|
+
* @param coreContract Core contract address for the given project.
|
|
338
|
+
* @dev this enables gas reduction after maxInvocations have been reached -
|
|
339
|
+
* core contracts shall still enforce a maxInvocation check during mint.
|
|
340
|
+
*/
|
|
341
|
+
function syncProjectMaxInvocationsToCore(
|
|
342
|
+
uint256 projectId,
|
|
343
|
+
address coreContract
|
|
344
|
+
) public {
|
|
345
|
+
AuthLib.onlyArtist({
|
|
346
|
+
projectId: projectId,
|
|
347
|
+
coreContract: coreContract,
|
|
348
|
+
sender: msg.sender
|
|
349
|
+
});
|
|
350
|
+
|
|
351
|
+
MaxInvocationsLib.syncProjectMaxInvocationsToCore({
|
|
352
|
+
projectId: projectId,
|
|
353
|
+
coreContract: coreContract
|
|
354
|
+
});
|
|
355
|
+
}
|
|
356
|
+
|
|
357
|
+
/**
|
|
358
|
+
* @notice Purchases a token from project `projectId` and sets
|
|
359
|
+
* the token's owner to `to`.
|
|
360
|
+
* @param to Address to be the new token's owner.
|
|
361
|
+
* @param projectId Project ID to mint a token on.
|
|
362
|
+
* @param coreContract Core contract address for the given project.
|
|
363
|
+
* @return tokenId Token ID of minted token
|
|
364
|
+
*/
|
|
365
|
+
function purchaseTo(
|
|
366
|
+
address to,
|
|
367
|
+
uint256 projectId,
|
|
368
|
+
address coreContract
|
|
369
|
+
) public payable nonReentrant returns (uint256 tokenId) {
|
|
370
|
+
// CHECKS
|
|
371
|
+
// pre-mint MaxInvocationsLib checks
|
|
372
|
+
// Note that `maxHasBeenInvoked` is only checked here to reduce gas
|
|
373
|
+
// consumption after a project has been fully minted.
|
|
374
|
+
// `maxInvocationsProjectConfig.maxHasBeenInvoked` is locally cached to reduce
|
|
375
|
+
// gas consumption, but if not in sync with the core contract's value,
|
|
376
|
+
// the core contract also enforces its own max invocation check during
|
|
377
|
+
// minting.
|
|
378
|
+
MaxInvocationsLib.preMintChecks({
|
|
379
|
+
projectId: projectId,
|
|
380
|
+
coreContract: coreContract
|
|
381
|
+
});
|
|
382
|
+
|
|
383
|
+
// pre-mint checks for set price lib, and get price per token in wei
|
|
384
|
+
// @dev price per token is loaded into memory here for gas efficiency
|
|
385
|
+
uint256 pricePerTokenInWei = SetPriceLib.preMintChecksAndGetPrice({
|
|
386
|
+
projectId: projectId,
|
|
387
|
+
coreContract: coreContract
|
|
388
|
+
});
|
|
389
|
+
|
|
390
|
+
require(msg.value >= pricePerTokenInWei, "Min value to mint req.");
|
|
391
|
+
|
|
392
|
+
// EFFECTS
|
|
393
|
+
tokenId = _minterFilter.mint_joo({
|
|
394
|
+
to: to,
|
|
395
|
+
projectId: projectId,
|
|
396
|
+
coreContract: coreContract,
|
|
397
|
+
sender: msg.sender
|
|
398
|
+
});
|
|
399
|
+
|
|
400
|
+
MaxInvocationsLib.validatePurchaseEffectsInvocations({
|
|
401
|
+
tokenId: tokenId,
|
|
402
|
+
coreContract: coreContract
|
|
403
|
+
});
|
|
404
|
+
|
|
405
|
+
// INTERACTIONS
|
|
406
|
+
SplitFundsLib.splitFundsETHRefundSender({
|
|
407
|
+
projectId: projectId,
|
|
408
|
+
pricePerTokenInWei: pricePerTokenInWei,
|
|
409
|
+
coreContract: coreContract
|
|
410
|
+
});
|
|
411
|
+
|
|
412
|
+
return tokenId;
|
|
413
|
+
}
|
|
414
|
+
}
|
|
@@ -20,4 +20,19 @@ contract DeadReceiverBidderMock is DeadReceiverMock {
|
|
|
20
20
|
);
|
|
21
21
|
require(success, "DeadReceiverBidderMock: call failed");
|
|
22
22
|
}
|
|
23
|
+
|
|
24
|
+
function createBidOnAuctionSharedMinter(
|
|
25
|
+
address minter,
|
|
26
|
+
uint256 tokenId,
|
|
27
|
+
address coreContract
|
|
28
|
+
) external payable {
|
|
29
|
+
(bool success, ) = minter.call{value: msg.value}(
|
|
30
|
+
abi.encodeWithSignature(
|
|
31
|
+
"createBid(uint256,address)",
|
|
32
|
+
tokenId,
|
|
33
|
+
coreContract
|
|
34
|
+
)
|
|
35
|
+
);
|
|
36
|
+
require(success, "DeadReceiverBidderMock: call failed");
|
|
37
|
+
}
|
|
23
38
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
// SPDX-License-Identifier: LGPL-3.0-only
|
|
2
2
|
// Created By: Art Blocks Inc.
|
|
3
3
|
|
|
4
|
-
import "../interfaces/
|
|
5
|
-
import "../interfaces/
|
|
4
|
+
import "../interfaces/v0.8.x/IGenArt721CoreContractV3_Base.sol";
|
|
5
|
+
import "../interfaces/v0.8.x/IMinterFilterV1.sol";
|
|
6
6
|
|
|
7
7
|
pragma solidity 0.8.19;
|
|
8
8
|
|
|
@@ -5,7 +5,23 @@ pragma solidity ^0.8.0;
|
|
|
5
5
|
import "@openzeppelin-4.5/contracts/token/ERC20/ERC20.sol";
|
|
6
6
|
|
|
7
7
|
contract ERC20Mock is ERC20 {
|
|
8
|
+
// add a banned address to enable testing of unsuccessful transfers
|
|
9
|
+
address public bannedReceiver;
|
|
10
|
+
|
|
8
11
|
constructor(uint256 initialSupply) ERC20("Mock Token", "MOCK") {
|
|
9
12
|
_mint(msg.sender, initialSupply);
|
|
10
13
|
}
|
|
14
|
+
|
|
15
|
+
function updateBannedAddress(address account) external {
|
|
16
|
+
bannedReceiver = account;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
function _afterTokenTransfer(
|
|
20
|
+
address from,
|
|
21
|
+
address to,
|
|
22
|
+
uint256 amount
|
|
23
|
+
) internal override {
|
|
24
|
+
require(to != bannedReceiver, "ERC20Mock: transfer to banned address");
|
|
25
|
+
super._afterTokenTransfer(from, to, amount);
|
|
26
|
+
}
|
|
11
27
|
}
|
|
@@ -3,18 +3,17 @@ pragma solidity 0.8.19;
|
|
|
3
3
|
|
|
4
4
|
// Created By: Art Blocks Inc.
|
|
5
5
|
|
|
6
|
-
import "../interfaces/
|
|
7
|
-
import "../interfaces/
|
|
8
|
-
import "../interfaces/
|
|
9
|
-
import "../interfaces/
|
|
10
|
-
import "../interfaces/
|
|
11
|
-
import "../interfaces/0.8.x/IManifold.sol";
|
|
6
|
+
import "../interfaces/v0.8.x/IRandomizerV2.sol";
|
|
7
|
+
import "../interfaces/v0.8.x/IAdminACLV0.sol";
|
|
8
|
+
import "../interfaces/v0.8.x/IGenArt721CoreContractV3_Engine.sol";
|
|
9
|
+
import "../interfaces/v0.8.x/IDependencyRegistryCompatibleV0.sol";
|
|
10
|
+
import "../interfaces/v0.8.x/IManifold.sol";
|
|
12
11
|
|
|
13
12
|
import "@openzeppelin-4.7/contracts/utils/Strings.sol";
|
|
14
13
|
import "@openzeppelin-4.7/contracts/access/Ownable.sol";
|
|
15
|
-
import "../libs/
|
|
16
|
-
import "../libs/
|
|
17
|
-
import "../libs/
|
|
14
|
+
import "../libs/v0.8.x/ERC721_PackedHashSeed.sol";
|
|
15
|
+
import "../libs/v0.8.x/BytecodeStorageV1.sol";
|
|
16
|
+
import "../libs/v0.8.x/Bytes32Strings.sol";
|
|
18
17
|
|
|
19
18
|
/**
|
|
20
19
|
* @title MISCONFIGURED Art Blocks Engine ERC-721 core contract, V3.
|
|
@@ -310,8 +309,7 @@ contract GenArt721CoreV3_Engine_IncorrectCoreType is
|
|
|
310
309
|
address _randomizerContract,
|
|
311
310
|
address _adminACLContract,
|
|
312
311
|
uint248 _startingProjectId,
|
|
313
|
-
bool _autoApproveArtistSplitProposals
|
|
314
|
-
address _engineRegistryContract
|
|
312
|
+
bool _autoApproveArtistSplitProposals
|
|
315
313
|
)
|
|
316
314
|
ERC721_PackedHashSeed(_tokenName, _tokenSymbol)
|
|
317
315
|
onlyNonZeroAddress(_renderProviderAddress)
|
|
@@ -343,13 +341,8 @@ contract GenArt721CoreV3_Engine_IncorrectCoreType is
|
|
|
343
341
|
);
|
|
344
342
|
// initialize next project ID
|
|
345
343
|
_nextProjectId = _startingProjectId;
|
|
346
|
-
//
|
|
347
|
-
// register contract
|
|
348
|
-
IEngineRegistryV0(_engineRegistryContract).registerContract(
|
|
349
|
-
address(this),
|
|
350
|
-
CORE_VERSION,
|
|
351
|
-
CORE_TYPE
|
|
352
|
-
);
|
|
344
|
+
// @dev follow-on action: This contract does not self-register. A core
|
|
345
|
+
// registry owner must register contract in a subsequent call.
|
|
353
346
|
}
|
|
354
347
|
|
|
355
348
|
/**
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
pragma solidity ^0.8.19;
|
|
4
4
|
|
|
5
5
|
import "../engine/V3/forks/PROHIBITION/interfaces/IAdminACLV0_PROHIBITION.sol";
|
|
6
|
-
import "../interfaces/
|
|
6
|
+
import "../interfaces/v0.8.x/IGenArt721CoreContractV3_Base.sol";
|
|
7
7
|
import "@openzeppelin-4.7/contracts/access/Ownable.sol";
|
|
8
8
|
import "@openzeppelin-4.7/contracts/utils/introspection/ERC165.sol";
|
|
9
9
|
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
// SPDX-License-Identifier: LGPL-3.0-only
|
|
2
|
+
// Created By: Art Blocks Inc.
|
|
3
|
+
|
|
4
|
+
import "../interfaces/v0.8.x/ISharedMinterHolderV0.sol";
|
|
5
|
+
|
|
6
|
+
pragma solidity ^0.8.0;
|
|
7
|
+
|
|
8
|
+
contract ReentrancyHolderMockShared {
|
|
9
|
+
uint256 public currentQtyToPurchase;
|
|
10
|
+
uint256 public currentProjectId;
|
|
11
|
+
address public currentCoreContract;
|
|
12
|
+
uint256 public currentPriceToPay;
|
|
13
|
+
address public currentOwnedNftAddress;
|
|
14
|
+
uint256 public currentOwnedNftTokenId;
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
@notice This function can be called to induce controlled reentrency attacks
|
|
18
|
+
on the shared AB minter filter suite.
|
|
19
|
+
Note that _priceToPay should be > project price per token to induce refund,
|
|
20
|
+
making reentrency possible via fallback function.
|
|
21
|
+
*/
|
|
22
|
+
function attack(
|
|
23
|
+
uint256 _qtyToPurchase,
|
|
24
|
+
address _minterContractAddress,
|
|
25
|
+
uint256 _projectId,
|
|
26
|
+
address _coreContract,
|
|
27
|
+
uint256 _priceToPay,
|
|
28
|
+
address _ownedNftAddress,
|
|
29
|
+
uint256 _ownedNftTokenId
|
|
30
|
+
) external payable {
|
|
31
|
+
// update state variables so that receive() knows what to do
|
|
32
|
+
currentQtyToPurchase = _qtyToPurchase;
|
|
33
|
+
currentProjectId = _projectId;
|
|
34
|
+
currentCoreContract = _coreContract;
|
|
35
|
+
currentPriceToPay = _priceToPay;
|
|
36
|
+
currentOwnedNftAddress = _ownedNftAddress;
|
|
37
|
+
currentOwnedNftTokenId = _ownedNftTokenId;
|
|
38
|
+
ISharedMinterHolderV0(_minterContractAddress).purchase{
|
|
39
|
+
value: _priceToPay
|
|
40
|
+
}(_projectId, _coreContract, _ownedNftAddress, _ownedNftTokenId);
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
// receiver is called when minter sends refunded Ether to this contract.
|
|
44
|
+
receive() external payable {
|
|
45
|
+
// decrement num to be purchased
|
|
46
|
+
currentQtyToPurchase--;
|
|
47
|
+
if (currentQtyToPurchase > 0) {
|
|
48
|
+
// purchase again!
|
|
49
|
+
ISharedMinterHolderV0(msg.sender).purchase{
|
|
50
|
+
value: currentPriceToPay
|
|
51
|
+
}(
|
|
52
|
+
currentProjectId,
|
|
53
|
+
currentCoreContract,
|
|
54
|
+
currentOwnedNftAddress,
|
|
55
|
+
currentOwnedNftTokenId
|
|
56
|
+
);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}
|