diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts index 422bf08e..9958691f 100644 --- a/contracts/hardhat.config.ts +++ b/contracts/hardhat.config.ts @@ -109,6 +109,7 @@ const config: HardhatUserConfig = { clear: true, only: [ "CurrencyManager", + "ExecutionManager", "HypercertMinter", "LooksRareProtocol", "OrderValidatorV2A", diff --git a/contracts/package.json b/contracts/package.json index d3912958..2b7597b1 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -1,7 +1,7 @@ { "name": "@hypercerts-org/contracts", "description": "EVM compatible protocol for managing impact claims", - "version": "1.0.0-alpha.6", + "version": "1.0.0-alpha.7", "author": { "name": "Hypercerts Foundation", "url": "https://github.com/hypercerts-org/hypercerts" diff --git a/contracts/src/index.ts b/contracts/src/index.ts index cbee534e..ee478287 100644 --- a/contracts/src/index.ts +++ b/contracts/src/index.ts @@ -8,8 +8,10 @@ import TransferManagerAbi from "../abi/src/marketplace/TransferManager.sol/Trans import StrategyCollectionOfferAbi from "../abi/src/marketplace/executionStrategies/StrategyCollectionOffer.sol/StrategyCollectionOffer.json"; import StrategyHypercertFractionOfferAbi from "../abi/src/marketplace/executionStrategies/StrategyHypercertFractionOffer.sol/StrategyHypercertFractionOffer.json"; import CreatorFeeManagerWithRoyaltiesAbi from "../abi/src/marketplace/CreatorFeeManagerWithRoyalties.sol/CreatorFeeManagerWithRoyalties.json"; +import ExecutionManagerAbi from "../abi/src/marketplace/ExecutionManager.sol/ExecutionManager.json"; import { + ExecutionManager, HypercertMinter, IHypercertToken, LooksRareProtocol as HypercertExchange, @@ -74,6 +76,7 @@ export { deployments, asDeployedChain }; // Abis export { CreatorFeeManagerWithRoyaltiesAbi, + ExecutionManagerAbi, HypercertMinterAbi, HypercertExchangeAbi, OrderValidatorV2AAbi, @@ -86,6 +89,7 @@ export { // Interfaces export type { CreatorFeeManagerWithRoyalties, + ExecutionManager, IHypercertExchange, IHypercertToken, HypercertExchange, diff --git a/contracts/test/foundry/marketplace/LooksRareProtocol.t.sol b/contracts/test/foundry/marketplace/LooksRareProtocol.t.sol index 5f685cec..eae62a48 100644 --- a/contracts/test/foundry/marketplace/LooksRareProtocol.t.sol +++ b/contracts/test/foundry/marketplace/LooksRareProtocol.t.sol @@ -84,6 +84,10 @@ contract LooksRareProtocolTest is ProtocolBase { _createMockMakerAskAndTakerBid(address(mockERC721)); makerAsk.currency = address(mockERC20); + mockERC20.mint(takerUser, 10 ether); + vm.prank(takerUser); + mockERC20.approve(address(looksRareProtocol), 10 ether); + // Mint asset mockERC721.mint(makerUser, makerAsk.itemIds[0]); @@ -125,6 +129,12 @@ contract LooksRareProtocolTest is ProtocolBase { merkleTrees, false // Non-atomic ); + + vm.prank(_owner); + looksRareProtocol.updateCurrencyStatus(address(mockERC20), true); + + vm.prank(takerUser); + looksRareProtocol.executeTakerBid{value: price}(takerBid, makerAsk, signature, _EMPTY_MERKLE_TREE); } function testCannotTradeIfETHIsUsedForMakerBid() public {