Merge branch 'asset-l2-integration' of https://github.com/thesandboxg…

…ame/sandbox-smart-contracts into integration-tests

packages/deploy/deploy/300_catalyst/302_catalyst_setup.ts

@@ -1,6 +1,9 @@
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 
+// TODO this should not be hardcoded here
+export const royaltyAmount = 500;
+
 const func: DeployFunction = async function (
   hre: HardhatRuntimeEnvironment
 ): Promise<void> {
@@ -33,8 +36,7 @@ const func: DeployFunction = async function (
 
   // set catalyst on Royalty Manager
   const catalyst = await deployments.get('Catalyst');
-  // TODO this should not be hardcoded here
-  const royaltyAmount = 500;
+
   if (
     (await read(
       'RoyaltyManager',

packages/deploy/deploy_mocks/200_marketplace_1.ts

@@ -0,0 +1,17 @@
+import {HardhatRuntimeEnvironment} from 'hardhat/types';
+import {DeployFunction} from 'hardhat-deploy/types';
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const {deployments, getNamedAccounts} = hre;
+  const {deploy} = deployments;
+
+  const {deployer} = await getNamedAccounts();
+  await deploy('MockERC1155MarketPlace1', {
+    from: deployer,
+    contract:
+      '@sandbox-smart-contracts/dependency-operator-filter/contracts/mock/MockMarketPlace1.sol:MockERC1155MarketPlace1',
+    log: true,
+  });
+};
+export default func;
+func.tags = ['MockERC1155MarketPlace1'];

packages/deploy/deploy_mocks/300_marketplace_2.ts

@@ -0,0 +1,17 @@
+import {HardhatRuntimeEnvironment} from 'hardhat/types';
+import {DeployFunction} from 'hardhat-deploy/types';
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const {deployments, getNamedAccounts} = hre;
+  const {deploy} = deployments;
+
+  const {deployer} = await getNamedAccounts();
+  await deploy('MockERC1155MarketPlace2', {
+    from: deployer,
+    contract:
+      '@sandbox-smart-contracts/dependency-operator-filter/contracts/mock/MockMarketPlace2.sol:MockERC1155MarketPlace2',
+    log: true,
+  });
+};
+export default func;
+func.tags = ['MockERC1155MarketPlace2'];

packages/deploy/deploy_mocks/400_marketplace_3.ts

@@ -0,0 +1,17 @@
+import {HardhatRuntimeEnvironment} from 'hardhat/types';
+import {DeployFunction} from 'hardhat-deploy/types';
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const {deployments, getNamedAccounts} = hre;
+  const {deploy} = deployments;
+
+  const {deployer} = await getNamedAccounts();
+  await deploy('MockERC1155MarketPlace3', {
+    from: deployer,
+    contract:
+      '@sandbox-smart-contracts/dependency-operator-filter/contracts/mock/MockMarketPlace3.sol:MockERC1155MarketPlace3',
+    log: true,
+  });
+};
+export default func;
+func.tags = ['MockERC1155MarketPlace3'];

packages/deploy/deploy_mocks/500_marketplace_4.ts

@@ -0,0 +1,17 @@
+import {HardhatRuntimeEnvironment} from 'hardhat/types';
+import {DeployFunction} from 'hardhat-deploy/types';
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const {deployments, getNamedAccounts} = hre;
+  const {deploy} = deployments;
+
+  const {deployer} = await getNamedAccounts();
+  await deploy('MockERC1155MarketPlace4', {
+    from: deployer,
+    contract:
+      '@sandbox-smart-contracts/dependency-operator-filter/contracts/mock/MockMarketPlace4.sol:MockERC1155MarketPlace4',
+    log: true,
+  });
+};
+export default func;
+func.tags = ['MockERC1155MarketPlace4'];

packages/deploy/test/asset/AssetReveal.test.ts

@@ -0,0 +1,103 @@
+import {expect} from 'chai';
+import {deployments} from 'hardhat';
+
+const setupTest = deployments.createFixture(
+  async ({deployments, getNamedAccounts, ethers}) => {
+    const {assetAdmin, backendAuthWallet} = await getNamedAccounts();
+    await deployments.fixture('Asset');
+    const Asset = await deployments.get('Asset');
+    const AssetContract = await ethers.getContractAt('Asset', Asset.address);
+    const AssetReveal = await deployments.get('AssetReveal');
+    const AssetRevealContract = await ethers.getContractAt(
+      'AssetReveal',
+      AssetReveal.address
+    );
+    const Catalyst = await deployments.get('Catalyst');
+    const CatalystContract = await ethers.getContractAt(
+      'Catalyst',
+      Catalyst.address
+    );
+    const TRUSTED_FORWARDER = await deployments.get('TRUSTED_FORWARDER_V2');
+    const AuthSuperValidator = await deployments.get('AuthSuperValidator');
+    const AuthSuperValidatorContract = await ethers.getContractAt(
+      'AuthSuperValidator',
+      AuthSuperValidator.address
+    );
+
+    return {
+      AssetContract,
+      AssetRevealContract,
+      CatalystContract,
+      TRUSTED_FORWARDER,
+      AuthSuperValidatorContract,
+      assetAdmin,
+      backendAuthWallet,
+    };
+  }
+);
+
+describe('Asset Reveal', function () {
+  describe('Contract references', function () {
+    it('AuthSuperValidator', async function () {
+      const {AssetRevealContract, AuthSuperValidatorContract} =
+        await setupTest();
+      expect(await AssetRevealContract.getAuthValidator()).to.be.equal(
+        AuthSuperValidatorContract.address
+      );
+    });
+    it('Asset', async function () {
+      const {AssetRevealContract, AssetContract} = await setupTest();
+      expect(await AssetRevealContract.getAssetContract()).to.be.equal(
+        AssetContract.address
+      );
+    });
+  });
+  describe('Roles', function () {
+    it('Admin', async function () {
+      const {AssetRevealContract, assetAdmin} = await setupTest();
+      const defaultAdminRole = await AssetRevealContract.DEFAULT_ADMIN_ROLE();
+      expect(await AssetRevealContract.hasRole(defaultAdminRole, assetAdmin)).to
+        .be.true;
+    });
+    it("Asset's Minter role is granted to AssetReveal", async function () {
+      const {AssetRevealContract, AssetContract} = await setupTest();
+      const minterRole = await AssetContract.MINTER_ROLE();
+      expect(
+        await AssetContract.hasRole(minterRole, AssetRevealContract.address)
+      ).to.be.true;
+    });
+    it('AuthSuperValidator signer is set to backendAuthWallet', async function () {
+      const {
+        AssetRevealContract,
+        AuthSuperValidatorContract,
+        backendAuthWallet,
+      } = await setupTest();
+      expect(
+        await AuthSuperValidatorContract.getSigner(AssetRevealContract.address)
+      ).to.be.equal(backendAuthWallet);
+      expect(
+        await AuthSuperValidatorContract.getSigner(AssetRevealContract.address)
+      ).to.be.equal(backendAuthWallet);
+    });
+  });
+  describe('EIP712', function () {
+    it("name is 'Sandbox Asset Reveal'", async function () {
+      const {AssetRevealContract} = await setupTest();
+      const eip712Domain = await AssetRevealContract.eip712Domain();
+      expect(eip712Domain.name).to.be.equal('Sandbox Asset Reveal');
+    });
+    it("version is '1.0'", async function () {
+      const {AssetRevealContract} = await setupTest();
+      const eip712Domain = await AssetRevealContract.eip712Domain();
+      expect(eip712Domain.version).to.be.equal('1.0');
+    });
+  });
+  describe('Trusted Forwarder', function () {
+    it('Trusted forwarder address is set correctly', async function () {
+      const {AssetRevealContract, TRUSTED_FORWARDER} = await setupTest();
+      expect(await AssetRevealContract.getTrustedForwarder()).to.be.equal(
+        TRUSTED_FORWARDER.address
+      );
+    });
+  });
+});