thesandboxgame · capedcrusader21 · May 8, 2024 · May 8, 2024 · May 8, 2024 · May 8, 2024
diff --git a/packages/asset/contracts/libraries/LibOrder.sol b/packages/asset/contracts/libraries/LibOrder.sol
@@ -11,7 +11,7 @@ import {LibMath} from "./LibMath.sol";
 library LibOrder {
     bytes32 internal constant ORDER_TYPEHASH =
         keccak256(
-            "Order(address maker,Asset makeAsset,address taker,Asset takeAsset,uint256 salt,uint256 start,uint256 end)Asset(AssetType assetType,uint256 value)AssetType(uint256 assetClass,bytes data)"
+            "Order(address maker,Asset makeAsset,address taker,Asset takeAsset,address makeRecipient,uint256 salt,uint256 start,uint256 end)Asset(AssetType assetType,uint256 value)AssetType(uint256 assetClass,bytes data)"
         );
 
     /// @dev Represents the structure of an order.
@@ -20,6 +20,7 @@ library LibOrder {
         LibAsset.Asset makeAsset; // Asset the maker is providing.
         address taker; // Address of the taker.
         LibAsset.Asset takeAsset; // Asset the taker is providing.
+        address makeRecipient; // recipient address for maker.
         uint256 salt; // Random number to ensure unique order hash.
         uint256 start; // Timestamp when the order becomes valid.
         uint256 end; // Timestamp when the order expires.
@@ -39,6 +40,7 @@ library LibOrder {
             keccak256(
                 abi.encode(
                     order.maker,
+                    order.makeRecipient,
                     LibAsset.hash(order.makeAsset.assetType),
                     LibAsset.hash(order.takeAsset.assetType),
                     order.salt
@@ -59,6 +61,7 @@ library LibOrder {
                     LibAsset.hash(order.makeAsset),
                     order.taker,
                     LibAsset.hash(order.takeAsset),
+                    order.makeRecipient,
                     order.salt,
                     order.start,
                     order.end

diff --git a/packages/deploy/deploy/500_marketplace/500_deploy_royalties_registry.ts b/packages/deploy/deploy/500_marketplace/500_deploy_royalties_registry.ts
@@ -10,7 +10,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   await deploy('RoyaltiesRegistry', {
     from: deployer,
     contract:
-      '@sandbox-smart-contracts/marketplace/contracts/RoyaltiesRegistry.sol:RoyaltiesRegistry',
+      '@sandbox-smart-contracts/marketplace@1.0.1/contracts/RoyaltiesRegistry.sol:RoyaltiesRegistry',
     proxy: {
       owner: upgradeAdmin,
       proxyContract: 'OpenZeppelinTransparentProxy',

diff --git a/packages/deploy/deploy/500_marketplace/502_deploy_order_validator.ts b/packages/deploy/deploy/500_marketplace/502_deploy_order_validator.ts
@@ -14,7 +14,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   await deploy('OrderValidator', {
     from: deployer,
     contract:
-      '@sandbox-smart-contracts/marketplace/contracts/OrderValidator.sol:OrderValidator',
+      '@sandbox-smart-contracts/marketplace@1.0.1/contracts/OrderValidator.sol:OrderValidator',
     proxy: {
       owner: upgradeAdmin,
       proxyContract: 'OpenZeppelinTransparentProxy',

diff --git a/packages/deploy/deploy/500_marketplace/503_order_validator_setup.ts b/packages/deploy/deploy/500_marketplace/503_order_validator_setup.ts
@@ -13,7 +13,12 @@ const func: DeployFunction = async function (
   const TSB_ROLE = await read('OrderValidator', 'TSB_ROLE');
   const PARTNER_ROLE = await read('OrderValidator', 'PARTNER_ROLE');
 
-  const SandContract = await deployments.get('PolygonSand');
+  let SandContract;
+  if (hre.network.name === 'polygon') {
+    SandContract = await deployments.get('PolygonSand');
+  } else {
+    SandContract = await deployments.get('Sand');
+  }
   const AssetContract = await deployments.get('Asset');
 
   const addressesToGrant = [];
@@ -110,5 +115,6 @@ func.tags = [
 func.dependencies = [
   'OrderValidator_deploy',
   'PolygonSand_deploy',
+  'Sand_deploy',
   'Asset_deploy',
 ];
diff --git a/packages/deploy/deploy/500_marketplace/504_deploy_exchange.ts b/packages/deploy/deploy/500_marketplace/504_deploy_exchange.ts
@@ -18,7 +18,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   await deploy('Exchange', {
     from: deployer,
-    contract: `@sandbox-smart-contracts/marketplace/contracts/Exchange.sol:Exchange`,
+    contract: `@sandbox-smart-contracts/marketplace@1.0.1/contracts/Exchange.sol:Exchange`,
     proxy: {
       owner: upgradeAdmin,
       proxyContract: 'OpenZeppelinTransparentProxy',

diff --git a/packages/deploy/deploy/500_marketplace/505_upgrade_royalties_registry.ts b/packages/deploy/deploy/500_marketplace/505_upgrade_royalties_registry.ts
@@ -0,0 +1,36 @@
+import {DeployFunction} from 'hardhat-deploy/types';
+import {HardhatRuntimeEnvironment} from 'hardhat/types';
+import {DEPLOY_TAGS} from '../../hardhat.config';
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const {deployments, getNamedAccounts} = hre;
+  const {deploy, catchUnknownSigner} = deployments;
+  const {deployer, upgradeAdmin} = await getNamedAccounts();
+  await catchUnknownSigner(
+    deploy('RoyaltiesRegistry', {
+      from: deployer,
+      contract:
+        '@sandbox-smart-contracts/marketplace/contracts/RoyaltiesRegistry.sol:RoyaltiesRegistry',
+      proxy: {
+        owner: upgradeAdmin,
+        proxyContract: 'OpenZeppelinTransparentProxy',
+        upgradeIndex: 1,
+      },
+      log: true,
+    })
+  );
+};
+
+export default func;
+func.tags = [
+  'RoyaltiesRegistry',
+  'RoyaltiesRegistry',
+  'RoyaltiesRegistryV2_deploy',
+  DEPLOY_TAGS.L1,
+  DEPLOY_TAGS.L1_PROD,
+  DEPLOY_TAGS.L1_TEST,
+  DEPLOY_TAGS.L2,
+  DEPLOY_TAGS.L2_PROD,
+  DEPLOY_TAGS.L2_TEST,
+];
+func.dependencies = ['RoyaltiesRegistry_deploy'];
diff --git a/packages/deploy/deploy/500_marketplace/506_upgrade_order_validator.ts b/packages/deploy/deploy/500_marketplace/506_upgrade_order_validator.ts
@@ -0,0 +1,36 @@
+import {DeployFunction} from 'hardhat-deploy/types';
+import {HardhatRuntimeEnvironment} from 'hardhat/types';
+import {DEPLOY_TAGS} from '../../hardhat.config';
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const {deployments, getNamedAccounts} = hre;
+  const {deploy, catchUnknownSigner} = deployments;
+  const {deployer, upgradeAdmin} = await getNamedAccounts();
+  await catchUnknownSigner(
+    deploy('OrderValidator', {
+      from: deployer,
+      contract:
+        '@sandbox-smart-contracts/marketplace/contracts/OrderValidator.sol:OrderValidator',
+      proxy: {
+        owner: upgradeAdmin,
+        proxyContract: 'OpenZeppelinTransparentProxy',
+        upgradeIndex: 1,
+      },
+      log: true,
+    })
+  );
+};
+
+export default func;
+func.tags = [
+  'OrderValidator',
+  'OrderValidator',
+  'OrderValidatorV2_deploy',
+  DEPLOY_TAGS.L1,
+  DEPLOY_TAGS.L1_PROD,
+  DEPLOY_TAGS.L1_TEST,
+  DEPLOY_TAGS.L2,
+  DEPLOY_TAGS.L2_PROD,
+  DEPLOY_TAGS.L2_TEST,
+];
+func.dependencies = ['OrderValidator_deploy'];
diff --git a/packages/deploy/deploy/500_marketplace/507_upgrade_exchange.ts b/packages/deploy/deploy/500_marketplace/507_upgrade_exchange.ts
@@ -0,0 +1,35 @@
+import {DeployFunction} from 'hardhat-deploy/types';
+import {HardhatRuntimeEnvironment} from 'hardhat/types';
+import {DEPLOY_TAGS} from '../../hardhat.config';
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const {deployments, getNamedAccounts} = hre;
+  const {deploy, catchUnknownSigner} = deployments;
+  const {deployer, upgradeAdmin} = await getNamedAccounts();
+  await catchUnknownSigner(
+    deploy('Exchange', {
+      from: deployer,
+      contract: `@sandbox-smart-contracts/marketplace/contracts/Exchange.sol:Exchange`,
+      proxy: {
+        owner: upgradeAdmin,
+        proxyContract: 'OpenZeppelinTransparentProxy',
+        upgradeIndex: 1,
+      },
+      log: true,
+    })
+  );
+};
+
+export default func;
+func.tags = [
+  'Exchange',
+  'Exchange',
+  'ExchangeV2_deploy',
+  DEPLOY_TAGS.L1,
+  DEPLOY_TAGS.L1_PROD,
+  DEPLOY_TAGS.L1_TEST,
+  DEPLOY_TAGS.L2,
+  DEPLOY_TAGS.L2_PROD,
+  DEPLOY_TAGS.L2_TEST,
+];
+func.dependencies = ['Exchange_deploy'];
diff --git a/...loy/500_marketplace/505_exchange_setup.ts → ...loy/500_marketplace/508_exchange_setup.ts b/...loy/500_marketplace/505_exchange_setup.ts → ...loy/500_marketplace/508_exchange_setup.ts
@@ -11,7 +11,16 @@ const func: DeployFunction = async function (
 
   const ERC1776_OPERATOR_ROLE = await read('Exchange', 'ERC1776_OPERATOR_ROLE');
   const EXCHANGE_ADMIN_ROLE = await read('Exchange', 'EXCHANGE_ADMIN_ROLE');
-  const sandContract = await deployments.get('PolygonSand');
+
+  let sandContract;
+  let landContract;
+  if (hre.network.name === 'polygon') {
+    sandContract = await deployments.get('PolygonSand');
+    landContract = await deployments.get('PolygonLand');
+  } else {
+    sandContract = await deployments.get('Sand');
+    landContract = await deployments.get('Land');
+  }
 
   const hasERC1776OperatorRole = await read(
     'Exchange',
@@ -48,6 +57,18 @@ const func: DeployFunction = async function (
       )
     );
   }
+
+  const currentLand = await read('Exchange', 'landContract');
+  if (currentLand != landContract.address) {
+    await catchUnknownSigner(
+      execute(
+        'Exchange',
+        {from: sandAdmin, log: true},
+        'setLandContract',
+        landContract.address
+      )
+    );
+  }
 };
 
 export default func;
@@ -61,4 +82,13 @@ func.tags = [
   DEPLOY_TAGS.L2_PROD,
   DEPLOY_TAGS.L2_TEST,
 ];
-func.dependencies = ['Exchange_deploy', 'PolygonSand_deploy'];
+func.dependencies = [
+  'Exchange_deploy',
+  'Sand_deploy',
+  'Land_deploy',
+  'PolygonSand_deploy',
+  'PolygonLand_deploy',
+  'PolygonLandV2_deploy',
+  'LandV4_deploy',
+  'ExchangeV2_deploy',
+];
diff --git a/packages/deploy/hardhat.config.ts b/packages/deploy/hardhat.config.ts
@@ -32,10 +32,17 @@ const importedPackages = {
   ],
   '@sandbox-smart-contracts/giveaway': 'contracts/SignedMultiGiveaway.sol',
   '@sandbox-smart-contracts/faucets': 'contracts/FaucetsERC1155.sol',
+  '@sandbox-smart-contracts/[email protected]': [
+    'contracts/RoyaltiesRegistry.sol',
+    'contracts/OrderValidator.sol',
+    'contracts/Exchange.sol',
+    'contracts/TransferManager.sol',
+  ],
   '@sandbox-smart-contracts/marketplace': [
     'contracts/RoyaltiesRegistry.sol',
     'contracts/OrderValidator.sol',
     'contracts/Exchange.sol',
+    'contracts/TransferManager.sol',
   ],
   '@sandbox-smart-contracts/dependency-operator-filter': [
     'contracts/OperatorFilterSubscription.sol',

diff --git a/packages/deploy/package.json b/packages/deploy/package.json
@@ -25,7 +25,8 @@
     "@sandbox-smart-contracts/faucets": "0.0.1",
     "@sandbox-smart-contracts/giveaway": "0.0.3",
     "@sandbox-smart-contracts/land": "1.0.0-rc.1",
-    "@sandbox-smart-contracts/marketplace": "1.0.1",
+    "@sandbox-smart-contracts/marketplace": "1.0.2",
+    "@sandbox-smart-contracts/[email protected]": "npm:@sandbox-smart-contracts/[email protected]",
     "@sandbox-smart-contracts/oft-sand": "0.0.1"
   },
   "files": [

diff --git a/packages/deploy/test/asset/assetCreateFixture.ts b/packages/deploy/test/asset/assetCreateFixture.ts
@@ -17,6 +17,7 @@ const setupAssetCreateTests = deployments.createFixture(
 
     const {
       assetAdmin,
+      sandAdmin,
       backendAuthWallet,
       assetPauser,
       treasury,
@@ -46,6 +47,9 @@ const setupAssetCreateTests = deployments.createFixture(
       lazyMintingCatSeller
     );
 
+    const OrderValidatorAsAdmin = OrderValidatorContract.connect(
+      await ethers.provider.getSigner(sandAdmin)
+    );
     const CatalystContractAsAdmin = CatalystContract.connect(
       await ethers.provider.getSigner(catalystMinter)
     );
@@ -78,6 +82,13 @@ const setupAssetCreateTests = deployments.createFixture(
     const createBatchLazyMintSignature = (data: LazyMintBatchData) =>
       createMultipleLazyMintSignature(data, AssetCreateContract, network);
 
+    const ERC20_ROLE = await OrderValidatorContract.ERC20_ROLE();
+    await OrderValidatorAsAdmin.grantRole(
+      ERC20_ROLE,
+      await SandContract.getAddress()
+    );
+    await OrderValidatorAsAdmin.disableWhitelists();
+
     return {
       AssetContract,
       AssetCreateContract,

diff --git a/packages/deploy/utils/lazyMinting.ts b/packages/deploy/utils/lazyMinting.ts
@@ -38,6 +38,7 @@ export type Order = {
   makeAsset: Asset;
   taker: string;
   takeAsset: Asset;
+  makeRecipient: string;
   salt: Numeric;
   start: Numeric;
   end: Numeric;
@@ -115,6 +116,7 @@ export async function signOrder(
         {name: 'makeAsset', type: 'Asset'},
         {name: 'taker', type: 'address'},
         {name: 'takeAsset', type: 'Asset'},
+        {name: 'makeRecipient', type: 'address'},
         {name: 'salt', type: 'uint256'},
         {name: 'start', type: 'uint256'},
         {name: 'end', type: 'uint256'},
@@ -131,13 +133,15 @@ export const OrderDefault = async (
   takeAsset: Asset,
   salt: Numeric,
   start: Numeric,
-  end: Numeric
+  end: Numeric,
+  makeRecipient?: Address
 ): Promise<Order> => ({
   maker: await maker.getAddress(),
   makeAsset,
   taker:
     taker === ZeroAddress ? ZeroAddress : await (taker as Signer).getAddress(),
   takeAsset,
+  makeRecipient: makeRecipient || (await maker.getAddress()), // Use makerAddress if makeRecipient is not provided
   salt,
   start,
   end,

diff --git a/packages/marketplace/.solcover.js b/packages/marketplace/.solcover.js
@@ -3,5 +3,5 @@ module.exports = {
     grep: '@skip-on-coverage', // Find everything with this tag
     invert: true, // Run the grep's inverse set.
   },
-  skipFiles: ['/mock'],
+  skipFiles: ['/mocks'],
 };
diff --git a/packages/marketplace/.solhintignore b/packages/marketplace/.solhintignore
@@ -0,0 +1 @@
+mocks