Skip to content

Commit

Permalink
Merge branch 'master' into chore/wallet-ledger-v-coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolasbrugneaux authored Nov 18, 2024
2 parents 7b4a66d + 42d091f commit 92ebedb
Show file tree
Hide file tree
Showing 18 changed files with 38 additions and 31 deletions.
7 changes: 7 additions & 0 deletions .changeset/loud-kids-dress.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@celo/contractkit': patch
'@celo/governance': patch
'@celo/dev-utils': patch
---

Bump @celo/abis-12
4 changes: 2 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Being assigned as the release steward means you are expected to deliver
* Release notes on github for every package (automatically created by changesets bot)
* If the release is significant a forum post with the highlights and link back to release notes

### What is a signicant release
### What is a significant release

This is intentionally not defined. Some guiding principles: if it has been a long time, if someone will be asking about the release, if there are big fixes.

Expand Down Expand Up @@ -45,7 +45,7 @@ require a patch, minor, or major update.

## Package Versioning

Based on [semantic versioning best practices](semver.org),g iven a version number
Based on [semantic versioning best practices](semver.org), given a version number
`MAJOR.MINOR.PATCH`, increment the:

- `MAJOR` version when you make incompatible API changes
Expand Down
6 changes: 3 additions & 3 deletions docs/command-line-interface/account.md
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ _See code: [src/commands/account/deauthorize.ts](https://github.com/celo-org/dev

## `celocli account:delete-payment-delegation`

Removes a validator's payment delegation by setting benficiary and fraction to 0.
Removes a validator's payment delegation by setting beneficiary and fraction to 0.

```
USAGE
Expand All @@ -405,7 +405,7 @@ FLAGS
flags
DESCRIPTION
Removes a validator's payment delegation by setting benficiary and fraction to 0.
Removes a validator's payment delegation by setting beneficiary and fraction to 0.
EXAMPLES
delete-payment-delegation --account 0x5409ED021D9299bf6814279A6A1411A7e866A631
Expand Down Expand Up @@ -825,7 +825,7 @@ USAGE
[--globalHelp]
FLAGS
--from=0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d (required) Addess of the
--from=0xc1912fEE45d61C87Cc5EA59DaE31190FFFFf232d (required) Address of the
account to set the data
encryption key for
--gasCurrency=0x1234567890123456789012345678901234567890 Use a specific gas currency
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,14 @@ ___

**deletePaymentDelegation**: (...`args`: []) => `CeloTransactionObject`\<`void`\>

Remove a validator's payment delegation by setting benficiary and
Remove a validator's payment delegation by setting beneficiary and
fraction to 0.

#### Type declaration

▸ (`...args`): `CeloTransactionObject`\<`void`\>

Remove a validator's payment delegation by setting benficiary and
Remove a validator's payment delegation by setting beneficiary and
fraction to 0.

##### Parameters
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { CustomFlags } from '../../utils/command'

export default class DeletePaymentDelegation extends BaseCommand {
static description =
"Removes a validator's payment delegation by setting benficiary and fraction to 0."
"Removes a validator's payment delegation by setting beneficiary and fraction to 0."

static flags = {
...BaseCommand.flags,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default class RegisterDataEncryptionKey extends BaseCommand {
...BaseCommand.flags,
from: CustomFlags.address({
required: true,
description: 'Addess of the account to set the data encryption key for',
description: 'Address of the account to set the data encryption key for',
}),
publicKey: Flags.string({
required: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ exports[`network:contracts runs 1`] = `
{
"contract": "FeeHandler",
"proxy": "0xeaEEC408eCbCdF9CDF21d0B1880419dF7290E2c9",
"implementation": "0x82106CcC8feAE0bEc797281ae4dDf5F77E3E6156",
"implementation": "0x2e647D9D128c89D7239fdF47ca290453ad5869df",
"version": "1.2.0.0"
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ exports[`network:contracts runs 1`] = `
{
"contract": "FeeHandler",
"proxy": "0xeaEEC408eCbCdF9CDF21d0B1880419dF7290E2c9",
"implementation": "0x82106CcC8feAE0bEc797281ae4dDf5F77E3E6156",
"implementation": "0x2e647D9D128c89D7239fdF47ca290453ad5869df",
"version": "1.2.0.0"
},
{
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/network/parameters-l2.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ testWithAnvilL2('network:parameters', (web3) => {
Reserve:
frozenReserveGoldDays: 0
frozenReserveGoldStartBalance: 0
frozenReserveGoldStartDay: 20013 (~2.001e+4)
frozenReserveGoldStartDay: 20042 (~2.004e+4)
otherReserveAddresses:
tobinTaxStalenessThreshold: 3153600000 (~3.154e+9)
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/network/parameters.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ testWithAnvilL1('network:parameters', (web3: Web3) => {
Reserve:
frozenReserveGoldDays: 0
frozenReserveGoldStartBalance: 0
frozenReserveGoldStartDay: 20013 (~2.001e+4)
frozenReserveGoldStartDay: 20042 (~2.004e+4)
otherReserveAddresses:
tobinTaxStalenessThreshold: 3153600000 (~3.154e+9)
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/validatorgroup/member.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ testWithAnvilL2('validatorgroup:member cmd', (web3: Web3) => {
"0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65",
"0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
],
"membersUpdated": 1729165064,
"membersUpdated": 1731689623,
"name": "cLabs",
"nextCommission": "0",
"nextCommissionBlock": "0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/validatorgroup/show.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ testWithAnvilL2('validatorgroup:show cmd', (web3: Web3) => {
commission: 0.1
nextCommission: 0
nextCommissionBlock: 0
membersUpdated: 1729165064
membersUpdated: 1731689623
affiliates:
slashingMultiplier: 1
lastSlashed: 0",
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"web3-core-helpers": "1.10.4"
},
"devDependencies": {
"@celo/devchain-anvil": "12.0.0-canary.33",
"@celo/devchain-anvil": "12.0.0-canary.39",
"@celo/typescript": "workspace:^",
"@tsconfig/recommended": "^1.0.3",
"@types/fs-extra": "^8.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/contractkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"@celo/abis": "11.0.0",
"@celo/abis-12": "npm:@celo/[email protected].60",
"@celo/abis-12": "npm:@celo/[email protected].66",
"@celo/base": "^7.0.0-beta.0",
"@celo/connect": "^6.1.0-beta.1",
"@celo/utils": "^8.0.0-beta.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/contractkit/src/wrappers/Accounts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ export class AccountsWrapper extends BaseWrapper<Accounts> {
setPaymentDelegation = proxySend(this.connection, this.contract.methods.setPaymentDelegation)

/**
* Remove a validator's payment delegation by setting benficiary and
* Remove a validator's payment delegation by setting beneficiary and
* fraction to 0.
*/
deletePaymentDelegation = proxySend(
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/explorer/fixtures/contract.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -2546,7 +2546,7 @@
"notice": "Creates an account."
},
"deletePaymentDelegation()": {
"notice": "Removes a validator's payment delegation by setting benficiary and fraction to 0."
"notice": "Removes a validator's payment delegation by setting beneficiary and fraction to 0."
},
"getAttestationSigner(address)": {
"notice": "Returns the attestation signer for the specified account."
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/governance/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"dependencies": {
"@celo/abis": "11.0.0",
"@celo/abis-12": "npm:@celo/[email protected].60",
"@celo/abis-12": "npm:@celo/[email protected].66",
"@celo/base": "^7.0.0-beta.0",
"@celo/connect": "^6.1.0-beta.1",
"@celo/contractkit": "^9.0.0-beta.2",
Expand Down
22 changes: 11 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1631,10 +1631,10 @@ __metadata:
languageName: node
linkType: hard

"@celo/abis-12@npm:@celo/[email protected].60":
version: 12.0.0-canary.60
resolution: "@celo/abis@npm:12.0.0-canary.60"
checksum: 605aa68b6d7e2cd43b6a0d8115a44e3ace8416c49401c6559f173461c873ce2a8a1867c0a5dab5be05549f6a7e1d2249c57506a4633643a90694c0a011cf638d
"@celo/abis-12@npm:@celo/[email protected].66":
version: 12.0.0-canary.66
resolution: "@celo/abis@npm:12.0.0-canary.66"
checksum: 71f85edda338c651e214e77d983a9fb644cdc2f5bb0fe6bc471d73e3a8f87256dc4dc6e966e79d7b239fd5729d4862606c384a8f601e030829111e32b0824279
languageName: node
linkType: hard

Expand Down Expand Up @@ -1835,7 +1835,7 @@ __metadata:
resolution: "@celo/contractkit@workspace:packages/sdk/contractkit"
dependencies:
"@celo/abis": "npm:11.0.0"
"@celo/abis-12": "npm:@celo/[email protected].60"
"@celo/abis-12": "npm:@celo/[email protected].66"
"@celo/base": "npm:^7.0.0-beta.0"
"@celo/celo-devchain": "npm:^7.0.0"
"@celo/connect": "npm:^6.1.0-beta.1"
Expand Down Expand Up @@ -1888,7 +1888,7 @@ __metadata:
dependencies:
"@celo/abis": "npm:^11.0.0"
"@celo/connect": "npm:^6.1.0-beta.1"
"@celo/devchain-anvil": "npm:12.0.0-canary.33"
"@celo/devchain-anvil": "npm:12.0.0-canary.39"
"@celo/typescript": "workspace:^"
"@tsconfig/recommended": "npm:^1.0.3"
"@types/fs-extra": "npm:^8.1.0"
Expand All @@ -1904,10 +1904,10 @@ __metadata:
languageName: unknown
linkType: soft

"@celo/devchain-anvil@npm:12.0.0-canary.33":
version: 12.0.0-canary.33
resolution: "@celo/devchain-anvil@npm:12.0.0-canary.33"
checksum: 010b061f3c43b959f201b7aaf56e0d8c1d7558d341e4b5f905a1d445cefc8f8acc1f667d536aa2de40f7f1d850d5af611184e9740c31ff32a8c76266946834f3
"@celo/devchain-anvil@npm:12.0.0-canary.39":
version: 12.0.0-canary.39
resolution: "@celo/devchain-anvil@npm:12.0.0-canary.39"
checksum: 12e04bd2bb81acf43987b390e9ffe329445d72299651509a02f4a20dda86041910f167f59e2203c11e0633b02b668d50ef78c0866904193662f95127616e55be
languageName: node
linkType: hard

Expand Down Expand Up @@ -1935,7 +1935,7 @@ __metadata:
resolution: "@celo/governance@workspace:packages/sdk/governance"
dependencies:
"@celo/abis": "npm:11.0.0"
"@celo/abis-12": "npm:@celo/[email protected].60"
"@celo/abis-12": "npm:@celo/[email protected].66"
"@celo/base": "npm:^7.0.0-beta.0"
"@celo/connect": "npm:^6.1.0-beta.1"
"@celo/contractkit": "npm:^9.0.0-beta.2"
Expand Down

0 comments on commit 92ebedb

Please sign in to comment.