Merge pull request #99 from tablelandnetwork/dtb/fix-polygon

fix: mumbai failing to due gas limit issues

Author: dtbuchholz

package-lock.json

@@ -1,8 +1,12 @@
 {
   "name": "@tableland/cli",
-  "version": "5.4.0",
+  "version": "5.4.1",
   "description": "Tableland command line tools",
-  "repository": "https://github.com/tablelandnetwork/tableland-js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tablelandnetwork/tableland-js.git",
+    "directory": "packages/cli"
+  },
   "publishConfig": {
     "access": "public"
   },
@@ -46,7 +50,7 @@
   "dependencies": {
     "@ensdomains/ensjs": "3.0.0-alpha.64",
     "@tableland/node-helpers": "^0.0.2",
-    "@tableland/sdk": "^5.1.0",
+    "@tableland/sdk": "^5.1.1",
     "@tableland/sqlparser": "^1.3.0",
     "cli-select-2": "^2.0.0",
     "cosmiconfig": "^8.0.0",

packages/cli/package.json

@@ -2,7 +2,11 @@
   "name": "@tableland/local",
   "version": "2.3.0",
   "description": "Tooling to start a sandboxed Tableland network.",
-  "repository": "https://github.com/tablelandnetwork/tableland-js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tablelandnetwork/tableland-js.git",
+    "directory": "packages/local"
+  },
   "license": "MIT AND Apache-2.0",
   "publishConfig": {
     "access": "public"

packages/local/package.json

@@ -2,7 +2,11 @@
   "name": "@tableland/node-helpers",
   "version": "0.0.2",
   "description": "Helpers for the @tableland/sdk in a Node.js environment",
-  "repository": "https://github.com/tablelandnetwork/tableland-js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tablelandnetwork/tableland-js.git",
+    "directory": "packages/node-helpers"
+  },
   "license": "MIT AND Apache-2.0",
   "publishConfig": {
     "access": "public"

packages/node-helpers/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@tableland/sdk",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "description": "A database client and helpers for the Tableland network",
-  "repository": "https://github.com/tablelandnetwork/tableland-js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tablelandnetwork/tableland-js.git",
+    "directory": "packages/sdk"
+  },
   "publishConfig": {
     "access": "public"
   },

packages/sdk/package.json

