diff options
author | Jimmy Hu <jimmy.hu@dexon.org> | 2018-12-06 13:36:20 +0800 |
---|---|---|
committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
commit | 4b1789f7e96c19a516c1068a9d1b019262cb5741 (patch) | |
tree | a1dbfb97af185eea996ede82f59eb58a1cc51841 /vendor/vendor.json | |
parent | af2d4af8f03af72683ba23963b0c432effe7feb6 (diff) | |
download | dexon-4b1789f7e96c19a516c1068a9d1b019262cb5741.tar dexon-4b1789f7e96c19a516c1068a9d1b019262cb5741.tar.gz dexon-4b1789f7e96c19a516c1068a9d1b019262cb5741.tar.bz2 dexon-4b1789f7e96c19a516c1068a9d1b019262cb5741.tar.lz dexon-4b1789f7e96c19a516c1068a9d1b019262cb5741.tar.xz dexon-4b1789f7e96c19a516c1068a9d1b019262cb5741.tar.zst dexon-4b1789f7e96c19a516c1068a9d1b019262cb5741.zip |
vendor: sync to latest core and fix conflict (#79)
Diffstat (limited to 'vendor/vendor.json')
-rw-r--r-- | vendor/vendor.json | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/vendor/vendor.json b/vendor/vendor.json index a515fb204..0eab5926c 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -103,58 +103,58 @@ "versionExact": "dev" }, { - "checksumSHA1": "JQjsCP961LUqOQ9GeYq2rTtrP/I=", + "checksumSHA1": "65L1yf+f0OCiLFniljqfRxVdsQA=", "path": "github.com/dexon-foundation/dexon-consensus/common", - "revision": "81c3d2d4446b5daee09529f58bc17cad3284edbf", - "revisionTime": "2018-11-30T09:28:22Z" + "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", + "revisionTime": "2018-12-05T06:29:54Z" }, { - "checksumSHA1": "Y/CtabyOPE1ifc0ZScQzsDLdwB0=", + "checksumSHA1": "YWywKLu6YqxtRpXbCls4lRxjgPo=", "path": "github.com/dexon-foundation/dexon-consensus/core", - "revision": "81c3d2d4446b5daee09529f58bc17cad3284edbf", - "revisionTime": "2018-11-30T09:28:22Z" + "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", + "revisionTime": "2018-12-05T06:29:54Z" }, { "checksumSHA1": "v4fKR7uhoyufi6hAVO44cFEb+tY=", "path": "github.com/dexon-foundation/dexon-consensus/core/blockdb", - "revision": "81c3d2d4446b5daee09529f58bc17cad3284edbf", - "revisionTime": "2018-11-30T09:28:22Z" + "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", + "revisionTime": "2018-12-05T06:29:54Z" }, { "checksumSHA1": "tQSbYCu5P00lUhKsx3IbBZCuSLY=", "path": "github.com/dexon-foundation/dexon-consensus/core/crypto", - "revision": "81c3d2d4446b5daee09529f58bc17cad3284edbf", - "revisionTime": "2018-11-30T09:28:22Z" + "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", + "revisionTime": "2018-12-05T06:29:54Z" }, { "checksumSHA1": "p2jOAulavUU2xyj018pYPHlj8XA=", "path": "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg", - "revision": "81c3d2d4446b5daee09529f58bc17cad3284edbf", - "revisionTime": "2018-11-30T09:28:22Z" + "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", + "revisionTime": "2018-12-05T06:29:54Z" }, { "checksumSHA1": "6Pf6caC8LTNCI7IflFmglKYnxYo=", "path": "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa", - "revision": "81c3d2d4446b5daee09529f58bc17cad3284edbf", - "revisionTime": "2018-11-30T09:28:22Z" + "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", + "revisionTime": "2018-12-05T06:29:54Z" }, { "checksumSHA1": "Z079qQV+aQV9A3kSJ0LbFjx5VO4=", "path": "github.com/dexon-foundation/dexon-consensus/core/types", - "revision": "81c3d2d4446b5daee09529f58bc17cad3284edbf", - "revisionTime": "2018-11-30T09:28:22Z" + "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", + "revisionTime": "2018-12-05T06:29:54Z" }, { "checksumSHA1": "Sn3PAYsblIXmr7gVKDzxnoBPku4=", "path": "github.com/dexon-foundation/dexon-consensus/core/types/dkg", - "revision": "81c3d2d4446b5daee09529f58bc17cad3284edbf", - "revisionTime": "2018-11-30T09:28:22Z" + "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", + "revisionTime": "2018-12-05T06:29:54Z" }, { "checksumSHA1": "pE0L1qyJ7Jyir1SQ6jEsj8U+83U=", "path": "github.com/dexon-foundation/dexon-consensus/core/utils", - "revision": "81c3d2d4446b5daee09529f58bc17cad3284edbf", - "revisionTime": "2018-11-30T09:28:22Z" + "revision": "56e872f84131348adbc0861afb3554bba4a8e5db", + "revisionTime": "2018-12-05T06:29:54Z" }, { "checksumSHA1": "TAkwduKZqLyimyTPPWIllZWYFuE=", |