Merge pull request #1196 from thesandboxgame/merge/latest

Merge/latest

.gitignore

@@ -1,3 +1,4 @@
+package-lock.json 
 .env
 yarn.error.log
 yarn-error.log

packages/asset/.solhint.json

@@ -9,6 +9,7 @@
       }
     ],
     "compiler-version": ["error", "^0.8.0"],
+    "custom-errors": "off",
     "func-visibility": ["error", {"ignoreConstructors": true}]
   }
 }

packages/asset/contracts/Asset.sol

@@ -23,8 +23,7 @@ import {
     MultiRoyaltyDistributor
 } from "@sandbox-smart-contracts/dependency-royalty-management/contracts/MultiRoyaltyDistributor.sol";
 import {
-    OperatorFiltererUpgradeable,
-    IOperatorFilterRegistry
+    OperatorFiltererUpgradeable
 } from "@sandbox-smart-contracts/dependency-operator-filter/contracts/OperatorFiltererUpgradeable.sol";
 import {TokenIdUtils} from "./libraries/TokenIdUtils.sol";
 import {IAsset} from "./interfaces/IAsset.sol";

packages/asset/contracts/AssetCreate.sol

@@ -135,9 +135,9 @@ contract AssetCreate is
             "AssetCreate: Invalid signature"
         );
 
-        require(tiers.length == amounts.length, "AssetCreate: Arrays must be same length");
-        require(amounts.length == metadataHashes.length, "AssetCreate: Arrays must be same length");
-        require(metadataHashes.length == revealed.length, "AssetCreate: Arrays must be same length");
+        require(tiers.length == amounts.length, "AssetCreate: 1-Array lengths");
+        require(amounts.length == metadataHashes.length, "AssetCreate: 2-Array lengths");
+        require(metadataHashes.length == revealed.length, "AssetCreate: 3-Array lengths");
 
         uint256[] memory tokenIds = new uint256[](tiers.length);
         uint256[] memory tiersToBurn = new uint256[](tiers.length);

packages/asset/contracts/AuthSuperValidator.sol

@@ -48,7 +48,7 @@ contract AuthSuperValidator is AccessControl {
     /// @param role Role to renounce
     /// @param account Account to renounce the role for
     function renounceRole(bytes32 role, address account) public override {
-        require(role != DEFAULT_ADMIN_ROLE, "AuthSuperValidator: cant renounce admin role");
+        require(role != DEFAULT_ADMIN_ROLE, "AuthSuperValidator: Admin needed");
         super.renounceRole(role, account);
     }
 }

packages/asset/contracts/Catalyst.sol

@@ -17,8 +17,7 @@ import {
 } from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155URIStorageUpgradeable.sol";
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import {
-    OperatorFiltererUpgradeable,
-    IOperatorFilterRegistry
+    OperatorFiltererUpgradeable
 } from "@sandbox-smart-contracts/dependency-operator-filter/contracts/OperatorFiltererUpgradeable.sol";
 import {
     RoyaltyDistributor

packages/asset/contracts/mock/MockCatalyst.sol

@@ -2,7 +2,10 @@
 
 pragma solidity 0.8.18;
 
-import {Catalyst, IOperatorFilterRegistry} from "../Catalyst.sol";
+import {Catalyst} from "../Catalyst.sol";
+import {
+    IOperatorFilterRegistry
+} from "@sandbox-smart-contracts/dependency-operator-filter/contracts/OperatorFiltererUpgradeable.sol";
 
 contract MockCatalyst is Catalyst {
     /// @notice sets registry and subscribe to subscription

packages/asset/package.json

@@ -47,7 +47,7 @@
     "operator-filter-registry": "^1.4.2",
     "prettier": "^2.8.8",
     "prettier-plugin-solidity": "1.0.0-beta.11",
-    "solhint": "^3.4.1",
+    "solhint": "^3.6.2",
     "solhint-plugin-prettier": "^0.0.5",
     "solidity-coverage": "^0.8.2",
     "ts-node": "^10.9.1",

packages/asset/test/AssetCreate.test.ts

@@ -981,7 +981,7 @@ describe('AssetCreate (/packages/asset/contracts/AssetCreate.sol)', function ()
             [true, true],
             [...metadataHashes, additionalMetadataHash]
           )
-        ).to.be.revertedWith('AssetCreate: Arrays must be same length');
+        ).to.be.revertedWith('AssetCreate: 2-Array lengths');
       });
       it('should revert if amounts mismatch signed values', async function () {
         const {

packages/asset/test/AuthSuperValidator.test.ts

@@ -23,7 +23,7 @@ describe('AuthSuperValidator, (/packages/asset/contracts/AuthSuperValidator.sol)
           DEFAULT_ADMIN_ROLE,
           authValidatorAdmin.address
         )
-      ).to.be.revertedWith('AuthSuperValidator: cant renounce admin role');
+      ).to.be.revertedWith('AuthSuperValidator: Admin needed');
     });
     it('should allow admin to set signer for a given contract address', async function () {
       const {MockContract, AuthValidatorContractAsAdmin, backendSigner} =

packages/core/data/landSales/LandPreSale_27/bundles.mainnet.json

@@ -0,0 +1,11 @@
+{
+  "170": [],
+  "171": [],
+  "172": [],
+  "173": [],
+  "174": [],
+  "175": [],
+  "176": [],
+  "177": [],
+  "178": []
+}

packages/core/data/landSales/LandPreSale_27/bundles.testnet.json

@@ -0,0 +1,11 @@
+{
+  "170": [],
+  "171": [],
+  "172": [],
+  "173": [],
+  "174": [],
+  "175": [],
+  "176": [],
+  "177": [],
+  "178": []
+}