feat: upgrade Taquito SDK from v20 to v24.2 (#947)

- Bump all @taquito/* packages to ^24.2.0
- Remove @airgap/beacon-sdk and @airgap/beacon-types (replaced by @ecadlabs/beacon-types)
- Migrate contract.methods to contract.methodsObject (removed in v23+)
- Convert propose() calls from positional args to named object params
- Rename bytes2Char to bytesToString (@taquito/utils)
- Alias MichelsonV1Expression for MichelineMichelsonV1Expression rename
- Remove unused encodePubKey import
- Add process/browser polyfill and vm:false webpack fallback
- Fix ESM fullySpecified resolution for process module

Author: EightRice

craco.config.js

@@ -17,9 +17,26 @@ module.exports = {
         stream: require.resolve("stream-browserify/"),
         url: require.resolve("url/"),
         util: require.resolve("util/"),
+        vm: false,
         fs: false,
       };
 
+      // Fix ESM modules that import "process/browser" without .js extension
+      config.resolve.alias = {
+        ...(config.resolve.alias || {}),
+        "process/browser": require.resolve("process/browser"),
+      };
+
+      // Handle fully-specified ESM imports for process
+      config.module = config.module || {};
+      config.module.rules = config.module.rules || [];
+      config.module.rules.push({
+        test: /\.m?js$/,
+        resolve: {
+          fullySpecified: false,
+        },
+      });
+
       // persistent cache for faster rebuilds
       config.cache = {
         type: "filesystem",
@@ -28,6 +45,11 @@ module.exports = {
 
       return config;
     },
-    plugins: [new ProvidePlugin({ Buffer: ["buffer", "Buffer"] })],
+    plugins: [
+      new ProvidePlugin({
+        Buffer: ["buffer", "Buffer"],
+        process: "process/browser",
+      }),
+    ],
   },
 };

package.json

@@ -19,8 +19,6 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@airgap/beacon-sdk": "4.7.0",
-    "@airgap/beacon-types": "4.7.0",
     "@craco/craco": "^7.1.0",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
@@ -34,12 +32,12 @@
     "@mui/icons-material": "^5.14.14",
     "@mui/material": "^5.14.14",
     "@tanstack/react-query": "^5.59.13",
-    "@taquito/beacon-wallet": "^20.0.0",
-    "@taquito/signer": "^20.0.0",
-    "@taquito/taquito": "^20.0.0",
-    "@taquito/tzip12": "^20.0.0",
-    "@taquito/tzip16": "^20.0.0",
-    "@taquito/utils": "^20.0.0",
+    "@taquito/beacon-wallet": "^24.2.0",
+    "@taquito/signer": "^24.2.0",
+    "@taquito/taquito": "^24.2.0",
+    "@taquito/tzip12": "^24.2.0",
+    "@taquito/tzip16": "^24.2.0",
+    "@taquito/utils": "^24.2.0",
     "@types/dompurify": "^3.2.0",
     "@types/prismjs": "^1.26.0",
     "@types/react-paginate": "^7.1.2",

src/modules/explorer/components/ArbitraryContractInteractionForm.tsx

@@ -496,11 +496,11 @@ const ContractInteractionForm = ({
                     daoDetails?.data?.token?.decimals as number
                   )
 
-                  const contractMethod = contract.methods.propose(
-                    await tezos.wallet.pkh(),
-                    frozenToken,
-                    finalPackedDataBytes
-                  )
+                  const contractMethod = contract.methodsObject.propose({
+                    from: await tezos.wallet.pkh(),
+                    frozen_token: frozenToken,
+                    proposal_metadata: finalPackedDataBytes
+                  })
 
                   const result = await contractMethod.send()
 

src/modules/lite/explorer/components/DownloadCsvFile.tsx

@@ -5,7 +5,7 @@ import { Choice } from "models/Choice"
 import { mkConfig, generateCsv, download } from "export-to-csv"
 import { useNotification } from "modules/lite/components/hooks/useNotification"
 import BigNumber from "bignumber.js"
-import { bytes2Char } from "@taquito/utils"
+import { bytesToString } from "@taquito/utils"
 import dayjs from "dayjs"
 
 interface GroupedVotes {
@@ -45,7 +45,9 @@ export const DownloadCsvFile: React.FC<DownloadCsvFileProps> = ({ data, pollId,
         signature: item.options[0].signature,
         ipfsStorage: item.options[0].cidLink,
         timestamp:
-          item.options[0] && item.options[0].payloadBytes ? bytes2Char(item.options[0].payloadBytes).split(" ")[4] : ""
+          item.options[0] && item.options[0].payloadBytes
+            ? bytesToString(item.options[0].payloadBytes).split(" ")[4]
+            : ""
       }
       return arr.push(formattedVote)
     })

src/services/aci/endpoint.ts

@@ -1,10 +1,10 @@
 import { TezosToolkit } from "@taquito/taquito"
-import { validateAddress, encodePubKey, encodeKey, encodeKeyHash } from "@taquito/utils"
+import { validateAddress, encodeKey, encodeKeyHash } from "@taquito/utils"
 import { TokenSchema, Schema } from "@taquito/michelson-encoder"
 import { rpcNodes } from "services/beacon"
 import { assertNever } from "assert-never"
 import type { token, tokenValueType } from "."
-import type { MichelineMichelsonV1Expression } from "@airgap/beacon-sdk"
+import type { MichelsonV1Expression as MichelineMichelsonV1Expression } from "@taquito/rpc"
 
 function getFieldName(id: any): string {
   return `input-${id.toString()}`

src/services/aci/index.ts

@@ -6,7 +6,7 @@ import { assertNever } from "assert-never"
 import { BigNumber } from "bignumber.js"
 
 import { Schema } from "@taquito/michelson-encoder"
-import type { MichelineMichelsonV1Expression } from "@airgap/beacon-sdk"
+import type { MichelsonV1Expression as MichelineMichelsonV1Expression } from "@taquito/rpc"
 import type { TokenSchema } from "@taquito/michelson-encoder"
 
 type version = "1.0.0" | "unknown version"

src/services/beacon/utils.ts

@@ -1,4 +1,4 @@
-import { NetworkType } from "@airgap/beacon-types"
+import { NetworkType } from "@ecadlabs/beacon-types"
 import { capitalize } from "@material-ui/core"
 import { BeaconWallet } from "@taquito/beacon-wallet"
 import { MichelCodecPacker, TezosToolkit } from "@taquito/taquito"

src/services/contracts/baseDAO/class.ts

@@ -122,7 +122,7 @@ export abstract class BaseDAO {
   public static transfer_ownership = async (newOwner: string, address: string, tezos: TezosToolkit) => {
     const contract = await getContract(tezos, address)
 
-    return await contract.methods.transfer_ownership(newOwner).send()
+    return await contract.methodsObject.transfer_ownership(newOwner).send()
   }
 
   protected constructor(public data: BaseDAOData) {}
@@ -132,26 +132,26 @@ export abstract class BaseDAO {
     const initialBatch = await tezos.wallet.batch()
 
     const batch = expiredProposalIds.reduce((prev, current) => {
-      return prev.withContractCall(daoContract.methods.drop_proposal(current))
+      return prev.withContractCall(daoContract.methodsObject.drop_proposal(current))
     }, initialBatch)
 
-    batch.withContractCall(daoContract.methods.flush(numerOfProposalsToFlush))
+    batch.withContractCall(daoContract.methodsObject.flush(numerOfProposalsToFlush))
 
     return await batch.send()
   }
 
   public dropProposal = async (proposalId: string, tezos: TezosToolkit) => {
     const contract = await getContract(tezos, this.data.address)
 
-    return await contract.methods.drop_proposal(proposalId).send()
+    return await contract.methodsObject.drop_proposal(proposalId).send()
   }
 
   public dropAllExpired = async (expiredProposalIds: string[], tezos: TezosToolkit) => {
     const daoContract = await getContract(tezos, this.data.address)
     const initialBatch = await tezos.wallet.batch()
 
     const batch = expiredProposalIds.reduce((prev, current) => {
-      return prev.withContractCall(daoContract.methods.drop_proposal(current))
+      return prev.withContractCall(daoContract.methodsObject.drop_proposal(current))
     }, initialBatch)
 
     return await batch.send()
@@ -162,7 +162,7 @@ export abstract class BaseDAO {
     const initialBatch = await tezos.wallet.batch()
 
     const batch = proposals.reduce((prev, current) => {
-      return prev.withContractCall(daoContract.methods.unstake_vote([current]))
+      return prev.withContractCall(daoContract.methodsObject.unstake_vote([current]))
     }, initialBatch)
 
     return await batch.send()
@@ -171,10 +171,15 @@ export abstract class BaseDAO {
   public sendXtz = async (xtzAmount: BigNumber, tezos: TezosToolkit) => {
     const contract = await getContract(tezos, this.data.address)
 
-    return await contract.methods.callCustom("receive_xtz", "").send({
-      amount: xtzToMutez(xtzAmount).toNumber(),
-      mutez: true
-    })
+    return await contract.methodsObject
+      .callCustom({
+        0: "receive_xtz",
+        1: ""
+      })
+      .send({
+        amount: xtzToMutez(xtzAmount).toNumber(),
+        mutez: true
+      })
   }
 
   public vote = async ({
@@ -189,7 +194,7 @@ export abstract class BaseDAO {
     tezos: TezosToolkit
   }) => {
     const contract = await getContract(tezos, this.data.address)
-    return await contract.methods
+    return await contract.methodsObject
       .vote([
         {
           argument: {
@@ -210,7 +215,7 @@ export abstract class BaseDAO {
     const batch = await tezos.wallet
       .batch()
       .withContractCall(
-        govTokenContract.methods.update_operators([
+        govTokenContract.methodsObject.update_operators([
           {
             add_operator: {
               owner: await tezos.wallet.pkh(),
@@ -220,9 +225,9 @@ export abstract class BaseDAO {
           }
         ])
       )
-      .withContractCall(daoContract.methods.freeze(formatUnits(amount, tokenMetadata.decimals).toString()))
+      .withContractCall(daoContract.methodsObject.freeze(formatUnits(amount, tokenMetadata.decimals).toString()))
       .withContractCall(
-        govTokenContract.methods.update_operators([
+        govTokenContract.methodsObject.update_operators([
           {
             remove_operator: {
               owner: await tezos.wallet.pkh(),
@@ -239,13 +244,13 @@ export abstract class BaseDAO {
   public unfreeze = async (amount: BigNumber, tezos: TezosToolkit) => {
     const contract = await getContract(tezos, this.data.address)
 
-    return await contract.methods.unfreeze(formatUnits(amount, this.data.token.decimals).toString()).send()
+    return await contract.methodsObject.unfreeze(formatUnits(amount, this.data.token.decimals).toString()).send()
   }
 
   public unstakeVotes = async (proposalId: string, tezos: TezosToolkit) => {
     const contract = await getContract(tezos, this.data.address)
 
-    return await contract.methods.unstake_vote([proposalId]).send()
+    return await contract.methodsObject.unstake_vote([proposalId]).send()
   }
 
   static async encodeProposalMetadata(dataToEncode: any, michelsonSchemaString: string, tezos: TezosToolkit) {
@@ -330,11 +335,11 @@ export abstract class BaseDAO {
       proposal_meta_michelson_type
     )
 
-    const contractMethod = contract.methods.propose(
-      await tezos.wallet.pkh(),
-      formatUnits(new BigNumber(this.data.extra.frozen_extra_value), this.data.token.decimals),
-      proposalMetadata.bytes
-    )
+    const contractMethod = contract.methodsObject.propose({
+      from: await tezos.wallet.pkh(),
+      frozen_token: formatUnits(new BigNumber(this.data.extra.frozen_extra_value), this.data.token.decimals),
+      proposal_metadata: proposalMetadata.bytes
+    })
 
     return await contractMethod.send()
   }

src/services/contracts/baseDAO/lambdaDAO/index.ts

@@ -131,11 +131,11 @@ export class LambdaDAO extends BaseDAO {
       proposal_meta_michelson_type
     )
 
-    const contractMethod = contract.methods.propose(
-      await tezos.wallet.pkh(),
-      formatUnits(new BigNumber(this.data.extra.frozen_extra_value), this.data.token.decimals),
-      proposalMetadata.bytes
-    )
+    const contractMethod = contract.methodsObject.propose({
+      from: await tezos.wallet.pkh(),
+      frozen_token: formatUnits(new BigNumber(this.data.extra.frozen_extra_value), this.data.token.decimals),
+      proposal_metadata: proposalMetadata.bytes
+    })
 
     return await contractMethod.send()
   }
@@ -162,11 +162,11 @@ export class LambdaDAO extends BaseDAO {
       proposal_meta_michelson_type
     )
 
-    const contractMethod = contract.methods.propose(
-      await tezos.wallet.pkh(),
-      formatUnits(new BigNumber(this.data.extra.frozen_extra_value), this.data.token.decimals),
-      proposalMetadata.bytes
-    )
+    const contractMethod = contract.methodsObject.propose({
+      from: await tezos.wallet.pkh(),
+      frozen_token: formatUnits(new BigNumber(this.data.extra.frozen_extra_value), this.data.token.decimals),
+      proposal_metadata: proposalMetadata.bytes
+    })
 
     return await contractMethod.send()
   }
@@ -201,11 +201,11 @@ export class LambdaDAO extends BaseDAO {
       proposal_meta_michelson_type
     )
 
-    const contractMethod = contract.methods.propose(
-      await tezos.wallet.pkh(),
-      formatUnits(new BigNumber(this.data.extra.frozen_extra_value), this.data.token.decimals),
-      proposalMetadata.bytes
-    )
+    const contractMethod = contract.methodsObject.propose({
+      from: await tezos.wallet.pkh(),
+      frozen_token: formatUnits(new BigNumber(this.data.extra.frozen_extra_value), this.data.token.decimals),
+      proposal_metadata: proposalMetadata.bytes
+    })
 
     return await contractMethod.send()
   }
@@ -244,11 +244,11 @@ export class LambdaDAO extends BaseDAO {
       proposal_meta_michelson_type
     )
 
-    const contractMethod = contract.methods.propose(
-      await tezos.wallet.pkh(),
-      formatUnits(new BigNumber(this.data.extra.frozen_extra_value), this.data.token.decimals),
-      proposalMetadata.bytes
-    )
+    const contractMethod = contract.methodsObject.propose({
+      from: await tezos.wallet.pkh(),
+      frozen_token: formatUnits(new BigNumber(this.data.extra.frozen_extra_value), this.data.token.decimals),
+      proposal_metadata: proposalMetadata.bytes
+    })
 
     return await contractMethod.send()
   }
@@ -258,11 +258,11 @@ export class LambdaDAO extends BaseDAO {
 
     const proposalMetadata = await BaseDAO.encodeLambdaAddMetadata(data, proposelambda, tezos)
 
-    const contractMethod = contract.methods.propose(
-      await tezos.wallet.pkh(),
-      formatUnits(new BigNumber(this.data.extra.frozen_extra_value), this.data.token.decimals),
-      proposalMetadata.bytes
-    )
+    const contractMethod = contract.methodsObject.propose({
+      from: await tezos.wallet.pkh(),
+      frozen_token: formatUnits(new BigNumber(this.data.extra.frozen_extra_value), this.data.token.decimals),
+      proposal_metadata: proposalMetadata.bytes
+    })
 
     return await contractMethod.send()
   }
@@ -284,12 +284,12 @@ export class LambdaDAO extends BaseDAO {
       type: michelsonType as Expr
     })
 
-    const contractMethod = contract.methods.propose(
-      await tezos.wallet.pkh(),
+    const contractMethod = contract.methodsObject.propose({
+      from: await tezos.wallet.pkh(),
       // frozen_extra_value is 0 for lambda remove
-      formatUnits(new BigNumber(this.data.extra.frozen_extra_value), this.data.token.decimals),
-      proposalMetadata
-    )
+      frozen_token: formatUnits(new BigNumber(this.data.extra.frozen_extra_value), this.data.token.decimals),
+      proposal_metadata: proposalMetadata
+    })
 
     return await contractMethod.send()
   }

src/services/contracts/token/index.ts

@@ -107,7 +107,7 @@ export const setDelegate = async ({
 }) => {
   try {
     const contract = await getContract(tezos, tokenAddress)
-    return contract.methods.set_delegate(delegateAddress).send()
+    return contract.methodsObject.set_delegate(delegateAddress).send()
   } catch (e) {
     console.error(e)
     return e