refactor: simplify contract method signatures

thirdweb-dev · Feb 23, 2024 · 3f3bfe5 · 3f3bfe5
1 parent b66e4a0
commit 3f3bfe5
Show file tree

Hide file tree

Showing 27 changed files with 28 additions and 35 deletions.
diff --git a/packages/thirdweb/src/contract/deployment/deploy-via-clone-factory.ts b/packages/thirdweb/src/contract/deployment/deploy-via-clone-factory.ts
@@ -56,7 +56,7 @@ export async function prepareDeployTransactionViaCloneFactory(
   return prepareContractCall({
     contract: factory,
     method:
-      "function deployProxyByImplementation(address _implementation, bytes memory _data, bytes32 _salt) returns (address deployedProxy)",
+      "function deployProxyByImplementation(address, bytes, bytes32) returns (address)",
     params: async () => {
       const implementation = getContract({
         client,

diff --git a/packages/thirdweb/src/extensions/erc1155/read/balanceOf.ts b/packages/thirdweb/src/extensions/erc1155/read/balanceOf.ts
@@ -22,8 +22,7 @@ export function balanceOf(
 ): Promise<bigint> {
   return readContract({
     ...options,
-    method:
-      "function balanceOf(owner address, tokenId uint256) view returns (uint256)",
+    method: "function balanceOf(address, uint256) view returns (uint256)",
     params: [options.address, options.tokenId],
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/read/balanceOfBatch.ts b/packages/thirdweb/src/extensions/erc1155/read/balanceOfBatch.ts
@@ -22,8 +22,7 @@ export function balanceOfBatch(
 ): Promise<readonly bigint[]> {
   return readContract({
     ...options,
-    method:
-      "function balanceOfBatch(owners address[], tokenIds uint256[]) view returns (uint256[])",
+    method: "function balanceOfBatch(address[], uint256[]) returns (uint256[])",
     params: [options.owners, options.tokenIds],
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/read/nextTokenIdToMint.ts b/packages/thirdweb/src/extensions/erc1155/read/nextTokenIdToMint.ts
@@ -17,6 +17,6 @@ export function nextTokenIdToMint(
 ): Promise<bigint> {
   return readContract({
     ...options,
-    method: "function nextTokenIdToMint() view returns (uint256)",
+    method: "function nextTokenIdToMint() returns (uint256)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/read/tokenURI.ts b/packages/thirdweb/src/extensions/erc1155/read/tokenURI.ts
@@ -19,8 +19,7 @@ export function tokenURI(
 ): Promise<string> {
   return readContract({
     ...options,
-    method:
-      "function tokenURI(tokenId uint256) external view returns (string memory)",
+    method: "function tokenURI(uint256) returns (string)",
     params: [options.tokenId],
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc1155/read/totalSupply.ts b/packages/thirdweb/src/extensions/erc1155/read/totalSupply.ts
@@ -19,7 +19,7 @@ export function totalSupply(
 ): Promise<bigint> {
   return readContract({
     ...options,
-    method: "function totalSupply(tokenId uint256) view returns (uint256)",
+    method: "function totalSupply(uint256) returns (uint256)",
     params: [options.tokenId],
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/read/allowance.ts b/packages/thirdweb/src/extensions/erc20/read/allowance.ts
@@ -23,8 +23,7 @@ export function allowance(
 ): Promise<bigint> {
   return readContract({
     ...options,
-    method:
-      "function allowance(address owner, address spender) view returns (uint256)",
+    method: "function allowance(address, address) returns (uint256)",
     params: [options.owner, options.spender],
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/read/balanceOf.ts b/packages/thirdweb/src/extensions/erc20/read/balanceOf.ts
@@ -5,7 +5,7 @@ import { readContract } from "../../../transaction/read-contract.js";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
 import { toTokens } from "../../../utils/units.js";
 
-const METHOD = "function balanceOf(address) view returns (uint256)" as const;
+const METHOD = "function balanceOf(address) returns (uint256)" as const;
 
 type BalanceOfParams = { address: string };
 

diff --git a/packages/thirdweb/src/extensions/erc20/read/decimals.ts b/packages/thirdweb/src/extensions/erc20/read/decimals.ts
@@ -5,7 +5,7 @@ import { detectMethod } from "../../../utils/bytecode/detectExtension.js";
 
 const cache = new WeakMap<ThirdwebContract<any>, Promise<number>>();
 
-const METHOD = "function decimals() view returns (uint8)" as const;
+const METHOD = "function decimals() returns (uint8)" as const;
 
 /**
  * Detects if the contract has a function to retrieve the number of decimals.

diff --git a/packages/thirdweb/src/extensions/erc20/read/totalSupply.ts b/packages/thirdweb/src/extensions/erc20/read/totalSupply.ts
@@ -15,6 +15,6 @@ import type { BaseTransactionOptions } from "../../../transaction/types.js";
 export function totalSupply(options: BaseTransactionOptions): Promise<bigint> {
   return readContract({
     ...options,
-    method: "function totalSupply() view returns (uint256)",
+    method: "function totalSupply() returns (uint256)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc20/write/approve.ts b/packages/thirdweb/src/extensions/erc20/write/approve.ts
@@ -33,7 +33,7 @@ export type ApproveParams = Prettify<
 export function approve(options: BaseTransactionOptions<ApproveParams>) {
   return prepareContractCall({
     ...options,
-    method: "function approve(address spender, uint256 value) returns (bool)",
+    method: "function approve(address, uint256) returns (bool)",
     params: async () => {
       let amount: bigint;
       if ("amount" in options) {

diff --git a/packages/thirdweb/src/extensions/erc20/write/mintTo.ts b/packages/thirdweb/src/extensions/erc20/write/mintTo.ts
@@ -32,7 +32,7 @@ export type MintToParams = Prettify<
 export function mintTo(options: BaseTransactionOptions<MintToParams>) {
   return prepareContractCall({
     ...options,
-    method: "function mintTo(address to, uint256 amount)",
+    method: "function mintTo(address, uint256)",
     params: async () => {
       let amount: bigint;
       if ("amount" in options) {

diff --git a/packages/thirdweb/src/extensions/erc20/write/transfer.ts b/packages/thirdweb/src/extensions/erc20/write/transfer.ts
@@ -32,7 +32,7 @@ export type TransferParams = Prettify<
 export function transfer(options: BaseTransactionOptions<TransferParams>) {
   return prepareContractCall({
     contract: options.contract,
-    method: "function transfer(address to, uint256 value)",
+    method: "function transfer(address, uint256)",
     params: async () => {
       let amount: bigint;
       if ("amount" in options) {

diff --git a/packages/thirdweb/src/extensions/erc20/write/transferFrom.ts b/packages/thirdweb/src/extensions/erc20/write/transferFrom.ts
@@ -37,7 +37,7 @@ export function transferFrom(
 ) {
   return prepareContractCall({
     ...options,
-    method: "function transferFrom(address from, address to, uint256 value)",
+    method: "function transferFrom(address, address, uint256)",
     params: async () => {
       let amount: bigint;
       if ("amount" in options) {

diff --git a/packages/thirdweb/src/extensions/erc721/read/balanceOf.ts b/packages/thirdweb/src/extensions/erc721/read/balanceOf.ts
@@ -19,8 +19,7 @@ export function balanceOf(
 ): Promise<bigint> {
   return readContract({
     ...options,
-    method:
-      "function balanceOf(address owner) external view returns (uint256 balance)",
+    method: "function balanceOf(address) returns (uint256)",
     params: [options.address],
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/read/nextTokenIdToMint.ts b/packages/thirdweb/src/extensions/erc721/read/nextTokenIdToMint.ts
@@ -17,6 +17,6 @@ export function nextTokenIdToMint(
 ): Promise<bigint> {
   return readContract({
     ...options,
-    method: "function nextTokenIdToMint() view returns (uint256)",
+    method: "function nextTokenIdToMint()  returns (uint256)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/read/ownerOf.ts b/packages/thirdweb/src/extensions/erc721/read/ownerOf.ts
@@ -19,8 +19,7 @@ export function ownerOf(
 ): Promise<string> {
   return readContract({
     ...options,
-    method:
-      "function ownerOf(uint256 tokenId) external view returns (address owner)",
+    method: "function ownerOf(uint256) returns (address)",
     params: [BigInt(options.tokenId)],
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/read/startTokenId.ts b/packages/thirdweb/src/extensions/erc721/read/startTokenId.ts
@@ -15,6 +15,6 @@ import type { BaseTransactionOptions } from "../../../transaction/types.js";
 export function startTokenId(options: BaseTransactionOptions): Promise<bigint> {
   return readContract({
     ...options,
-    method: "function startTokenId() view returns (uint256)",
+    method: "function startTokenId() returns (uint256)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/read/tokenURI.ts b/packages/thirdweb/src/extensions/erc721/read/tokenURI.ts
@@ -19,7 +19,7 @@ export function tokenURI(
 ): Promise<string> {
   return readContract({
     ...options,
-    method: "function tokenURI(uint256 tokenId) returns (string memory)",
+    method: "function tokenURI(uint256) returns (string)",
     params: [options.tokenId],
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/read/totalSupply.ts b/packages/thirdweb/src/extensions/erc721/read/totalSupply.ts
@@ -15,6 +15,6 @@ import type { BaseTransactionOptions } from "../../../transaction/types.js";
 export function totalSupply(options: BaseTransactionOptions): Promise<bigint> {
   return readContract({
     ...options,
-    method: "function totalSupply() view returns (uint256)",
+    method: "function totalSupply() returns (uint256)",
   });
 }
diff --git a/packages/thirdweb/src/extensions/erc721/write/mintTo.ts b/packages/thirdweb/src/extensions/erc721/write/mintTo.ts
@@ -45,7 +45,7 @@ export type MintToParams = {
 export function mintTo(options: BaseTransactionOptions<MintToParams>) {
   return prepareContractCall({
     contract: options.contract,
-    method: "function mintTo(address _to, string memory _tokenURI)",
+    method: "function mintTo(address, string)",
     params: async () => {
       let tokenUri: string;
 

diff --git a/packages/thirdweb/src/extensions/erc721/write/transferFrom.ts b/packages/thirdweb/src/extensions/erc721/write/transferFrom.ts
@@ -32,7 +32,7 @@ export function transferFrom(
 ) {
   return prepareContractCall({
     contract: options.contract,
-    method: "function transferFrom(address from, address to, uint256 tokenId)",
+    method: "function transferFrom(address, address, uint256)",
     params: [options.from, options.to, options.tokenId],
   });
 }
diff --git a/packages/thirdweb/src/transaction/actions/encode.test.ts b/packages/thirdweb/src/transaction/actions/encode.test.ts
@@ -15,7 +15,7 @@ describe("transaction: encode", () => {
   it("should encode correctly (human-readable)", async () => {
     const tx = prepareContractCall({
       contract: USDC_CONTRACT,
-      method: "function transfer(address to, uint256 value) returns (bool)",
+      method: "function transfer(address, uint256) returns (bool)",
       params: [TEST_WALLET_A, 100n],
     });
     const encoded = await encode(tx);

diff --git a/packages/thirdweb/src/transaction/actions/estimate-gas.test.ts b/packages/thirdweb/src/transaction/actions/estimate-gas.test.ts
@@ -13,7 +13,7 @@ describe("transaction: estimate-gas", () => {
   it("should estimate gas correctly (human-readable)", async () => {
     const tx = prepareContractCall({
       contract: USDC_CONTRACT,
-      method: "function transfer(address to, uint256 value) returns (bool)",
+      method: "function transfer(address, uint256) returns (bool)",
       params: [TEST_WALLET_A, 100n],
     });
     const gasEstimate = await estimateGas({

diff --git a/packages/thirdweb/src/transaction/actions/simulate.test.ts b/packages/thirdweb/src/transaction/actions/simulate.test.ts
@@ -13,7 +13,7 @@ describe("transaction: simulate", () => {
   it("should simulate correctly (human-readable)", async () => {
     const tx = prepareContractCall({
       contract: USDC_CONTRACT,
-      method: "function transfer(address to, uint256 value) returns (bool)",
+      method: "function transfer(address, uint256) returns (bool)",
       params: [TEST_WALLET_A, 100n],
     });
     const result = await simulateTransaction({

diff --git a/packages/thirdweb/src/transaction/read-contract.test.ts b/packages/thirdweb/src/transaction/read-contract.test.ts
@@ -10,7 +10,7 @@ describe("transaction: read", () => {
   it("should read from the contract correctly", async () => {
     const result = await readContract({
       contract: USDC_CONTRACT,
-      method: "function balanceOf(address owner) returns (uint256)",
+      method: "function balanceOf(address) returns (uint256)",
       params: [VITALIK_WALLET],
     });
 

diff --git a/packages/thirdweb/src/wallets/smart/lib/calls.ts b/packages/thirdweb/src/wallets/smart/lib/calls.ts
@@ -42,7 +42,7 @@ export function prepareCreateAccount(args: {
   }
   return prepareContractCall({
     contract: factoryContract,
-    method: "function createAccount(address, bytes) public returns (address)",
+    method: "function createAccount(address, bytes) returns (address)",
     params: [
       options.overrides?.accountAddress || options.personalAccount.address,
       stringToHex(options.overrides?.accountSalt ?? ""),
@@ -87,8 +87,7 @@ export function prepareBatchExecute(args: {
   }
   return prepareContractCall({
     contract: accountContract,
-    method:
-      "function executeBatch(address[] calldata _target,uint256[] calldata _value,bytes[] calldata _calldata)",
+    method: "function executeBatch(address[], uint256[], bytes[])",
     params: [
       transactions.map((tx) => tx.to || ""),
       transactions.map((tx) => tx.value || 0n),