Merge branch 'master' into fix/ledger-sig

celo-org · Nov 8, 2024 · 534a41a · 534a41a
2 parents d5a1333 + 76045eb
commit 534a41a
Show file tree

Hide file tree

Showing 124 changed files with 6,322 additions and 695 deletions.
diff --git a/.changeset/calm-sheep-tie.md b/.changeset/calm-sheep-tie.md
@@ -0,0 +1,5 @@
+---
+'@celo/dev-utils': patch
+---
+
+Upgrades to latest devchain
diff --git a/.changeset/chilled-cycles-smell.md b/.changeset/chilled-cycles-smell.md
@@ -0,0 +1,5 @@
+---
+'@celo/celocli': major
+---
+
+Remove transfer:gold -- this was an old alias for transfer:celo which has the same functionality
diff --git a/.changeset/dull-windows-travel.md b/.changeset/dull-windows-travel.md
@@ -0,0 +1,9 @@
+---
+'@celo/celocli': major
+---
+
+Remove `celocli validator:force-deaffiliate`
+
+This command was only ever usable pre mainnet launch. The force deaffiliate method it would call is only callable by one of the whitelisted Slasher Contracts. 
+
+To force removal of validator with poor uptime use `celocli validator:downtime-slash` or to sever association with a validator from your group use `celocli validator:deaffiliate` 
diff --git a/.changeset/good-trees-reply.md b/.changeset/good-trees-reply.md
@@ -0,0 +1,6 @@
+---
+'@celo/celocli': major
+---
+Remove account:recover-old
+
+This was meant to be a temporary command for migrating account from a beta version of Valora to the release version. Please use a previous version of celocli if you need to make this one time recovery. 
diff --git a/.changeset/smart-berries-accept.md b/.changeset/smart-berries-accept.md
@@ -0,0 +1,5 @@
+---
+'@celo/contractkit': minor
+---
+
+ValidatorsWrapper: add registerValidatorNoBls to allow registration without BLS keys which are not supported in L2
diff --git a/.changeset/smart-guests-refuse.md b/.changeset/smart-guests-refuse.md
@@ -0,0 +1,5 @@
+---
+'@celo/contractkit': patch
+---
+
+Renames `getElected` and its usages to `getElectedAccounts` for `EpochManagerWrapper`
diff --git a/.changeset/twenty-rocks-pull.md b/.changeset/twenty-rocks-pull.md
@@ -0,0 +1,5 @@
+---
+'@celo/celocli': minor
+---
+
+BLS keys are now optional as being deprecated on L2, validator:register and releasecelo:authorize no longer require them in L2 context
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,11 +1,10 @@
 ### Description
 
-_A few sentences describing the overall effects and goals of the pull request's commits.
-What is the current behavior, and what is the updated/expected behavior with this PR?_
+_Tell us why these changes are being made_
 
-### Other changes
+#### Other changes
 
-_Describe any minor or "drive-by" changes here._
+_Describe any minor or "drive-by" changes here. If none delete this section_
 
 ### Tested
 
@@ -14,11 +13,3 @@ _An explanation of how the changes were tested or an explanation as to why they
 ### Related issues
 
 - Fixes #[issue number here]
