diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-10-25 11:17:52 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 21:32:52 +0800 |
| commit | 2d1ed5288cab621aba39c3a81aae7042ead14fd5 (patch) | |
| tree | 3312352700814c6e97305b84a58672ee1f059e66 /vendor/vendor.json | |
| parent | f5fa30b21ea123d66cf5fdaf527f546ef5a2f46b (diff) | |
| download | dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.tar dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.tar.gz dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.tar.bz2 dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.tar.lz dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.tar.xz dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.tar.zst dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.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=", |