Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in / Register
C
CCS Proposals
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 7
    • Merge Requests 7
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Packages & Registries
    • Packages & Registries
    • Package Registry
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • monero-project
  • CCS Proposals
  • Merge Requests
  • !192

Merged
Opened Dec 05, 2020 by moneromooo-monero@moneromooo-moneroContributor

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://repo.getmonero.org/moneromooo-monero/ccs-proposals.git" "mooo-2020-12"
git checkout -b "moneromooo-monero/ccs-proposals-mooo-2020-12" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "moneromooo-monero/ccs-proposals-mooo-2020-12"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

More moneromooo work on monero

  • Overview 2
  • Commits 1
  • Changes 1

Hi,

After a hiatus, I'm back for more monero work.

This will be part time again, and with a main goal of working on mitigations for various attempts at abusing the network (which I've started working on already in the last couple weeks or so) including PoW on connect. Possibly also helping sarang plug his implementation of Bulletproofs++ into Monero consensus, if he does not do it himself. And the usual bits and bobs as always.

Here's the link to my previous CCS: !103 (merged)

With the usual rate of $30 + 0.2 monero per hour, and monero at $130 currently, we get 225 monero for three months (which will be more than three calendar months, since part time, how much more depends on how I divide my time between monero and other things). As before, I'll post monthly updates regardless of how much time I actually spent on Monero that month.

Thanks

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: monero-project/ccs-proposals!192
Source branch: mooo-2020-12

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.