Vk/fee4 make cli tests p

.vscode/extensions.json

@@ -1,15 +1,3 @@
 {
-  // See http://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-  // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
-  // List of extensions which should be recommended for users of this workspace.
-  "recommendations": [
-    "eamodio.gitlens",
-    "biomejs.biome",
-    "redhat.vscode-yaml",
-    "davidanson.vscode-markdownlint",
-    "markis.code-coverage"
-  ],
-  // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
-  "unwantedRecommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
+  "recommendations": ["bloop.vibe-kanban"]
 }

.yarn/patches/buffer-equal-constant-time-npm-1.0.1-41826f3419.patch

@@ -0,0 +1,27 @@
+diff --git a/index.js b/index.js
+index 5462c1f830bdbe79bf2b1fcfd811cd9799b4dd11..e8fe7e61083d95714bba6f2d4544d0426749a64f 100644
+--- a/index.js
++++ b/index.js
+@@ -28,14 +28,19 @@ function bufferEq(a, b) {
+ }
+
+ bufferEq.install = function() {
+-  Buffer.prototype.equal = SlowBuffer.prototype.equal = function equal(that) {
++  Buffer.prototype.equal = function equal(that) {
+     return bufferEq(this, that);
+   };
++  if (SlowBuffer) {
++    SlowBuffer.prototype.equal = Buffer.prototype.equal;
++  }
+ };
+
+ var origBufEqual = Buffer.prototype.equal;
+-var origSlowBufEqual = SlowBuffer.prototype.equal;
++var origSlowBufEqual = SlowBuffer ? SlowBuffer.prototype.equal : undefined;
+ bufferEq.restore = function() {
+   Buffer.prototype.equal = origBufEqual;
+-  SlowBuffer.prototype.equal = origSlowBufEqual;
++  if (SlowBuffer && origSlowBufEqual) {
++    SlowBuffer.prototype.equal = origSlowBufEqual;
++  }
+ };

package.json

@@ -54,11 +54,10 @@
     "typescript": "5.3.3"
   },
   "resolutions": {
-    "web3": "1.10.4",
-    "web3-utils": "1.10.4",
     "blind-threshold-bls": "npm:@celo/blind-threshold-bls@1.0.0-beta",
     "@types/bn.js": "4.11.6",
-    "bignumber.js": "9.0.0"
+    "bignumber.js": "9.0.0",
+    "buffer-equal-constant-time@npm:1.0.1": "patch:buffer-equal-constant-time@npm%3A1.0.1#~/.yarn/patches/buffer-equal-constant-time-npm-1.0.1-41826f3419.patch"
   },
   "dependencies": {
     "@changesets/cli": "^2.29.5"

packages/cli/package.json

@@ -74,8 +74,7 @@
     "fs-extra": "^8.1.0",
     "humanize-duration": "^3.32.1",
     "prompts": "^2.0.1",
-    "viem": "^2.33.2",
-    "web3": "1.10.4"
+    "viem": "^2.33.2"
   },
   "devDependencies": {
     "@celo/dev-utils": "workspace:^",

packages/cli/src/base.test.ts

@@ -7,7 +7,6 @@ import http from 'http'
 import { tmpdir } from 'os'
 import { MethodNotFoundRpcError } from 'viem'
 import { privateKeyToAddress } from 'viem/accounts'
-import Web3 from 'web3'
 import { BaseCommand } from './base'
 import Set from './commands/config/set'
 import CustomHelp from './help'
@@ -105,7 +104,7 @@ jest.mock('../package.json', () => ({
   version: '5.2.3',
 }))
 
-testWithAnvilL2('BaseCommand', (web3: Web3) => {
+testWithAnvilL2('BaseCommand', (client) => {
   const logSpy = jest.spyOn(console, 'log').mockImplementation()
 
   beforeEach(() => {
@@ -118,7 +117,7 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
         const storedDerivationPath = readConfig(tmpdir()).derivationPath
         console.info('storedDerivationPath', storedDerivationPath)
         expect(storedDerivationPath).not.toBe(undefined)
-        await testLocallyWithWeb3Node(BasicCommand, ['--useLedger'], web3)
+        await testLocallyWithWeb3Node(BasicCommand, ['--useLedger'], client)
         expect(WalletLedgerExports.newLedgerWalletWithSetup).toHaveBeenCalledWith(
           expect.anything(),
           expect.objectContaining({
@@ -134,8 +133,8 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
       it('uses custom derivationPath', async () => {
         const storedDerivationPath = readConfig(tmpdir()).derivationPath
         const customPath = "m/44'/9000'/0'"
-        await testLocallyWithWeb3Node(Set, ['--derivationPath', customPath], web3)
-        await testLocallyWithWeb3Node(BasicCommand, ['--useLedger'], web3)
+        await testLocallyWithWeb3Node(Set, ['--derivationPath', customPath], client)
+        await testLocallyWithWeb3Node(BasicCommand, ['--useLedger'], client)
         expect(WalletLedgerExports.newLedgerWalletWithSetup).toHaveBeenCalledWith(
           expect.anything(),
           expect.objectContaining({
@@ -147,12 +146,12 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
             baseDerivationPath: customPath,
           })
         )
-        await testLocallyWithWeb3Node(Set, ['--derivationPath', storedDerivationPath], web3)
+        await testLocallyWithWeb3Node(Set, ['--derivationPath', storedDerivationPath], client)
       })
     })
 
     it('--ledgerAddresses passes derivationPathIndexes to LedgerWallet', async () => {
-      await testLocallyWithWeb3Node(BasicCommand, ['--useLedger', '--ledgerAddresses', '5'], web3)
+      await testLocallyWithWeb3Node(BasicCommand, ['--useLedger', '--ledgerAddresses', '5'], client)
 
       expect(WalletLedgerExports.newLedgerWalletWithSetup).toHaveBeenCalledWith(
         expect.anything(),
@@ -200,7 +199,7 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
         await testLocallyWithWeb3Node(
           BasicCommand,
           ['--useLedger', '--ledgerLiveMode', '--ledgerAddresses', '5'],
-          web3
+          client
         )
 
         expect(WalletLedgerExports.newLedgerWalletWithSetup).toHaveBeenCalledWith(
@@ -249,7 +248,7 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
           await testLocallyWithWeb3Node(
             BasicCommand,
             ['--useLedger', '--ledgerLiveMode', '--ledgerCustomAddresses', '[1,8,9]'],
-            web3
+            client
           )
 
           expect(WalletLedgerExports.newLedgerWalletWithSetup).toHaveBeenCalledWith(
@@ -296,7 +295,7 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
         await testLocallyWithWeb3Node(
           BasicCommand,
           ['--useLedger', '--ledgerCustomAddresses', '[1,8,9]'],
-          web3
+          client
         )
 
         expect(WalletLedgerExports.newLedgerWalletWithSetup).toHaveBeenCalledWith(
@@ -350,7 +349,7 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
             '--from',
             '0x1234567890123456789012345678901234567890',
           ],
-          web3
+          client
         )
 
         expect(ViemAccountLedgerExports.ledgerToWalletClient).toHaveBeenCalledWith(
@@ -381,7 +380,7 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
     const errorSpy = jest.spyOn(console, 'error').mockImplementation()
 
     await expect(
-      testLocallyWithWeb3Node(TestErrorCommand, [], web3)
+      testLocallyWithWeb3Node(TestErrorCommand, [], client)
     ).rejects.toThrowErrorMatchingInlineSnapshot(
       `"Unable to create an RPC Wallet Client, the node is not unlocked. Did you forget to use \`--privateKey\` or \`--useLedger\`?"`
     )
@@ -399,7 +398,7 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
     const errorSpy = jest.spyOn(console, 'error').mockImplementation()
 
     await expect(
-      testLocallyWithWeb3Node(TestErrorCommand, [], web3)
+      testLocallyWithWeb3Node(TestErrorCommand, [], client)
     ).rejects.toThrowErrorMatchingInlineSnapshot(`"test error"`)
 
     expect(errorSpy.mock.calls).toMatchInlineSnapshot(`
@@ -432,7 +431,7 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
     const errorSpy = jest.spyOn(console, 'error').mockImplementation()
 
     await expect(
-      testLocallyWithWeb3Node(TestErrorCommand, ['--output', 'csv'], web3)
+      testLocallyWithWeb3Node(TestErrorCommand, ['--output', 'csv'], client)
     ).rejects.toThrowErrorMatchingInlineSnapshot(`"test error"`)
 
     expect(errorSpy.mock.calls).toMatchInlineSnapshot(`[]`)
@@ -453,7 +452,7 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
       throw new Error('Mock connection stop error')
     })
 
-    await testLocallyWithWeb3Node(TestConnectionStopErrorCommand, [], web3)
+    await testLocallyWithWeb3Node(TestConnectionStopErrorCommand, [], client)
 
     expect(logSpy.mock.calls).toMatchInlineSnapshot(`
       [
@@ -492,7 +491,7 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
         testLocallyWithWeb3Node(
           TestPrivateKeyCommand,
           ['--privateKey', privateKey, '--from', wrongFromAddress],
-          web3
+          client
         )
       ).rejects.toThrowErrorMatchingInlineSnapshot(
         `"The --from address ${wrongFromAddress} does not match the address derived from the provided private key 0x1Be31A94361a391bBaFB2a4CCd704F57dc04d4bb."`
@@ -518,7 +517,7 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
         testLocallyWithWeb3Node(
           TestPrivateKeyCommand,
           ['--privateKey', privateKey, '--from', correctFromAddress],
-          web3
+          client
         )
       ).resolves.not.toThrow()
     })
@@ -538,7 +537,7 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
       }
 
       await expect(
-        testLocallyWithWeb3Node(TestPrivateKeyCommand, ['--privateKey', privateKey], web3)
+        testLocallyWithWeb3Node(TestPrivateKeyCommand, ['--privateKey', privateKey], client)
       ).resolves.not.toThrow()
     })
   })
@@ -687,7 +686,6 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
         })
 
         delete process.env.TELEMETRY_ENABLED
-        process.env.TELEMETRY_URL = 'http://localhost:3000/'
 
         const fetchSpy = jest.spyOn(global, 'fetch')
 
@@ -697,13 +695,17 @@ testWithAnvilL2('BaseCommand', (web3: Web3) => {
           }, 5000) // Higher timeout than the telemetry logic uses
         })
 
-        server.listen(3000, async () => {
+        server.listen(0, async () => {
+          const address = server.address() as { port: number }
+          const telemetryUrl = `http://localhost:${address.port}/`
+          process.env.TELEMETRY_URL = telemetryUrl
+
           // Make sure the command actually returns
           await expect(TestTelemetryCommand.run([])).resolves.toBe(EXPECTED_COMMAND_RESULT)
 
           expect(fetchSpy.mock.calls.length).toEqual(1)
 
-          expect(fetchSpy.mock.calls[0][0]).toMatchInlineSnapshot(`"http://localhost:3000/"`)
+          expect(fetchSpy.mock.calls[0][0]).toEqual(telemetryUrl)
           expect(fetchSpy.mock.calls[0][1]?.body).toMatchInlineSnapshot(`
             "
             celocli_invocation{success="true", version="5.2.3", command="test:telemetry-timeout"} 1

packages/cli/src/base.ts

@@ -7,6 +7,7 @@ import {
 } from '@celo/base'
 import { ReadOnlyWallet } from '@celo/connect'
 import { ContractKit, newKitFromWeb3 } from '@celo/contractkit'
+import { getWeb3ForKit } from '@celo/contractkit/lib/setupForKits'
 import { ledgerToWalletClient } from '@celo/viem-account-ledger'
 import { AzureHSMWallet } from '@celo/wallet-hsm-azure'
 import { AddressValidation, newLedgerWalletWithSetup } from '@celo/wallet-ledger'
@@ -16,7 +17,6 @@ import { Command, Flags, ux } from '@oclif/core'
 import { CLIError } from '@oclif/core/lib/errors'
 import { ArgOutput, FlagOutput, Input, ParserOutput } from '@oclif/core/lib/interfaces/parser'
 import chalk from 'chalk'
-import net from 'net'
 import {
   createPublicClient,
   createWalletClient,
@@ -30,7 +30,6 @@ import {
 import { privateKeyToAccount } from 'viem/accounts'
 import { celo, celoSepolia } from 'viem/chains'
 import { ipc } from 'viem/node'
-import Web3 from 'web3'
 import createRpcWalletClient from './packages-to-be/rpc-client'
 import { failWith } from './utils/cli'
 import { CustomFlags } from './utils/command'
@@ -143,7 +142,7 @@ export abstract class BaseCommand extends Command {
   // useful for the LedgerWalletClient which sometimes needs user input on reads
   public isOnlyReadingWallet = false
 
-  private _web3: Web3 | null = null
+  private _web3: any = null
   private _kit: ContractKit | null = null
 
   private publicClient: PublicCeloClient | null = null
@@ -153,7 +152,8 @@ export abstract class BaseCommand extends Command {
 
   async getWeb3() {
     if (!this._web3) {
-      this._web3 = await this.newWeb3()
+      const kit = await this.getKit()
+      this._web3 = kit.web3
     }
     return this._web3
   }
@@ -174,15 +174,12 @@ export abstract class BaseCommand extends Command {
 
   async newWeb3() {
     const nodeUrl = await this.getNodeUrl()
-
-    return nodeUrl && nodeUrl.endsWith('.ipc')
-      ? new Web3(new Web3.providers.IpcProvider(nodeUrl, net))
-      : new Web3(nodeUrl)
+    return getWeb3ForKit(nodeUrl, undefined)
   }
 
   async getKit() {
     if (!this._kit) {
-      this._kit = newKitFromWeb3(await this.getWeb3())
+      this._kit = newKitFromWeb3(await this.newWeb3())
     }
 
     const res = await this.parse()