@arcblock/erc721did-contract 0.3.1 → 0.3.3

package/lib/cjs/ERC721DIDFactory.json

@@ -0,0 +1,165 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "ERC721DIDFactory",
+  "sourceName": "src/ERC721DIDFactory.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_implementation",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "contractAddress",
+          "type": "address"
+        }
+      ],
+      "name": "Created",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "previousOwner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "newOwner",
+          "type": "address"
+        }
+      ],
+      "name": "OwnershipTransferred",
+      "type": "event"
+    },
+    {
+      "stateMutability": "nonpayable",
+      "type": "fallback"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_proxyRegistryAddress",
+          "type": "address"
+        },
+        {
+          "internalType": "string",
+          "name": "_baseImageURI",
+          "type": "string"
+        },
+        {
+          "internalType": "string",
+          "name": "_contractName",
+          "type": "string"
+        },
+        {
+          "internalType": "string",
+          "name": "_contractSymbol",
+          "type": "string"
+        },
+        {
+          "internalType": "string",
+          "name": "_contractDescription",
+          "type": "string"
+        },
+        {
+          "internalType": "uint256",
+          "name": "_totalLimit",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "_price",
+          "type": "uint256"
+        },
+        {
+          "internalType": "address payable",
+          "name": "_transferTokenAddress",
+          "type": "address"
+        }
+      ],
+      "name": "create",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "implementation",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "owner",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "renounceOwnership",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_implementation",
+          "type": "address"
+        }
+      ],
+      "name": "setImplementation",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "newOwner",
+          "type": "address"
+        }
+      ],
+      "name": "transferOwnership",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x608060405234801561001057600080fd5b5060405161091438038061091483398101604081905261002f916100e2565b6100383361005d565b600180546001600160a01b0319166001600160a01b039290921691909117905561010b565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60006001600160a01b0382165b92915050565b6100c9816100ad565b81146100d457600080fd5b50565b80516100ba816100c0565b6000602082840312156100f7576100f7600080fd5b600061010384846100d7565b949350505050565b6107fa8061011a6000396000f3fe608060405234801561001057600080fd5b50600436106100625760003560e01c80635c60da1b14610083578063715018a6146100ac5780638da5cb5b146100b6578063c137ecd7146100c7578063d784d426146100da578063f2fde38b146100ed575b60405162461bcd60e51b815260040161007a90610352565b60405180910390fd5b600154610096906001600160a01b031681565b6040516100a39190610388565b60405180910390f35b6100b4610100565b005b6000546001600160a01b0316610096565b6100b46100d53660046104c4565b610114565b6100b46100e83660046105e3565b6101dd565b6100b46100fb3660046105e3565b610207565b610108610241565b610112600061026b565b565b60015460009061012c906001600160a01b03166102bb565b604051637bced14560e11b81529091506001600160a01b0382169063f79da28a90610169908c908c908c908c908c908c908c908c9060040161066c565b600060405180830381600087803b15801561018357600080fd5b505af1158015610197573d6000803e3d6000fd5b505050507f1449abf21e49fd025f33495e77f7b1461caefdd3d4bb646424a3f445c4576a5b816040516101ca9190610388565b60405180910390a1505050505050505050565b6101e5610241565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b61020f610241565b6001600160a01b0381166102355760405162461bcd60e51b815260040161007a906106ff565b61023e8161026b565b50565b6000546001600160a01b031633146101125760405162461bcd60e51b815260040161007a90610779565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6000763d602d80600a3d3981f3363d3d373d3d3d363d730000008260601b60e81c176000526e5af43d82803e903d91602b57fd5bf38260781b17602052603760096000f090506001600160a01b0381166103275760405162461bcd60e51b815260040161007a906107b4565b919050565b600f8152602081016e2ab735b737bb90333ab731ba34b7b760891b815290505b60200190565b602080825281016103628161032c565b92915050565b60006001600160a01b038216610362565b61038281610368565b82525050565b602081016103628284610379565b61039f81610368565b811461023e57600080fd5b803561036281610396565b634e487b7160e01b600052604160045260246000fd5b601f19601f830116810181811067ffffffffffffffff821117156103f1576103f16103b5565b6040525050565b600061040360405190565b905061032782826103cb565b600067ffffffffffffffff821115610429576104296103b5565b601f19601f83011660200192915050565b82818337506000910152565b60006104596104548461040f565b6103f8565b90508281526020810184848401111561047457610474600080fd5b61047f84828561043a565b509392505050565b600082601f83011261049b5761049b600080fd5b81356104ab848260208601610446565b949350505050565b8061039f565b8035610362816104b3565b600080600080600080600080610100898b0312156104e4576104e4600080fd5b60006104f08b8b6103aa565b985050602089013567ffffffffffffffff81111561051057610510600080fd5b61051c8b828c01610487565b975050604089013567ffffffffffffffff81111561053c5761053c600080fd5b6105488b828c01610487565b965050606089013567ffffffffffffffff81111561056857610568600080fd5b6105748b828c01610487565b955050608089013567ffffffffffffffff81111561059457610594600080fd5b6105a08b828c01610487565b94505060a06105b18b828c016104b9565b93505060c06105c28b828c016104b9565b92505060e06105d38b828c016103aa565b9150509295985092959890939650565b6000602082840312156105f8576105f8600080fd5b60006104ab84846103aa565b60005b8381101561061f578181015183820152602001610607565b8381111561062e576000848401525b50505050565b600061063e825190565b808452602084019350610655818560208601610604565b601f01601f19169290920192915050565b80610382565b610100810161067b828b610379565b818103602083015261068d818a610634565b905081810360408301526106a18189610634565b905081810360608301526106b58188610634565b905081810360808301526106c98187610634565b90506106d860a0830186610666565b6106e560c0830185610666565b6106f260e0830184610379565b9998505050505050505050565b6020808252810161036281602681527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160208201526564647265737360d01b604082015260600190565b60208082527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572910190815261034c565b6020808252810161036281610749565b601681526020810175115490cc4c4d8dce8818dc99585d194819985a5b195960521b8152905061034c565b602080825281016103628161078956fea26469706673582212206b3b4db5959cc750e7d240d269ad0f1ecf46bc9c3fedc4fa170569c318499f3c64736f6c63430008090033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100625760003560e01c80635c60da1b14610083578063715018a6146100ac5780638da5cb5b146100b6578063c137ecd7146100c7578063d784d426146100da578063f2fde38b146100ed575b60405162461bcd60e51b815260040161007a90610352565b60405180910390fd5b600154610096906001600160a01b031681565b6040516100a39190610388565b60405180910390f35b6100b4610100565b005b6000546001600160a01b0316610096565b6100b46100d53660046104c4565b610114565b6100b46100e83660046105e3565b6101dd565b6100b46100fb3660046105e3565b610207565b610108610241565b610112600061026b565b565b60015460009061012c906001600160a01b03166102bb565b604051637bced14560e11b81529091506001600160a01b0382169063f79da28a90610169908c908c908c908c908c908c908c908c9060040161066c565b600060405180830381600087803b15801561018357600080fd5b505af1158015610197573d6000803e3d6000fd5b505050507f1449abf21e49fd025f33495e77f7b1461caefdd3d4bb646424a3f445c4576a5b816040516101ca9190610388565b60405180910390a1505050505050505050565b6101e5610241565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b61020f610241565b6001600160a01b0381166102355760405162461bcd60e51b815260040161007a906106ff565b61023e8161026b565b50565b6000546001600160a01b031633146101125760405162461bcd60e51b815260040161007a90610779565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6000763d602d80600a3d3981f3363d3d373d3d3d363d730000008260601b60e81c176000526e5af43d82803e903d91602b57fd5bf38260781b17602052603760096000f090506001600160a01b0381166103275760405162461bcd60e51b815260040161007a906107b4565b919050565b600f8152602081016e2ab735b737bb90333ab731ba34b7b760891b815290505b60200190565b602080825281016103628161032c565b92915050565b60006001600160a01b038216610362565b61038281610368565b82525050565b602081016103628284610379565b61039f81610368565b811461023e57600080fd5b803561036281610396565b634e487b7160e01b600052604160045260246000fd5b601f19601f830116810181811067ffffffffffffffff821117156103f1576103f16103b5565b6040525050565b600061040360405190565b905061032782826103cb565b600067ffffffffffffffff821115610429576104296103b5565b601f19601f83011660200192915050565b82818337506000910152565b60006104596104548461040f565b6103f8565b90508281526020810184848401111561047457610474600080fd5b61047f84828561043a565b509392505050565b600082601f83011261049b5761049b600080fd5b81356104ab848260208601610446565b949350505050565b8061039f565b8035610362816104b3565b600080600080600080600080610100898b0312156104e4576104e4600080fd5b60006104f08b8b6103aa565b985050602089013567ffffffffffffffff81111561051057610510600080fd5b61051c8b828c01610487565b975050604089013567ffffffffffffffff81111561053c5761053c600080fd5b6105488b828c01610487565b965050606089013567ffffffffffffffff81111561056857610568600080fd5b6105748b828c01610487565b955050608089013567ffffffffffffffff81111561059457610594600080fd5b6105a08b828c01610487565b94505060a06105b18b828c016104b9565b93505060c06105c28b828c016104b9565b92505060e06105d38b828c016103aa565b9150509295985092959890939650565b6000602082840312156105f8576105f8600080fd5b60006104ab84846103aa565b60005b8381101561061f578181015183820152602001610607565b8381111561062e576000848401525b50505050565b600061063e825190565b808452602084019350610655818560208601610604565b601f01601f19169290920192915050565b80610382565b610100810161067b828b610379565b818103602083015261068d818a610634565b905081810360408301526106a18189610634565b905081810360608301526106b58188610634565b905081810360808301526106c98187610634565b90506106d860a0830186610666565b6106e560c0830185610666565b6106f260e0830184610379565b9998505050505050505050565b6020808252810161036281602681527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160208201526564647265737360d01b604082015260600190565b60208082527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572910190815261034c565b6020808252810161036281610749565b601681526020810175115490cc4c4d8dce8818dc99585d194819985a5b195960521b8152905061034c565b602080825281016103628161078956fea26469706673582212206b3b4db5959cc750e7d240d269ad0f1ecf46bc9c3fedc4fa170569c318499f3c64736f6c63430008090033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/lib/{EvmChainList.json → cjs/EvmChainList.json}

