Merge branch 'master' into fix/cli-govn-show

celo-org · Nov 14, 2024 · 014fa5e · 014fa5e
2 parents 92b9895 + 79cbdf0
commit 014fa5e
Show file tree

Hide file tree

Showing 89 changed files with 3,146 additions and 1,650 deletions.
diff --git a/.changeset/afraid-seas-cross.md b/.changeset/afraid-seas-cross.md
@@ -0,0 +1,5 @@
+---
+'@celo/celocli': patch
+---
+
+fix governance:build-proposal with contracts from mento or which use solidity 0.8
diff --git a/.changeset/famous-cherries-kick.md b/.changeset/famous-cherries-kick.md
@@ -0,0 +1,5 @@
+---
+'@celo/governance': patch
+---
+
+minor update to inquirer lib
diff --git a/.changeset/few-seals-matter.md b/.changeset/few-seals-matter.md
@@ -0,0 +1,12 @@
+---
+'@celo/wallet-hsm-azure': patch
+'@celo/wallet-hsm-aws': patch
+'@celo/wallet-hsm-gcp': patch
+'@celo/wallet-ledger': patch
+'@celo/wallet-remote': patch
+'@celo/wallet-local': patch
+'@celo/wallet-base': patch
+'@celo/wallet-hsm': patch
+---
+
+Force patch bump wallets to deal with version conflict
diff --git a/.changeset/lemon-gorillas-explain.md b/.changeset/lemon-gorillas-explain.md
@@ -0,0 +1,5 @@
+---
+'@celo/celocli': minor
+---
+
+Adds support for safe integration for L2 hotfix security council approvals
diff --git a/.changeset/orange-penguins-sneeze.md b/.changeset/orange-penguins-sneeze.md
@@ -0,0 +1,5 @@
+---
+'@celo/celocli': minor
+---
+
+Removes L2 BLS keys support for account:authorize
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -2,8 +2,8 @@
   "mode": "pre",
   "tag": "beta",
   "initialVersions": {
-    "@celo/celocli": "5.2.1",
-    "@celo/dev-utils": "0.0.5",
+    "@celo/celocli": "5.2.3",
+    "@celo/dev-utils": "0.0.6",
     "@celo/base": "6.1.0",
     "@celo/connect": "6.0.2",
     "@celo/contractkit": "8.3.0",
@@ -16,37 +16,45 @@
     "@celo/phone-utils": "6.0.3",
     "@celo/transactions-uri": "5.0.11",
     "@celo/utils": "7.0.0",
-    "@celo/wallet-base": "6.0.1",
-    "@celo/wallet-hsm": "6.0.1",
-    "@celo/wallet-hsm-aws": "6.0.1",
-    "@celo/wallet-hsm-azure": "6.0.1",
-    "@celo/wallet-hsm-gcp": "6.0.1",
-    "@celo/wallet-ledger": "6.0.1",
-    "@celo/wallet-local": "6.0.1",
-    "@celo/wallet-remote": "6.0.1",
+    "@celo/wallet-base": "6.0.3",
+    "@celo/wallet-hsm": "6.0.3",
+    "@celo/wallet-hsm-aws": "6.0.3",
+    "@celo/wallet-hsm-azure": "6.0.3",
+    "@celo/wallet-hsm-gcp": "6.0.3",
+    "@celo/wallet-ledger": "6.0.3",
+    "@celo/wallet-local": "6.0.3",
+    "@celo/wallet-remote": "6.0.3",
     "@celo/typescript": "0.0.1",
     "@celo/viem-account-ledger": "0.0.1"
   },
   "changesets": [
+    "afraid-seas-cross",
     "calm-sheep-tie",
     "chilled-cycles-smell",
     "dry-gifts-love",
     "dull-windows-travel",
     "fair-points-beg",
+    "famous-cherries-kick",
+    "few-seals-matter",
     "fifty-roses-explain",
     "gold-pumas-fry",
     "good-trees-reply",
     "hot-pugs-nail",
     "hungry-cups-juggle",
+    "lemon-gorillas-explain",
     "little-carpets-argue",
     "many-cobras-live",
     "moody-falcons-remain",
+    "orange-penguins-sneeze",
     "polite-pets-push",
     "rude-parrots-know",
+    "sharp-shirts-count",
     "smart-berries-accept",
     "smart-guests-refuse",
     "thirty-pugs-smile",
     "twenty-rocks-pull",
+    "warm-papayas-smile",
+    "weak-beers-itch",
     "wild-impalas-smoke"
   ]
 }
