Skip to content

Conversation

@UdjinM6
Copy link

@UdjinM6 UdjinM6 commented Jul 19, 2016

  • Resolved conflicts:
    .travis.yml (ignoring changes, keeping dash version)
    src/Makefile.am
    src/main.cpp
    src/main.h
    src/rpcclient.cpp
    src/rpcserver.cpp
    src/script/script.cpp
    src/script/script.h
  • Fixed tests:
    qa/rpc-tests/addressindex.py
    qa/rpc-tests/spentindex.py
    qa/rpc-tests/txtindex.py
    src/test/script_P2PKH_tests.cpp

Braydon Fuller and others added 30 commits June 2, 2016 11:52
Adds a configuration option for addressindex to search for txids by address. Includes
an additional rpc method for getting the txids for an address.
fixes a sorting issue when iterating over keys
It's only necessary to sort when combining results for several addresses
as the results are already in order from the database.
There was a bug where the spending address index could have the same key
as the receiving address index if the input and output indexes matched. This lead
to the output always overwriting the input index leading to incorrect balances
with missing spent amounts. This patch separates the two so that they have unique
keys so balances will be correctly calculated.
Braydon Fuller and others added 20 commits June 2, 2016 12:15
There was an issue where getblockhashes wouldn't work from bitcoin-cli
as the two params would be strings instead of integers. This fixes that
issue, and will parse the first param as JSON for other addressindex
related rpc methods.
for the purposes of secondary sorting by block order
fixes a minor bug where iteration would not end when there are matching
hashes for a p2sh and p2pkh address, and would return results for
both addresses
fixes a bug that would happen when an output would match an input with
the same address and index, and would lead to the outputs not appearing
in results.
rpc: add input confirmations to getrawtransaction
main: do not log error when spent info not found
Revert "rpc: add input confirmations to getrawtransaction"
Resolved Conflicts:
	.travis.yml (ignoring changes, leaving dash version)
	src/Makefile.am
	src/main.cpp
	src/main.h
	src/rpcclient.cpp
	src/rpcserver.cpp
	src/script/script.cpp
	src/script/script.h
@schinzelh
Copy link

Maybe we need a compiler switch (like DISABLE_WALLET) to guard these features

{ "blockchain", "gettxoutsetinfo", &gettxoutsetinfo, true },
{ "blockchain", "verifychain", &verifychain, true },
{ "blockchain", "invalidateblock", &invalidateblock, true },
{ "blockchain", "reconsiderblock", &reconsiderblock, true },

Choose a reason for hiding this comment

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

I guess you don't wont to remove these

Copy link
Author

Choose a reason for hiding this comment

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

We somehow missed bitcoin@5ebe095 so I resolved it this way.

@schinzelh
Copy link

Is this still WIP?

@UdjinM6 UdjinM6 changed the title WIP Merge Bitpay's version of Bitcoin Core (additional indexes) Merge Bitpay's version of Bitcoin Core (additional indexes) Jul 29, 2016
@UdjinM6
Copy link
Author

UdjinM6 commented Jul 29, 2016

Changed title ;)

This merge is kind of huge so I still would like to hear any comments and/or (ut/n)ACKs from @evan82 though.

@schinzelh
Copy link

Yep, i agree - waiting for comments and/or (ut/n)ACKs from @evan82 :)

@eduffield222
Copy link

This is insanely useful and built entirely separate from core... merged 👍

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.

8 participants