Commit Graph

23279 Commits

Author SHA1 Message Date
blackjok3r
877360794b fix? 2018-10-28 12:36:39 +08:00
blackjok3r
b5e3297073 fix 2018-10-28 12:24:22 +08:00
blackjok3r
79a6109971 fix? 2018-10-28 12:23:27 +08:00
blackjok3r
474065ed99 wtf 2018-10-28 12:21:34 +08:00
blackjok3r
b2ec72ec89 try 2018-10-28 12:19:22 +08:00
blackjok3r
d23a74de92 lol 2018-10-28 12:16:14 +08:00
blackjok3r
6046afc2eb ry 2018-10-28 12:15:16 +08:00
blackjok3r
3f06963078 try 2018-10-28 12:12:36 +08:00
blackjok3r
153227c27f fix? 2018-10-28 12:01:54 +08:00
miketout
6023e8ab75 Merge branch 'dev' of https://github.com/miketout/komodo into dev 2018-10-27 20:29:09 -07:00
miketout
99aeab28f9 Integrate latest Zcash fixes and update for non-latin user names 2018-10-27 20:29:03 -07:00
blackjok3r
77b6a312d5 remove check for error 2018-10-28 09:31:42 +08:00
miketout
ea9c37f245 Merge pull request #33 from VerusCoin/dev
CI update
2018-10-27 18:11:14 -07:00
Asher Dawes
0868246437 Removing redundant verus script from src.
Moving verus.bat from src to scr/fiat
Adjusting gitlab-ci configuration and Mac release packaging script to comform to the changes.
2018-10-27 18:00:53 -07:00
miketout
8546284349 Delete incorrectly located CLI bash file 2018-10-27 14:53:53 -07:00
miketout
45bb468139 Better cheat catcher 2018-10-27 14:53:18 -07:00
jl777
de490a4695 Merge pull request #917 from blackjok3rtt/FSM
Add entropy txs to dice info
2018-10-27 10:52:49 -11:00
blackjok3r
2b31eb6fa6 fix 2018-10-28 05:44:51 +08:00
blackjok3r
202873160e entropy txs added to diceinfo 2018-10-28 05:39:36 +08:00
blackjok3rtt
f4a4641c56 Merge pull request #1 from jl777/FSM
Fsm
2018-10-28 05:35:56 +08:00
jl777
22c41c6d95 Merge pull request #916 from Alrighttt/FSM
FSM
2018-10-27 10:08:09 -11:00
Alrighttt
e062742886 comment out oracle print 2018-10-27 22:46:11 +02:00
Alrighttt
4312178b3d Merge pull request #3 from jl777/FSM
Fsm
2018-10-27 16:42:24 -04:00
Homu
11fa12773e Auto merge of #3633 - str4d:params-path-encoding, r=bitcartel
Pass parameter paths as native strings to librustzcash

Fixes a user-reported crash when starting on Windows with a Cyrillic non-UTF-8 locale.
2018-10-27 11:22:17 -07:00
Jack Grigg
262cf38712 Build librustzcash package without changing directory
This ensures that the depends system's custom PATH is applied correctly,
and the pre-build Rust binaries are accessible.
2018-10-28 06:41:53 +13:00
jl777
b9fefbfa06 Auto-reconsider block 2018-10-27 00:24:19 -11:00
Jack Grigg
ee3fa7020e Pass parameter paths as native strings to librustzcash 2018-10-27 19:19:02 +13:00
Jack Grigg
eff2938e46 Migrate to current librustzcash
The only upstream change relative to the previous commit is that the
various Zcash-specific dependencies have been pulled into a cargo
workspace. The dependecies in the workspace use the same commits as the
crates we had previously vendored.

The patches are necessary to handle the fact that cargo requires that
dev dependencies are available even if not used, and we would otherwise
need to vendor all the underlying crates.
2018-10-27 17:03:47 +13:00
Mihailo Milenkovic
ced164c07a Fix 2018-10-26 23:53:58 +02:00
Mihailo Milenkovic
0c3f76e992 Fix 2018-10-26 22:15:18 +02:00
Mihailo Milenkovic
8841c81404 Fix 2018-10-26 22:02:42 +02:00
Mihailo Milenkovic
f29445f03e Fix 2018-10-26 21:45:52 +02:00
Asher Dawes
95b8f04f77 Updating version 2018-10-26 09:29:57 -07:00
Asher Dawes
395f18f556 Merge pull request #146 from miketout/dev
Dev
2018-10-26 09:21:53 -07:00
Mihailo Milenkovic
07660bb098 Fix 2018-10-26 18:08:39 +02:00
Mihailo Milenkovic
b18631ae2b Fix 2018-10-26 17:49:21 +02:00
Mihailo Milenkovic
32572846de Fix 2018-10-26 16:55:36 +02:00
Mihailo Milenkovic
4dbfd427b7 Fix 2018-10-26 16:40:58 +02:00
Mihailo Milenkovic
2fd999a2f6 Multisig withdraw fix 2018-10-26 13:00:16 +02:00
miketout
a12f70bf55 Ensure that only valid staking transactions are synced with wallets 2018-10-26 01:04:07 -07:00
miketout
846b64df6f Merge branch 'dev' of https://github.com/miketout/komodo into dev 2018-10-25 23:25:55 -07:00
miketout
4c8293dc76 Fixed issue #145, should fix stake synching with wallets 2018-10-25 23:25:31 -07:00
jl777
3ba3090468 syntax 2018-10-24 22:18:54 -11:00
jl777
c83d68baaa Allow z_sendmany to notaryaddr 2018-10-24 22:16:45 -11:00
Homu
186874bb83 Auto merge of #3622 - Eirik0:rpc-assert-message, r=daira
Fix potentially misleading test failures

This is in response to https://github.com/zcash/zcash/pull/3590#discussion_r224677644

Currently statements such as:

```assert_equal("Embarassment", "Embarrassment", "Misspelling detected")```

Will produce essentially the following error:
```
Assertion failed: Misspelling detected; expected: <Embarassment> but was: <Embarrassment>
  File "/home/eirik/Development/zcash/qa/rpc-tests/test_framework/test_framework.py", line 121, in main
    self.run_test()
  File "/home/eirik/Development/zcash/qa/rpc-tests/test_spelling.py", line 13, in run_test
```
Which is misleading because the item on the left is not what is actually expected.

This PR changes the assertion failure to be displayed as:
```
Assertion failed: (left == right); Misspelling detected
  left: <Embarassment>
 right: <Embarrassment>
  File "/home/eirik/Development/zcash/qa/rpc-tests/test_framework/test_framework.py", line 121, in main
    self.run_test()
  File "/home/eirik/Development/zcash/qa/rpc-tests/test_spelling.py", line 13, in run_test
```
2018-10-24 23:14:19 -07:00
miketout
ada0f5a496 Merge pull request #32 from VerusCoin/dev
Adding missing batch scripts
2018-10-24 16:09:40 -07:00
Asher Dawes
6954882ce3 Adding missing batch scripts 2018-10-24 16:03:24 -07:00
Homu
e88a069627 Auto merge of #3620 - Eirik0:fix-sendmany-errmsg, r=bitcartel
Fix error message

This error should never happen, but it may as well reference the method it is thrown from.
2018-10-24 14:12:05 -07:00
Eirik Ogilvie-Wigley
882a4f577f Fix potentially misleading test failures 2018-10-24 13:53:25 -06:00
Eirik Ogilvie-Wigley
81005fb214 Fix error message 2018-10-24 12:05:48 -06:00