-
-### Backwards compatibility
-
-_Brief explanation of why these changes are/are not backwards compatible._
-
-### Documentation
-
-_The set of community facing docs that have been added/modified because of this change_
diff --git a/docs/command-line-interface/account.md b/docs/command-line-interface/account.md
@@ -21,7 +21,6 @@ Manage your account, keys, and metadata
 * [`celocli account:offchain-read ARG1`](#celocli-accountoffchain-read-arg1)
 * [`celocli account:offchain-write`](#celocli-accountoffchain-write)
 * [`celocli account:proof-of-possession`](#celocli-accountproof-of-possession)
-* [`celocli account:recover-old`](#celocli-accountrecover-old)
 * [`celocli account:register`](#celocli-accountregister)
 * [`celocli account:register-data-encryption-key`](#celocli-accountregister-data-encryption-key)
 * [`celocli account:register-metadata`](#celocli-accountregister-metadata)
@@ -781,74 +780,6 @@ EXAMPLES
 
 _See code: [src/commands/account/proof-of-possession.ts](https://github.com/celo-org/developer-tooling/tree/master/packages/cli/src/commands/account/proof-of-possession.ts)_
 
-## `celocli account:recover-old`
-
-Recovers the Valora old account and print out the key information. The old Valora app (in a beta state) generated the user address using a seed of 32 bytes, instead of 64 bytes. As the app fixed that, some old accounts were left with some funds. This command allows the user to recover those funds.
-
-```
-USAGE
-  $ celocli account:recover-old --mnemonicPath <value> [--gasCurrency
-    0x1234567890123456789012345678901234567890] [--globalHelp] [--passphrasePath
-    <value>] [--changeIndex <value>] [--addressIndex <value>] [--language chinese_simpli
-    fied|chinese_traditional|english|french|italian|japanese|korean|spanish]
-    [--derivationPath <value>]
-
-FLAGS
-  --addressIndex=<value>
-      Choose the address index for the derivation path
-
-  --changeIndex=<value>
-      Choose the change index for the derivation path
-
-  --derivationPath=<value>
-      Choose a different derivation Path (Celo's default is "m/44'/52752'/0'"). Use "eth"
-      as an alias of the Ethereum derivation path ("m/44'/60'/0'"). Recreating the same
-      account requires knowledge of the mnemonic, passphrase (if any), and the derivation
-      path
-
-  --gasCurrency=0x1234567890123456789012345678901234567890
-      Use a specific gas currency for transaction fees (defaults to CELO if no gas
-      currency is supplied). It must be a whitelisted token.
-
-  --globalHelp
-      View all available global flags
-
-  --language=<option>
-      [default: english] Language for the mnemonic words. **WARNING**, some hardware
-      wallets don't support other languages
-      <options: chinese_simplified|chinese_traditional|english|french|italian|japanese|kor
-      ean|spanish>
-
-  --mnemonicPath=<value>
-      (required) Path to a file that contains all the mnemonic words separated by a space
-      (example: "word1 word2 word3 ... word24"). If the words are a language other than
-      English, the --language flag must be used. Only BIP39 mnemonics are supported
-
-  --passphrasePath=<value>
-      Path to a file that contains the BIP39 passphrase to combine with the mnemonic
-      specified using the mnemonicPath flag and the index specified using the addressIndex
-      flag. Every passphrase generates a different private key and wallet address.
-
-DESCRIPTION
-  Recovers the Valora old account and print out the key information. The old Valora app
-  (in a beta state) generated the user address using a seed of 32 bytes, instead of 64
-  bytes. As the app fixed that, some old accounts were left with some funds. This
-  command allows the user to recover those funds.
-
-EXAMPLES
-  recover-old --mnemonicPath some_folder/my_mnemonic_file
-
-  recover-old --mnemonicPath some_folder/my_mnemonic_file --passphrasePath myFolder/my_passphrase_file
-
-  recover-old --mnemonicPath some_folder/my_mnemonic_file --language spanish
-
-  recover-old --mnemonicPath some_folder/my_mnemonic_file --passphrasePath some_folder/my_passphrase_file --language japanese --addressIndex 5
-
-  recover-old --mnemonicPath some_folder/my_mnemonic_file --passphrasePath some_folder/my_passphrase_file --addressIndex 5
-```
-
-_See code: [src/commands/account/recover-old.ts](https://github.com/celo-org/developer-tooling/tree/master/packages/cli/src/commands/account/recover-old.ts)_
-
 ## `celocli account:register`
 
 Register an account on-chain. This allows you to lock Gold, which is a pre-requisite for registering a Validator or Group, participating in Validator elections and on-chain Governance, and earning epoch rewards.

diff --git a/docs/command-line-interface/reserve.md b/docs/command-line-interface/reserve.md
diff --git a/docs/command-line-interface/transfer.md b/docs/command-line-interface/transfer.md
@@ -7,7 +7,6 @@ Transfer CELO and Celo Dollars
 * [`celocli transfer:dollars`](#celocli-transferdollars)
 * [`celocli transfer:erc20`](#celocli-transfererc20)
 * [`celocli transfer:euros`](#celocli-transfereuros)
-* [`celocli transfer:gold`](#celocli-transfergold)
 * [`celocli transfer:reals`](#celocli-transferreals)
 * [`celocli transfer:stable`](#celocli-transferstable)
 
@@ -157,42 +156,6 @@ EXAMPLES
 
 _See code: [src/commands/transfer/euros.ts](https://github.com/celo-org/developer-tooling/tree/master/packages/cli/src/commands/transfer/euros.ts)_
 
-## `celocli transfer:gold`
-
-Transfer CELO to a specified address. *DEPRECATION WARNING* Use the "transfer:celo" command instead
-
-```
-USAGE
-  $ celocli transfer:gold --from 0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d --to
-    0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d --value <value> [--gasCurrency
-    0x1234567890123456789012345678901234567890] [--globalHelp] [--comment <value>]
-
-FLAGS
-  --comment=<value>                                         Transfer comment
-  --from=0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d         (required) Address of the
-                                                            sender
-  --gasCurrency=0x1234567890123456789012345678901234567890  Use a specific gas currency
-                                                            for transaction fees
-                                                            (defaults to CELO if no gas
-                                                            currency is supplied). It
-                                                            must be a whitelisted token.
-  --globalHelp                                              View all available global
-                                                            flags
-  --to=0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d           (required) Address of the
-                                                            receiver
-  --value=<value>                                           (required) Amount to
-                                                            transfer (in wei)
-
-DESCRIPTION
-  Transfer CELO to a specified address. *DEPRECATION WARNING* Use the "transfer:celo"
-  command instead
-
-EXAMPLES
-  gold --from 0xa0Af2E71cECc248f4a7fD606F203467B500Dd53B --to 0x5409ed021d9299bf6814279a6a1411a7e866a631 --value 10000000000000000000
-```
-
-_See code: [src/commands/transfer/gold.ts](https://github.com/celo-org/developer-tooling/tree/master/packages/cli/src/commands/transfer/gold.ts)_
-
 ## `celocli transfer:reals`
 
 Transfer Celo Brazilian Real (cREAL) to a specified address.

diff --git a/docs/command-line-interface/validator.md b/docs/command-line-interface/validator.md
@@ -7,7 +7,6 @@ View and manage Validators
 * [`celocli validator:deaffiliate`](#celocli-validatordeaffiliate)
 * [`celocli validator:deregister`](#celocli-validatorderegister)
 * [`celocli validator:downtime-slash`](#celocli-validatordowntime-slash)
-* [`celocli validator:force-deaffiliate`](#celocli-validatorforce-deaffiliate)
 * [`celocli validator:list`](#celocli-validatorlist)
 * [`celocli validator:register`](#celocli-validatorregister)
 * [`celocli validator:requirements`](#celocli-validatorrequirements)
@@ -164,41 +163,6 @@ EXAMPLES
 
 _See code: [src/commands/validator/downtime-slash.ts](https://github.com/celo-org/developer-tooling/tree/master/packages/cli/src/commands/validator/downtime-slash.ts)_
 
-## `celocli validator:force-deaffiliate`
-
-Force deaffiliate a Validator from a Validator Group, and remove it from the Group if it is also a member.  Used by stake-off admins in order to remove validators from the next epoch's validator set if they are down and consistently unresponsive, in order to preserve the health of the network. This feature will be removed once slashing for downtime is implemented.
-
-```
-USAGE
-  $ celocli validator:force-deaffiliate --from 0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d
-    --validator 0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d [--gasCurrency
-    0x1234567890123456789012345678901234567890] [--globalHelp]
-
-FLAGS
-  --from=0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d         (required) Initiator
-  --gasCurrency=0x1234567890123456789012345678901234567890  Use a specific gas currency
-                                                            for transaction fees
-                                                            (defaults to CELO if no gas
-                                                            currency is supplied). It
-                                                            must be a whitelisted token.
-  --globalHelp                                              View all available global
-                                                            flags
-  --validator=0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d    (required) Validator's
-                                                            address
-
-DESCRIPTION
-  Force deaffiliate a Validator from a Validator Group, and remove it from the Group if
-  it is also a member.  Used by stake-off admins in order to remove validators from the
-  next epoch's validator set if they are down and consistently unresponsive, in order to
-  preserve the health of the network. This feature will be removed once slashing for
-  downtime is implemented.
-
-EXAMPLES
-  force-deaffiliate --from 0x47e172f6cfb6c7d01c1574fa3e2be7cc73269d95 --validator 0xb7ef0985bdb4f19460A29d9829aA1514B181C4CD
-```
-
-_See code: [src/commands/validator/force-deaffiliate.ts](https://github.com/celo-org/developer-tooling/tree/master/packages/cli/src/commands/validator/force-deaffiliate.ts)_
-
 ## `celocli validator:list`
 
 List registered Validators, their name (if provided), affiliation, uptime score, and public keys used for validating.
@@ -260,13 +224,12 @@ Register a new Validator
 ```
 USAGE
   $ celocli validator:register --from 0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d
-    --ecdsaKey 0x --blsKey 0x --blsSignature 0x [--gasCurrency
-    0x1234567890123456789012345678901234567890] [--globalHelp] [--yes]
+    --ecdsaKey 0x [--gasCurrency 0x1234567890123456789012345678901234567890]
+    [--globalHelp] [--blsKey 0x] [--blsSignature 0x] [--yes]
 
 FLAGS
-  --blsKey=0x                                               (required) BLS Public Key
-  --blsSignature=0x                                         (required) BLS
-                                                            Proof-of-Possession
+  --blsKey=0x                                               BLS Public Key
+  --blsSignature=0x                                         BLS Proof-of-Possession
   --ecdsaKey=0x                                             (required) ECDSA Public Key
   --from=0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d         (required) Address for the
                                                             Validator