diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-10-25 11:17:52 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | b3ec3ce42ce5382fc16c532ad961b0ac2a3897dc (patch) | |
| tree | 77c2ca24a653c38124ca43d5be0af785bea0a24f /vendor/vendor.json | |
| parent | e776662999ddf0ab195fb731975643708fa2e8c3 (diff) | |
| download | dexon-b3ec3ce42ce5382fc16c532ad961b0ac2a3897dc.tar.gz dexon-b3ec3ce42ce5382fc16c532ad961b0ac2a3897dc.tar.zst dexon-b3ec3ce42ce5382fc16c532ad961b0ac2a3897dc.zip | |
vendor: sync consensus core and fix conflict
Diffstat (limited to 'vendor/vendor.json')
| -rw-r--r-- | vendor/vendor.json | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/vendor/vendor.json b/vendor/vendor.json index cd7af1a10..37dc8aa51 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -105,44 +105,50 @@ { "checksumSHA1": "IKOLx0ZjJoT9x9zO/bVAXWcNXs8=", "path": "github.com/dexon-foundation/dexon-consensus-core/common", - "revision": "47885b50ad94c3b34118554bed2a142717e6ee72", - "revisionTime": "2018-10-24T04:03:50Z" + "revision": "e9283765abc5dddee2e1f8455509bb188f445818", + "revisionTime": "2018-10-25T01:55:59Z" }, { - "checksumSHA1": "h+9DsEkDRxBqu5/GHdNfRuNSYdY=", + "checksumSHA1": "N0TZFVRpv3PxmAZmJyCO5JOGt78=", "path": "github.com/dexon-foundation/dexon-consensus-core/core", - "revision": "47885b50ad94c3b34118554bed2a142717e6ee72", - "revisionTime": "2018-10-24T04:03:50Z" + "revision": "e9283765abc5dddee2e1f8455509bb188f445818", + "revisionTime": "2018-10-25T01:55:59Z" }, { "checksumSHA1": "69/j3ROwzhdGPWKymJnGjaJ5QzY=", "path": "github.com/dexon-foundation/dexon-consensus-core/core/blockdb", - "revision": "47885b50ad94c3b34118554bed2a142717e6ee72", - "revisionTime": "2018-10-24T04:03:50Z" + "revision": "e9283765abc5dddee2e1f8455509bb188f445818", + "revisionTime": "2018-10-25T01:55:59Z" }, { "checksumSHA1": "GXHmtn3UlUftllBXI+M8RBkilzY=", "path": "github.com/dexon-foundation/dexon-consensus-core/core/crypto", - "revision": "47885b50ad94c3b34118554bed2a142717e6ee72", - "revisionTime": "2018-10-24T04:03:50Z" + "revision": "e9283765abc5dddee2e1f8455509bb188f445818", + "revisionTime": "2018-10-25T01:55:59Z" }, { "checksumSHA1": "sh19Kk6G7esEcBPC2QsaFF3V/Ds=", "path": "github.com/dexon-foundation/dexon-consensus-core/core/crypto/dkg", - "revision": "47885b50ad94c3b34118554bed2a142717e6ee72", - "revisionTime": "2018-10-24T04:03:50Z" + "revision": "e9283765abc5dddee2e1f8455509bb188f445818", + "revisionTime": "2018-10-25T01:55:59Z" }, { "checksumSHA1": "priVCcv7H4LTooiN/1EUu8qFiSs=", "path": "github.com/dexon-foundation/dexon-consensus-core/core/crypto/ecdsa", - "revision": "47885b50ad94c3b34118554bed2a142717e6ee72", - "revisionTime": "2018-10-24T04:03:50Z" + "revision": "e9283765abc5dddee2e1f8455509bb188f445818", + "revisionTime": "2018-10-25T01:55:59Z" }, { - "checksumSHA1": "dKIKJdmVmYKd1ihBAfEoOn6qeCc=", + "checksumSHA1": "9UYwfOHKwJlCEk1EH3eZtdVLuS0=", "path": "github.com/dexon-foundation/dexon-consensus-core/core/types", - "revision": "47885b50ad94c3b34118554bed2a142717e6ee72", - "revisionTime": "2018-10-24T04:03:50Z" + "revision": "e9283765abc5dddee2e1f8455509bb188f445818", + "revisionTime": "2018-10-25T01:55:59Z" + }, + { + "checksumSHA1": "ZOjAnqYE7HayNBTsMIgRQPLxndI=", + "path": "github.com/dexon-foundation/dexon-consensus-core/core/types/dkg", + "revision": "e9283765abc5dddee2e1f8455509bb188f445818", + "revisionTime": "2018-10-25T01:55:59Z" }, { "checksumSHA1": "TAkwduKZqLyimyTPPWIllZWYFuE=", |