Merge pull request #1497 from thesandboxgame/feat/marketplace-bundle-…

…type

feat: bundle as AssetClass

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',

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',

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',
 ];

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',

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'];

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'];

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'];

packages/deploy/deploy/500_marketplace/505_exchange_setup.ts → packages/deploy/deploy/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',
+];

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',

packages/deploy/integration_test/marketplace/config.ts

@@ -0,0 +1,26 @@
+export const GRID_SIZE = 408;
+
+//ERC20 to exchange for
+export const erc20PriceForBundle = 10000000000;
+
+// Configuration for ERC721 land tokens (array of [x,y] values)
+export const erc721 = [
+  // Add (x, y) pairs as needed
+];
+
+// Configuration for quad land (array of [x, y, size] values)
+export const quad = [
+  // Add (size,x, y) triples as needed
+];
+
+// Configuration for ERC1155 assets (array of [tokenId, supply] values)
+export const erc1155 = [
+  // Add [tier, amount, metadataHash] as needed
+];
+
+// Price distribution setup
+export const priceDistribution = {
+  erc721Prices: [[]],
+  erc1155Prices: [[]],
+  quadPrices: [],
+};