From cc67c64607250b022e7892a0416c08220846993a Mon Sep 17 00:00:00 2001 From: Neeraj Kashyap Date: Thu, 26 Oct 2023 23:34:19 -0700 Subject: [PATCH 1/2] Made several methods on Inventory facet virtual and public To make more custom subclasses possible/easy. --- contracts/inventory/InventoryFacet.sol | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contracts/inventory/InventoryFacet.sol b/contracts/inventory/InventoryFacet.sol index 88db4860..d6f96e20 100644 --- a/contracts/inventory/InventoryFacet.sol +++ b/contracts/inventory/InventoryFacet.sol @@ -135,7 +135,7 @@ contract InventoryFacet is address adminTerminusAddress, uint256 adminTerminusPoolId, address contractAddress - ) external { + ) public { LibDiamond.enforceIsContractOwner(); LibInventory.InventoryStorage storage istore = LibInventory .inventoryStorage(); @@ -160,7 +160,7 @@ contract InventoryFacet is function createSlot( bool persistent, string memory slotURI - ) external onlyAdmin returns (uint256) { + ) public onlyAdmin returns (uint256) { LibInventory.InventoryStorage storage istore = LibInventory .inventoryStorage(); @@ -199,7 +199,7 @@ contract InventoryFacet is function setSlotURI( string memory newSlotURI, uint slotId - ) external onlyAdmin { + ) public onlyAdmin { LibInventory.InventoryStorage storage istore = LibInventory .inventoryStorage(); @@ -217,7 +217,7 @@ contract InventoryFacet is function setSlotPersistent( uint256 slotId, bool persistent - ) external onlyAdmin { + ) public onlyAdmin { LibInventory.InventoryStorage storage istore = LibInventory .inventoryStorage(); @@ -234,7 +234,7 @@ contract InventoryFacet is address itemAddress, uint256 itemPoolId, uint256 maxAmount - ) external onlyAdmin { + ) public onlyAdmin { require( itemType == LibInventory.ERC20_ITEM_TYPE || itemType == LibInventory.ERC721_ITEM_TYPE || @@ -371,7 +371,7 @@ contract InventoryFacet is address itemAddress, uint256 itemTokenId, uint256 amount - ) public override diamondNonReentrant { + ) public virtual override diamondNonReentrant { require( itemType == LibInventory.ERC20_ITEM_TYPE || itemType == LibInventory.ERC721_ITEM_TYPE || @@ -491,7 +491,7 @@ contract InventoryFacet is uint256 slot, bool unequipAll, uint256 amount - ) public override diamondNonReentrant { + ) public virtual override diamondNonReentrant { LibInventory.InventoryStorage storage istore = LibInventory .inventoryStorage(); From ea3e3f8588a5e57e826d08dd87a89b74149989b4 Mon Sep 17 00:00:00 2001 From: Neeraj Kashyap Date: Thu, 26 Oct 2023 23:37:24 -0700 Subject: [PATCH 2/2] Version bump --- cli/web3cli/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/web3cli/version.txt b/cli/web3cli/version.txt index 5a5831ab..c5d54ec3 100644 --- a/cli/web3cli/version.txt +++ b/cli/web3cli/version.txt @@ -1 +1 @@ -0.0.7 +0.0.9