@arcblock/erc721did-contract 0.3.17 → 0.3.19

package/lib/cjs/contract.js

@@ -165,10 +165,13 @@ async function getGasPrice({ provider }) {
 }
 
 async function getTxData(params = {}, type = 'arcblock') {
-  const { contract, fn, args, value } = params;
-  const txData = contract.interface.encodeFunctionData(fn, args);
+  const { contract, fn, args, value, txData: _txData, chainId: _chainId, gasLimit: _gasLimit, to: _to } = params;
 
-  const chainId = await getChainId({ contract });
+  // if txData is set, ignore fn and args
+  const txData = _txData || contract.interface.encodeFunctionData(fn, args);
+
+  // if txData is set, ignore contract
+  const chainId = _chainId || (await getChainId({ contract }));
 
   // const gasPrice = await getGasPrice({ provider: contract.provider });
   // const gasPriceAsGwei = Math.ceil(ethers.utils.formatUnits(gasPrice, 'gwei').toString());
@@ -179,13 +182,17 @@ async function getTxData(params = {}, type = 'arcblock') {
       }
     : {};
 
-  const gasLimit = await contract.provider
-    .estimateGas({
-      to: contract.address,
-      data: txData,
-      ...extraEtherValueMap,
-    })
-    .then((res) => res.toString());
+  const to = _to || contract?.address || null;
+
+  const gasLimit =
+    _gasLimit ||
+    (await contract.provider
+      .estimateGas({
+        to,
+        data: txData,
+        ...extraEtherValueMap,
+      })
+      .then((res) => res.toString()));
 
   if (type === 'arcblock') {
     return toBase58(
@@ -193,10 +200,10 @@ async function getTxData(params = {}, type = 'arcblock') {
         JSON.stringify({
           network: chainId,
           tx: {
-            to: contract.address,
+            to,
             value: '0',
-            ...extraEtherValueMap,
             gasLimit,
+            ...extraEtherValueMap,
             data: txData,
           },
         }),
@@ -359,6 +366,11 @@ const getEvmChainList = () => {
   return defaultChainList;
 };
 
+async function createContractFactory({ abi, bytecode, signer } = {}) {
+  const factory = new ethers.ContractFactory(abi, bytecode, signer);
+  return factory;
+}
+
 module.exports.getContract = getContract;
 module.exports.getContractFactory = getContractFactory;
 module.exports.getTxData = getTxData;
@@ -375,3 +387,4 @@ module.exports.getEvmChainList = getEvmChainList;
 module.exports.setupContractEnv = setupContractEnv;
 module.exports.getChainIdByChainName = getChainIdByChainName;
 module.exports.ethers = ethers;
+module.exports.createContractFactory = createContractFactory;

package/lib/esm/contract.js

@@ -1184,10 +1184,13 @@ async function getGasPrice({ provider }) {
 }
 
 async function getTxData(params = {}, type = 'arcblock') {
-  const { contract, fn, args, value } = params;
-  const txData = contract.interface.encodeFunctionData(fn, args);
+  const { contract, fn, args, value, txData: _txData, chainId: _chainId, gasLimit: _gasLimit, to: _to } = params;
 
-  const chainId = await getChainId({ contract });
+  // if txData is set, ignore fn and args
+  const txData = _txData || contract.interface.encodeFunctionData(fn, args);
+
+  // if txData is set, ignore contract
+  const chainId = _chainId || (await getChainId({ contract }));
 
   // const gasPrice = await getGasPrice({ provider: contract.provider });
   // const gasPriceAsGwei = Math.ceil(ethers.utils.formatUnits(gasPrice, 'gwei').toString());
@@ -1198,13 +1201,17 @@ async function getTxData(params = {}, type = 'arcblock') {
       }
     : {};
 
-  const gasLimit = await contract.provider
-    .estimateGas({
-      to: contract.address,
-      data: txData,
-      ...extraEtherValueMap,
-    })
-    .then((res) => res.toString());
+  const to = _to || contract?.address || null;
+
+  const gasLimit =
+    _gasLimit ||
+    (await contract.provider
+      .estimateGas({
+        to,
+        data: txData,
+        ...extraEtherValueMap,
+      })
+      .then((res) => res.toString()));
 
   if (type === 'arcblock') {
     return toBase58(
@@ -1212,10 +1219,10 @@ async function getTxData(params = {}, type = 'arcblock') {
         JSON.stringify({
           network: chainId,
           tx: {
-            to: contract.address,
+            to,
             value: '0',
-            ...extraEtherValueMap,
             gasLimit,
+            ...extraEtherValueMap,
             data: txData,
           },
         }),
@@ -1378,6 +1385,11 @@ const getEvmChainList = () => {
   return defaultChainList;
 };
 
+async function createContractFactory({ abi, bytecode, signer } = {}) {
+  const factory = new ethers.ContractFactory(abi, bytecode, signer);
+  return factory;
+}
+
 var getContract_1 = contract$1.getContract = getContract;
 var getContractFactory_1 = contract$1.getContractFactory = getContractFactory;
 var getTxData_1 = contract$1.getTxData = getTxData;
@@ -1394,5 +1406,6 @@ var getEvmChainList_1 = contract$1.getEvmChainList = getEvmChainList;
 var setupContractEnv_1 = contract$1.setupContractEnv = setupContractEnv;
 var getChainIdByChainName_1 = contract$1.getChainIdByChainName = getChainIdByChainName;
 var ethers_1 = contract$1.ethers = ethers;
+var createContractFactory_1 = contract$1.createContractFactory = createContractFactory;
 
-export { contract$1 as default, ethers_1 as ethers, getAddressExplorerUrl_1 as getAddressExplorerUrl, getBlockExplorerUrl_1 as getBlockExplorerUrl, getChainId_1 as getChainId, getChainIdByChainName_1 as getChainIdByChainName, getChainInfo_1 as getChainInfo, getCloneContractArgs_1 as getCloneContractArgs, getContract_1 as getContract, getContractFactory_1 as getContractFactory, getEvmChainList_1 as getEvmChainList, getGasPrice_1 as getGasPrice, getTxData_1 as getTxData, getTxExplorerUrl_1 as getTxExplorerUrl, onContractFilter_1 as onContractFilter, setupContractEnv_1 as setupContractEnv, waitForTxReceipt_1 as waitForTxReceipt };
+export { createContractFactory_1 as createContractFactory, contract$1 as default, ethers_1 as ethers, getAddressExplorerUrl_1 as getAddressExplorerUrl, getBlockExplorerUrl_1 as getBlockExplorerUrl, getChainId_1 as getChainId, getChainIdByChainName_1 as getChainIdByChainName, getChainInfo_1 as getChainInfo, getCloneContractArgs_1 as getCloneContractArgs, getContract_1 as getContract, getContractFactory_1 as getContractFactory, getEvmChainList_1 as getEvmChainList, getGasPrice_1 as getGasPrice, getTxData_1 as getTxData, getTxExplorerUrl_1 as getTxExplorerUrl, onContractFilter_1 as onContractFilter, setupContractEnv_1 as setupContractEnv, waitForTxReceipt_1 as waitForTxReceipt };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.3.17",
+  "version": "0.3.19",
   "exports": {
     ".": {
       "import": "./lib/esm",
@@ -38,7 +38,7 @@
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.1.0",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.17.0",
+    "@types/node": "^18.17.1",
     "chai": "^4.3.7",
     "dotenv-flow": "^3.2.0",
     "envfile": "^6.18.0",