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

moved version number inside the transaction object #518

Merged
merged 8 commits into from Aug 5, 2016

Conversation

eladve
Copy link
Contributor

@eladve eladve commented Aug 3, 2016

As per #341

moved the transaction version (currently fixed to 1) from the outer
"transaction" object to the inside part, where it will get hashed
together with the rest of the transaction.

updated docs and tests accordingly.

Note that this feature might cause backwards incompatibility.

eladve and others added 8 commits August 3, 2016 06:18
moved the transaction version (currently fixed to 1.0) from the outer
"transaction" object to the inside part, where it will get hashed
together with the rest of the transaction.

updated docs accordingly.
moved transaction version inside the tx object that gets hashed
moved version to be inside the transaction
@codecov-io
Copy link

Current coverage is 91.56% (diff: 100%)

Merging #518 into master will not change coverage

@@             master       #518   diff @@
==========================================
  Files            20         20          
  Lines          1245       1245          
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
  Hits           1140       1140          
  Misses          105        105          
  Partials          0          0          

Sunburst

Powered by Codecov. Last update ff042b5...c895088

@ttmc
Copy link
Contributor

ttmc commented Aug 4, 2016

Hi @eladve

Before we can merge this pull request, which may contain your intellectual property in the form of copyright or patents, our lawyers say we need you or your organization to agree to one of our contributor agreements. If you are contributing on behalf of yourself (and not on behalf of your employer or another organization you are part of) then you should:

  1. Go to: https://www.bigchaindb.com/cla/
  2. Read the Individual Contributor Agreement
  3. Fill in the form "For Individuals"
  4. Check the box to agree
  5. Click the SEND button

If you're contributing as an employee, and/or you want all employees of your employing organization to be covered by our contributor agreement, then someone in your organization with the authority to enter agreements on behalf of all employees must do the following:

  1. Go to: https://www.bigchaindb.com/cla/
  2. Read the Entity Contributor Agreement
  3. Fill in the form "For Organizations”
  4. Check the box to agree
  5. Click the SEND button

We will email you (or your employer) with further instructions.

P.S. We generally don't make changes to the master branch directly. For details, see https://github.com/bigchaindb/bigchaindb/blob/master/CONTRIBUTING.md

@eladve
Copy link
Contributor Author

eladve commented Aug 4, 2016

@ttmc Perfect, I signed the CLI.

Should I do anything about pushing to the sub-branch? That's what I thought I was doing, but I'm used to Mercurial.

@ttmc
Copy link
Contributor

ttmc commented Aug 4, 2016

There's nothing that can be done about the branch (eladve:master) that this pull request requests to be merged into bigchaindb:master. In future pull requests, you can create a new branch on your local machine, rather than committing direct to master.

@vrde
Copy link
Contributor

vrde commented Aug 5, 2016

@eladve thanks for your PR! Looks good to me.

@diminator
Copy link
Contributor

looks good to me!
👍

@vrde vrde merged commit c895088 into bigchaindb:master Aug 5, 2016
@eladve
Copy link
Contributor Author

eladve commented Aug 5, 2016

This is to confirm that I agreed to and accepted the BigchainDB Individual Contributor Agreement at https://www.bigchaindb.com/cla/ and to represent and warrant that I have authority to do so.

Iy1GPDhX8uRi52pLjeurHqyzNJX0l7wxcjE4P2wFRDlKfpWZodk5MGilgpqXSAr

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants