test with node 22

.changeset/curly-toes-pump.md

@@ -2,4 +2,4 @@
 '@celo/celocli': major
 ---
 
-Now defaults to using "m/44'/60'/0'" as base derivation path for account:new and any command using --useLedger. use celocli config:set --derivationPath celoLegacy for old behavior.
+Now defaults to using "m/44'/60'/0'" as base derivation path for account:new and any command using --useLedger. use celocli `config:set --derivationPath celoLegacy` for old behavior.

.changeset/fresh-months-share.md

@@ -2,4 +2,4 @@
 '@celo/celocli': major
 ---
 
-Remove node:accounts commmand (use account:list)
+Remove node:accounts command (use account:list)

.changeset/old-cougars-look.md

@@ -2,5 +2,5 @@
 '@celo/celocli': patch
 ---
 
-Deprecate useAKV flag with intent to remove. This was for connecting to AzureKeyVault for storing key to sign trnsactions. We hope to streamline and remove this functionality.  
+Deprecate useAKV flag with intent to remove. This was for connecting to AzureKeyVault for storing key to sign transactions. We hope to streamline and remove this functionality.  
 

.github/workflows/ci.yml

@@ -52,14 +52,14 @@ jobs:
     steps:
       - uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: 'enable corepack for yarn'
         run: sudo corepack enable yarn
       - uses: actions/checkout@v4
       # must call twice because of chicken and egg problem with yarn and node
       - uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
           cache: 'yarn'
       - name: Restore node cache
         uses: actions/cache@v4

.github/workflows/release.yaml

@@ -42,7 +42,7 @@ jobs:
       # must call twice because of chicken and egg problem with yarn and node
       - uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
           cache: 'yarn'
       - name: Install Dependencies
         shell: bash

.github/workflows/upload-celocli-executables.yml

@@ -41,7 +41,7 @@ jobs:
       # must call twice because of chicken and egg problem with yarn and node
       - uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
           cache: 'yarn'
 
       - name: Install Dependencies
@@ -121,7 +121,7 @@ jobs:
       # must call twice because of chicken and egg problem with yarn and node
       - uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
           cache: 'yarn'
       - name: Install Dependencies
         shell: bash
@@ -194,7 +194,7 @@ jobs:
       # must call twice because of chicken and egg problem with yarn and node
       - uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
           cache: 'yarn'
       - name: Install Dependencies
         shell: bash

packages/actions/package.json

@@ -49,7 +49,7 @@
     "postbuild": "node ../../scripts/post-build.mjs",
     "clean": "yarn --top-level run tsc -b . --clean && yarn --top-level run rimraf dist",
     "docs": "yarn --top-level run typedoc",
-    "test": "yarn run vitest --run --passWithNoTests",
+    "test": "yarn run vitest --run --retry=1",
     "check-size": "size-limit",
     "test:watch": "yarn run vitest --watch",
     "test:changes": "yarn run vitest --run --changed",

packages/actions/src/client.ts

@@ -1,4 +1,10 @@
-import type { Account, Client, PublicClient, Transport, WalletClient } from 'viem'
+import {
+  type Account,
+  type Client,
+  type PublicClient,
+  type Transport,
+  type WalletClient,
+} from 'viem'
 import type { celo, celoAlfajores } from 'viem/chains'
 import type { celoBaklava } from './chains'
 
@@ -9,3 +15,11 @@ export type CeloClient = Client<Transport, CeloChain>
 export type PublicCeloClient = PublicClient<Transport, CeloChain, undefined>
 
 export type WalletCeloClient = WalletClient<Transport, CeloChain, Account>
+
+export type Clients<
+  P extends PublicCeloClient | PublicClient = PublicCeloClient,
+  W extends WalletCeloClient | WalletClient = WalletCeloClient
+> = {
+  public: P
+  wallet?: W
+}

packages/actions/src/contracts/accounts.ts

@@ -1,26 +1,27 @@
 import { accountsABI } from '@celo/abis'
-import { Address, Client, getContract, GetContractReturnType, PublicClient } from 'viem'
-
+import { Address, getContract, GetContractReturnType } from 'viem'
+import { Clients, PublicCeloClient } from '../client'
 import { resolveAddress } from './registry'
 
-export type AccountsContract<T extends Client = PublicClient> = GetContractReturnType<
+export type AccountsContract<C extends Clients = Clients> = GetContractReturnType<
   typeof accountsABI,
-  T
+  C
 >
 
-export async function getAccountsContract<T extends Client = PublicClient>(
-  client: T
-): Promise<AccountsContract<T>> {
+export async function getAccountsContract(clients: Clients): Promise<AccountsContract<Clients>> {
   return getContract({
-    address: await resolveAddress(client, 'Accounts'),
+    address: await resolveAddress(clients.public, 'Accounts'),
     abi: accountsABI,
-    client,
+    client: clients,
   })
 }
 
 // METHODS
 
-export const signerToAccount = async (client: PublicClient, signer: Address): Promise<Address> => {
+export const signerToAccount = async (
+  client: PublicCeloClient,
+  signer: Address
+): Promise<Address> => {
   return await client.readContract({
     address: await resolveAddress(client, 'Accounts'),
     abi: accountsABI,

packages/actions/src/contracts/celo-erc20.ts

@@ -1,17 +1,16 @@
 import { goldTokenABI } from '@celo/abis'
-import { Client, getContract, GetContractReturnType, PublicClient } from 'viem'
+import { getContract, GetContractReturnType } from 'viem'
+import { Clients } from '../client'
 import { resolveAddress } from './registry'
 
-export async function getCeloERC20Contract<T extends Client = PublicClient>(
-  client: T
+export type CeloERC20<T extends Clients = Clients> = GetContractReturnType<typeof goldTokenABI, T>
+
+export async function getCeloERC20Contract<T extends Clients = Clients>(
+  clients: T
 ): Promise<CeloERC20<T>> {
   return getContract({
-    address: await resolveAddress(client, 'GoldToken'),
+    address: await resolveAddress(clients.public, 'GoldToken'),
     abi: goldTokenABI,
-    client,
+    client: clients,
   })
 }
-export type CeloERC20<T extends Client = PublicClient> = GetContractReturnType<
-  typeof goldTokenABI,
-  T
->

packages/actions/src/contracts/election.ts

@@ -1,18 +1,19 @@
 import { electionABI } from '@celo/abis'
-import { Client, getContract, GetContractReturnType, PublicClient } from 'viem'
+import { getContract, GetContractReturnType } from 'viem'
+import { Clients } from '../client'
 import { resolveAddress } from './registry'
 
-export type ElectionContract<T extends Client = PublicClient> = GetContractReturnType<
+export type ElectionContract<T extends Clients = Clients> = GetContractReturnType<
   typeof electionABI,
   T
 >
 
-export async function getElectionContract<T extends Client = PublicClient>(
-  client: T
+export async function getElectionContract<T extends Clients = Clients>(
+  clients: T
 ): Promise<ElectionContract<T>> {
   return getContract({
-    address: await resolveAddress(client, 'Election'),
+    address: await resolveAddress(clients.public, 'Election'),
     abi: electionABI,
-    client,
+    client: clients,
   })
 }

packages/actions/src/contracts/epoch-manager.ts

@@ -1,17 +1,19 @@
 import { epochManagerABI } from '@celo/abis'
-import { Client, getContract, GetContractReturnType, PublicClient } from 'viem'
+import { getContract, GetContractReturnType } from 'viem'
+import { Clients } from '../client'
 import { resolveAddress } from './registry'
 
-export async function getEpochManagerContract<T extends Client = PublicClient>(
-  client: T
+export type EpochManager<T extends Clients = Clients> = GetContractReturnType<
+  typeof epochManagerABI,
+  T
+>
+
+export async function getEpochManagerContract<T extends Clients = Clients>(
+  clients: T
 ): Promise<EpochManager<T>> {
   return getContract({
-    address: await resolveAddress(client, 'EpochManager'),
+    address: await resolveAddress(clients.public, 'EpochManager'),
     abi: epochManagerABI,
-    client,
+    client: clients,
   })
 }
-export type EpochManager<T extends Client = PublicClient> = GetContractReturnType<
-  typeof epochManagerABI,
-  T
->

packages/actions/src/contracts/erc20.ts

@@ -1,13 +1,14 @@
-import { Address, Client, erc20Abi, getContract, GetContractReturnType, PublicClient } from 'viem'
+import { erc20Abi, getContract, type Address, type GetContractReturnType } from 'viem'
+import { Clients } from '../client'
 
-export async function getERC20Contract<T extends Client = PublicClient>(
-  client: T,
+export async function getERC20Contract<T extends Clients = Clients>(
+  clients: T,
   address: Address
 ): Promise<ERC20<T>> {
   return getContract({
     address,
     abi: erc20Abi,
-    client,
+    client: clients,
   })
 }
-export type ERC20<T extends Client = PublicClient> = GetContractReturnType<typeof erc20Abi, T>
+export type ERC20<T extends Clients = Clients> = GetContractReturnType<typeof erc20Abi, T>

packages/actions/src/contracts/feecurrency-directory.ts

@@ -1,17 +1,18 @@
 import { feeCurrencyDirectoryABI } from '@celo/abis'
-import { Client, getContract, GetContractReturnType, PublicClient } from 'viem'
+import { getContract, GetContractReturnType } from 'viem'
+import { Clients } from '../client'
 import { resolveAddress } from './registry'
 
-export async function getFeeCurrencyDirectoryContract<T extends Client = PublicClient>(
-  client: T
+export async function getFeeCurrencyDirectoryContract<T extends Clients = Clients>(
+  clients: T
 ): Promise<FeeCurrencyDirectory<T>> {
   return getContract({
-    address: await resolveAddress(client, 'FeeCurrencyDirectory'),
+    address: await resolveAddress(clients.public, 'FeeCurrencyDirectory'),
     abi: feeCurrencyDirectoryABI,
-    client,
+    client: clients,
   })
 }
-export type FeeCurrencyDirectory<T extends Client = PublicClient> = GetContractReturnType<
+export type FeeCurrencyDirectory<T extends Clients = Clients> = GetContractReturnType<
   typeof feeCurrencyDirectoryABI,
   T
 >

packages/actions/src/contracts/governance.test.ts

@@ -1,8 +1,8 @@
 import { viem_testWithAnvil } from '@celo/dev-utils/viem/anvil-test'
-import { createWalletClient, http } from 'viem'
+import { createPublicClient, createWalletClient, http } from 'viem'
 import { celo } from 'viem/chains'
 import { expect, it } from 'vitest'
-import { WalletCeloClient } from '../client'
+import { PublicCeloClient, WalletCeloClient } from '../client'
 import { vote } from './governance'
 
 const TIMEOUT = 10_000
@@ -16,14 +16,21 @@ const forkUrl = celo.rpcUrls.default.http[0]
 viem_testWithAnvil(
   'vote',
   async (client) => {
-    let walletClient: WalletCeloClient
+    let clients: { public: PublicCeloClient; wallet: WalletCeloClient }
     beforeEach(async () => {
-      client.impersonateAccount({ address: voter })
-      walletClient = createWalletClient({
+      await client.impersonateAccount({ address: voter })
+      const walletClient = createWalletClient({
         account: voter,
         chain: client.chain,
         transport: http(client.chain.rpcUrls.default.http[0]),
       })
+      clients = {
+        public: createPublicClient({
+          chain: client.chain,
+          transport: http(client.chain.rpcUrls.default.http[0]),
+        }),
+        wallet: walletClient,
+      }
     })
     afterEach(async () => {
       await client.stopImpersonatingAccount({ address: voter })
@@ -33,25 +40,22 @@ viem_testWithAnvil(
     it(
       'votes Yes on a proposal',
       async () => {
-        // This will throw if proposalId is not in the dequeue
-        // In a real test, ensure proposalId is valid and in the dequeue
-        await expect(vote(walletClient, proposalId, 'Yes')).resolves.toMatch(txHashRegex)
+        await expect(vote(clients, proposalId, 'Yes')).resolves.toMatch(txHashRegex)
       },
       TIMEOUT
     )
-
     it(
       'votes No on a proposal',
       async () => {
-        await expect(vote(walletClient, proposalId, 'No')).resolves.toMatch(txHashRegex)
+        await expect(vote(clients, proposalId, 'No')).resolves.toMatch(txHashRegex)
       },
       TIMEOUT
     )
 
     it(
-      'votes Abstain on a proposal',
+      'votes Abstain a proposal',
       async () => {
-        await expect(vote(walletClient, proposalId, 'Abstain')).resolves.toMatch(txHashRegex)
+        await expect(vote(clients, proposalId, 'Abstain')).resolves.toMatch(txHashRegex)
       },
       TIMEOUT
     )
@@ -61,7 +65,7 @@ viem_testWithAnvil(
       async () => {
         const invalidProposalId = 999999n
         await expect(
-          vote(walletClient, invalidProposalId, 'Yes')
+          vote(clients, invalidProposalId, 'Yes')
         ).rejects.toThrowErrorMatchingInlineSnapshot(
           `[Error: ID 999999 not found in array 36,47,72,32,33,37,38,44,46,45,52,51,58,59,65,64,112,70,73,78,75,74,84,79,81,82,95,87,94,110,90,92,93,97,98,104,100,106,113,108,109,114,126,125,122,124,129,153,146,154,141,152,149,148,155,156,192,184,166,173,186,185,196,230,203,0,207,0,224,206]`
         )