diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2018-12-13 11:12:59 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 21:32:54 +0800 |
| commit | c972cddcfb5d5b16efdf08135b4f7782d796764c (patch) | |
| tree | db6ce016c56b6ff57d49e37a3fcff3390f7743ba /vendor/vendor.json | |
| parent | bffc4410c72dbe2b9461ef78867f972f939a95a4 (diff) | |
| download | dexon-c972cddcfb5d5b16efdf08135b4f7782d796764c.tar dexon-c972cddcfb5d5b16efdf08135b4f7782d796764c.tar.gz dexon-c972cddcfb5d5b16efdf08135b4f7782d796764c.tar.bz2 dexon-c972cddcfb5d5b16efdf08135b4f7782d796764c.tar.lz dexon-c972cddcfb5d5b16efdf08135b4f7782d796764c.tar.xz dexon-c972cddcfb5d5b16efdf08135b4f7782d796764c.tar.zst dexon-c972cddcfb5d5b16efdf08135b4f7782d796764c.zip | |
vendor: sync to latest core and fix conflict
Diffstat (limited to 'vendor/vendor.json')
| -rw-r--r-- | vendor/vendor.json | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/vendor/vendor.json b/vendor/vendor.json index 0eab5926c..81119dc09 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -105,14 +105,14 @@ { "checksumSHA1": "65L1yf+f0OCiLFniljqfRxVdsQA=", "path": "github.com/dexon-foundation/dexon-consensus/common", - "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", - "revisionTime": "2018-12-05T06:29:54Z" + "revision": "0ead4a7c012af9ddaa4a934729e216539d2caeb1", + "revisionTime": "2018-12-13T03:01:43Z" }, { - "checksumSHA1": "YWywKLu6YqxtRpXbCls4lRxjgPo=", + "checksumSHA1": "7Oa+i0v4Xtpk+mA1ANSwPzOZrZo=", "path": "github.com/dexon-foundation/dexon-consensus/core", - "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", - "revisionTime": "2018-12-05T06:29:54Z" + "revision": "0ead4a7c012af9ddaa4a934729e216539d2caeb1", + "revisionTime": "2018-12-13T03:01:43Z" }, { "checksumSHA1": "v4fKR7uhoyufi6hAVO44cFEb+tY=", @@ -123,38 +123,44 @@ { "checksumSHA1": "tQSbYCu5P00lUhKsx3IbBZCuSLY=", "path": "github.com/dexon-foundation/dexon-consensus/core/crypto", - "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", - "revisionTime": "2018-12-05T06:29:54Z" + "revision": "0ead4a7c012af9ddaa4a934729e216539d2caeb1", + "revisionTime": "2018-12-13T03:01:43Z" }, { "checksumSHA1": "p2jOAulavUU2xyj018pYPHlj8XA=", "path": "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg", - "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", - "revisionTime": "2018-12-05T06:29:54Z" + "revision": "0ead4a7c012af9ddaa4a934729e216539d2caeb1", + "revisionTime": "2018-12-13T03:01:43Z" }, { "checksumSHA1": "6Pf6caC8LTNCI7IflFmglKYnxYo=", "path": "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa", - "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", - "revisionTime": "2018-12-05T06:29:54Z" + "revision": "0ead4a7c012af9ddaa4a934729e216539d2caeb1", + "revisionTime": "2018-12-13T03:01:43Z" + }, + { + "checksumSHA1": "oE4WEMp92OrJrujzd3XdQEkPiDI=", + "path": "github.com/dexon-foundation/dexon-consensus/core/db", + "revision": "0ead4a7c012af9ddaa4a934729e216539d2caeb1", + "revisionTime": "2018-12-13T03:01:43Z" }, { "checksumSHA1": "Z079qQV+aQV9A3kSJ0LbFjx5VO4=", "path": "github.com/dexon-foundation/dexon-consensus/core/types", - "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", - "revisionTime": "2018-12-05T06:29:54Z" + "revision": "0ead4a7c012af9ddaa4a934729e216539d2caeb1", + "revisionTime": "2018-12-13T03:01:43Z" }, { "checksumSHA1": "Sn3PAYsblIXmr7gVKDzxnoBPku4=", "path": "github.com/dexon-foundation/dexon-consensus/core/types/dkg", - "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", - "revisionTime": "2018-12-05T06:29:54Z" + "revision": "0ead4a7c012af9ddaa4a934729e216539d2caeb1", + "revisionTime": "2018-12-13T03:01:43Z" }, { - "checksumSHA1": "pE0L1qyJ7Jyir1SQ6jEsj8U+83U=", + "checksumSHA1": "A7UQ+7rv9FuElmFBEn/ZdhBqFKI=", "path": "github.com/dexon-foundation/dexon-consensus/core/utils", - "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", - "revisionTime": "2018-12-05T06:29:54Z" + "revision": "0ead4a7c012af9ddaa4a934729e216539d2caeb1", + "revisionTime": "2018-12-13T03:01:43Z" }, { "checksumSHA1": "TAkwduKZqLyimyTPPWIllZWYFuE=", |