Merge remote-tracking branch 'origin/master' into elliptic-more-like-…

…byelliptic

.changeset/curly-pianos-applaud.md

@@ -0,0 +1,7 @@
+---
+'@celo/contractkit': patch
+---
+
+Re-removes MetaTransaction wallets, as previously removed in 6.0.0 (9ab9d00eb).
+
+Remove support for deprecated `MetaTransactionWallet` and `MetaTransactionWalletDeployer`. If absolutely needed the contracts can be accessed directly or an alternative such as account abstraction should be used.

.changeset/plenty-bananas-shop.md

@@ -0,0 +1,9 @@
+---
+'@celo/contractkit': patch
+---
+
+Re-removes `grandamento`
+
+  While 6.0.0 (9ab9d00eb) previously removed `grandamento` it was added back temporarily because `@celo/celocli` required the wrappers to be available in order to execute the proposal to remove it from governance. It is now gone for good. RIP.
+
+  Due to previous removal this is not considered a breaking change.

.changeset/pre.json

@@ -0,0 +1,34 @@
+{
+  "mode": "pre",
+  "tag": "beta",
+  "initialVersions": {
+    "@celo/celocli": "3.1.3",
+    "@celo/base": "6.0.0",
+    "@celo/connect": "5.1.1",
+    "@celo/contractkit": "6.0.0",
+    "@celo/cryptographic-utils": "5.0.6",
+    "@celo/explorer": "5.0.7",
+    "@celo/governance": "5.0.8",
+    "@celo/keystores": "5.0.6",
+    "@celo/network-utils": "5.0.5",
+    "@celo/phone-utils": "6.0.0",
+    "@celo/transactions-uri": "5.0.6",
+    "@celo/utils": "5.0.6",
+    "@celo/wallet-base": "5.1.1",
+    "@celo/wallet-hsm": "5.1.1",
+    "@celo/wallet-hsm-aws": "5.1.1",
+    "@celo/wallet-hsm-azure": "5.1.1",
+    "@celo/wallet-hsm-gcp": "5.1.1",
+    "@celo/wallet-ledger": "5.1.1",
+    "@celo/wallet-local": "5.1.1",
+    "@celo/wallet-remote": "5.1.1",
+    "@celo/wallet-rpc": "5.1.1",
+    "@celo/typescript": "0.0.1"
+  },
+  "changesets": [
+    "curly-pianos-applaud",
+    "plenty-bananas-shop",
+    "real-rabbits-grab",
+    "tough-gorillas-invent"
+  ]
+}

.changeset/real-rabbits-grab.md

@@ -2,4 +2,4 @@
 '@celo/celocli': major
 ---
 
-Removes releasegold commnand topic. use releasecelo
+Removes the `releasegold` command in favour of `releasecelo`.

.changeset/tough-gorillas-invent.md

@@ -2,4 +2,4 @@
 '@celo/celocli': major
 ---
 
-Remove Grandamento from CLI
+Remove `grandamento` commands from CLI.

.github/actions/sync-workspace/action.yml

@@ -11,14 +11,14 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: actions/setup-node@v2
+    - uses: actions/setup-node@v4
       with:
         node-version: '18'
     - name: "enable corepack for yarn"
       run : sudo corepack enable yarn
       shell: bash
     # must call twice because of chicken and egg problem with yarn and node
-    - uses: actions/setup-node@v2
+    - uses: actions/setup-node@v4
       with:
         node-version: '18'
         cache: 'yarn'

.github/workflows/ci.yml

@@ -45,14 +45,14 @@ jobs:
     runs-on: ['self-hosted', 'org', '8-cpu']
     timeout-minutes: 30
     steps:
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: '18'
       - 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@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: '18'
           cache: 'yarn'
@@ -77,7 +77,7 @@ jobs:
         run: yarn run postinstall
         if: steps.cache_node.outputs.cache-hit == 'true'
       - name: Build packages
-        run: yarn build --ignore docs --include-dependencies
+        run: yarn build
       - name: Check licenses
         if: steps.cache_node.outputs.cache-hit != 'true'
         run: |
@@ -152,10 +152,11 @@ jobs:
         run: |
           mkdir -p test-results/jest
           # Skipping packages that are tested in a specific job below
