Improved comments. Removed unused constants

Author: mudgen

README.md

@@ -2,30 +2,9 @@
 
 ## Contract Addresses
 
-Kovan:
-- Aavegotchi diamond: 0x16a2BA2F8d91f0D5e3B9dBAd7E716DaA428fBA85
-- Old Aavegotchi diamond: 0x243D0E444BCaE6BD0645b6Bf4960cc6a925167E0
-- Old Aavegotchi diamond: 0x10225cc1ea2435E53E7661E84D36Fb4E9e20a9DB
-- GHST diamond: 0xeDaA788Ee96a0749a2De48738f5dF0AA88E99ab5
+Aavegotchi diamond: 0x86935F11C86623deC8a25696E1C19a8659CbF95d
 
-The ABI files for the diamonds are in the artifacts directory:
 
-1. IAavegotchiDiamond.json
-1. IGHSTDiamond.json
-
-To easily see what functions these ABI files provide check the corresponding files in the contracts/interfaces directory:
-
-1. IAavegotchiDiamond.sol
-1. IGHSTDiamond.sol
-
-Using a diamond ABI should look something like this:
-
-```javascript
-let aavegotchiDiamond = new web3.eth.Contract(
-  JSON.parse(jsonfromfile).abi,
-  aavegotchiDiamondAddress
-);
-```
 
 ## Local Deployment
 

contracts/Aavegotchi/facets/ERC721MarketplaceFacet.sol

@@ -134,7 +134,7 @@ contract ERC721MarketplaceFacet is Modifiers {
 
     function getERC721Category(address _erc721TokenAddress, uint256 _erc721TokenId) public view returns (uint256 category_) {
         require(_erc721TokenAddress == address(this), "ERC721Marketplace: ERC721 category does not exist");
-        category_ = s.aavegotchis[_erc721TokenId].status; // 0 == portal, 1 == vrf pending, 1 == open portal, 2 == Aavegotchi
+        category_ = s.aavegotchis[_erc721TokenId].status; // 0 == portal, 1 == vrf pending, 2 == open portal, 3 == Aavegotchi
     }
 
     function addERC721Listing(

contracts/Aavegotchi/facets/SvgFacet.sol

@@ -177,16 +177,6 @@ contract SvgFacet is Modifiers {
 
     function getWearableClass(uint256 _slotPosition) internal pure returns (string memory className_) {
         //Wearables
-        /*
-    uint8 internal constant WEARABLE_SLOT_BODY = 0;
-    uint8 internal constant WEARABLE_SLOT_FACE = 1;
-    uint8 internal constant WEARABLE_SLOT_EYES = 2;
-    uint8 internal constant WEARABLE_SLOT_HEAD = 3;
-    uint8 internal constant WEARABLE_SLOT_HAND_LEFT = 4;
-    uint8 internal constant WEARABLE_SLOT_HAND_RIGHT = 5;
-    uint8 internal constant WEARABLE_SLOT_PET = 6;
-    uint8 internal constant WEARABLE_SLOT_BG = 7;
-    */
 
         if (_slotPosition == LibItems.WEARABLE_SLOT_BODY) className_ = "wearable-body";
         if (_slotPosition == LibItems.WEARABLE_SLOT_FACE) className_ = "wearable-face";

contracts/Aavegotchi/facets/VoucherMigrationFacet.sol

@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.1;
+
+import {AppStorage, Modifiers, ItemType} from "../libraries/LibAppStorage.sol";
+import {LibItems} from "../libraries/LibItems.sol";
+import {LibERC1155} from "../../shared/libraries/LibERC1155.sol";
+import {LibMeta} from "../../shared/libraries/LibMeta.sol";
+
+contract VoucherMigrationFacet is Modifiers {
+    event MigrateVouchers(address indexed _owner, uint256[] _ids, uint256[] _values);
+
+    struct VouchersOwner {
+        address owner;
+        uint256[] ids;
+        uint256[] values;
+    }
+
+    function migrateVouchers(VouchersOwner[] calldata _vouchersOwners) external onlyOwner {
+        address sender = LibMeta.msgSender();
+        for (uint256 i; i < _vouchersOwners.length; i++) {
+            address owner = _vouchersOwners[i].owner;
+            uint256[] calldata ids = _vouchersOwners[i].ids;
+            uint256[] calldata values = _vouchersOwners[i].values;
+            for (uint256 j; j < ids.length; j++) {
+                uint256 id = ids[j];
+                uint256 value = values[j];
+                ItemType storage itemType = s.itemTypes[id];
+                uint256 totalQuantity = itemType.totalQuantity + value;
+                require(totalQuantity <= itemType.maxQuantity, "ShopFacet: Total item type quantity exceeds max quantity");
+                itemType.totalQuantity = totalQuantity;
+                LibItems.addToOwner(owner, id, value);
+            }
+            emit LibERC1155.TransferBatch(sender, address(0), owner, ids, values);
+            emit MigrateVouchers(owner, ids, values);
+            LibERC1155.onERC1155BatchReceived(sender, address(0), owner, ids, values, "");
+        }
+    }
+}

contracts/Aavegotchi/libraries/LibAppStorage.sol

@@ -11,6 +11,20 @@ uint256 constant NUMERIC_TRAITS_NUM = 6;
 uint256 constant TRAIT_BONUSES_NUM = 5;
 uint256 constant PORTAL_AAVEGOTCHIS_NUM = 10;
 
+//  switch (traitType) {
+//         case 0:
+//             return energy(value);
+//         case 1:
+//             return aggressiveness(value);
+//         case 2:
+//             return spookiness(value);
+//         case 3:
+//             return brain(value);
+//         case 4:
+//             return eyeShape(value);
+//         case 5:
+//             return eyeColor(value);
+
 struct Aavegotchi {
     uint16[EQUIPPED_WEARABLE_SLOTS] equippedWearables; //The currently equipped wearables of the Aavegotchi
     // [Experience, Rarity Score, Kinship, Eye Color, Eye Shape, Brain Size, Spookiness, Aggressiveness, Energy]