@@ -29,7 +29,7 @@ export async function getOverrides({
   const opts: Overrides = {};
   const network = await signer.provider?.getNetwork();
   /* c8 ignore next 7 */
-  if (network?.chainId === 137) {
+  if (network && isPolygon(network.chainId)) {
     const feeData = await signer.getFeeData();
     if (feeData.gasPrice != null) {
       opts.gasPrice =
@@ -39,6 +39,15 @@ export async function getOverrides({
   return opts;
 }
 
+/**
+ * Check if a chain is Polygon.
+ * @param chainId The chainId of the network.
+ * @returns A boolean that indicates if the chain is a mainnet/testnet Polygon.
+ */
+export function isPolygon(chainId: number): boolean {
+  return chainId === 137 || chainId === 80001;
+}
+
 /**
  * RegistryReceipt is based on the TransactionReceipt type which defined by the API spec.
  * The API v1 has a known problem where it only returns the first tableId from a transaction.

packages/sdk/src/helpers/ethers.ts

@@ -1,5 +1,5 @@
 import { type SignerConfig } from "../helpers/config.js";
-import { type ContractTransaction } from "../helpers/ethers.js";
+import { type ContractTransaction, isPolygon } from "../helpers/ethers.js";
 import { type TableIdentifier, getContractSetup } from "./contract.js";
 
 export interface SetParams {
@@ -23,6 +23,16 @@ export async function setController(
   );
   const caller = await signer.getAddress();
   const controller = params.controller;
+  const chainId = await signer.getChainId();
+  if (isPolygon(chainId)) {
+    const gasLimit = await contract.estimateGas.setController(
+      caller,
+      tableId,
+      controller,
+      overrides
+    );
+    overrides.gasLimit = Math.floor(gasLimit.toNumber() * 1.2);
+  }
   return await contract.setController(caller, tableId, controller, overrides);
 }
 
@@ -35,6 +45,15 @@ export async function lockController(
     tableName
   );
   const caller = await signer.getAddress();
+  const chainId = await signer.getChainId();
+  if (isPolygon(chainId)) {
+    const gasLimit = await contract.estimateGas.lockController(
+      caller,
+      tableId,
+      overrides
+    );
+    overrides.gasLimit = Math.floor(gasLimit.toNumber() * 1.2);
+  }
   return await contract.lockController(caller, tableId, overrides);
 }
 

packages/sdk/src/registry/controller.ts

@@ -1,6 +1,6 @@
 import { normalize } from "../helpers/index.js";
 import { type SignerConfig } from "../helpers/config.js";
-import { type ContractTransaction } from "../helpers/ethers.js";
+import { type ContractTransaction, isPolygon } from "../helpers/ethers.js";
 import { validateTableName } from "../helpers/parser.js";
 import { getContractAndOverrides } from "./contract.js";
 
@@ -96,6 +96,14 @@ async function _createOne(
     signer,
     chainId
   );
+  if (isPolygon(chainId)) {
+    const gasLimit = await contract.estimateGas["create(address,string)"](
+      owner,
+      statement,
+      overrides
+    );
+    overrides.gasLimit = Math.floor(gasLimit.toNumber() * 1.2);
+  }
   return await contract["create(address,string)"](owner, statement, overrides);
 }
 
@@ -108,6 +116,14 @@ async function _createMany(
     signer,
     chainId
   );
+  if (isPolygon(chainId)) {
+    const gasLimit = await contract.estimateGas["create(address,string[])"](
+      owner,
+      statements,
+      overrides
+    );
+    overrides.gasLimit = Math.floor(gasLimit.toNumber() * 1.2);
+  }
   return await contract["create(address,string[])"](
     owner,
     statements,

packages/sdk/src/registry/create.ts

@@ -1,5 +1,5 @@
 import { type SignerConfig } from "../helpers/config.js";
-import { type ContractTransaction } from "../helpers/ethers.js";
+import { type ContractTransaction, isPolygon } from "../helpers/ethers.js";
 import { validateTableName } from "../helpers/parser.js";
 import {
   getContractAndOverrides,
@@ -84,6 +84,12 @@ async function _mutateOne(
     signer,
     chainId
   );
+  if (isPolygon(chainId)) {
+    const gasLimit = await contract.estimateGas[
+      "mutate(address,uint256,string)"
+    ](caller, tableId, statement, overrides);
+    overrides.gasLimit = Math.floor(gasLimit.toNumber() * 1.2);
+  }
   return await contract["mutate(address,uint256,string)"](
     caller,
     tableId,
@@ -101,6 +107,12 @@ async function _mutateMany(
     signer,
     chainId
   );
+  if (isPolygon(chainId)) {
+    const gasLimit = await contract.estimateGas[
+      "mutate(address,(uint256,string)[])"
+    ](caller, runnables, overrides);
+    overrides.gasLimit = Math.floor(gasLimit.toNumber() * 1.2);
+  }
   return await contract["mutate(address,(uint256,string)[])"](
     caller,
     runnables,

packages/sdk/src/registry/run.ts

@@ -1,5 +1,5 @@
 import { type SignerConfig } from "../helpers/config.js";
-import { type ContractTransaction } from "../helpers/ethers.js";
+import { type ContractTransaction, isPolygon } from "../helpers/ethers.js";
 import { type TableIdentifier, getContractSetup } from "./contract.js";
 
 export interface TransferParams {
@@ -22,6 +22,13 @@ export async function safeTransferFrom(
     params.tableName
   );
   const caller = await signer.getAddress();
+  const chainId = await signer.getChainId();
+  if (isPolygon(chainId)) {
+    const gasLimit = await contract.estimateGas[
+      "safeTransferFrom(address,address,uint256)"
+    ](caller, params.to, tableId, overrides);
+    overrides.gasLimit = Math.floor(gasLimit.toNumber() * 1.2);
+  }
   return await contract["safeTransferFrom(address,address,uint256)"](
     caller,
     params.to,