diff options
| author | Mission Liao <mission.liao@dexon.org> | 2018-12-25 10:06:35 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 21:32:55 +0800 |
| commit | 6aee32cd8c3d7f0c7d99bf1fe4951fdf6c534be9 (patch) | |
| tree | a8020f5aace2a3f3ac3de3bcbe98bdc8226245a6 /vendor/vendor.json | |
| parent | b39d0be8e1fd2e870fafd2c23e7d5cb220696a60 (diff) | |
| download | dexon-6aee32cd8c3d7f0c7d99bf1fe4951fdf6c534be9.tar.gz dexon-6aee32cd8c3d7f0c7d99bf1fe4951fdf6c534be9.tar.zst dexon-6aee32cd8c3d7f0c7d99bf1fe4951fdf6c534be9.zip | |
vendor: sync DEXON core and fix conflicts/missings (#101)
Merging these commits in DEXON consensus core:
- https://github.com/dexon-foundation/dexon-consensus/commit/dce509a13ef5873b9cae3c1cabdb97e219b6fb7d
- https://github.com/dexon-foundation/dexon-consensus/commit/6d1c1aeea0d3e75d10cbb2712c68b4c422ba8ba6
- https://github.com/dexon-foundation/dexon-consensus/commit/c1ed57c4abaf1f4758e52f082bb7114ad00c8b39
Diffstat (limited to 'vendor/vendor.json')
| -rw-r--r-- | vendor/vendor.json | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/vendor/vendor.json b/vendor/vendor.json index 56b294989..a1c2eb19f 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": "146ed32cf841151b826eafd7d6ade188c56865bf", - "revisionTime": "2018-12-20T09:26:30Z" + "revision": "dce509a13ef5873b9cae3c1cabdb97e219b6fb7d", + "revisionTime": "2018-12-24T02:29:31Z" }, { - "checksumSHA1": "DxtHhW/eYFodiPxgwu7opvIhJu0=", + "checksumSHA1": "GuNkyaDFHBDzOV5un2efH5CBG7k=", "path": "github.com/dexon-foundation/dexon-consensus/core", - "revision": "146ed32cf841151b826eafd7d6ade188c56865bf", - "revisionTime": "2018-12-20T09:26:30Z" + "revision": "dce509a13ef5873b9cae3c1cabdb97e219b6fb7d", + "revisionTime": "2018-12-24T02:29:31Z" }, { "checksumSHA1": "v4fKR7uhoyufi6hAVO44cFEb+tY=", @@ -123,50 +123,50 @@ { "checksumSHA1": "tQSbYCu5P00lUhKsx3IbBZCuSLY=", "path": "github.com/dexon-foundation/dexon-consensus/core/crypto", - "revision": "146ed32cf841151b826eafd7d6ade188c56865bf", - "revisionTime": "2018-12-20T09:26:30Z" + "revision": "dce509a13ef5873b9cae3c1cabdb97e219b6fb7d", + "revisionTime": "2018-12-24T02:29:31Z" }, { "checksumSHA1": "W2P7pkuJ+26BpJg03K4Y0nB5obI=", "path": "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg", - "revision": "146ed32cf841151b826eafd7d6ade188c56865bf", - "revisionTime": "2018-12-20T09:26:30Z" + "revision": "dce509a13ef5873b9cae3c1cabdb97e219b6fb7d", + "revisionTime": "2018-12-24T02:29:31Z" }, { "checksumSHA1": "6Pf6caC8LTNCI7IflFmglKYnxYo=", "path": "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa", - "revision": "146ed32cf841151b826eafd7d6ade188c56865bf", - "revisionTime": "2018-12-20T09:26:30Z" + "revision": "dce509a13ef5873b9cae3c1cabdb97e219b6fb7d", + "revisionTime": "2018-12-24T02:29:31Z" }, { "checksumSHA1": "PJXR1OuWwVVYrdJMK3skPr1/8ls=", "path": "github.com/dexon-foundation/dexon-consensus/core/db", - "revision": "146ed32cf841151b826eafd7d6ade188c56865bf", - "revisionTime": "2018-12-20T09:26:30Z" + "revision": "dce509a13ef5873b9cae3c1cabdb97e219b6fb7d", + "revisionTime": "2018-12-24T02:29:31Z" }, { - "checksumSHA1": "VRDwO2+FQkeZFeuLfRFS9FUpdCc=", + "checksumSHA1": "ZQnoWpMJTicqu9UMKi+CPd5r3so=", "path": "github.com/dexon-foundation/dexon-consensus/core/syncer", - "revision": "146ed32cf841151b826eafd7d6ade188c56865bf", - "revisionTime": "2018-12-20T09:26:30Z" + "revision": "dce509a13ef5873b9cae3c1cabdb97e219b6fb7d", + "revisionTime": "2018-12-24T02:29:31Z" }, { "checksumSHA1": "Z079qQV+aQV9A3kSJ0LbFjx5VO4=", "path": "github.com/dexon-foundation/dexon-consensus/core/types", - "revision": "146ed32cf841151b826eafd7d6ade188c56865bf", - "revisionTime": "2018-12-20T09:26:30Z" + "revision": "dce509a13ef5873b9cae3c1cabdb97e219b6fb7d", + "revisionTime": "2018-12-24T02:29:31Z" }, { "checksumSHA1": "sY+2eiOoWvsNMvuPl9qQ+rlT9sA=", "path": "github.com/dexon-foundation/dexon-consensus/core/types/dkg", - "revision": "146ed32cf841151b826eafd7d6ade188c56865bf", - "revisionTime": "2018-12-20T09:26:30Z" + "revision": "dce509a13ef5873b9cae3c1cabdb97e219b6fb7d", + "revisionTime": "2018-12-24T02:29:31Z" }, { - "checksumSHA1": "WEtKiyBYr0oPUSF+smv1A2LPBuI=", + "checksumSHA1": "0JFlVFny0IyANnlelQDl8ot16wU=", "path": "github.com/dexon-foundation/dexon-consensus/core/utils", - "revision": "146ed32cf841151b826eafd7d6ade188c56865bf", - "revisionTime": "2018-12-20T09:26:30Z" + "revision": "dce509a13ef5873b9cae3c1cabdb97e219b6fb7d", + "revisionTime": "2018-12-24T02:29:31Z" }, { "checksumSHA1": "TAkwduKZqLyimyTPPWIllZWYFuE=", |