@@ -2,49 +2,53 @@
   {
     "chainId": "5",
     "chainName": "Goerli",
-    "contractFactoryAddress": "0x8bE1AE46848232C5fD6A08A7bDfcD177daFb8A88",
+    "contractFactoryAddress": "0x4c093eAf8d569f6b2dC5a217D25cb3f0B60918C3",
     "isTest": true,
     "networkName": "goerli",
     "symbol": "ETH (Goerli)",
     "defaultRPC": "https://goerli.infura.io/v3/31276ea517a941c5b91d914fab83494e",
     "explorer": "https://goerli.etherscan.io",
     "icon": "eth",
-    "enable": true
+    "enable": true,
+    "decimal": 18
   },
   {
     "chainId": "84531",
     "chainName": "Base Goerli",
-    "contractFactoryAddress": "0xD462A649154693610F6A46258848e9C338fb7Eb3",
+    "contractFactoryAddress": "0xe83044a18dAb8F28F99F22f413C3856A0e39B153",
     "isTest": true,
     "networkName": "base-goerli",
     "symbol": "ETH (Base Goerli)",
     "defaultRPC": "https://goerli.base.org",
     "explorer": "https://goerli.basescan.org",
     "icon": "base",
-    "enable": true
+    "enable": true,
+    "decimal": 18
+  },
+  {
+    "chainId": "97",
+    "chainName": "BNB (Binance Smart Chain)",
+    "contractFactoryAddress": "0xf13AAEF9071498eE61D0e6390970e0629c60a53C",
+    "isTest": true,
+    "networkName": "bsc-test",
+    "symbol": "tBNB",
+    "defaultRPC": "https://bsc.getblock.io/13042277-cdaa-47dc-acda-5a0900eaf4ae/testnet",
+    "explorer": "https://testnet.bscscan.com",
+    "icon": "bnb",
+    "enable": true,
+    "decimal": 18
   },
   {
     "chainId": "11155111",
     "chainName": "Sepolia",
-    "contractFactoryAddress": "0xA44112bA00F1a4bc20374C99EC9547C6FA925db7",
+    "contractFactoryAddress": "0xf13AAEF9071498eE61D0e6390970e0629c60a53C",
     "isTest": true,
     "networkName": "sepolia",
     "symbol": "ETH (Sepolia)",
     "defaultRPC": "https://sepolia.infura.io/v3/31276ea517a941c5b91d914fab83494e",
     "explorer": "https://sepolia.etherscan.io",
     "icon": "eth",
-    "enable": false
-  },
-  {
-    "chainId": "97",
-    "chainName": "BNB (Binance Smart Chain)",
-    "contractFactoryAddress": "0xA44112bA00F1a4bc20374C99EC9547C6FA925db7",
-    "isTest": true,
-    "networkName": "bsc-test",
-    "symbol": "BNB",
-    "defaultRPC": "https://bsc.getblock.io/13042277-cdaa-47dc-acda-5a0900eaf4ae/testnet",
-    "explorer": "https://testnet.bscscan.com",
-    "icon": "bnb",
-    "enable": true
+    "enable": false,
+    "decimal": 18
   }
