UdjinM6
6af7a58d92
Merge remote-tracking branch 'bitcoin/0.12' into mergebtc12, fix/dashify
...
NOTE: .travis.yml was mostly preserved, probably needs additional attention
2016-08-26 04:09:20 +03:00
UdjinM6
48d0edcbdf
Merge remote-tracking branch 'bitpay/0.12.1-bitcore' into dashBitcore1
...
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
2016-07-19 08:49:28 +03:00
BtcDrak
ac5577b512
Rename OP_NOP3 to OP_CHECKSEQUENCEVERIFY
2016-07-08 11:44:16 +01:00
Braydon Fuller
9babc7ff9f
main: start of address index
...
Adds a configuration option for addressindex to search for txids by address. Includes
an additional rpc method for getting the txids for an address.
2016-06-02 12:15:13 -04:00
UdjinM6
a5ac60b868
Merge remote-tracking branch 'bitcoin/0.12' into HEAD
...
+ merge fixes
+ keepass on evhttp
2016-02-06 16:48:04 +03:00
mb300sd
605de4a88a
Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY.
...
Github-Pull: #7213
Rebased-From: 37d271d7cce44885f835292ffe99b54399b014d6
2016-01-13 21:25:36 +00:00
MarcoFalke
333e1eaeea
Bump copyright headers to 2015
...
- Bump copyright headers to 2015
- [devtools] Rewrite fix-copyright-headers.py
- [devtools] Use git pretty-format for year parsing
Github-Pull: #7205
Rebased-From: fa6ad855e9159b2247da4fa0054f32fa181499ab fa24439ff3d8ab5b9efaf66ef4dae6713b88cb35 fa71669452e57039e4270fd2b33a0e0e1635b813
2016-01-05 14:13:33 +01:00
Pieter Wuille
114b5812f6
Prevector type
2015-11-13 18:15:20 +01:00
David Hill
b48da5c189
script: Remove magic numbers
...
This adds two new constants, MAX_OPS_PER_SCRIPT and
MAX_PUBKEYS_PER_MULTISIG.
2015-10-15 09:48:15 -04:00
Peter Todd
da894ab5da
Accept any sequence of PUSHDATAs in OP_RETURN outputs
...
Previously only one PUSHDATA was allowed, needlessly limiting
applications such as matching OP_RETURN contents with bloom filters that
operate on a per-PUSHDATA level. Now any combination that passes
IsPushOnly() is allowed, so long as the total size of the scriptPubKey
is less than 42 bytes. (unchanged modulo non-minimal PUSHDATA encodings)
Also, this fixes the odd bug where previously the PUSHDATA could be
replaced by any single opcode, even sigops consuming opcodes such as
CHECKMULTISIG. (20 sigops!)
2015-10-01 18:28:13 +02:00
Peter Todd
5d8709c3b7
Add IsPushOnly(const_iterator pc)
...
Allows IsPushOnly() to be applied to just part of the script for
OP_RETURN outputs.
2015-10-01 18:28:11 +02:00
mruddy
af3208bfa6
Resolve issue 3166.
...
These changes decode valid SIGHASH types on signatures in assembly (asm) representations of scriptSig scripts.
This squashed commit incorporates substantial helpful feedback from jtimon, laanwj, and sipa.
2015-07-30 19:56:00 -04:00
Pieter Wuille
9e38d0f745
Separate core memory usage computation in core_memusage.h
2015-07-20 11:17:53 -04:00
Evan Duffield
304ab6c7ab
Various improvements to the proposal system
...
- Proposal scripts are now checked correctly
- Fee transactions are created correctly for IX and non-IX types
2015-07-12 14:02:39 -07:00
Pieter Wuille
5098c47b24
Implement accurate memory accounting for mempool
2015-07-10 10:49:31 -04:00
UdjinM6
64eebc3316
0.12 dirty merge'n'fix (bitcoin 0.10)
2015-04-04 19:24:37 +03:00
sandakersmann
f914f1a746
Added "Core" to copyright headers
...
Github-Pull: #5494
Rebased-From: 15de949bb9277e442302bdd8dee299a8d6deee60
2014-12-19 19:55:32 +01:00
Pieter Wuille
698c6abb25
Add SCRIPT_VERIFY_MINIMALDATA (BIP62 rules 3 and 4)
...
Also use the new flag as a standard rule, and replace the IsCanonicalPush
standardness check with it (as it is more complete).
2014-10-25 03:03:20 -07:00
Pieter Wuille
d752ba86c1
Add SCRIPT_VERIFY_SIGPUSHONLY (BIP62 rule 2)
2014-10-25 03:03:16 -07:00
Cory Fields
85c579e3a6
script: add a slew of includes all around and drop includes from script.h
...
Lots of files ended up with indirect includes from script.h.
2014-10-17 13:44:57 -04:00
Cory Fields
db8eb54bd7
script: move ToString and ValueString out of the header
2014-10-17 13:44:14 -04:00
Pieter Wuille
0be990ba34
Move CTxDestination from script/script to script/standard
2014-09-16 19:14:32 +02:00
Philip Kaufmann
2d79bba36b
cleanup new script files (no code changes)
...
- add missing header end comments
- ensure alphabetical ordering
- update copyright year and license
2014-09-14 12:25:38 +02:00
jtimon
cbd22a50c4
Move CScript class and dependencies to script/script
2014-09-08 20:19:31 +02:00