Commit Graph

24173 Commits

Author SHA1 Message Date
blackjok3r
58cb0e8ea2 use unused address variable for source, to get source chain to explorer. 2019-01-07 22:36:58 +08:00
jl777
f68daa998d Merge pull request #1143 from wallnutkraken/master
Fixed a 404'd libsodium link
2019-01-07 03:28:53 -11:00
blackjok3rtt
5d34792067 fix 2019-01-07 20:41:54 +08:00
blackjok3r
d53a4a9e5b push changes for getrawtransaction 2019-01-07 18:11:51 +08:00
jl777
1f12585b33 Merge pull request #1144 from letolabs/z_listreceivedbyaddress
Add confs+dpowconfs to z_listreceivedbyaddress
2019-01-06 18:35:51 -11:00
Jonathan "Duke" Leto
5d5af91e5d Add dpowconfs to z_listreceivedbyaddress 2019-01-06 14:00:09 -08:00
Jonathan "Duke" Leto
18b0a92c3e Add confirmations to z_listreceivedbyaddress 2019-01-06 13:40:04 -08:00
wallnutkraken
536580bdec Fixed a 404'd libsodium link 2019-01-06 22:10:59 +01:00
blackjok3r
5a917a6f02 Merge branch 'FSM' of https://github.com/jl777/komodo 2019-01-06 23:19:16 +08:00
jl777
5921eb2923 Merge pull request #1141 from blackjok3rtt/FSM
Fix mempool lock.
2019-01-06 02:28:43 -11:00
blackjok3r
4fa788c76d fix mempool lock. 2019-01-06 21:24:04 +08:00
blackjok3rtt
07f7ad3717 Merge pull request #5 from jl777/FSM
Fsm
2019-01-06 20:46:26 +08:00
jl777
a5bcdac1db Merge pull request #1140 from letolabs/dpowconfs_fix
Add dpowconfs to z_listunspent + listreceivedbyaddress and other small fixes
2019-01-05 19:08:38 -11:00
Jonathan "Duke" Leto
5070f4397a cleanup 2019-01-05 17:02:20 -08:00
Jonathan "Duke" Leto
dda20b2760 Correctly lookup height of joinsplits in z_listunspent 2019-01-06 01:39:04 +01:00
Jonathan "Duke" Leto
f24ae214d2 Add dpowconfs to z_listunspent + listreceivedbyaddress and other small fixes 2019-01-05 19:24:14 +01:00
blackjok3r
1cd8881329 change print 2019-01-04 17:51:23 +08:00
blackjok3r
ff43475a31 Re-add txs that were removed from wallet, if they are valid. 2019-01-04 17:26:28 +08:00
blackjok3r
5837b5bc05 Wallet corruption fix. No longer calls a rescan on daemon load, instead we now delete the non existant txs from the wallet, so next time you load it the error is gone. 2019-01-04 16:11:51 +08:00
blackjok3r
75ae32c0aa fix source chain display error 2019-01-04 14:35:34 +08:00
jl777
76d120fa72 Merge pull request #1139 from Mixa84/FSM
Oracles data and format check and decodeccopret
2019-01-03 07:08:22 -11:00
Mihailo Milenkovic
8089c2a86f Decode CC opret RPC 2019-01-03 17:45:11 +01:00
SHossain
0ae7616707 Merge pull request #105 from jl777/dev
Dev
2019-01-03 13:46:39 +00:00
blackjok3r
542607e4e2 fix my stupidity guys.. sorry 2019-01-03 19:52:02 +08:00
Mihailo Milenkovic
1db43ae672 Oracles data and format check (#8)
- Sanity check of oracle data

- Fix oracle format check
2019-01-03 11:55:48 +01:00
jl777
6a1259ba5b marmaraaddress 2019-01-02 19:17:55 -11:00
jl777
6392d7f9a0 Marmara files 2019-01-02 19:13:02 -11:00
jl777
520964ae40 marmara.cpp 2019-01-02 19:11:26 -11:00
jl777
31e466f6c7 Triggers -> Marmara stubs 2019-01-02 19:10:10 -11:00
blackjok3rtt
be07d63f99 Merge pull request #69 from StakedChain/ac_import
try to fix invalid burntx decode error
2019-01-03 09:57:08 +08:00
blackjok3r
3e22247501 try to fix invalid burntx decode error 2019-01-03 09:55:56 +08:00
jl777
b1dc77875a Merge pull request #1137 from Mixa84/FSM
Fixing print of CC address in transaction
2019-01-02 09:00:15 -11:00
Mihailo Milenkovic
79c1797de3 Returned print of CC address in getrawtransaction and similar functions. 2019-01-02 20:51:42 +01:00
blackjok3rtt
ad78d2f1ec Merge pull request #68 from StakedChain/ac_import
Merge in latest FSM to test migrates and new RPC call.
2019-01-03 01:07:02 +08:00
blackjok3rtt
080d02e673 Merge pull request #67 from jl777/FSM
merge latest FSM in, to add sourcechain to burn tx.
2019-01-03 01:03:22 +08:00
blackjok3r
bb95bce9e7 Add source chain to burn op return, and extract it in getimports RPC if it exists. 2019-01-03 01:02:45 +08:00
jl777
8a606896dd Merge pull request #1136 from jl777/jl777
Always makeburnoutput raw proof
2019-01-02 04:52:55 -11:00
jl777
5298e3c99a Always makeburnoutput raw proof 2019-01-02 04:52:22 -11:00
blackjok3r
e93fd95815 Merge branch 'FSM' of https://github.com/jl777/komodo into ac_import 2019-01-02 23:29:52 +08:00
Mihailo Milenkovic
3847272ab2 Removed unused tx_notarizedconfirmed in oraclefeed. 2019-01-02 16:13:12 +01:00
blackjok3r
91b6694c71 Fix some bugs? Add getimports RPC. 2019-01-02 23:04:26 +08:00
jl777
f7b88823c7 Merge pull request #1135 from jl777/jl777
Fix oracles 'd' and 'D'
2019-01-02 04:03:14 -11:00
jl777
398cc66405 Fix oracles 'd' and 'D' 2019-01-02 04:02:49 -11:00
jl777
7aceb88100 Merge pull request #1134 from jl777/jl777
Jl777
2019-01-02 02:17:52 -11:00
jl777
ab5f7437a1 ASSETCHAINS_SYMBOL 2019-01-02 02:16:52 -11:00
jl777
c4f5be1c6d Acname -> raw proof 2019-01-02 02:16:15 -11:00
jl777
bf3cef4edc Set raw proof to ac_name for cross chain burn 2019-01-02 02:13:24 -11:00
jl777
d63390197d Fix comment 2019-01-01 23:53:39 -11:00
jl777
81e3a485e2 Fix test 2019-01-01 23:42:45 -11:00
jl777
0b4120eefa Fix 2019-01-01 23:40:20 -11:00