From 2d36d3e86b467326f2c7ddcff78774d235dfa948 Mon Sep 17 00:00:00 2001 From: 0xSamWitch Date: Thu, 24 Oct 2024 10:51:59 +0100 Subject: [PATCH] Deploy halloween update on prod --- .openzeppelin/unknown-250.json | 1072 ++++++++++++++++++++++++++++++++ README.md | 20 +- scripts/contractAddresses.ts | 16 +- scripts/deployImpls.ts | 2 +- scripts/deployUpgrade.ts | 22 +- 5 files changed, 1099 insertions(+), 33 deletions(-) diff --git a/.openzeppelin/unknown-250.json b/.openzeppelin/unknown-250.json index e28aff2d..b1c53c67 100644 --- a/.openzeppelin/unknown-250.json +++ b/.openzeppelin/unknown-250.json @@ -71663,6 +71663,1078 @@ } } } + }, + "48de2f29a0ec61e7cd176490dea683033aa2dcf8f2fa9f7001e62a220f13f6d7": { + "address": "0x1c2B42507d734356B4724a46465d1b7BC6D144fa", + "txHash": "0x00deaa4e22b4eb698092972b67793601ab47604333fae36d7d178b9bba0ff4d3", + "layout": { + "solcVersion": "0.8.20", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "contracts\\ozUpgradeable\\proxy\\utils\\Initializable.sol:66", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "contracts\\ozUpgradeable\\proxy\\utils\\Initializable.sol:71" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "contracts\\ozUpgradeable\\proxy\\ERC1967\\ERC1967UpgradeUpgradeable.sol:215" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "contracts\\ozUpgradeable\\proxy\\utils\\UUPSUpgradeable.sol:116" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "contracts\\ozUpgradeable\\utils\\ContextUpgradeable.sol:35" + }, + { + "label": "_owner", + "offset": 0, + "slot": "151", + "type": "t_address", + "contract": "OwnableUpgradeable", + "src": "contracts\\ozUpgradeable\\access\\OwnableUpgradeable.sol:22" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "OwnableUpgradeable", + "src": "contracts\\ozUpgradeable\\access\\OwnableUpgradeable.sol:101" + }, + { + "label": "users", + "offset": 0, + "slot": "201", + "type": "t_mapping(t_address,t_uint256)", + "contract": "Promotions", + "src": "contracts\\Promotions.sol:84" + }, + { + "label": "adminAccess", + "offset": 0, + "slot": "202", + "type": "t_contract(AdminAccess)5265", + "contract": "Promotions", + "src": "contracts\\Promotions.sol:85" + }, + { + "label": "itemNFT", + "offset": 0, + "slot": "203", + "type": "t_contract(ItemNFT)8603", + "contract": "Promotions", + "src": "contracts\\Promotions.sol:86" + }, + { + "label": "playerNFT", + "offset": 0, + "slot": "204", + "type": "t_contract(PlayerNFT)10320", + "contract": "Promotions", + "src": "contracts\\Promotions.sol:87" + }, + { + "label": "isBeta", + "offset": 20, + "slot": "204", + "type": "t_bool", + "contract": "Promotions", + "src": "contracts\\Promotions.sol:88" + }, + { + "label": "singlePlayerPromotionsCompleted", + "offset": 0, + "slot": "205", + "type": "t_mapping(t_uint256,t_struct(BitMap)4871_storage)", + "contract": "Promotions", + "src": "contracts\\Promotions.sol:89" + }, + { + "label": "activePromotions", + "offset": 0, + "slot": "206", + "type": "t_mapping(t_enum(Promotion)18466,t_struct(PromotionInfo)18610_storage)", + "contract": "Promotions", + "src": "contracts\\Promotions.sol:90" + }, + { + "label": "multidayPlayerPromotionsCompleted", + "offset": 0, + "slot": "207", + "type": "t_mapping(t_uint256,t_mapping(t_enum(Promotion)18466,t_array(t_uint8)32_storage))", + "contract": "Promotions", + "src": "contracts\\Promotions.sol:91" + }, + { + "label": "userPromotionsClaimed", + "offset": 0, + "slot": "208", + "type": "t_mapping(t_address,t_struct(BitMap)4871_storage)", + "contract": "Promotions", + "src": "contracts\\Promotions.sol:95" + }, + { + "label": "playerPromotionsClaimed", + "offset": 0, + "slot": "209", + "type": "t_mapping(t_uint256,t_struct(BitMap)4871_storage)", + "contract": "Promotions", + "src": "contracts\\Promotions.sol:96" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint16)dyn_storage": { + "label": "uint16[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_array(t_uint32)dyn_storage": { + "label": "uint32[]", + "numberOfBytes": "32" + }, + "t_array(t_uint8)32_storage": { + "label": "uint8[32]", + "numberOfBytes": "32" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(AdminAccess)5265": { + "label": "contract AdminAccess", + "numberOfBytes": "20" + }, + "t_contract(ItemNFT)8603": { + "label": "contract ItemNFT", + "numberOfBytes": "20" + }, + "t_contract(PlayerNFT)10320": { + "label": "contract PlayerNFT", + "numberOfBytes": "20" + }, + "t_enum(Promotion)18466": { + "label": "enum Promotion", + "members": [ + "NONE", + "STARTER", + "HALLOWEEN_2023", + "XMAS_2023", + "HALLOWEEN_2024", + "HOLIDAY4", + "HOLIDAY5", + "HOLIDAY6", + "HOLIDAY7", + "HOLIDAY8", + "HOLIDAY9", + "HOLIDAY10" + ], + "numberOfBytes": "1" + }, + "t_mapping(t_address,t_struct(BitMap)4871_storage)": { + "label": "mapping(address => struct BitMaps.BitMap)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_enum(Promotion)18466,t_array(t_uint8)32_storage)": { + "label": "mapping(enum Promotion => uint8[32])", + "numberOfBytes": "32" + }, + "t_mapping(t_enum(Promotion)18466,t_struct(PromotionInfo)18610_storage)": { + "label": "mapping(enum Promotion => struct PromotionInfo)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_enum(Promotion)18466,t_array(t_uint8)32_storage))": { + "label": "mapping(uint256 => mapping(enum Promotion => uint8[32]))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_struct(BitMap)4871_storage)": { + "label": "mapping(uint256 => struct BitMaps.BitMap)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_uint256)": { + "label": "mapping(uint256 => uint256)", + "numberOfBytes": "32" + }, + "t_struct(BitMap)4871_storage": { + "label": "struct BitMaps.BitMap", + "members": [ + { + "label": "_data", + "type": "t_mapping(t_uint256,t_uint256)", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(PromotionInfo)18610_storage": { + "label": "struct PromotionInfo", + "members": [ + { + "label": "promotion", + "type": "t_enum(Promotion)18466", + "offset": 0, + "slot": "0" + }, + { + "label": "startTime", + "type": "t_uint40", + "offset": 1, + "slot": "0" + }, + { + "label": "numDays", + "type": "t_uint8", + "offset": 6, + "slot": "0" + }, + { + "label": "numDailyRandomItemsToPick", + "type": "t_uint8", + "offset": 7, + "slot": "0" + }, + { + "label": "minTotalXP", + "type": "t_uint40", + "offset": 8, + "slot": "0" + }, + { + "label": "brushCost", + "type": "t_uint24", + "offset": 13, + "slot": "0" + }, + { + "label": "redeemCodeLength", + "type": "t_uint8", + "offset": 16, + "slot": "0" + }, + { + "label": "adminOnly", + "type": "t_bool", + "offset": 17, + "slot": "0" + }, + { + "label": "promotionTiedToUser", + "type": "t_bool", + "offset": 18, + "slot": "0" + }, + { + "label": "promotionTiedToPlayer", + "type": "t_bool", + "offset": 19, + "slot": "0" + }, + { + "label": "promotionMustOwnPlayer", + "type": "t_bool", + "offset": 20, + "slot": "0" + }, + { + "label": "evolvedHeroOnly", + "type": "t_bool", + "offset": 21, + "slot": "0" + }, + { + "label": "isMultiday", + "type": "t_bool", + "offset": 22, + "slot": "0" + }, + { + "label": "brushCostMissedDay", + "type": "t_uint8", + "offset": 23, + "slot": "0" + }, + { + "label": "numDaysHitNeededForStreakBonus", + "type": "t_uint8", + "offset": 24, + "slot": "0" + }, + { + "label": "numDaysClaimablePeriodStreakBonus", + "type": "t_uint8", + "offset": 25, + "slot": "0" + }, + { + "label": "numRandomStreakBonusItemsToPick1", + "type": "t_uint8", + "offset": 26, + "slot": "0" + }, + { + "label": "numRandomStreakBonusItemsToPick2", + "type": "t_uint8", + "offset": 27, + "slot": "0" + }, + { + "label": "randomStreakBonusItemTokenIds1", + "type": "t_array(t_uint16)dyn_storage", + "offset": 0, + "slot": "1" + }, + { + "label": "randomStreakBonusAmounts1", + "type": "t_array(t_uint32)dyn_storage", + "offset": 0, + "slot": "2" + }, + { + "label": "randomStreakBonusItemTokenIds2", + "type": "t_array(t_uint16)dyn_storage", + "offset": 0, + "slot": "3" + }, + { + "label": "randomStreakBonusAmounts2", + "type": "t_array(t_uint32)dyn_storage", + "offset": 0, + "slot": "4" + }, + { + "label": "guaranteedStreakBonusItemTokenIds", + "type": "t_array(t_uint16)dyn_storage", + "offset": 0, + "slot": "5" + }, + { + "label": "guaranteedStreakBonusAmounts", + "type": "t_array(t_uint16)dyn_storage", + "offset": 0, + "slot": "6" + }, + { + "label": "guaranteedItemTokenIds", + "type": "t_array(t_uint16)dyn_storage", + "offset": 0, + "slot": "7" + }, + { + "label": "guaranteedAmounts", + "type": "t_array(t_uint32)dyn_storage", + "offset": 0, + "slot": "8" + }, + { + "label": "randomItemTokenIds", + "type": "t_array(t_uint16)dyn_storage", + "offset": 0, + "slot": "9" + }, + { + "label": "randomAmounts", + "type": "t_array(t_uint32)dyn_storage", + "offset": 0, + "slot": "10" + } + ], + "numberOfBytes": "352" + }, + "t_uint16": { + "label": "uint16", + "numberOfBytes": "2" + }, + "t_uint24": { + "label": "uint24", + "numberOfBytes": "3" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint32": { + "label": "uint32", + "numberOfBytes": "4" + }, + "t_uint40": { + "label": "uint40", + "numberOfBytes": "5" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "5b9e47b6447694ec15b5effbdf813c26bdb914045b55590a6a9bfc03e59f343c": { + "address": "0x32CDf14136A95aFe9FBF78571B74C20c236548AF", + "txHash": "0x53986ce1b949cfaef9b92676ae1354700618a1e2ea89fba6c9a072e9ee43b416", + "layout": { + "solcVersion": "0.8.20", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "contracts\\ozUpgradeable\\proxy\\utils\\Initializable.sol:66", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "contracts\\ozUpgradeable\\proxy\\utils\\Initializable.sol:71" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "contracts\\ozUpgradeable\\proxy\\ERC1967\\ERC1967UpgradeUpgradeable.sol:215" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "contracts\\ozUpgradeable\\proxy\\utils\\UUPSUpgradeable.sol:116" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "contracts\\ozUpgradeable\\utils\\ContextUpgradeable.sol:35" + }, + { + "label": "_owner", + "offset": 0, + "slot": "151", + "type": "t_address", + "contract": "OwnableUpgradeable", + "src": "contracts\\ozUpgradeable\\access\\OwnableUpgradeable.sol:22" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "OwnableUpgradeable", + "src": "contracts\\ozUpgradeable\\access\\OwnableUpgradeable.sol:101" + }, + { + "label": "__gap", + "offset": 0, + "slot": "201", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC165Upgradeable", + "src": "contracts\\ozUpgradeable\\utils\\introspection\\ERC165Upgradeable.sol:40" + }, + { + "label": "_owner", + "offset": 0, + "slot": "251", + "type": "t_mapping(t_uint256,t_address)", + "contract": "ERC1155UpgradeableSinglePerToken", + "src": "contracts\\ozUpgradeable\\token\\ERC1155\\ERC1155UpgradeableSinglePerToken.sol:44" + }, + { + "label": "_operatorApprovals", + "offset": 0, + "slot": "252", + "type": "t_mapping(t_address,t_mapping(t_address,t_bool))", + "contract": "ERC1155UpgradeableSinglePerToken", + "src": "contracts\\ozUpgradeable\\token\\ERC1155\\ERC1155UpgradeableSinglePerToken.sol:47" + }, + { + "label": "_uri", + "offset": 0, + "slot": "253", + "type": "t_string_storage", + "contract": "ERC1155UpgradeableSinglePerToken", + "src": "contracts\\ozUpgradeable\\token\\ERC1155\\ERC1155UpgradeableSinglePerToken.sol:50" + }, + { + "label": "_totalSupplyAll", + "offset": 0, + "slot": "254", + "type": "t_uint40", + "contract": "ERC1155UpgradeableSinglePerToken", + "src": "contracts\\ozUpgradeable\\token\\ERC1155\\ERC1155UpgradeableSinglePerToken.sol:52" + }, + { + "label": "nextPetId", + "offset": 5, + "slot": "254", + "type": "t_uint40", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:98" + }, + { + "label": "instantVRFActions", + "offset": 10, + "slot": "254", + "type": "t_address", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:99" + }, + { + "label": "basePetMetadatas", + "offset": 0, + "slot": "255", + "type": "t_mapping(t_uint256,t_struct(BasePetMetadata)10989_storage)", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:102" + }, + { + "label": "pets", + "offset": 0, + "slot": "256", + "type": "t_mapping(t_uint256,t_struct(Pet)10940_storage)", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:103" + }, + { + "label": "names", + "offset": 0, + "slot": "257", + "type": "t_mapping(t_uint256,t_string_storage)", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:104" + }, + { + "label": "lowercaseNames", + "offset": 0, + "slot": "258", + "type": "t_mapping(t_string_memory_ptr,t_bool)", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:105" + }, + { + "label": "lastAssignmentTimestamps", + "offset": 0, + "slot": "259", + "type": "t_mapping(t_uint256,t_uint40)", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:106" + }, + { + "label": "imageBaseUri", + "offset": 0, + "slot": "260", + "type": "t_string_storage", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:107" + }, + { + "label": "royaltyReceiver", + "offset": 0, + "slot": "261", + "type": "t_address", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:110" + }, + { + "label": "royaltyFee", + "offset": 20, + "slot": "261", + "type": "t_uint8", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:111" + }, + { + "label": "adminAccess", + "offset": 0, + "slot": "262", + "type": "t_contract(AdminAccess)6214", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:113" + }, + { + "label": "isBeta", + "offset": 20, + "slot": "262", + "type": "t_bool", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:114" + }, + { + "label": "dev", + "offset": 0, + "slot": "263", + "type": "t_address", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:116" + }, + { + "label": "brush", + "offset": 0, + "slot": "264", + "type": "t_contract(IBrushToken)12167", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:117" + }, + { + "label": "editNameCost", + "offset": 20, + "slot": "264", + "type": "t_uint72", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:118" + }, + { + "label": "brushBurntPercentage", + "offset": 29, + "slot": "264", + "type": "t_uint8", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:119" + }, + { + "label": "brushPoolPercentage", + "offset": 30, + "slot": "264", + "type": "t_uint8", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:120" + }, + { + "label": "brushDevPercentage", + "offset": 31, + "slot": "264", + "type": "t_uint8", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:121" + }, + { + "label": "brushTerritoriesPercentage", + "offset": 0, + "slot": "265", + "type": "t_uint8", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:122" + }, + { + "label": "territories", + "offset": 1, + "slot": "265", + "type": "t_address", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:123" + }, + { + "label": "players", + "offset": 0, + "slot": "266", + "type": "t_address", + "contract": "PetNFT", + "src": "contracts\\PetNFT.sol:124" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(AdminAccess)6214": { + "label": "contract AdminAccess", + "numberOfBytes": "20" + }, + "t_contract(IBrushToken)12167": { + "label": "contract IBrushToken", + "numberOfBytes": "20" + }, + "t_enum(PetEnhancementType)10919": { + "label": "enum PetEnhancementType", + "members": [ + "NONE", + "MELEE", + "MAGIC", + "RANGED", + "DEFENCE", + "HEALTH", + "MELEE_AND_DEFENCE", + "MAGIC_AND_DEFENCE", + "RANGED_AND_DEFENCE" + ], + "numberOfBytes": "1" + }, + "t_enum(PetSkin)10909": { + "label": "enum PetSkin", + "members": ["NONE", "DEFAULT", "OG", "ONEKIN", "FROST", "CRYSTAL", "ANNIV1", "KRAGSTYR"], + "numberOfBytes": "1" + }, + "t_enum(Skill)10860": { + "label": "enum Skill", + "members": [ + "NONE", + "COMBAT", + "MELEE", + "RANGED", + "MAGIC", + "DEFENCE", + "HEALTH", + "RESERVED_COMBAT", + "MINING", + "WOODCUTTING", + "FISHING", + "SMITHING", + "THIEVING", + "CRAFTING", + "COOKING", + "FIREMAKING", + "AGILITY", + "ALCHEMY", + "FLETCHING", + "FORGING", + "RESERVED2", + "RESERVED3", + "RESERVED4", + "RESERVED5", + "RESERVED6", + "RESERVED7", + "RESERVED8", + "RESERVED9", + "RESERVED10", + "RESERVED11", + "RESERVED12", + "RESERVED13", + "RESERVED14", + "RESERVED15", + "RESERVED16", + "RESERVED17", + "RESERVED18", + "RESERVED19", + "RESERVED20", + "TRAVELING" + ], + "numberOfBytes": "1" + }, + "t_mapping(t_address,t_bool)": { + "label": "mapping(address => bool)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_mapping(t_address,t_bool))": { + "label": "mapping(address => mapping(address => bool))", + "numberOfBytes": "32" + }, + "t_mapping(t_string_memory_ptr,t_bool)": { + "label": "mapping(string => bool)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_address)": { + "label": "mapping(uint256 => address)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_string_storage)": { + "label": "mapping(uint256 => string)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_struct(BasePetMetadata)10989_storage)": { + "label": "mapping(uint256 => struct BasePetMetadata)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_struct(Pet)10940_storage)": { + "label": "mapping(uint256 => struct Pet)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_uint40)": { + "label": "mapping(uint256 => uint40)", + "numberOfBytes": "32" + }, + "t_string_memory_ptr": { + "label": "string", + "numberOfBytes": "32" + }, + "t_string_storage": { + "label": "string", + "numberOfBytes": "32" + }, + "t_struct(BasePetMetadata)10989_storage": { + "label": "struct BasePetMetadata", + "members": [ + { + "label": "description", + "type": "t_string_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "tier", + "type": "t_uint8", + "offset": 0, + "slot": "1" + }, + { + "label": "skin", + "type": "t_enum(PetSkin)10909", + "offset": 1, + "slot": "1" + }, + { + "label": "enhancementType", + "type": "t_enum(PetEnhancementType)10919", + "offset": 2, + "slot": "1" + }, + { + "label": "skillEnhancement1", + "type": "t_enum(Skill)10860", + "offset": 3, + "slot": "1" + }, + { + "label": "skillFixedMin1", + "type": "t_uint8", + "offset": 4, + "slot": "1" + }, + { + "label": "skillFixedMax1", + "type": "t_uint8", + "offset": 5, + "slot": "1" + }, + { + "label": "skillFixedIncrement1", + "type": "t_uint8", + "offset": 6, + "slot": "1" + }, + { + "label": "skillPercentageMin1", + "type": "t_uint8", + "offset": 7, + "slot": "1" + }, + { + "label": "skillPercentageMax1", + "type": "t_uint8", + "offset": 8, + "slot": "1" + }, + { + "label": "skillPercentageIncrement1", + "type": "t_uint8", + "offset": 9, + "slot": "1" + }, + { + "label": "skillMinLevel1", + "type": "t_uint8", + "offset": 10, + "slot": "1" + }, + { + "label": "skillEnhancement2", + "type": "t_enum(Skill)10860", + "offset": 11, + "slot": "1" + }, + { + "label": "skillFixedMin2", + "type": "t_uint8", + "offset": 12, + "slot": "1" + }, + { + "label": "skillFixedMax2", + "type": "t_uint8", + "offset": 13, + "slot": "1" + }, + { + "label": "skillFixedIncrement2", + "type": "t_uint8", + "offset": 14, + "slot": "1" + }, + { + "label": "skillPercentageMin2", + "type": "t_uint8", + "offset": 15, + "slot": "1" + }, + { + "label": "skillPercentageMax2", + "type": "t_uint8", + "offset": 16, + "slot": "1" + }, + { + "label": "skillPercentageIncrement2", + "type": "t_uint8", + "offset": 17, + "slot": "1" + }, + { + "label": "skillMinLevel2", + "type": "t_uint8", + "offset": 18, + "slot": "1" + }, + { + "label": "fixedStarThreshold", + "type": "t_uint16", + "offset": 19, + "slot": "1" + }, + { + "label": "percentageStarThreshold", + "type": "t_uint16", + "offset": 21, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Pet)10940_storage": { + "label": "struct Pet", + "members": [ + { + "label": "skillEnhancement1", + "type": "t_enum(Skill)10860", + "offset": 0, + "slot": "0" + }, + { + "label": "skillFixedEnhancement1", + "type": "t_uint8", + "offset": 1, + "slot": "0" + }, + { + "label": "skillPercentageEnhancement1", + "type": "t_uint8", + "offset": 2, + "slot": "0" + }, + { + "label": "skillEnhancement2", + "type": "t_enum(Skill)10860", + "offset": 3, + "slot": "0" + }, + { + "label": "skillFixedEnhancement2", + "type": "t_uint8", + "offset": 4, + "slot": "0" + }, + { + "label": "skillPercentageEnhancement2", + "type": "t_uint8", + "offset": 5, + "slot": "0" + }, + { + "label": "lastAssignmentTimestamp", + "type": "t_uint40", + "offset": 6, + "slot": "0" + }, + { + "label": "owner", + "type": "t_address", + "offset": 11, + "slot": "0" + }, + { + "label": "baseId", + "type": "t_uint24", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint16": { + "label": "uint16", + "numberOfBytes": "2" + }, + "t_uint24": { + "label": "uint24", + "numberOfBytes": "3" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint40": { + "label": "uint40", + "numberOfBytes": "5" + }, + "t_uint72": { + "label": "uint72", + "numberOfBytes": "9" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } } } } diff --git a/README.md b/README.md index cfe68026..9a1b0c55 100644 --- a/README.md +++ b/README.md @@ -57,19 +57,19 @@ ItemNFTLibrary [0x8d61639c830aaf82c8549c36e65a9aeef9a73b45](https://ftmscan.com/ ItemNFT [0x4b9c90ebb1fa98d9724db46c4689994b46706f5a](https://ftmscan.com/address/0x4b9c90ebb1fa98d9724db46c4689994b46706f5a) EstforLibrary [0x804a530f41ecf0c40cd4e312a72e033c78a2c1fa](https://ftmscan.com/address/0x804a530f41ecf0c40cd4e312a72e033c78a2c1fa) PlayerNFT [0xb809ed839c691d465e2ec45e1bcb5e5aded50fb9](https://ftmscan.com/address/0xb809ed839c691d465e2ec45e1bcb5e5aded50fb9) -PromotionsLibrary [0x5494e6a699e8e59e9a6ec3031ab96e35f2476c95](https://ftmscan.com/address/0x5494e6a699e8e59e9a6ec3031ab96e35f2476c95) +PromotionsLibrary [0x8b7e1bd3fe31d926209adfdbdc9d48a74e5666f5](https://ftmscan.com/address/0x8b7e1bd3fe31d926209adfdbdc9d48a74e5666f5) Promotions [0x7d1c598266Dd6Bb0Ed7a76161c11e5073D8A71A4](https://ftmscan.com/address/0x7d1c598266Dd6Bb0Ed7a76161c11e5073D8A71A4) Quests [0x17c59f0d2d4f80FD0F906Df53a28272736c7b455](https://ftmscan.com/address/0x17c59f0d2d4f80FD0F906Df53a28272736c7b455) Clans [0x334caa8907bdf49470f7b085380c25431ef96f6d](https://ftmscan.com/address/0x334caa8907bdf49470f7b085380c25431ef96f6d) WishingWell [0x0a8d80ce4855666b7d7121d75f2a49aac434a918](https://ftmscan.com/address/0x0a8d80ce4855666b7d7121d75f2a49aac434a918) Bank Beacon [0xe183a43881eac74808c55bdb2a073929602af4db](https://ftmscan.com/address/0xe183a43881eac74808c55bdb2a073929602af4db) -PlayersLibrary [0xfd0145ef3585176345cf8f2c63e025049f689073](https://ftmscan.com/address/0xfd0145ef3585176345cf8f2c63e025049f689073) -PlayersImplQueueActions [0x0776fd8b445e272b718db2db13f500d4d31b5de6](https://ftmscan.com/address/0x0776fd8b445e272b718db2db13f500d4d31b5de6) -PlayersImplProcessActions [0xb041035dbb95eac6011c5ef3cdd8a355fcb68700](https://ftmscan.com/address/0xb041035dbb95eac6011c5ef3cdd8a355fcb68700) -PlayersImplRewards [0x139bb2ac01597c7b4e6157aba6a4b3db1620014d](https://ftmscan.com/address/0x139bb2ac01597c7b4e6157aba6a4b3db1620014d) -PlayersImplMisc [0xf2136389a8e829da6a399b58ad56999d99e7cef7](https://ftmscan.com/address/0xf2136389a8e829da6a399b58ad56999d99e7cef7) -PlayersImplMisc1 [0x971703455f101d1d81d71e82a9ba895446c1183f](https://ftmscan.com/address/0x971703455f101d1d81d71e82a9ba895446c1183f) +PlayersLibrary [0xf01bc981a79f38b74a9b3953ee5aa6c95d9eded7](https://ftmscan.com/address/0xf01bc981a79f38b74a9b3953ee5aa6c95d9eded7) +PlayersImplQueueActions [0x05b9958e6f209d9d0594d34f0ac44d1f9bf128d6](https://ftmscan.com/address/0x05b9958e6f209d9d0594d34f0ac44d1f9bf128d6) +PlayersImplProcessActions [0x61da56557859597fa6bf693b7f149bc3934ac497](https://ftmscan.com/address/0x61da56557859597fa6bf693b7f149bc3934ac497) +PlayersImplRewards [0x8eae3948ff44ddce15223902b396f373692a422e](https://ftmscan.com/address/0x8eae3948ff44ddce15223902b396f373692a422e) +PlayersImplMisc [0xd5aba67d0469fd553c9c5fb6b3534b98db3e1558](https://ftmscan.com/address/0xd5aba67d0469fd553c9c5fb6b3534b98db3e1558) +PlayersImplMisc1 [0xc55b5e713ee31a641e090d1e550bf4fcfe0b6ba4](https://ftmscan.com/address/0xc55b5e713ee31a641e090d1e550bf4fcfe0b6ba4) Players [0x058ec56aba13f7fee3ae9c9b91b3bb03bc336143](https://ftmscan.com/address/0x058ec56aba13f7fee3ae9c9b91b3bb03bc336143) BankRegistry [0x55a1b0251e1375bd41dd9778c379322e3863a54e](https://ftmscan.com/address/0x55a1b0251e1375bd41dd9778c379322e3863a54e) @@ -87,7 +87,7 @@ Territories [0x2cfd3b9f8b595200d6b4b7f667b2a1bcc6d0c170](https://ftmscan.com/add CombatantsHelper [0x8fedf83c55012acff7115b8fa164095721953c39](https://ftmscan.com/address/0x8fedf83c55012acff7115b8fa164095721953c39) DecoratorProvider [0xba2f8cff9ea18f3687eb685f0c1bcd509b539963](https://ftmscan.com/address/0xba2f8cff9ea18f3687eb685f0c1bcd509b539963) -PetNFTLibrary [0x5a134487df2d8e216e34bf9407bd63cd80e76957](https://ftmscan.com/address/0x5a134487df2d8e216e34bf9407bd63cd80e76957) +PetNFTLibrary [0x517792d5cbb33cd337a2ef1bc6290ad964ea434e](https://ftmscan.com/address/0x517792d5cbb33cd337a2ef1bc6290ad964ea434e) PetNFT [0x1681f593ac5cba407c2a190de0ca2beb4a69b5d3](https://ftmscan.com/address/0x1681f593ac5cba407c2a190de0ca2beb4a69b5d3) PassiveActions [0xa3e3a69edaee89b8dbbd1ca37704cc574cb8e1d4](https://ftmscan.com/address/0xa3e3a69edaee89b8dbbd1ca37704cc574cb8e1d4) @@ -106,7 +106,7 @@ ItemNFTLibrary [0x2d0b79a4d76d6fd86b8ba08acc68d3f35430aa7a](https://ftmscan.com/ ItemNFT [0x1dae89b469d15b0ded980007dfdc8e68c363203d](https://ftmscan.com/address/0x1dae89b469d15b0ded980007dfdc8e68c363203d) EstforLibrary [0xAD4Fe5A1d43F986659F548Cc899dCD4045FA9974](https://ftmscan.com/address/0xAD4Fe5A1d43F986659F548Cc899dCD4045FA9974) PlayerNFT [0xde70e49756322afdf7714d3aca963abcb4547b8d](https://ftmscan.com/address/0xde70e49756322afdf7714d3aca963abcb4547b8d) -PromotionsLibrary [0x13af205b631928f0ccb582cf6c5cae4d92470d2a](https://ftmscan.com/address/0x13af205b631928f0ccb582cf6c5cae4d92470d2a) +PromotionsLibrary [0x8b7e1bd3fe31d926209adfdbdc9d48a74e5666f5](https://ftmscan.com/address/0x8b7e1bd3fe31d926209adfdbdc9d48a74e5666f5) Promotions [0xf28cab48e29be56fcc68574b5c147b780c35647c](https://ftmscan.com/address/0xf28cab48e29be56fcc68574b5c147b780c35647c) Quests [0x96948a6df3a64cc2eb0a1825fccd26f0c93bfce9](https://ftmscan.com/address/0x96948a6df3a64cc2eb0a1825fccd26f0c93bfce9) Clans [0xd35410f526db135f09bb8e2bb066c8a63135d812](https://ftmscan.com/address/0xd35410f526db135f09bb8e2bb066c8a63135d812) @@ -137,7 +137,7 @@ Territories [0xf31517db9f0987002f3a0fb4f787dfb9e892f184](https://ftmscan.com/add CombatantsHelper [0xe8231ac805a88b3c72e9602c2ae14a5d3421bc7c](https://ftmscan.com/address/0xe8231ac805a88b3c72e9602c2ae14a5d3421bc7c) DecoratorProvider [0xea8c4d188eb8d9704bc36931d89ba4f8e935cee2](https://ftmscan.com/address/0xea8c4d188eb8d9704bc36931d89ba4f8e935cee2) -PetNFTLibrary [0x1445660336c1b0bcb2b484e86a56297f1da6575d](https://ftmscan.com/address/0x1445660336c1b0bcb2b484e86a56297f1da6575d) +PetNFTLibrary [0x517792d5cbb33cd337a2ef1bc6290ad964ea434e](https://ftmscan.com/address/0x517792d5cbb33cd337a2ef1bc6290ad964ea434e) PetNFT [0xa6489181b24e966402891225c65f8e2d136ddd2e](https://ftmscan.com/address/0xa6489181b24e966402891225c65f8e2d136ddd2e) PassiveActions [0x3df5b6cad0d2de6b71f2d5084e0b933dbcd395f6](https://ftmscan.com/address/0x3df5b6cad0d2de6b71f2d5084e0b933dbcd395f6) diff --git a/scripts/contractAddresses.ts b/scripts/contractAddresses.ts index 283f78eb..7480d1e6 100644 --- a/scripts/contractAddresses.ts +++ b/scripts/contractAddresses.ts @@ -52,17 +52,17 @@ if (!isBeta) { estforLibrary = "0x804a530f41ecf0c40cd4e312a72e033c78a2c1fa"; playerNFT = "0xb809ed839c691d465e2ec45e1bcb5e5aded50fb9"; promotions = "0x7d1c598266Dd6Bb0Ed7a76161c11e5073D8A71A4"; - promotionsLibrary = "0x5494e6a699e8e59e9a6ec3031ab96e35f2476c95"; + promotionsLibrary = "0x8b7e1bd3fe31d926209adfdbdc9d48a74e5666f5"; quests = "0x17c59f0d2d4f80FD0F906Df53a28272736c7b455"; clans = "0x334caa8907bdf49470f7b085380c25431ef96f6d"; wishingWell = "0x0a8d80ce4855666b7d7121d75f2a49aac434a918"; bank = "0xe183a43881eac74808c55bdb2a073929602af4db"; // beacon - playersLibrary = "0xfd0145ef3585176345cf8f2c63e025049f689073"; - playersImplQueueActions = "0x0776fd8b445e272b718db2db13f500d4d31b5de6"; - playersImplProcessActions = "0xb041035dbb95eac6011c5ef3cdd8a355fcb68700"; - playersImplRewards = "0x139bb2ac01597c7b4e6157aba6a4b3db1620014d"; - playersImplMisc = "0xf2136389a8e829da6a399b58ad56999d99e7cef7"; - playersImplMisc1 = "0x971703455f101d1d81d71e82a9ba895446c1183f"; + playersLibrary = "0xf01bc981a79f38b74a9b3953ee5aa6c95d9eded7"; + playersImplQueueActions = "0x05b9958e6f209d9d0594d34f0ac44d1f9bf128d6"; + playersImplProcessActions = "0x61da56557859597fa6bf693b7f149bc3934ac497"; + playersImplRewards = "0x8eae3948ff44ddce15223902b396f373692a422e"; + playersImplMisc = "0xd5aba67d0469fd553c9c5fb6b3534b98db3e1558"; + playersImplMisc1 = "0xc55b5e713ee31a641e090d1e550bf4fcfe0b6ba4"; players = "0x058ec56aba13f7fee3ae9c9b91b3bb03bc336143"; bankRegistry = "0x55a1b0251e1375bd41dd9778c379322e3863a54e"; bankFactory = "0x4af59427b2aeb66e6f7dca98c366ec66cca4e8d4"; @@ -79,7 +79,7 @@ if (!isBeta) { oracle = "0x28ade840602d0363a2ab675479f1b590b23b0490"; samWitchVRF = "0xeF5AC0489fc8ABC1085E8D1f5BEE85e74E6D2cC2"; bazaar = "0x6996c519dA4ac7815bEFbd836cf0b78Aa62fdBcE"; - petNFTLibrary = "0x5a134487df2d8e216e34bf9407bd63cd80e76957"; + petNFTLibrary = "0x517792d5cbb33cd337a2ef1bc6290ad964ea434e"; petNFT = "0x1681f593ac5cba407c2a190de0ca2beb4a69b5d3"; passiveActions = "0xa3e3a69edaee89b8dbbd1ca37704cc574cb8e1d4"; } else { diff --git a/scripts/deployImpls.ts b/scripts/deployImpls.ts index 478a9092..87da7fe1 100644 --- a/scripts/deployImpls.ts +++ b/scripts/deployImpls.ts @@ -17,7 +17,7 @@ async function main() { console.log(`Deploying player implementation contracts with the account: ${owner.address} on chain id ${chainId}`); // Players - const newPlayersLibrary = true; + const newPlayersLibrary = false; const PlayersLibrary = await ethers.getContractFactory("PlayersLibrary"); let playersLibrary: PlayersLibrary; if (newPlayersLibrary) { diff --git a/scripts/deployUpgrade.ts b/scripts/deployUpgrade.ts index 48193e45..a075da08 100644 --- a/scripts/deployUpgrade.ts +++ b/scripts/deployUpgrade.ts @@ -60,7 +60,7 @@ async function main() { estforLibrary = await EstforLibrary.attach(ESTFOR_LIBRARY_ADDRESS); } console.log(`estforLibrary = "${estforLibrary.address.toLowerCase()}"`); - /* + // Players const Players = (await ethers.getContractFactory("Players")).connect(owner); const players = await upgrades.upgradeProxy(PLAYERS_ADDRESS, Players, { @@ -189,8 +189,8 @@ async function main() { }); await adminAccess.deployed(); console.log(`adminAccess = "${adminAccess.address.toLowerCase()}"`); -*/ - const newPromotionsLibrary = true; + + const newPromotionsLibrary = false; const PromotionsLibrary = await ethers.getContractFactory("PromotionsLibrary"); let promotionsLibrary: PromotionsLibrary; if (newPromotionsLibrary) { @@ -215,7 +215,7 @@ async function main() { }); await promotions.deployed(); console.log(`promotions = "${promotions.address.toLowerCase()}"`); - /* + // Instant actions const InstantActions = (await ethers.getContractFactory("InstantActions")).connect(owner); const instantActions = await upgrades.upgradeProxy(INSTANT_ACTIONS_ADDRESS, InstantActions, { @@ -260,9 +260,8 @@ async function main() { ); await eggInstantVRFActionStrategy.deployed(); console.log(`eggInstantVRFActionStrategy = "${eggInstantVRFActionStrategy.address.toLowerCase()}"`); -*/ - const newPetNFTLibrary = true; + const newPetNFTLibrary = false; let petNFTLibrary: PetNFTLibrary; if (newPetNFTLibrary) { petNFTLibrary = (await ethers.deployContract("PetNFTLibrary")) as PetNFTLibrary; @@ -285,7 +284,6 @@ async function main() { await petNFT.deployed(); console.log(`petNFT = "${petNFT.address.toLowerCase()}"`); - /* const VRFRequestInfo = (await ethers.getContractFactory("VRFRequestInfo")).connect(owner); const vrfRequestInfo = await upgrades.upgradeProxy(VRF_REQUEST_INFO_ADDRESS, VRFRequestInfo, { kind: "uups", @@ -368,10 +366,8 @@ async function main() { }); await passiveActions.deployed(); console.log(`passiveActions = "${passiveActions.address.toLowerCase()}"`); - */ if (network.chainId == 250) { - /* await verifyContracts([players.address]); await verifyContracts([playerNFT.address]); await verifyContracts([itemNFT.address]); @@ -382,24 +378,22 @@ async function main() { await verifyContracts([worldLibrary.address]); await verifyContracts([estforLibrary.address]); await verifyContracts([adminAccess.address]); - await verifyContracts([wishingWell.address]); */ + await verifyContracts([wishingWell.address]); await verifyContracts([promotions.address]); await verifyContracts([promotionsLibrary.address]); - /* await verifyContracts([instantActions.address]); await verifyContracts([vrfRequestInfo.address]); await verifyContracts([instantVRFActions.address]); await verifyContracts([genericInstantVRFActionStrategy.address]); await verifyContracts([eggInstantVRFActionStrategy.address]); - */ await verifyContracts([petNFT.address]); await verifyContracts([petNFTLibrary.address]); - /* await verifyContracts([lockedBankVaults.address]); + await verifyContracts([lockedBankVaults.address]); await verifyContracts([lockedBankVaultsLibrary.address]); await verifyContracts([combatantsHelper.address]); await verifyContracts([decoratorProvider.address]); await verifyContracts([royaltyReceiver.address]); - await verifyContracts([passiveActions.address]); */ + await verifyContracts([passiveActions.address]); } }