diff --git a/.openzeppelin/unknown-80001.json b/.openzeppelin/unknown-80001.json new file mode 100644 index 00000000..fa5bcfd5 --- /dev/null +++ b/.openzeppelin/unknown-80001.json @@ -0,0 +1,287 @@ +{ + "manifestVersion": "3.2", + "proxies": [ + { + "address": "0x875fc1205Cb81A1F38fC4deEC44390c2aC5f5890", + "txHash": "0x29521152973d9eab9af1a07b7180f282fb6eb43059a1759fb0af5af4a596a3f5", + "kind": "uups" + } + ], + "impls": { + "efebae3f0eed446025e8907ec5fd748d5931333680bcb8489a0cdfd97385ce78": { + "address": "0x94626Aa2af0deddfc4186c7E42D4b9670E930055", + "txHash": "0x51c295146b624c1c68acc59c319ccda453c1033d477c4460297eb620d8c20bf0", + "layout": { + "storage": [ + { + "label": "_uriParts", + "offset": 0, + "slot": "0", + "type": "t_array(t_string_storage)dyn_storage", + "contract": "URITemplate", + "src": "contracts/utils/URITemplate.sol:13" + }, + { + "label": "_initialized", + "offset": 0, + "slot": "1", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "1", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "2", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "_owner", + "offset": 0, + "slot": "52", + "type": "t_address", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" + }, + { + "label": "__gap", + "offset": 0, + "slot": "53", + "type": "t_array(t_uint256)49_storage", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" + }, + { + "label": "_paused", + "offset": 0, + "slot": "102", + "type": "t_bool", + "contract": "PausableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol:29" + }, + { + "label": "__gap", + "offset": 0, + "slot": "103", + "type": "t_array(t_uint256)49_storage", + "contract": "PausableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol:116" + }, + { + "label": "_status", + "offset": 0, + "slot": "152", + "type": "t_uint256", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "153", + "type": "t_array(t_uint256)49_storage", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:74" + }, + { + "label": "__gap", + "offset": 0, + "slot": "202", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC165Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol:41" + }, + { + "label": "_defaultRoyaltyInfo", + "offset": 0, + "slot": "252", + "type": "t_struct(RoyaltyInfo)1041_storage", + "contract": "ERC2981Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/common/ERC2981Upgradeable.sol:36" + }, + { + "label": "_tokenRoyaltyInfo", + "offset": 0, + "slot": "253", + "type": "t_mapping(t_uint256,t_struct(RoyaltyInfo)1041_storage)", + "contract": "ERC2981Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/common/ERC2981Upgradeable.sol:37" + }, + { + "label": "__gap", + "offset": 0, + "slot": "254", + "type": "t_array(t_uint256)48_storage", + "contract": "ERC2981Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/common/ERC2981Upgradeable.sol:123" + }, + { + "label": "__gap", + "offset": 0, + "slot": "302", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "352", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "maxSupply", + "offset": 0, + "slot": "402", + "type": "t_uint256", + "contract": "TablelandRigs", + "src": "contracts/TablelandRigs.sol:32" + }, + { + "label": "mintPrice", + "offset": 0, + "slot": "403", + "type": "t_uint256", + "contract": "TablelandRigs", + "src": "contracts/TablelandRigs.sol:35" + }, + { + "label": "beneficiary", + "offset": 0, + "slot": "404", + "type": "t_address_payable", + "contract": "TablelandRigs", + "src": "contracts/TablelandRigs.sol:38" + }, + { + "label": "allowlistRoot", + "offset": 0, + "slot": "405", + "type": "t_bytes32", + "contract": "TablelandRigs", + "src": "contracts/TablelandRigs.sol:41" + }, + { + "label": "waitlistRoot", + "offset": 0, + "slot": "406", + "type": "t_bytes32", + "contract": "TablelandRigs", + "src": "contracts/TablelandRigs.sol:44" + }, + { + "label": "mintPhase", + "offset": 0, + "slot": "407", + "type": "t_enum(MintPhase)2659", + "contract": "TablelandRigs", + "src": "contracts/TablelandRigs.sol:47" + }, + { + "label": "_contractInfoURI", + "offset": 0, + "slot": "408", + "type": "t_string_storage", + "contract": "TablelandRigs", + "src": "contracts/TablelandRigs.sol:50" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_address_payable": { + "label": "address payable", + "numberOfBytes": "20" + }, + "t_array(t_string_storage)dyn_storage": { + "label": "string[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)48_storage": { + "label": "uint256[48]", + "numberOfBytes": "1536" + }, + "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_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_enum(MintPhase)2659": { + "label": "enum ITablelandRigs.MintPhase", + "members": [ + "CLOSED", + "ALLOWLIST", + "WAITLIST", + "PUBLIC" + ], + "numberOfBytes": "1" + }, + "t_mapping(t_uint256,t_struct(RoyaltyInfo)1041_storage)": { + "label": "mapping(uint256 => struct ERC2981Upgradeable.RoyaltyInfo)", + "numberOfBytes": "32" + }, + "t_string_storage": { + "label": "string", + "numberOfBytes": "32" + }, + "t_struct(RoyaltyInfo)1041_storage": { + "label": "struct ERC2981Upgradeable.RoyaltyInfo", + "members": [ + { + "label": "receiver", + "type": "t_address", + "offset": 0, + "slot": "0" + }, + { + "label": "royaltyFraction", + "type": "t_uint96", + "offset": 20, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + }, + "t_uint96": { + "label": "uint96", + "numberOfBytes": "12" + } + } + } + } + } +} diff --git a/contracts/TablelandRigs.sol b/contracts/TablelandRigs.sol index 100962df..caf2df1f 100644 --- a/contracts/TablelandRigs.sol +++ b/contracts/TablelandRigs.sol @@ -44,7 +44,7 @@ contract TablelandRigs is bytes32 public waitlistRoot; // Flag specifying whether or not claims - MintPhase public mintPhase = MintPhase.CLOSED; + MintPhase public mintPhase; // URI for contract info. string private _contractInfoURI; @@ -71,6 +71,7 @@ contract TablelandRigs is _setDefaultRoyalty(royaltyReceiver, 500); allowlistRoot = _allowlistRoot; waitlistRoot = _waitlistRoot; + mintPhase = MintPhase.CLOSED; } // ============================= diff --git a/deployments.js b/deployments.js index 87a4fbce..ccdcb5e7 100644 --- a/deployments.js +++ b/deployments.js @@ -6,8 +6,8 @@ exports.deployments = { ethereum: { contractAddress: "", royaltyContractAddress: "", - contractTable: "", - allowlistTable: "", + contractTable: "rigs_contract_5_57", + allowlistTable: "rigs_allowlist_5_59", }, // testnets "ethereum-goerli": { @@ -23,8 +23,8 @@ exports.deployments = { allowlistTable: "", }, "polygon-mumbai": { - contractAddress: "0x0E1B53feac55716c5fdb2623ED719144A423cEEE", - royaltyContractAddress: "0xA51Ce9F6604925c16e88a6A0a017BB49573DC3cB", + contractAddress: "0x875fc1205Cb81A1F38fC4deEC44390c2aC5f5890", + royaltyContractAddress: "0x13287B498F61c735221e11eD2ED6808597d996f3", contractTable: "rigs_contract_5_57", allowlistTable: "rigs_allowlist_5_59", }, diff --git a/deployments.js.map b/deployments.js.map index 6c21b624..8b45948b 100644 --- a/deployments.js.map +++ b/deployments.js.map @@ -1 +1 @@ -{"version":3,"file":"deployments.js","sourceRoot":"","sources":["deployments.ts"],"names":[],"mappings":";;;AAWa,QAAA,WAAW,GAAoB;IAC1C,WAAW;IACX,QAAQ,EAAE;QACR,eAAe,EAAE,EAAE;QACnB,sBAAsB,EAAE,EAAE;QAC1B,aAAa,EAAE,EAAE;QACjB,cAAc,EAAE,EAAE;KACnB;IACD,WAAW;IACX,iBAAiB,EAAE;QACjB,eAAe,EAAE,EAAE;QACnB,sBAAsB,EAAE,EAAE;QAC1B,aAAa,EAAE,EAAE;QACjB,cAAc,EAAE,EAAE;KACnB;IACD,gBAAgB,EAAE;QAChB,eAAe,EAAE,EAAE;QACnB,sBAAsB,EAAE,EAAE;QAC1B,aAAa,EAAE,EAAE;QACjB,cAAc,EAAE,EAAE;KACnB;IACD,gBAAgB,EAAE;QAChB,eAAe,EAAE,4CAA4C;QAC7D,sBAAsB,EAAE,4CAA4C;QACpE,aAAa,EAAE,oBAAoB;QACnC,cAAc,EAAE,qBAAqB;KACtC;IACD,SAAS,EAAE;QACT,eAAe,EAAE,EAAE;QACnB,sBAAsB,EAAE,EAAE;QAC1B,aAAa,EAAE,EAAE;QACjB,cAAc,EAAE,EAAE;KACnB;CACF,CAAC"} \ No newline at end of file +{"version":3,"file":"deployments.js","sourceRoot":"","sources":["deployments.ts"],"names":[],"mappings":";;;AAWa,QAAA,WAAW,GAAoB;IAC1C,WAAW;IACX,QAAQ,EAAE;QACR,eAAe,EAAE,EAAE;QACnB,sBAAsB,EAAE,EAAE;QAC1B,aAAa,EAAE,oBAAoB;QACnC,cAAc,EAAE,qBAAqB;KACtC;IACD,WAAW;IACX,iBAAiB,EAAE;QACjB,eAAe,EAAE,EAAE;QACnB,sBAAsB,EAAE,EAAE;QAC1B,aAAa,EAAE,EAAE;QACjB,cAAc,EAAE,EAAE;KACnB;IACD,gBAAgB,EAAE;QAChB,eAAe,EAAE,EAAE;QACnB,sBAAsB,EAAE,EAAE;QAC1B,aAAa,EAAE,EAAE;QACjB,cAAc,EAAE,EAAE;KACnB;IACD,gBAAgB,EAAE;QAChB,eAAe,EAAE,4CAA4C;QAC7D,sBAAsB,EAAE,4CAA4C;QACpE,aAAa,EAAE,oBAAoB;QACnC,cAAc,EAAE,qBAAqB;KACtC;IACD,SAAS,EAAE;QACT,eAAe,EAAE,EAAE;QACnB,sBAAsB,EAAE,EAAE;QAC1B,aAAa,EAAE,EAAE;QACjB,cAAc,EAAE,EAAE;KACnB;CACF,CAAC"} \ No newline at end of file diff --git a/deployments.ts b/deployments.ts index 1f4f50d5..7ded1124 100644 --- a/deployments.ts +++ b/deployments.ts @@ -31,8 +31,8 @@ export const deployments: RigsDeployments = { allowlistTable: "", }, "polygon-mumbai": { - contractAddress: "", - royaltyContractAddress: "", + contractAddress: "0x875fc1205Cb81A1F38fC4deEC44390c2aC5f5890", + royaltyContractAddress: "0x13287B498F61c735221e11eD2ED6808597d996f3", contractTable: "rigs_contract_5_57", allowlistTable: "rigs_allowlist_5_59", },