okb support

me-foundation · Feb 25, 2024 · d6147b9 · d6147b9
1 parent 4eac692
commit d6147b9
Show file tree

Hide file tree

Showing 8 changed files with 826 additions and 27 deletions.
diff --git a/contracts/Animal.sol b/contracts/Animal.sol
diff --git a/contracts/AnimalRoyalties.sol b/contracts/AnimalRoyalties.sol
@@ -0,0 +1,46 @@
+//SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.4;
+
+import {ERC2981, UpdatableRoyalties} from "./royalties/UpdatableRoyalties.sol";
+import {Animal, ERC721ACQueryable, IERC721A} from "./Animal.sol";
+
+/**
+ * @title AnimalRoyalties
+ */
+contract AnimalRoyalties is Animal, UpdatableRoyalties {
+    constructor(
+        string memory collectionName,
+        string memory collectionSymbol,
+        string memory tokenURISuffix,
+        uint256 maxMintableSupply,
+        uint256 globalWalletLimit,
+        address cosigner,
+        uint64 timestampExpirySeconds,
+        address mintCurrency,
+        address royaltyReceiver,
+        uint96 royaltyFeeNumerator
+    )
+        Animal(
+            collectionName,
+            collectionSymbol,
+            tokenURISuffix,
+            maxMintableSupply,
+            globalWalletLimit,
+            cosigner,
+            timestampExpirySeconds,
+            mintCurrency
+        )
+        UpdatableRoyalties(royaltyReceiver, royaltyFeeNumerator)
+    {}
+
+    function supportsInterface(bytes4 interfaceId)
+        public
+        view
+        virtual
+        override(ERC2981, ERC721ACQueryable, IERC721A)
+        returns (bool)
+    {
+        return super.supportsInterface(interfaceId);
+    }
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,6 +42,7 @@
   },
   "devDependencies": {
     "@ethersproject/abstract-provider": "^5.7.0",
+    "@ethersproject/solidity": "^5.7.0",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.6",
     "@nomiclabs/hardhat-ethers": "^2.1.1",
     "@nomiclabs/hardhat-etherscan": "^3.1.0",

diff --git a/scripts/deploy.ts b/scripts/deploy.ts
@@ -42,9 +42,11 @@ export const deploy = async (
   let contractName: string = ContractDetails.ERC721M.name;
 
   if (args.useerc721c && args.useerc2198) {
-    contractName = ContractDetails.ERC721CMRoyalties.name;
+    contractName = 'AnimalRoyalties';
+    //contractName = ContractDetails.ERC721CMRoyalties.name;
   } else if (args.useerc721c) {
-    contractName = ContractDetails.ERC721CM.name;
+    contractName = 'Animal';
+    //contractName = ContractDetails.ERC721CM.name;
   } else if (args.useoperatorfilterer) {
     if (args.increasesupply) {
       contractName = ContractDetails.ERC721MIncreasableOperatorFilterer.name;

diff --git a/scripts/setStages.ts b/scripts/setStages.ts
@@ -4,6 +4,7 @@ import { MerkleTree } from 'merkletreejs';
 import fs from 'fs';
 import { ContractDetails } from './common/constants';
 import { estimateGas } from './utils/helper';
+import { keccak256 } from '@ethersproject/solidity';
 
 export interface ISetStagesParams {
   stages: string;
@@ -18,6 +19,7 @@ interface StageConfig {
   walletLimit?: number;
   maxSupply?: number;
   whitelistPath?: string;
+  variableLimitPath?: string;
 }
 
 export const setStages = async (
@@ -39,33 +41,63 @@ export const setStages = async (
   }
   const merkleRoots = await Promise.all(
     stagesConfig.map((stage) => {
-      if (!stage.whitelistPath) {
-        return ethers.utils.hexZeroPad('0x', 32);
-      }
-      const whitelist = JSON.parse(
-        fs.readFileSync(stage.whitelistPath, 'utf-8'),
-      );
-
-      // Clean up whitelist
-      const filteredWhitelist=  whitelist.filter((address: string) => ethers.utils.isAddress(address));
-      console.log(`Filtered whitelist: ${filteredWhitelist.length} addresses. ${whitelist.length - filteredWhitelist.length} invalid addresses removed.`);
-      const invalidWhitelist=  whitelist.filter((address: string) => !ethers.utils.isAddress(address));
-      console.log(`❌ Invalid whitelist: ${invalidWhitelist.length} addresses.\r\n${invalidWhitelist.join(', \r\n')}`);
-
-      if (invalidWhitelist.length > 0) {
-        console.log(`🔄 🚨 updating whitelist file: ${stage.whitelistPath}`);
-        fs.writeFileSync(stage.whitelistPath, JSON.stringify(filteredWhitelist, null, 2))
+      if (stage.whitelistPath) {
+        const whitelist = JSON.parse(
+          fs.readFileSync(stage.whitelistPath, 'utf-8'),
+        );
+
+        // Clean up whitelist
+        const filteredWhitelist=  whitelist.filter((address: string) => ethers.utils.isAddress(address));
+        console.log(`Filtered whitelist: ${filteredWhitelist.length} addresses. ${whitelist.length - filteredWhitelist.length} invalid addresses removed.`);
+        const invalidWhitelist=  whitelist.filter((address: string) => !ethers.utils.isAddress(address));
+        console.log(`❌ Invalid whitelist: ${invalidWhitelist.length} addresses.\r\n${invalidWhitelist.join(', \r\n')}`);
+
+        if (invalidWhitelist.length > 0) {
+          console.log(`🔄 🚨 updating whitelist file: ${stage.whitelistPath}`);
+          fs.writeFileSync(stage.whitelistPath, JSON.stringify(filteredWhitelist, null, 2))
+        }
+
+        const mt = new MerkleTree(
+          filteredWhitelist.map(ethers.utils.getAddress),
+          ethers.utils.keccak256,
+          {
+            sortPairs: true,
+            hashLeaves: true,
+          },
+        );
+        return mt.getHexRoot();
+      } else if (stage.variableLimitPath) {
+        const leaves: any[] = [];
+        const file = fs.readFileSync(stage.variableLimitPath, 'utf-8');
+        file.split('\n').filter(line => line).forEach(line => {
+          const [addressStr, limitStr] = line.split(',');
+          const address = ethers.utils.getAddress(addressStr.toLowerCase().trim());
+          const limit = parseInt(limitStr, 10)
+
+          const digest = keccak256(
+            [
+              'address',
+              'uint32',
+            ],
+            [
+              address,
+              limit,
+            ],
+          );
+          leaves.push(digest);
+        });
+        const mt = new MerkleTree(
+          leaves,
+          ethers.utils.keccak256,
+          {
+            sortPairs: true,
+            hashLeaves: true,
+          },
+        );
+        return mt.getHexRoot();
       }
 
-      const mt = new MerkleTree(
-        filteredWhitelist.map(ethers.utils.getAddress),
-        ethers.utils.keccak256,
-        {
-          sortPairs: true,
-          hashLeaves: true,
-        },
-      );
-      return mt.getHexRoot();
+      return ethers.utils.hexZeroPad('0x', 32);
     }),
   );
 

diff --git a/stages.json b/stages.json
@@ -0,0 +1,9 @@
+[
+  {
+    "price": "0.00",
+    "walletLimit": 100,
+    "startDate": "2024-02-25T08:45:00.000Z",
+    "endDate": "2024-12-20T00:00:01.000Z",
+    "variableLimitPath": "/Users/channingmao/Documents/MagicEden/magiceden-oss/erc721m/variableWalletLimit.txt"
+  }
+]
diff --git a/variableWalletLimit.txt b/variableWalletLimit.txt
@@ -0,0 +1,2 @@
+0xef59F379B48f2E92aBD94ADcBf714D170967925D, 99
+0x9aE2DF1709FF8BccFc3B24623f84f7d919cb0a71, 12