From 1cb2fd1dc19b75ba1d96bd2f62bfee735aaf3ca1 Mon Sep 17 00:00:00 2001 From: Narayan Prusty Date: Sat, 22 Jul 2023 20:41:50 +0100 Subject: [PATCH 1/2] updated hardhat --- hardhat.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardhat.config.ts b/hardhat.config.ts index 5591b65cd..9df1f2011 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -83,7 +83,7 @@ export default { }, supernet: { url: process.env.SUPERNET_URL, - // accounts: [process.env.SECRET], + accounts: [process.env.SECRET], }, // gorli: { // url: process.env.GORLI, From e9e6c015e46dc50b6a8bf95bc97671bbb611f750 Mon Sep 17 00:00:00 2001 From: Narayan Prusty Date: Sat, 22 Jul 2023 20:43:01 +0100 Subject: [PATCH 2/2] uncommented features --- contracts/Aavegotchi/facets/AavegotchiFacet.sol | 6 +++--- contracts/Aavegotchi/facets/AavegotchiGameFacet.sol | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contracts/Aavegotchi/facets/AavegotchiFacet.sol b/contracts/Aavegotchi/facets/AavegotchiFacet.sol index 5a42ceaf0..238927919 100644 --- a/contracts/Aavegotchi/facets/AavegotchiFacet.sol +++ b/contracts/Aavegotchi/facets/AavegotchiFacet.sol @@ -206,7 +206,7 @@ contract AavegotchiFacet is Modifiers { ) external { address sender = LibMeta.msgSender(); internalTransferFrom(sender, _from, _to, _tokenId); - // LibERC721.checkOnERC721Received(sender, _from, _to, _tokenId, ""); + LibERC721.checkOnERC721Received(sender, _from, _to, _tokenId, ""); } /// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE @@ -234,8 +234,8 @@ contract AavegotchiFacet is Modifiers { address _to, uint256 _tokenId ) internal { - // LibGotchiLending.enforceAavegotchiNotInLending(uint32(_tokenId), _sender); - // _enforceAavegotchiNotForging(_tokenId); + LibGotchiLending.enforceAavegotchiNotInLending(uint32(_tokenId), _sender); + _enforceAavegotchiNotForging(_tokenId); require(_to != address(0), "AavegotchiFacet: Can't transfer to 0 address"); require(_from != address(0), "AavegotchiFacet: _from can't be 0 address"); diff --git a/contracts/Aavegotchi/facets/AavegotchiGameFacet.sol b/contracts/Aavegotchi/facets/AavegotchiGameFacet.sol index 22c7d1330..c335f3e8c 100644 --- a/contracts/Aavegotchi/facets/AavegotchiGameFacet.sol +++ b/contracts/Aavegotchi/facets/AavegotchiGameFacet.sol @@ -244,7 +244,7 @@ contract AavegotchiGameFacet is Modifiers { address escrow = address(new CollateralEscrow(option.collateralType)); aavegotchi.escrow = escrow; address owner = LibMeta.msgSender(); - // LibERC20.transferFrom(option.collateralType, owner, escrow, _stakeAmount); + LibERC20.transferFrom(option.collateralType, owner, escrow, _stakeAmount); LibERC721Marketplace.cancelERC721Listing(address(this), _tokenId, owner); }