-          yarn run lerna \
-            --ignore @celo/contractkit \
-            --ignore @celo/celocli \
-            --ignore '@celo/wallet-*' \
+          yarn workspaces foreach \
+            --all \
+            --exclude celo \
+            --exclude "@celo/{celocli,contractkit,wallet-*}" \
+            -ip \
             run test
       - name: Upload Jest Test Results
         uses: actions/upload-artifact@v3
@@ -176,7 +177,7 @@ jobs:
       - run: sudo corepack enable yarn
       - name: Run Wallet tests
         run: |
-          yarn run lerna --scope '@celo/wallet-*' run test
+          yarn workspaces foreach -ip --all --include '@celo/wallet-*' run test
 
   contractkit-tests:
     name: ContractKit Tests

.github/workflows/release.yaml

@@ -20,7 +20,7 @@ jobs:
       repository-projects: write
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Akeyless Get Secrets
         id: get_auth_token
@@ -31,14 +31,17 @@ jobs:
           access-id: p-kf9vjzruht6l
           static-secrets: '{"/static-secrets/NPM/npm-publish-token":"NPM_TOKEN"}'
       - name: Setup Node.js 18.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
-      - name: 'Setup yarn'
+      - name: "enable corepack for yarn"
+        run : sudo corepack enable yarn
         shell: bash
-        run: |
-          npm install --global yarn
-          source ~/.bashrc
+      # must call twice because of chicken and egg problem with yarn and node
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+          cache: 'yarn'
       - name: Install Dependencies
         shell: bash
         run: yarn

.github/workflows/stale.yml

@@ -18,7 +18,7 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/stale@v8
+    - uses: actions/stale@v9
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue is stale and will be closed in 30 days without activity'

package.json

@@ -6,7 +6,7 @@
   "private": true,
   "scripts": {
     "preinstall": "git config --global url.\"https://\".insteadOf ssh://",
-    "lint": "yarn lerna run lint",
+    "lint": "yarn workspaces foreach -piv --all run lint",
     "prettify": "yarn run prettier --config .prettierrc.js --write '**/*.+(ts|tsx|js|jsx|sol|java)'",
     "prettify:diff": "yarn run prettier --config .prettierrc.js --list-different '**/*.+(ts|tsx|js|jsx|sol|java)'",
     "reset": "yarn reset-modules && yarn reset-cache",
@@ -15,20 +15,20 @@
     "reset-rn": "watchman watch-del-all; rm -rf $TMPDIR/metro-cache-*; rm -rf $TMPDIR/haste-map-*; rm -rf $TMPDIR/metro-symbolicate*",
     "reset-yarn": "yarn cache clean",
     "test": "yarn test-pure && yarn test-needing-ganache",
-    "test-pure": "yarn run lerna run test --ignore @celo/contractkit --ignore @celo/celocli --ignore @celo/transactions-uri",
+    "test-pure": "yarn workspaces foreach -piv --all --exclude celo --exclude \"@celo/{celocli,contractkit,transactions-uri}\" run test",
     "test-needing-ganache": "yarn workspace @celo/contractkit test && yarn workspace @celo/celocli test && yarn workspace @celo/transactions-uri test",
-    "build": "yarn run lerna run build",
-    "clean": "yarn run lerna run clean",
-    "docs": "yarn run lerna run docs",
+    "build": "yarn workspaces foreach -pitv --all run build",
+    "clean": "yarn workspaces foreach -piv --all run clean",
+    "docs": "yarn workspaces foreach -piv --all run docs",
     "cs": "yarn changeset",
     "check-licenses": "yarn licenses list --prod | grep '\\(─ GPL\\|─ (GPL-[1-9]\\.[0-9]\\+ OR GPL-[1-9]\\.[0-9]\\+)\\)' && echo 'Found GPL license(s). Use 'yarn licenses list --prod' to look up the offending package' || echo 'No GPL licenses found'",
-    "report-coverage": "yarn run lerna run test-coverage",
+    "report-coverage": "yarn workspaces foreach -piv --all run test-coverage",
     "test:watch": "node node_modules/jest/bin/jest.js --watch",
-    "postinstall": "husky install && yarn run lerna run postinstall",
+    "postinstall": "husky install && yarn workspaces foreach -piv --all run postinstall",
     "release": "yarn clean && yarn build && yarn workspace @celo/celocli run prepack && yarn cs publish",
     "beta-enter": "bash scripts/beta-mode.sh",
     "beta-exit": "yarn changeset pre exit && git commit -am 'Complete beta mode'",
-    "version-and-reinstall": "yarn changeset version && yarn install",
+    "version-and-reinstall": "yarn changeset version && yarn install --no-immutable",
     "celocli": "yarn workspace @celo/celocli run --silent celocli",
     "deprecate-sdks": "ts-node ./scripts/unpublish-sdks.ts"
   },
