Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Governance ContractKit + CLI changes #2139

Merged
merged 95 commits into from
Dec 23, 2019

Conversation

nambrot
Copy link
Contributor

@nambrot nambrot commented Dec 10, 2019

Description

This is all @yorhodes 's work to make governance proposals and hotfixes work in contractkit + CLI, just updated to master

Copy link
Contributor

@jmrossy jmrossy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The /mobile and /utils changes lgtm
Looks like tests are failing though.

const proposal = await buildProposalFromJsonFile(this.kit, res.flags.jsonTransactions)
const tx = governance.propose(proposal)
await displaySendTx('proposeTx', tx, { from: res.flags.from, value: res.flags.deposit })
const proposalID = await tx.txo.call()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this work?
you first "send the tx" and after that make the same call. But will it result on the same proposalID?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

definitely not
opened #2335

@codecov
Copy link

codecov bot commented Dec 23, 2019

Codecov Report

Merging #2139 into master will decrease coverage by <.01%.
The diff coverage is 80%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2139      +/-   ##
==========================================
- Coverage   74.67%   74.66%   -0.01%     
==========================================
  Files         274      274              
  Lines        7731     7732       +1     
  Branches      700      701       +1     
==========================================
  Hits         5773     5773              
- Misses       1846     1847       +1     
  Partials      112      112
Flag Coverage Δ
#mobile 74.66% <80%> (-0.01%) ⬇️
Impacted Files Coverage Δ
packages/mobile/src/import/saga.ts 84.44% <100%> (ø) ⬆️
packages/mobile/src/invite/saga.ts 72.43% <100%> (ø) ⬆️
packages/mobile/src/verify/VerificationCodeRow.tsx 76.66% <100%> (ø) ⬆️
packages/mobile/src/escrow/saga.ts 21.47% <50%> (ø) ⬆️
packages/mobile/src/identity/commentKey.ts 35.71% <50%> (-2.75%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f782851...d866c8b. Read the comment docs.

@yorhodes yorhodes added the automerge Have PR merge automatically when checks pass label Dec 23, 2019
@celo-ci-bot-user celo-ci-bot-user merged commit 8fd486d into master Dec 23, 2019
@yorhodes yorhodes deleted the nambrot/contract-upgrades-cli branch December 23, 2019 23:40
aaronmgdr added a commit that referenced this pull request Jan 2, 2020
* master: (26 commits)
  Added new lint rule (#2349)
  [Slashing] Slash locked gold (#2317)
  [Slashing] Allow voting gold to be slashable (#2302)
  1666 precompiles assembly rewrite (#2324)
  Small fixes to deploy web (#2343)
  Governance, downtime and double signing slasher contracts (#2267)
  Added daily limit for reserve spending (#2303)
  Fixing multisig tests (#2342)
  [Wallet] Implement new send & import flow (#2332)
  Limechain/16xx (#1982)
  Add infinite pagination to Leaderboard (#2339)
  cli: Add rewards:show (#2160)
  Correct broken link formatting
  Celotool command for deploying hotfixes (#2142)
  Governance ContractKit + CLI changes (#2139)
  Complete codependent slashing precompile PRs (#2333)
  Add new and modified precompiles to UsingPrecompiles.sol (#2318)
  Adding error messages to contracts (#1182)
  Upgrade i18next and react-i18next to latest across monorepo (#2311)
  [Wallet] Fix exchange input on iOS and feed item display (#2319)
  ...

# Conflicts:
#	yarn.lock
aaronmgdr added a commit that referenced this pull request Jan 2, 2020
* master: (35 commits)
  Remove rep sentence from brand kit page (#2350)
  Added new lint rule (#2349)
  [Slashing] Slash locked gold (#2317)
  [Slashing] Allow voting gold to be slashable (#2302)
  1666 precompiles assembly rewrite (#2324)
  Small fixes to deploy web (#2343)
  Governance, downtime and double signing slasher contracts (#2267)
  Added daily limit for reserve spending (#2303)
  Fixing multisig tests (#2342)
  [Wallet] Implement new send & import flow (#2332)
  Limechain/16xx (#1982)
  Add infinite pagination to Leaderboard (#2339)
  cli: Add rewards:show (#2160)
  Correct broken link formatting
  Celotool command for deploying hotfixes (#2142)
  Governance ContractKit + CLI changes (#2139)
  Complete codependent slashing precompile PRs (#2333)
  Add new and modified precompiles to UsingPrecompiles.sol (#2318)
  Adding error messages to contracts (#1182)
  Upgrade i18next and react-i18next to latest across monorepo (#2311)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Have PR merge automatically when checks pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants