DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
16,616 Commits 2 Branches 1 Tag
0d8e3988e9bebc871914c2011958761b67d668de
Commit Graph

112 Commits

Author SHA1 Message Date
jl777
e21c70e9a4 Test 2018-04-17 21:26:08 +03:00
jl777
91e76e0cec Test 2018-04-17 21:16:38 +03:00
jl777
dbc800502f Add netinfo fields 2018-04-17 21:14:35 +03:00
jl777
e8fa58ecb5 Default JUMBLR_PAUSE.1 2018-04-17 16:43:03 +03:00
Scott Grayson
0c4f43951e Merge branch 'dev' of https://github.com/jl777/komodo into trunk-merge 
* 'dev' of https://github.com/jl777/komodo: (1062 commits)
  Delay PoW check until connect block
  Declare
  KOMODO_NEWBLOCKS
  Prevent autorewind if syncing. Not a critical update
  Change n0/n1 size to int32_t
  Syntax
  Fix n -> static n0/n1
  Test
  Test
  Test
  KOMODO_LONGESTCHAIN = height;
  Sync main.cpp to jl777
  -print
  -USD/EUR
  readme
  curl fix
  -print
  Fix buffer overflows and reduce KMD men usage
  -print
  Test
  ...
 2018-04-15 21:59:37 -04:00
TheTrunk
8b78a8199e Bitcore port 2018-03-27 13:34:52 +02:00
jl777
9000990c30 Merge remote-tracking branch 'zcash/master' into rebase2 
# Conflicts:
#	.travis.yml
#	Makefile.am
#	README.md
#	configure.ac
#	depends/Makefile
#	depends/builders/darwin.mk
#	depends/funcs.mk
#	depends/hosts/darwin.mk
#	depends/packages/googlemock.mk
#	depends/packages/googletest.mk
#	depends/packages/libsnark.mk
#	depends/packages/libsodium.mk
#	depends/packages/packages.mk
#	depends/packages/rust.mk
#	src/Makefile.am
#	src/Makefile.gtest.include
#	src/chainparams.cpp
#	src/chainparams.h
#	src/checkpoints.h
#	src/clientversion.h
#	src/coins.cpp
#	src/consensus/consensus.h
#	src/gtest/test_mempool.cpp
#	src/httprpc.cpp
#	src/init.cpp
#	src/komodo-tx.cpp
#	src/main.cpp
#	src/miner.cpp
#	src/policy/fees.cpp
#	src/policy/fees.h
#	src/rpcmining.cpp
#	src/rpcrawtransaction.cpp
#	src/rpcserver.cpp
#	src/test/policyestimator_tests.cpp
#	src/test/rpc_wallet_tests.cpp
#	src/test/transaction_tests.cpp
#	src/txdb.cpp
#	src/txmempool.cpp
#	src/wallet/asyncrpcoperation_sendmany.cpp
#	src/wallet/rpcwallet.cpp
#	src/wallet/wallet.cpp
#	src/wallet/wallet.h
#	src/zcash/CreateJoinSplit.cpp
#	zcutil/build.sh
 2018-03-25 18:44:38 +03:00
jl777
e34a9d43fe Fix 2018-02-13 22:42:34 +02:00
jl777
8683bd8d11 Debugging 2018-02-13 21:29:42 +02:00
jl777
eea03b7b5d jumblr_pause and jumblr_resume 
Thanks to @amigo for the feature request
 2017-11-22 10:53:16 +04:00
Jay Graber
337a99a219 Add cli and rpc examples for z_sendmany 2017-11-17 13:17:51 -08:00
Jay Graber
c16528495c s/zcash/Zcash 2017-10-04 17:06:51 -07:00
Bruno Arueira
d2c1e4a807 Removes out bitcoin mention in favor for zcash 
Bitcoin Core => Zcash
bitcoin address => Zcash address
bitcoinaddress => zcashaddress

Closes #1756
 2017-10-04 17:05:30 -07:00
Ross Nicoll
091b2116a0 Rationalize currency unit to "BTC" 
Previously various user-facing strings have used inconsistent currency units "BTC",
"btc" and "bitcoins". This adds a single constant and uses it for each reference to
the currency unit.

Also adds a description of the unit for --maxtxfee, and adds the missing "amount"
field description to the (deprecated) move RPC command.
 2017-08-03 16:32:41 +01:00
jl777
190dbe6d43 Test 2017-07-12 12:56:43 +02:00
jl777
b487a8fe6b Test 2017-07-12 12:50:07 +02:00
jl777
bc035879e9 Test 2017-07-12 12:25:00 +02:00
jl777
eeaaf55488 Jumblr 2017-07-12 12:15:20 +02:00
jl777
945f015d80 Initial merge 2017-03-30 04:35:16 +03:00
jl777
57dd4adae0 Test 2017-03-26 17:50:05 +03:00
jl777
70d8393432 Test 2017-03-26 17:36:57 +03:00
jl777
7ea5a37187 Test 2017-03-26 17:22:49 +03:00
jl777
0cb025c181 Test 2017-03-26 14:26:03 +03:00
jl777
e9c40f1f8f Test 2017-03-26 14:20:04 +03:00
jl777
094b401e3d Test 2017-03-26 14:16:03 +03:00
jl777
43cc3df657 Test 2017-03-26 13:53:22 +03:00
jl777
1e2a41f6c1 Test 2017-03-26 13:35:37 +03:00
jl777
9e1bde7e24 Test 2017-03-26 13:30:23 +03:00
jl777
f1024f06ac Test 2017-03-26 13:25:55 +03:00
jl777
b000fa04a6 Test 2017-03-26 12:53:24 +03:00
Jay Graber
704547965a Change help text examples to use Zcash addresses 2017-03-24 14:52:28 -07:00
zkbot
a7cf698873 Auto merge of #2100 - str4d:2074-rpc, r=arcalinea 
Bitcoin 0.12 RPC PRs 1

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6266
- bitcoin/bitcoin#6257
- bitcoin/bitcoin#6271
- bitcoin/bitcoin#6158
- bitcoin/bitcoin#6307
- bitcoin/bitcoin#6290
- bitcoin/bitcoin#6262
- bitcoin/bitcoin#6088
- bitcoin/bitcoin#6339
- bitcoin/bitcoin#6299 (partial, remainder in #2099)
- bitcoin/bitcoin#6350
- bitcoin/bitcoin#6247
- bitcoin/bitcoin#6362
- bitcoin/bitcoin#5486
- bitcoin/bitcoin#6417
- bitcoin/bitcoin#6398 (partial, remainder was included in #1950)
- bitcoin/bitcoin#6444
- bitcoin/bitcoin#6456 (partial, remainder was included in #2082)
- bitcoin/bitcoin#6380
- bitcoin/bitcoin#6970

Part of #2074.
 2017-03-04 02:57:46 +00:00
Gavin Andresen
abb0e8cced Testing infrastructure: mocktime fixes 
New, undocumented-on-purpose -mocktime=timestamp command-line
argument to startup with mocktime set. Needed because
time-related blockchain sanity checks are done on startup, before a
test has a chance to make a setmocktime RPC call.

And changed the setmocktime RPC call so calling it will not result in
currently connected peers being disconnected due to inactivity timeouts.
 2017-03-03 11:46:59 -08:00
Wladimir J. van der Laan
56215c77d8 Fix crash in validateaddress with -disablewallet 
Fix a null pointer dereference in validateaddress with -disablewallet. Also add a regression testcase.
 2017-03-02 13:26:34 -08:00
dexX7
9c7167d1bc Return all available information via validateaddress 
`"validateaddress"` omits some information, even in cases where is it available.

The primary motivation is to be able to retrieve redeemScripts, after using `"addmultisigaddress"`, when not all keys are available in the keystore, but the redeemScript actually is.

The output of `"validateaddress"` with this commit:

Keys not available:
```js
validateaddress "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3"
{
  "isvalid": true,
  "address": "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3",
  "scriptPubKey": "76a914fa20d564550b105787f7ce3a9ad7fd9a45cd407088ac",
  "ismine": false,
  "iswatchonly": false,
  "isscript": false
}
```
```js
validateaddress "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK"
{
  "isvalid": true,
  "address": "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK",
  "scriptPubKey": "a9146769c19a16c9400b908756e19a4d2afb9e9760e187",
  "ismine": false,
  "iswatchonly": false,
  "isscript": true
}
```

