Merge Release 1 back into master #5328
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
upgrade next.js (and by extention serialize-javascript) to latest version some ts warnings/ errors on both web and reserver * ran `yarn dev`, `yarn build` (ts compile), `next build`, opened locally and deployed to staging fixes #4675 _Brief explanation of why these changes are/are not backwards compatible._
### Description Add yarn resolution for `bl` because of security vulnerability See https://www.npmjs.com/advisories/1555 ### Other changes None ### Tested Waiting for test to pass on CircleCI. ### Related issues Discussed on Slack ### Backwards compatibility Not entirely sure since there was some packages depending on different major versions of `bl`: - `^1.0.0` - `^3.0.0` - `^4.0.0`
#4958) * ozaudit [L05] Interfaces are missing functions present in their implementations * Mock contracts can't extend interface if not fully implemented * getVersionNumber is only in ICeloVersionedContract interface
* Open 5048 for deleteElement lib * Open 5049 for UsingRegistry initialize * Open 5050 for target gold > 15 years * Open 5051 for revoke approval investigation * Open 5052 for parameter minimums * Open 5053 for upvote edge case * Open 5054 for attestations view calls * Open 5055 for linked list optimization * Open 5056 for governance proposal vote total optimization * Open 5057 for governance proposal execution and meta transaction standardization * Open 5059 for linkedlist isvaluebetween optimization * Open 5068 for linked list value update optimization * Open 5069 for empty indices optimization * Open 5070 for governance index out of bounds
#4914) * Clarify sender on BitmapSetForInterval event * Fix event test
* Require result value and add revert messages * Fix build error * Simplify stabletoken registry optimization
* Add revert messages to all require statements * Bump contract versions
* Remove extraneous imports from SortedOracles * Remove extraneous imports from Attestations * Remove extraneous imports from ReleaseGold * Remove extraneous imports from Validators
…for all contracts (#5032) * Pin solc compiler version to 0.5.13 * Bump solc version in certora test
* L16 * testing * [L16] Transfer of CELO may unexpectedly fail
* [L13] Not using the SafeMath library * Fix ++ typo * Add versioning * Fix inheritance graph * Further fix rebase
* L06: Lack of Validation * Update verions GoldToken/EpochRewards * EpochRewards carbon offsetting partner CAN be addr(0) * take out no-op checks
* L10: Missing Docstrings * address PR review
* MetaTransactionWallet upgrades M03: Check for unused data in executeTransactions data param index events emit event when receiving ether * fix linting issues * [L12] MetaTransactionWallet does not return transactions outputs * Address PR comments * linting and cleanup * index nonce in MetaTransactionExecution event
… governance" (#4706) into "oz-prerelease" (#5194) * Cherry pick 8a8b822 * Resolve merge conflicts from cherry-pick * Remove double-specification of ICeloVersionedContract Co-authored-by: Asa Oines <[email protected]>
* Remove fixiditylib external version getter and proxy * Change release reference to release 0 * Add FixidityLib to excluded from version check
nambrot
requested review from
aaronmgdr,
asaj,
cmcewen,
nategraf and
timmoreton
as code owners
aaronmgdr
reviewed
Oct 15, 2020
| @@ -724,7 +724,7 @@ exports[`About renders 1`] = ` | |||
| /> | |||
| </audio> | |||
| </div> | |||
|
|
|||
There was a problem hiding this comment.
someday id like to figure out why there are these whitespace changes sometimes on this files
There was a problem hiding this comment.
I think it's my VS Code config that automatically delete trailing whitespace (which we really should have everywhere)
nambrot
changed the title
nambrot
force-pushed
the
nambrot/master-into-release-1
branch
from
7453623 to
511cd08
Compare
nambrot
requested review from
m-chrzan and
yorhodes
and removed request for
jeanregisser,
timmoreton,
mcortesi,
jmrossy,
gastonponti,
cmcewen,
aaitor,
asaj,
nategraf,
i1skn and
tkporter
yorhodes
approved these changes
Oct 15, 2020
| * @notice Returns the storage, major, minor, and patch version of the contract. | ||
| * @return The storage, major, minor, and patch version of the contract. | ||
| */ | ||
| * @notice Returns the storage, major, minor, and patch version of the contract. |
| @@ -37,7 +37,7 @@ const BAKLAVA_FROM = '0x0Cc59Ed03B3e763c02d54D695FFE353055f1502D' | |||
| const BAKLAVASTAGING_FROM = '0x4588ABb84e1BBEFc2BcF4b2296F785fB7AD9F285' | |||
|
|
|||
| // Gas limit is doubled for initial contract deployment. | |||
| const gasLimit = argv.reset ? 20000000 : 10000000 | |||
| const gasLimit = argv.reset ? 20000000 : 12500000 | |||
There was a problem hiding this comment.
this should be 13M right?
There was a problem hiding this comment.
this can be a followup
I think I had to increase this for the deploy to work
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Branch
nambrot/master-into-release-1represents a merge ofmasterintorelease/celo-core-contracts/1. The reason why it is separate is to make obvious the merge conflict resolution that happened since we want a clean merge-commit (instead of the typical squash merge). Thus the recommended sequence is:nambrot/master-into-release-1fromrelease/celo-core-contracts/1masterintonambrot/master-into-release-1without resolving conflictsrelease/celo-core-contracts/1tonambrot/master-into-release-1release/celo-core-contracts/1tomasterListed in #4812
The relevant diff to review becomes https://github.com/celo-org/celo-monorepo/pull/5328/files/a675fd719f7fe5ddd676affd69b263f21508b85f..1907dc071c5bf0fe4aaf1e60653523a4bdae66ed (i.e. the commits after the merge commit)