-]
+]

package/lib/{contract.js → cjs/contract.js}

@@ -7,10 +7,11 @@ const waitFor = require('p-wait-for');
 const { toBase58 } = require('@ocap/util');
 const upperFirst = require('lodash/upperFirst');
 const keyBy = require('lodash/keyBy');
+const pick = require('lodash/pick');
 const ERC721DID = require('./ERC721DID.json');
 const ERC721DIDFactory = require('./ERC721DIDFactory.json');
 
-const { INFURA_PROJECT_ID } = process.env;
+const INFURA_PROJECT_ID = '31276ea517a941c5b91d914fab83494e';
 
 const CHAIN_MAP = {
   1: {
@@ -22,6 +23,7 @@ const CHAIN_MAP = {
     explorer: 'https://etherscan.io',
     icon: 'eth',
     enable: true,
+    decimal: 18,
   },
   5: {
     networkName: 'goerli',
@@ -32,6 +34,7 @@ const CHAIN_MAP = {
     explorer: 'https://goerli.etherscan.io',
     icon: 'eth',
     enable: true,
+    decimal: 18,
   },
   31337: {
     networkName: 'localhost',
@@ -42,6 +45,7 @@ const CHAIN_MAP = {
     explorer: 'http://localhost:8545',
     icon: 'eth',
     enable: true,
+    decimal: 18,
   },
   84531: {
     networkName: 'base-goerli',
@@ -52,6 +56,7 @@ const CHAIN_MAP = {
     explorer: 'https://goerli.basescan.org',
     icon: 'base',
     enable: true,
+    decimal: 18,
   },
   11155111: {
     networkName: 'sepolia',
@@ -62,26 +67,25 @@ const CHAIN_MAP = {
     explorer: 'https://sepolia.etherscan.io',
     icon: 'eth',
     enable: false, // FIXME
+    decimal: 18,
   },
   97: {
     networkName: 'bsc-test',
     chainName: 'BNB (Binance Smart Chain)',
     chainId: '97',
-    symbol: 'BNB',
+    symbol: 'tBNB',
     defaultRPC: 'https://bsc.getblock.io/13042277-cdaa-47dc-acda-5a0900eaf4ae/testnet',
     explorer: 'https://testnet.bscscan.com',
     icon: 'bnb',
     enable: true,
+    decimal: 18,
   },
 };
 
 const CUSTOM_CHAIN_MAP = {};
 
-let isLocal = false;
-
 function getProvider(chainId) {
   const { defaultRPC } = getChainInfo(chainId);
-
   return new ethers.providers.JsonRpcProvider(defaultRPC);
 }
 
@@ -129,8 +133,8 @@ async function getGasPrice({ provider }) {
   return 1 * gwei;
 }
 
-async function getTxData(params = {}) {
-  const { contract, fn, args } = params;
+async function getTxData(params = {}, type = 'arcblock') {
+  const { contract, fn, args, value } = params;
   const txData = contract.interface.encodeFunctionData(fn, args);
 
   const chainId = await getChainId({ contract });
@@ -138,27 +142,42 @@ async function getTxData(params = {}) {
   // const gasPrice = await getGasPrice({ provider: contract.provider });
   // const gasPriceAsGwei = Math.ceil(ethers.utils.formatUnits(gasPrice, 'gwei').toString());
 
+  const extraEtherValueMap = value
+    ? {
+        value,
+      }
+    : {};
+
   const gasLimit = await contract.provider
     .estimateGas({
       to: contract.address,
       data: txData,
+      ...extraEtherValueMap,
     })
     .then((res) => res.toString());
 
-  return toBase58(
-    Buffer.from(
-      JSON.stringify({
-        network: chainId,
-        tx: {
-          to: contract.address,
-          value: '0',
-          gasLimit,
-          data: txData,
-        },
-      }),
-      'utf-8'
-    )
-  );
+  if (type === 'arcblock') {
+    return toBase58(
+      Buffer.from(
+        JSON.stringify({
+          network: chainId,
+          tx: {
+            to: contract.address,
+            value: '0',
+            ...extraEtherValueMap,
+            gasLimit,
+            data: txData,
+          },
+        }),
+        'utf-8'
+      )
+    );
+  }
+
+  return {
+    txData,
+    gasLimit,
+  };
 }
 
 const waitForTxReceipt = async ({ contract, txHash }) => {
@@ -225,12 +244,11 @@ const getChainId = async ({ contract }) => {
   return `${chainId}`;
 };
 
-const setupContractEnv = ({ customEvmChainList, isLocal: _isLocal = false }) => {
+const setupContractEnv = ({ customEvmChainList }) => {
   customEvmChainList.forEach((chain) => {
     const { chainId } = chain;
     CUSTOM_CHAIN_MAP[chainId] = chain;
   });
-  isLocal = _isLocal;
 };
 
 const getChainInfo = (chainId) => {
@@ -265,57 +283,64 @@ const getCloneContractArgs = ({
   contractSymbol = '',
   contractDescription,
   totalLimit = 0,
+  price = '0',
+  transferTokenAddress,
 } = {}) => {
-  const params = [ownerAddress, baseImageURI, contractName, contractSymbol, contractDescription, totalLimit];
+  const params = [
+    ownerAddress,
+    baseImageURI,
+    contractName,
+    contractSymbol,
+    contractDescription,
+    totalLimit,
+    price,
+    transferTokenAddress || ownerAddress,
+  ];
   return params;
 };
 
 const getEvmChainList = () => {
+  // eslint-disable-next-line global-require
+  let defaultChainList = require('./EvmChainList.json');
   try {
-    // eslint-disable-next-line global-require
-    let defaultChainList = require('./EvmChainList.json');
-    if (isLocal) {
-      defaultChainList = [
-        ...defaultChainList,
-        // eslint-disable-next-line global-require
-        ...require('./EvmChainList.local.json'),
-      ];
-    }
-    // CUSTOM_CHAIN_MAP is setup by setupContractEnv
-    if (Object.keys(CUSTOM_CHAIN_MAP).length > 0) {
-      defaultChainList = defaultChainList.map((item) => {
-        const { chainId } = item;
-        if (CUSTOM_CHAIN_MAP[chainId]) {
-          // override
-          return {
-            ...item,
-            ...CUSTOM_CHAIN_MAP[chainId],
-          };
-        }
-        return item;
-      });
-    }
-    return defaultChainList;
+    defaultChainList = [
+      ...defaultChainList,
+      // eslint-disable-next-line global-require
+      ...require('./EvmChainList.local.json'),
+    ];
   } catch (error) {
     // do nothing
   }
-  return [];
+  // CUSTOM_CHAIN_MAP is setup by setupContractEnv
+  if (Object.keys(CUSTOM_CHAIN_MAP).length > 0) {
+    defaultChainList = defaultChainList.map((item) => {
+      const { chainId } = item;
+      if (CUSTOM_CHAIN_MAP[chainId]) {
+        // override
+        return {
+          ...item,
+          ...pick(CUSTOM_CHAIN_MAP[chainId], ['enable', 'defaultRPC', 'explorer']),
+        };
+      }
+      return item;
+    });
+  }
+  return defaultChainList;
 };
 
-module.exports = {
-  getContract,
-  getContractFactory,
-  getTxData,
-  getGasPrice,
-  waitForTxReceipt,
-  onContractFilter,
-  getChainId,
-  getChainInfo,
-  getBlockExplorerUrl,
-  getTxExplorerUrl,
-  getAddressExplorerUrl,
-  getCloneContractArgs,
-  getEvmChainList,
-  setupContractEnv,
-  getChainIdByChainName,
-};
+module.exports.getContract = getContract;
+module.exports.getContractFactory = getContractFactory;
+module.exports.getTxData = getTxData;
+module.exports.getGasPrice = getGasPrice;
+module.exports.waitForTxReceipt = waitForTxReceipt;
+module.exports.onContractFilter = onContractFilter;
+module.exports.getChainId = getChainId;
+module.exports.getChainInfo = getChainInfo;
+module.exports.getBlockExplorerUrl = getBlockExplorerUrl;
+module.exports.getTxExplorerUrl = getTxExplorerUrl;
+module.exports.getAddressExplorerUrl = getAddressExplorerUrl;
+module.exports.getCloneContractArgs = getCloneContractArgs;
+module.exports.getEvmChainList = getEvmChainList;
+module.exports.setupContractEnv = setupContractEnv;
+module.exports.getChainIdByChainName = getChainIdByChainName;
+module.exports.ethers = ethers;