After adding the redeemScript:
```js
addmultisigaddress 2 '["02537357B156A33306A7A014A3748631C59DF405B56F11BA4AA4A3CE81501AF095","02F1FB200390E7864EF4450C07B15988179A57C3CF3A878F668E1070CB615749FE"]'
2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK

validateaddress "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK"
{
  "isvalid": true,
  "address": "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK",
  "scriptPubKey": "a9146769c19a16c9400b908756e19a4d2afb9e9760e187",
  "ismine": false,
  "iswatchonly": false,
  "isscript": true,
  "script": "multisig",
  "hex": "522102537357b156a33306a7a014a3748631c59df405b56f11ba4aa4a3ce81501af0952102f1fb200390e7864ef4450c07b15988179a57c3cf3a878f668e1070cb615749fe52ae",
  "addresses": [
    "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3",
    "mmSKNtbYYHRrhTLKiok5TuYrGEs4Y2A4k6"
  ],
  "sigsrequired": 2,
  "account": ""
}
```

All keys available:
```js
validateaddress "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3"
{
  "isvalid": true,
  "address": "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3",
  "scriptPubKey": "76a914fa20d564550b105787f7ce3a9ad7fd9a45cd407088ac",
  "ismine": true,
  "iswatchonly": false,
  "isscript": false,
  "pubkey": "02537357b156a33306a7a014a3748631c59df405b56f11ba4aa4a3ce81501af095",
  "iscompressed": true,
  "account": ""
}
```
```js
validateaddress "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK"
{
  "isvalid": true,
  "address": "2N2g2H7gjA8a11g1yKBgh5VTqndyvbnWpBK",
  "scriptPubKey": "a9146769c19a16c9400b908756e19a4d2afb9e9760e187",
  "ismine": true,
  "iswatchonly": false,
  "isscript": true,
  "script": "multisig",
  "hex": "522102537357b156a33306a7a014a3748631c59df405b56f11ba4aa4a3ce81501af0952102f1fb200390e7864ef4450c07b15988179a57c3cf3a878f668e1070cb615749fe52ae",
  "addresses": [
    "n4KWZKx349gdMQGgTnZ8W6WfgSwybkGSK3",
    "mmSKNtbYYHRrhTLKiok5TuYrGEs4Y2A4k6"
  ],
  "sigsrequired": 2,
  "account": ""
}
```
 2017-03-02 13:23:03 -08:00
Jonas Schnelli
a10a6e2a0e [Univalue] add univalue over subtree 
similar to secp256k1 include and compile univalue over a subtree
 2017-02-10 02:18:51 +00:00
Jack Grigg
0d37ae3a59 Migrate Zcash-specific code to UniValue 2017-02-10 00:52:57 +00:00
Jonas Schnelli
b47f3aea36 fix missing univalue types during constructing 2017-02-10 00:35:24 +00:00
Jonas Schnelli
d014114d67 Remove JSON Spirit wrapper, remove JSON Spirit leftovers 
- implement find_value() function for UniValue
- replace all Array/Value/Object types with UniValues, remove JSON Spirit to UniValue wrapper
- remove JSON Spirit sources
 2017-02-10 00:35:24 +00:00
Jonas Schnelli
851f58f94e remove JSON Spirit UniValue wrapper 2017-02-10 00:35:24 +00:00
Jonas Schnelli
38fc4b7090 expicit set UniValue type to avoid empty values 2017-02-10 00:35:24 +00:00
Jonas Schnelli
9756b7bd29 extend conversion to UniValue 2017-02-10 00:35:24 +00:00
Jeff Garzik
ed21d5bd4b Convert tree to using univalue. Eliminate all json_spirit uses. 2017-02-10 00:35:24 +00:00
jl777
8f704e3fcf fix getinfo bad notaryid 2017-02-07 22:22:51 +02:00
jl777
9152feb5df lastmined 2017-02-07 04:04:53 +02:00
jl777
bc17ac4928 Merge remote-tracking branch 'zcash/master' into rebase 
# Conflicts:
#	README.md
#	src/Makefile.gtest.include
#	src/chainparams.cpp
#	src/init.cpp
#	src/miner.cpp
#	src/wallet/wallet.cpp
 2016-12-12 12:19:13 +02:00
jl777
730a5006cb test 2016-12-04 06:59:32 -03:00
jl777
58033467ff test 2016-11-23 12:37:07 -03:00
jl777
a19b28ce5e test 2016-11-19 17:10:01 -03:00
jl777
f595c2e0f8 test 2016-11-19 17:01:44 -03:00