diff --git a/.changeset/sharp-shirts-count.md b/.changeset/sharp-shirts-count.md
@@ -0,0 +1,5 @@
+---
+'@celo/dev-utils': patch
+---
+
+Adds actual Celo chain id when running anvil
diff --git a/.changeset/warm-papayas-smile.md b/.changeset/warm-papayas-smile.md
@@ -0,0 +1,5 @@
+---
+'@celo/connect': minor
+---
+
+Now CeloProvider can be wrapped in EIP-1193 partially compatible object (request + args)
diff --git a/.changeset/weak-beers-itch.md b/.changeset/weak-beers-itch.md
@@ -0,0 +1,5 @@
+---
+'@celo/governance': patch
+---
+
+Fix being unable to use 08 and mento contracts with proposal builder
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,6 +10,7 @@ on:
       - master
       - changeset-release/master
       - prerelease/*
+      - hotfixes
   pull_request:
     types: [opened, reopened, synchronize, edited, ready_for_review]
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -3,9 +3,8 @@ name: Release Packages
 on:
   push:
     branches:
-      - main
       - master
-      - 'prerelease/*'
+      - hotfixes
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 

diff --git a/docs/command-line-interface/governance.md b/docs/command-line-interface/governance.md
@@ -33,7 +33,7 @@ Approve a dequeued governance proposal (or hotfix)
 USAGE
   $ celocli governance:approvehotfix --from 0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d
     [--gasCurrency 0x1234567890123456789012345678901234567890] [--globalHelp]
-    [--proposalID <value> | --hotfix <value>] [--useMultiSig] [--type
+    [--proposalID <value> | --hotfix <value>] [--useMultiSig | --useSafe] [--type
     approver|securityCouncil ]
 
 FLAGS
@@ -55,6 +55,8 @@ FLAGS
                                                             approver|securityCouncil>
   --useMultiSig                                             True means the request will
                                                             be sent through multisig.
+  --useSafe                                                 True means the request will
+                                                            be sent through safe.
 
 DESCRIPTION
   Approve a dequeued governance proposal (or hotfix)

diff --git a/docs/sdk/connect/classes/celo_provider.CeloProvider.md b/docs/sdk/connect/classes/celo_provider.CeloProvider.md
@@ -32,6 +32,7 @@
 - [send](celo_provider.CeloProvider.md#send)
 - [stop](celo_provider.CeloProvider.md#stop)
 - [supportsSubscriptions](celo_provider.CeloProvider.md#supportssubscriptions)
+- [toEip1193Provider](celo_provider.CeloProvider.md#toeip1193provider)
 
 ## Constructors
 
@@ -52,7 +53,7 @@
 
 #### Defined in
 
-[packages/sdk/connect/src/celo-provider.ts:54](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L54)
+[packages/sdk/connect/src/celo-provider.ts:56](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L56)
 
 ## Properties
 
@@ -62,7 +63,7 @@
 
 #### Defined in
 
-[packages/sdk/connect/src/celo-provider.ts:54](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L54)
+[packages/sdk/connect/src/celo-provider.ts:56](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L56)
 
 ___
 
@@ -72,7 +73,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/connect/src/celo-provider.ts:54](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L54)
+[packages/sdk/connect/src/celo-provider.ts:56](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L56)
 
 ## Accessors
 
@@ -86,7 +87,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/connect/src/celo-provider.ts:261](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L261)
+[packages/sdk/connect/src/celo-provider.ts:287](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L287)
 
 ## Methods
 
@@ -106,7 +107,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/connect/src/celo-provider.ts:59](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L59)
+[packages/sdk/connect/src/celo-provider.ts:61](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L61)
 
 ___
 
@@ -120,7 +121,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/connect/src/celo-provider.ts:69](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L69)
+[packages/sdk/connect/src/celo-provider.ts:71](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L71)
 
 ___
 
@@ -140,7 +141,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/connect/src/celo-provider.ts:73](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L73)
+[packages/sdk/connect/src/celo-provider.ts:75](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L75)
 
 ___
 
@@ -160,7 +161,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/connect/src/celo-provider.ts:64](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L64)
+[packages/sdk/connect/src/celo-provider.ts:66](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L66)
 
 ___
 
@@ -187,7 +188,7 @@ Send method as expected by web3.js
 
 #### Defined in
 
-[packages/sdk/connect/src/celo-provider.ts:80](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L80)
+[packages/sdk/connect/src/celo-provider.ts:82](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L82)
 
 ___
 
@@ -201,7 +202,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/connect/src/celo-provider.ts:159](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L159)
+[packages/sdk/connect/src/celo-provider.ts:161](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L161)
 
 ___
 
@@ -215,4 +216,18 @@ ___
 
 #### Defined in
 
-[packages/sdk/connect/src/celo-provider.ts:265](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L265)
+[packages/sdk/connect/src/celo-provider.ts:291](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L291)
+
+___
+
+### toEip1193Provider
+
+▸ **toEip1193Provider**(): [`Eip1193Provider`](../interfaces/types.Eip1193Provider.md)
+
+#### Returns
+
+[`Eip1193Provider`](../interfaces/types.Eip1193Provider.md)
+
+#### Defined in
+
+[packages/sdk/connect/src/celo-provider.ts:173](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L173)
diff --git a/docs/sdk/connect/interfaces/types.Eip1193Provider.md b/docs/sdk/connect/interfaces/types.Eip1193Provider.md
@@ -0,0 +1,31 @@
+[@celo/connect](../README.md) / [Exports](../modules.md) / [types](../modules/types.md) / Eip1193Provider
+
+# Interface: Eip1193Provider
+
+[types](../modules/types.md).Eip1193Provider
+
+## Table of contents
+
+### Methods
+
+- [request](types.Eip1193Provider.md#request)
+
+## Methods
+
+### request
+
+▸ **request**(`args`): `Promise`\<`unknown`\>
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `args` | [`Eip1193RequestArguments`](types.Eip1193RequestArguments.md) |
+
+#### Returns
+
+`Promise`\<`unknown`\>
+
+#### Defined in
+
+[packages/sdk/connect/src/types.ts:158](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/types.ts#L158)
diff --git a/docs/sdk/connect/interfaces/types.Eip1193RequestArguments.md b/docs/sdk/connect/interfaces/types.Eip1193RequestArguments.md
@@ -0,0 +1,32 @@
+[@celo/connect](../README.md) / [Exports](../modules.md) / [types](../modules/types.md) / Eip1193RequestArguments
+
+# Interface: Eip1193RequestArguments
+
+[types](../modules/types.md).Eip1193RequestArguments
+
+## Table of contents
+
+### Properties
+
+- [method](types.Eip1193RequestArguments.md#method)
+- [params](types.Eip1193RequestArguments.md#params)
+
+## Properties
+
+### method
+
+• `Readonly` **method**: `string`
+
+#### Defined in
+
+[packages/sdk/connect/src/types.ts:153](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/types.ts#L153)
+
+___
+
+### params
+
+• `Optional` `Readonly` **params**: `object` \| readonly `unknown`[]
+
+#### Defined in
+
+[packages/sdk/connect/src/types.ts:154](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/types.ts#L154)
diff --git a/docs/sdk/connect/modules/celo_provider.md b/docs/sdk/connect/modules/celo_provider.md
@@ -30,4 +30,4 @@ asserts provider is CeloProvider
 
 #### Defined in
 
-[packages/sdk/connect/src/celo-provider.ts:35](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L35)
+[packages/sdk/connect/src/celo-provider.ts:37](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L37)
diff --git a/docs/sdk/connect/modules/index.md b/docs/sdk/connect/modules/index.md
@@ -30,6 +30,8 @@
 - [DecodedParamsArray](index.md#decodedparamsarray)
 - [DecodedParamsObject](index.md#decodedparamsobject)
 - [EIP1559TXProperties](index.md#eip1559txproperties)
+- [Eip1193Provider](index.md#eip1193provider)
+- [Eip1193RequestArguments](index.md#eip1193requestarguments)
 - [EncodedTransaction](index.md#encodedtransaction)
 - [Error](index.md#error)
 - [EthereumLegacyTXProperties](index.md#ethereumlegacytxproperties)
@@ -226,6 +228,18 @@ Re-exports [EIP1559TXProperties](../interfaces/types.EIP1559TXProperties.md)
 
 ___
 
+### Eip1193Provider
+
+Re-exports [Eip1193Provider](../interfaces/types.Eip1193Provider.md)
+
+___
+
+### Eip1193RequestArguments
+
+Re-exports [Eip1193RequestArguments](../interfaces/types.Eip1193RequestArguments.md)
+
+___
+
 ### EncodedTransaction
 
 Re-exports [EncodedTransaction](../interfaces/types.EncodedTransaction.md)

diff --git a/docs/sdk/connect/modules/types.md b/docs/sdk/connect/modules/types.md
@@ -25,6 +25,8 @@
 - [CeloParams](../interfaces/types.CeloParams.md)
 - [CeloTxObject](../interfaces/types.CeloTxObject.md)
 - [EIP1559TXProperties](../interfaces/types.EIP1559TXProperties.md)
+- [Eip1193Provider](../interfaces/types.Eip1193Provider.md)
+- [Eip1193RequestArguments](../interfaces/types.Eip1193RequestArguments.md)
 - [EncodedTransaction](../interfaces/types.EncodedTransaction.md)
 - [Error](../interfaces/types.Error.md)
 - [EthereumLegacyTXProperties](../interfaces/types.EthereumLegacyTXProperties.md)

diff --git a/docs/sdk/governance/README.md b/docs/sdk/governance/README.md
@@ -7,4 +7,8 @@
 ### Modules
 
 - [index](modules/index.md)
+- [interactive-proposal-builder](modules/interactive_proposal_builder.md)
+- [proposal-builder](modules/proposal_builder.md)
 - [proposals](modules/proposals.md)
+- [test-utils/globals](modules/test_utils_globals.md)
+- [test-utils/setup.global](modules/test_utils_setup_global.md)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,4 +30,4 @@ asserts provider is CeloProvider

		#### Defined in

		[packages/sdk/connect/src/celo-provider.ts:35](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L35)
		[packages/sdk/connect/src/celo-provider.ts:37](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/connect/src/celo-provider.ts#L37)