jl777
01db353d61
Merge branch 'FSM' into jl777
...
# Conflicts:
# src/rpc/crosschain.cpp
2019-04-10 05:21:19 -11:00
jl777
2056c8727b
Token peg ideas
2019-04-10 05:14:54 -11:00
jl777
43b18d5259
Fix
2019-04-10 02:47:17 -11:00
jl777
a2cdadf17d
Add auto resync for local prices
2019-04-10 02:43:11 -11:00
jl777
137f516516
GetHash()
2019-04-10 02:16:07 -11:00
jl777
6618a43e8a
->
2019-04-10 02:14:07 -11:00
jl777
ae7c5ee027
Fix declaration
2019-04-10 02:13:07 -11:00
jl777
a8b06bf176
Merge remote-tracking branch 'origin/jl777' into jl777
2019-04-10 02:09:23 -11:00
jl777
ba0fda90b2
Small changes
2019-04-10 02:09:18 -11:00
jl777
8a0d6c900f
Merge branch 'FSM' into jl777
2019-04-10 02:08:51 -11:00
jl777
1fe6eeec74
Merge pull request #1387 from Mixa84/FSM
...
Adding dual daemon import and gateway import. (#21 )
2019-04-10 00:32:09 -11:00
Mihailo Milenkovic
2872c88795
Adding dual daemon import and gateway import. ( #21 )
2019-04-10 13:09:11 +02:00
jl777
87ed680d3b
Merge pull request #1386 from blackjok3rtt/jl777
...
fix getsnapshot2
2019-04-09 22:03:52 -11:00
blackjok3r
2e2bb2b518
fix getsnapshot2 thanks to dimxy's advice.
2019-04-10 16:53:08 +08:00
blackjok3rtt
e5ea4d5c1c
Merge pull request #54 from jl777/jl777
...
Jl777
2019-04-10 15:18:30 +08:00
jl777
a3f3151d10
Merge pull request #1385 from blackjok3rtt/notastats2
...
notaryt stats RPC
2019-04-09 19:31:26 -11:00
blackjok3rtt
2fbb858bef
remove git link
2019-04-10 12:27:53 +08:00
blackjok3r
3d83dda142
fix script
2019-04-10 12:07:31 +08:00
blackjok3r
e688959c6e
...
2019-04-10 11:41:29 +08:00
blackjok3r
df79068ab6
y
2019-04-10 02:12:52 +08:00
blackjok3r
bce0b87e6f
.
2019-04-10 02:11:40 +08:00
jl777
bb0de29c7e
Merge pull request #1383 from blackjok3rtt/walletfilter
...
Wallet filter and LABS code cleanup
2019-04-09 00:06:52 -11:00
blackjok3r
237f115594
Clean up some LABS related code, remove un-used/needed stuff.
...
Adds actual working and feild tested wallet filter. Can set any amount
of whitelist address's, in conf file or commandline args.
fix daemon deadlock, when doing z_mergetoaddress and mining at same time
(needs more testing on staking chains)
Set z_mergtoaddress to use a 0 expiry height when not doing z-tx's. They
were failing and peers were getting banned trying to broadcast them.
2019-04-09 18:53:32 +08:00
jl777
2e19349105
Redeem solution
2019-04-08 21:54:24 -11:00
blackjok3rtt
da4cf952ce
Merge pull request #53 from jl777/jl777
...
Jl777
2019-04-09 16:16:38 +08:00
blackjok3r
e101aa3f9b
make -whitelistaddress= activate wallet filter
2019-04-09 06:10:02 +08:00
blackjok3r
6f5e339884
fix
2019-04-09 05:50:06 +08:00
blackjok3r
0d587ccc31
fix
2019-04-09 05:39:34 +08:00
blackjok3r
a30fb4ae36
test
2019-04-09 05:38:10 +08:00
blackjok3r
faea923284
set notary address from -pubkey filter still default to on.
2019-04-09 05:10:52 +08:00
blackjok3r
7e74cb117c
fix
2019-04-09 01:39:38 +08:00
blackjok3r
d8edaa38ec
make wallet filter work for testnet notary
2019-04-09 01:36:30 +08:00
jl777
01be71fd44
Unsolved issue
2019-04-08 05:29:47 -11:00
jl777
74aa8a9536
Update
2019-04-08 02:47:02 -11:00
jl777
07f9635bd0
Comments
2019-04-08 02:41:05 -11:00
jl777
247a2ccc7f
Sync
2019-04-07 06:15:51 -11:00
jl777
90afbc5485
Merge pull request #1381 from blackjok3rtt/jl777
...
Snapshot2 changes.
2019-04-07 06:12:49 -11:00
blackjok3r
7c86c40d71
description comment
2019-04-07 23:54:44 +08:00
blackjok3r
df118e7c8f
fix json output
2019-04-07 23:16:25 +08:00
blackjok3r
6db2c41b51
inital commit for getSnapshot2 changes
2019-04-07 21:57:17 +08:00
blackjok3rtt
292dbd8d9a
Merge pull request #52 from jl777/jl777
...
Jl777
2019-04-07 12:03:20 +08:00
jl777
dae0476a0a
More docs
2019-04-06 06:49:05 -11:00
jl777
ed6a0ade44
Synthetic definition language
2019-04-06 02:40:49 -11:00
jl777
1de369ea40
Prices CC rpc purpose documented
2019-04-06 01:23:21 -11:00
jl777
88fb116c53
Comments
2019-04-06 00:55:23 -11:00
jl777
be0d9d034e
Merge remote-tracking branch 'origin/jl777' into jl777
...
# Conflicts:
# src/komodo_gateway.h
2019-04-06 00:43:15 -11:00
jl777
e06a4483e8
Merge branch 'FSM' into jl777
...
# Conflicts:
# .gitignore
2019-04-06 00:42:37 -11:00
jl777
d02edd2d77
Merge pull request #1379 from jl777/jl777
...
Jl777
2019-04-06 00:40:53 -11:00
jl777
fb797bc8b8
Merge branch 'FSM' into jl777
2019-04-06 00:40:45 -11:00
jl777
b81f1d4bee
Make it PRICES compatible
2019-04-06 00:38:13 -11:00