@@ -56,20 +56,18 @@
     "eslint-plugin-unicorn": "^50.0.1",
     "husky": "^8.0.0",
     "jest": "^29.0.2",
-    "lerna": "^5.5.0",
     "prettier": "^2.7.1",
     "pretty-quick": "^2.0.1",
     "prompt": "1.2.0",
-    "semver": "7.3.5",
-    "solc": "0.5.8",
+    "semver": "7.5.2",
     "ts-jest": "^29.0.0",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^3.8.0",
     "typescript": "5.3.3"
   },
   "resolutions": {
     "ganache": "npm:@soloseng/[email protected]",
-    "bip39": "https://github.com/bitcoinjs/bip39#d8ea080a18b40f301d4e2219a2991cd2417e83c2",
+    "bip39": "https://github.com/bitcoinjs/bip39#a7ecbfe2e60d0214ce17163d610cad9f7b23140c",
     "blind-threshold-bls": "npm:@celo/[email protected]",
     "@types/bn.js": "4.11.6",
     "bignumber.js": "9.0.0"

packages/cli/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 4.0.0-beta.0
+
+### Major Changes
+
+- [#21](https://github.com/celo-org/developer-tooling/pull/21) [`f167758`](https://github.com/celo-org/developer-tooling/commit/f1677581b90675e37a4846ce53b29d8615a056e6) Thanks [@aaronmgdr](https://github.com/aaronmgdr)! - Removes releasegold commnand topic. use releasecelo
+
+- [#21](https://github.com/celo-org/developer-tooling/pull/21) [`f167758`](https://github.com/celo-org/developer-tooling/commit/f1677581b90675e37a4846ce53b29d8615a056e6) Thanks [@aaronmgdr](https://github.com/aaronmgdr)! - Remove Grandamento from CLI
+
+### Patch Changes
+
+- Updated dependencies [[`8fb6c76`](https://github.com/celo-org/developer-tooling/commit/8fb6c76e4fada71c91f516ed151c4519ff2fe0fd)]:
+  - @celo/contractkit@6.0.1-beta.0
+  - @celo/explorer@5.0.8-beta.0
+  - @celo/governance@5.0.9-beta.0
+
 ## 3.1.3
 
 ### Patch Changes

packages/cli/bin/dev.js

@@ -2,5 +2,6 @@
 // eslint-disable-next-line node/shebang, unicorn/prefer-top-level-await
 ;(async () => {
   const oclif = await import('@oclif/core')
+  console.info('Running in development mode')
   await oclif.execute({ development: true, dir: __dirname })
 })()

packages/cli/jest.config.js

@@ -1,6 +1,7 @@
 module.exports = {
   preset: 'ts-jest',
   testMatch: ['<rootDir>/src/**/?(*.)+(spec|test).ts'],
+  setupFiles: ['<rootDir>/src/test-utils/setup.ts'],
   setupFilesAfterEnv: ['@celo/dev-utils/lib/matchers'],
   globalSetup: '<rootDir>/src/test-utils/setup.global.ts',
   globalTeardown: '<rootDir>/src/test-utils/teardown.global.ts',

packages/cli/package.json

@@ -1,15 +1,18 @@
 {
   "name": "@celo/celocli",
   "description": "CLI Tool for transacting with the Celo protocol",
-  "version": "3.1.3",
+  "version": "4.0.0-beta.0",
   "author": "Celo",
   "license": "Apache-2.0",
   "repository": "celo-org/developer-tooling",
   "homepage": "https://github.com/celo-org/developer-tooling",
   "bugs": "https://github.com/celo-org/developer-tooling/issues?utf8=%E2%9C%93&q=label%3Acli+",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",
-  "bin": "./bin/run",
+  "bin": {
+    "celocli": "./bin/run.js",
+    "dev": ".bin/dev.js"
+  },
   "keywords": [
     "celo",
     "celocli",
@@ -20,21 +23,22 @@
   },
   "scripts": {
     "clean": "tsc -b . --clean",
+    "dev": "ts-node ./bin/dev.js",
     "build": "tsc -b .",
     "docs": "./generate_docs.sh",
     "lint": "yarn run --top-level eslint -c .eslintrc.js ",
     "prepublish": "",
     "prepack": "yarn run build && oclif manifest && oclif readme",
-    "test": "TZ=UTC jest --runInBand"
+    "test": "TZ=UTC yarn jest --runInBand"
   },
   "dependencies": {
     "@celo/abis": "10.0.0",
     "@celo/base": "^6.0.0",
     "@celo/connect": "^5.1.1",
-    "@celo/contractkit": "^6.0.0",
+    "@celo/contractkit": "^6.0.1-beta.0",
     "@celo/cryptographic-utils": "^5.0.6",
-    "@celo/explorer": "^5.0.7",
-    "@celo/governance": "^5.0.8",
+    "@celo/explorer": "^5.0.8-beta.0",
+    "@celo/governance": "^5.0.9-beta.0",
     "@celo/identity": "^5.1.1",
     "@celo/phone-utils": "^6.0.0",
     "@celo/utils": "^5.0.6",
@@ -43,18 +47,17 @@
     "@celo/wallet-local": "^5.1.1",
     "@ethereumjs/util": "8.0.5",
     "@ledgerhq/hw-transport-node-hid": "^6.27.4",
-    "@oclif/core": "^3.15.0",
-    "@oclif/plugin-autocomplete": "^3.0.4",
-    "@oclif/plugin-commands": "^3.1.0",
-    "@oclif/plugin-help": "^6.0.9",
-    "@oclif/plugin-not-found": "^3.0.7",
-    "@oclif/plugin-plugins": "^4.1.14",
-    "@oclif/plugin-warn-if-update-available": "^3.0.8",
-    "@types/command-exists": "^1.2.0",
+    "@oclif/core": "^3.18.1",
+    "@oclif/plugin-autocomplete": "^3.0.5",
+    "@oclif/plugin-commands": "^3.1.1",
+    "@oclif/plugin-help": "^6.0.12",
+    "@oclif/plugin-not-found": "^3.0.9",
+    "@oclif/plugin-plugins": "^4.1.17",
+    "@oclif/plugin-warn-if-update-available": "^3.0.9",
+    "@types/command-exists": "^1.2.3",
     "bignumber.js": "9.0.0",
     "bip32": "3.1.0",
     "chalk": "^2.4.2",
-    "cli-table": "^0.3.1",
     "command-exists": "^1.2.9",
     "debug": "^4.1.1",
     "events": "^3.0.0",
@@ -63,14 +66,13 @@
     "path": "^0.12.7",
     "prompts": "^2.0.1",
     "randombytes": "^2.0.1",
-    "tslib": "^1",
     "web3": "1.10.0",
     "web3-utils": "^1.10.0"
   },
   "devDependencies": {
     "@celo/celo-devchain": "^6.0.3",
     "@celo/dev-utils": "0.0.1-beta.1",
-    "@types/cli-table": "^0.3.0",
+    "@celo/typescript": "workspace:^",
     "@types/debug": "^4.1.4",
     "@types/fs-extra": "^8.0.0",
     "@types/humanize-duration": "^3.27.0",
@@ -79,9 +81,8 @@
     "@types/node": "^18.7.16",
     "@types/prompts": "^1.1.1",
     "@types/web3": "^1.0.18",
-    "globby": "^8",
     "jest": "^29.0.2",
-    "oclif": "^4.1.3",
+    "oclif": "^4.3.4",
     "prettier": "1.19.1",
     "ts-jest": "^29.0.0",
     "ts-node": "^10.9.1",