Skip to content

Commit

Permalink
Upgrade for Core Release 11 compat (#171)
Browse files Browse the repository at this point in the history
* lets take this to 11

* as of cr11 minimum version is met

* upgrade celo devchain + tests for cr11

* docs and run ci MORE
  • Loading branch information
aaronmgdr authored Mar 6, 2024
1 parent beffcbc commit fb7877a
Show file tree
Hide file tree
Showing 27 changed files with 103 additions and 113 deletions.
9 changes: 9 additions & 0 deletions .changeset/blue-coins-call.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@celo/contractkit': minor
'@celo/governance': minor
'@celo/celocli': minor
---

Support for Core Contracts Release 11 (upgrade @celo/abis)

see https://github.com/celo-org/celo-monorepo/releases/tag/core-contracts.v11
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- changeset-release/master
- prerelease/*
pull_request:
types: [opened, reopened]
types: [opened, reopened, synchronize, edited, ready_for_review]

concurrency:
group: dev-tooling-${{ github.ref }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,4 @@ package.json-e

# Ignore generated credentials from google-github-actions/auth
gha-creds-*.json
transactions.json
4 changes: 2 additions & 2 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"test": "TZ=UTC yarn jest --runInBand"
},
"dependencies": {
"@celo/abis": "10.0.0",
"@celo/abis": "11.0.0",
"@celo/base": "^6.0.0",
"@celo/compliance": "~1.0.17",
"@celo/connect": "^5.2.0",
Expand Down Expand Up @@ -73,7 +73,7 @@
"web3-utils": "^1.10.0"
},
"devDependencies": {
"@celo/celo-devchain": "^6.0.3",
"@celo/celo-devchain": "^7.0.0",
"@celo/dev-utils": "0.0.1-beta.1",
"@celo/typescript": "workspace:^",
"@types/debug": "^4.1.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ exports[`network:contracts runs 1`] = `
"contract": "GasPriceMinimum",
"proxy": "0x038F9B392Fb9A9676DbAddF78EA5fdbf6C7d9710",
"implementation": "0x371b13d97f4bF77d724E78c16B7dC74099f40e84",
"version": "1.2.0.0",
"version": "1.2.0.1",
"CELO": "0",
"cUSD": "0",
"cEUR": "0",
Expand All @@ -148,7 +148,7 @@ exports[`network:contracts runs 1`] = `
"contract": "Governance",
"proxy": "0x82E9A894F6b752E5c1058ea69898Ff5D3EBA3939",
"implementation": "0xc98E260cBF7041cc2C42D7e055fb4350DF22dd68",
"version": "1.4.0.0",
"version": "1.4.1.0",
"CELO": "0",
"cUSD": "0",
"cEUR": "0",
Expand All @@ -158,7 +158,7 @@ exports[`network:contracts runs 1`] = `
"contract": "LockedGold",
"proxy": "0x4A86aD5f263260f24483Df2B1B3a23ea4788B6AB",
"implementation": "0x0221652D4306F6b3CB7B23E43C3e25D8F9a142Ca",
"version": "1.1.3.0",
"version": "1.1.4.0",
"CELO": "0",
"cUSD": "0",
"cEUR": "0",
Expand Down Expand Up @@ -218,7 +218,7 @@ exports[`network:contracts runs 1`] = `
"contract": "SortedOracles",
"proxy": "0x4D3d5c850Dd5bD9D6F4AdDA3DD039a3C8054CA29",
"implementation": "0xA31E64EA55B9B6Bbb9d6A676738e9A5b23149f84",
"version": "1.1.2.2",
"version": "1.1.3.0",
"CELO": "0",
"cUSD": "0",
"cEUR": "0",
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/test-utils/setup.global.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import * as path from 'path'
export default async function globalSetup() {
console.log('\nstarting ganache...')
const chainDataPath = path.join(path.dirname(require.resolve('@celo/celo-devchain')), '../chains')
// v10 refers to core contract release 10
await baseSetup(path.resolve(chainDataPath), 'v10.tar.gz', {
// v X refers to core contract release X
await baseSetup(path.resolve(chainDataPath), 'v11.tar.gz', {
from_targz: true,
})
console.log('\n ganache started...')
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/command-line-interface/exchange.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ _See code: [src/commands/exchange/reals.ts](https://github.com/celo-org/develope

## `celocli exchange:show`

Show the current exchange rates offered by the Exchange
Show the current exchange rates offered by the Broker

```
USAGE
Expand All @@ -180,7 +180,7 @@ FLAGS
--globalHelp View all available global flags
DESCRIPTION
Show the current exchange rates offered by the Exchange
Show the current exchange rates offered by the Broker
EXAMPLES
list
Expand Down
7 changes: 4 additions & 3 deletions packages/docs/command-line-interface/governance.md
Original file line number Diff line number Diff line change
Expand Up @@ -238,16 +238,16 @@ Submit a governance proposal
```
USAGE
$ celocli governance:propose --jsonTransactions <value> --deposit <value> --from
<value> --descriptionURL <value> [--globalHelp] [--force] [--afterExecutingProposal
<value> | --afterExecutingID <value>]
<value> --descriptionURL <value> [--globalHelp] [--force] [--noInfo]
[--afterExecutingProposal <value> | --afterExecutingID <value>]
FLAGS
--afterExecutingID=<value> Governance proposal identifier
which will be executed prior to
proposal
--afterExecutingProposal=<value> Path to proposal which will be
executed prior to proposal
--deposit=<value> (required) Amount of Gold to attach
--deposit=<value> (required) Amount of Celo to attach
to proposal
--descriptionURL=<value> (required) A URL where further
information about the proposal can
Expand All @@ -257,6 +257,7 @@ FLAGS
--globalHelp View all available global flags
--jsonTransactions=<value> (required) Path to json
transactions
--noInfo Skip printing the proposal info
DESCRIPTION
Submit a governance proposal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ ___

### methodIds

**methodIds**: `Record`\<``"gasPriceMinimum"`` \| ``"targetDensity"`` \| ``"adjustmentSpeed"`` \| ``"initialized"`` \| ``"owner"`` \| ``"registry"`` \| ``"renounceOwnership"`` \| ``"setRegistry"`` \| ``"transferOwnership"`` \| ``"getVersionNumber"`` \| ``"initialize"`` \| ``"baseFeeOpCodeActivationBlock"`` \| ``"deprecated_gasPriceMinimum"`` \| ``"gasPriceMinimumFloor"`` \| ``"setAdjustmentSpeed"`` \| ``"setTargetDensity"`` \| ``"setGasPriceMinimumFloor"`` \| ``"setBaseFeeOpCodeActivationBlock"`` \| ``"getGasPriceMinimum"`` \| ``"updateGasPriceMinimum"`` \| ``"getUpdatedGasPriceMinimum"``, `string`\>
**methodIds**: `Record`\<``"gasPriceMinimum"`` \| ``"targetDensity"`` \| ``"adjustmentSpeed"`` \| ``"initialized"`` \| ``"owner"`` \| ``"registry"`` \| ``"renounceOwnership"`` \| ``"setRegistry"`` \| ``"transferOwnership"`` \| ``"getVersionNumber"`` \| ``"initialize"`` \| ``"ABSOLUTE_MINIMAL_GAS_PRICE"`` \| ``"baseFeeOpCodeActivationBlock"`` \| ``"deprecated_gasPriceMinimum"`` \| ``"gasPriceMinimumFloor"`` \| ``"setAdjustmentSpeed"`` \| ``"setTargetDensity"`` \| ``"setGasPriceMinimumFloor"`` \| ``"setBaseFeeOpCodeActivationBlock"`` \| ``"getGasPriceMinimum"`` \| ``"updateGasPriceMinimum"`` \| ``"getUpdatedGasPriceMinimum"``, `string`\>

#### Inherited from

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,7 @@ ___

### methodIds

• **methodIds**: `Record`\<``"propose"`` \| ``"executeHotfix"`` \| ``"concurrentProposals"`` \| ``"dequeueFrequency"`` \| ``"minDeposit"`` \| ``"queueExpiry"`` \| ``"stageDurations"`` \| ``"upvote"`` \| ``"refundedDeposits"`` \| ``"approver"`` \| ``"checkProofOfPossession"`` \| ``"dequeued"`` \| ``"emptyIndices"`` \| ``"fractionMulExp"`` \| ``"getBlockNumberFromHeader"`` \| ``"getEpochNumber"`` \| ``"getEpochNumberOfBlock"`` \| ``"getEpochSize"`` \| ``"getParentSealBitmap"`` \| ``"getVerifiedSealBitmapFromHeader"`` \| ``"hashHeader"`` \| ``"hotfixes"`` \| ``"initialized"`` \| ``"isOwner"`` \| ``"lastDequeue"`` \| ``"minQuorumSize"`` \| ``"minQuorumSizeInCurrentSet"`` \| ``"numberValidatorsInCurrentSet"`` \| ``"numberValidatorsInSet"`` \| ``"owner"`` \| ``"proposalCount"`` \| ``"registry"`` \| ``"renounceOwnership"`` \| ``"setRegistry"`` \| ``"transferOwnership"`` \| ``"validatorSignerAddressFromCurrentSet"`` \| ``"validatorSignerAddressFromSet"`` \| ``"getVersionNumber"`` \| ``"initialize"`` \| ``"setApprover"`` \| ``"setConcurrentProposals"`` \| ``"setMinDeposit"`` \| ``"setQueueExpiry"`` \| ``"setDequeueFrequency"`` \| ``"setReferendumStageDuration"`` \| ``"setExecutionStageDuration"`` \| ``"setParticipationBaseline"`` \| ``"setParticipationFloor"`` \| ``"setBaselineUpdateFactor"`` \| ``"setBaselineQuorumFactor"`` \| ``"setConstitution"`` \| ``"getProposalStage"`` \| ``"revokeUpvote"`` \| ``"approve"`` \| ``"vote"`` \| ``"votePartially"`` \| ``"revokeVotes"`` \| ``"execute"`` \| ``"approveHotfix"`` \| ``"isHotfixWhitelistedBy"`` \| ``"whitelistHotfix"`` \| ``"prepareHotfix"`` \| ``"withdraw"`` \| ``"isVoting"`` \| ``"getReferendumStageDuration"`` \| ``"getExecutionStageDuration"`` \| ``"getParticipationParameters"`` \| ``"proposalExists"`` \| ``"getProposal"`` \| ``"getProposalTransaction"`` \| ``"isApproved"`` \| ``"getVoteTotals"`` \| ``"getVoteRecord"`` \| ``"getQueueLength"`` \| ``"getUpvotes"`` \| ``"getQueue"`` \| ``"getDequeue"`` \| ``"getUpvoteRecord"`` \| ``"getMostRecentReferendumProposal"`` \| ``"hotfixWhitelistValidatorTally"`` \| ``"isHotfixPassing"`` \| ``"getHotfixRecord"`` \| ``"dequeueProposalsIfReady"`` \| ``"isQueued"`` \| ``"isProposalPassing"`` \| ``"isDequeuedProposal"`` \| ``"isDequeuedProposalExpired"`` \| ``"isQueuedProposalExpired"`` \| ``"getConstitution"`` \| ``"getAmountOfGoldUsedForVoting"`` \| ``"removeVotesWhenRevokingDelegatedVotes"``, `string`\>
• **methodIds**: `Record`\<``"propose"`` \| ``"executeHotfix"`` \| ``"concurrentProposals"`` \| ``"dequeueFrequency"`` \| ``"minDeposit"`` \| ``"queueExpiry"`` \| ``"stageDurations"`` \| ``"upvote"`` \| ``"refundedDeposits"`` \| ``"approver"`` \| ``"checkProofOfPossession"`` \| ``"dequeued"`` \| ``"emptyIndices"`` \| ``"fractionMulExp"`` \| ``"getBlockNumberFromHeader"`` \| ``"getEpochNumber"`` \| ``"getEpochNumberOfBlock"`` \| ``"getEpochSize"`` \| ``"getParentSealBitmap"`` \| ``"getVerifiedSealBitmapFromHeader"`` \| ``"hashHeader"`` \| ``"hotfixes"`` \| ``"initialized"`` \| ``"isOwner"`` \| ``"lastDequeue"`` \| ``"minQuorumSize"`` \| ``"minQuorumSizeInCurrentSet"`` \| ``"numberValidatorsInCurrentSet"`` \| ``"numberValidatorsInSet"`` \| ``"owner"`` \| ``"proposalCount"`` \| ``"registry"`` \| ``"renounceOwnership"`` \| ``"setRegistry"`` \| ``"transferOwnership"`` \| ``"validatorSignerAddressFromCurrentSet"`` \| ``"validatorSignerAddressFromSet"`` \| ``"getVersionNumber"`` \| ``"initialize"`` \| ``"setApprover"`` \| ``"setConcurrentProposals"`` \| ``"setMinDeposit"`` \| ``"setQueueExpiry"`` \| ``"setDequeueFrequency"`` \| ``"setReferendumStageDuration"`` \| ``"setExecutionStageDuration"`` \| ``"setParticipationBaseline"`` \| ``"setParticipationFloor"`` \| ``"setBaselineUpdateFactor"`` \| ``"setBaselineQuorumFactor"`` \| ``"setConstitution"`` \| ``"getProposalStage"`` \| ``"revokeUpvote"`` \| ``"approve"`` \| ``"vote"`` \| ``"votePartially"`` \| ``"revokeVotes"`` \| ``"execute"`` \| ``"approveHotfix"`` \| ``"isHotfixWhitelistedBy"`` \| ``"whitelistHotfix"`` \| ``"prepareHotfix"`` \| ``"withdraw"`` \| ``"isVoting"`` \| ``"getReferendumStageDuration"`` \| ``"getExecutionStageDuration"`` \| ``"getParticipationParameters"`` \| ``"proposalExists"`` \| ``"getProposal"`` \| ``"getProposalTransaction"`` \| ``"isApproved"`` \| ``"getVoteTotals"`` \| ``"getVoteRecord"`` \| ``"getQueueLength"`` \| ``"getUpvotes"`` \| ``"getQueue"`` \| ``"getDequeue"`` \| ``"getUpvoteRecord"`` \| ``"getMostRecentReferendumProposal"`` \| ``"hotfixWhitelistValidatorTally"`` \| ``"isHotfixPassing"`` \| ``"getHotfixRecord"`` \| ``"dequeueProposalsIfReady"`` \| ``"isQueued"`` \| ``"isProposalPassing"`` \| ``"isDequeuedProposal"`` \| ``"isDequeuedProposalExpired"`` \| ``"isQueuedProposalExpired"`` \| ``"getConstitution"`` \| ``"getAmountOfGoldUsedForVoting"`` \| ``"removeVotesWhenRevokingDelegatedVotes"`` \| ``"getHotfixHash"``, `string`\>

#### Inherited from

Expand Down
Loading

0 comments on commit fb7877a

Please sign in to comment.