diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-10-29 09:31:36 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 21:32:52 +0800 |
| commit | 1b0f418c085bc1b4d972845f16a97b2eebc7ce42 (patch) | |
| tree | 14678e60666e736f700eb748e9e4bbe51a80fab7 /vendor/vendor.json | |
| parent | 7c1386d928acd050684f435e49149696bcc0a637 (diff) | |
| download | dexon-1b0f418c085bc1b4d972845f16a97b2eebc7ce42.tar dexon-1b0f418c085bc1b4d972845f16a97b2eebc7ce42.tar.gz dexon-1b0f418c085bc1b4d972845f16a97b2eebc7ce42.tar.bz2 dexon-1b0f418c085bc1b4d972845f16a97b2eebc7ce42.tar.lz dexon-1b0f418c085bc1b4d972845f16a97b2eebc7ce42.tar.xz dexon-1b0f418c085bc1b4d972845f16a97b2eebc7ce42.tar.zst dexon-1b0f418c085bc1b4d972845f16a97b2eebc7ce42.zip | |
vendor: sync consensus core and fix conflict
Diffstat (limited to 'vendor/vendor.json')
| -rw-r--r-- | vendor/vendor.json | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/vendor/vendor.json b/vendor/vendor.json index 37dc8aa51..78a3f8b60 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -105,50 +105,50 @@ { "checksumSHA1": "IKOLx0ZjJoT9x9zO/bVAXWcNXs8=", "path": "github.com/dexon-foundation/dexon-consensus-core/common", - "revision": "e9283765abc5dddee2e1f8455509bb188f445818", - "revisionTime": "2018-10-25T01:55:59Z" + "revision": "b64211c448f12368730356d1e36a208246a663d8", + "revisionTime": "2018-10-29T06:23:39Z" }, { - "checksumSHA1": "N0TZFVRpv3PxmAZmJyCO5JOGt78=", + "checksumSHA1": "lq2Fwm6LM1oHq7iRUVXKwuNz5Og=", "path": "github.com/dexon-foundation/dexon-consensus-core/core", - "revision": "e9283765abc5dddee2e1f8455509bb188f445818", - "revisionTime": "2018-10-25T01:55:59Z" + "revision": "b64211c448f12368730356d1e36a208246a663d8", + "revisionTime": "2018-10-29T06:23:39Z" }, { "checksumSHA1": "69/j3ROwzhdGPWKymJnGjaJ5QzY=", "path": "github.com/dexon-foundation/dexon-consensus-core/core/blockdb", - "revision": "e9283765abc5dddee2e1f8455509bb188f445818", - "revisionTime": "2018-10-25T01:55:59Z" + "revision": "b64211c448f12368730356d1e36a208246a663d8", + "revisionTime": "2018-10-29T06:23:39Z" }, { "checksumSHA1": "GXHmtn3UlUftllBXI+M8RBkilzY=", "path": "github.com/dexon-foundation/dexon-consensus-core/core/crypto", - "revision": "e9283765abc5dddee2e1f8455509bb188f445818", - "revisionTime": "2018-10-25T01:55:59Z" + "revision": "b64211c448f12368730356d1e36a208246a663d8", + "revisionTime": "2018-10-29T06:23:39Z" }, { "checksumSHA1": "sh19Kk6G7esEcBPC2QsaFF3V/Ds=", "path": "github.com/dexon-foundation/dexon-consensus-core/core/crypto/dkg", - "revision": "e9283765abc5dddee2e1f8455509bb188f445818", - "revisionTime": "2018-10-25T01:55:59Z" + "revision": "b64211c448f12368730356d1e36a208246a663d8", + "revisionTime": "2018-10-29T06:23:39Z" }, { "checksumSHA1": "priVCcv7H4LTooiN/1EUu8qFiSs=", "path": "github.com/dexon-foundation/dexon-consensus-core/core/crypto/ecdsa", - "revision": "e9283765abc5dddee2e1f8455509bb188f445818", - "revisionTime": "2018-10-25T01:55:59Z" + "revision": "b64211c448f12368730356d1e36a208246a663d8", + "revisionTime": "2018-10-29T06:23:39Z" }, { - "checksumSHA1": "9UYwfOHKwJlCEk1EH3eZtdVLuS0=", + "checksumSHA1": "WQjNg/86ikGl9ZXli+S5ltLY78U=", "path": "github.com/dexon-foundation/dexon-consensus-core/core/types", - "revision": "e9283765abc5dddee2e1f8455509bb188f445818", - "revisionTime": "2018-10-25T01:55:59Z" + "revision": "b64211c448f12368730356d1e36a208246a663d8", + "revisionTime": "2018-10-29T06:23:39Z" }, { "checksumSHA1": "ZOjAnqYE7HayNBTsMIgRQPLxndI=", "path": "github.com/dexon-foundation/dexon-consensus-core/core/types/dkg", - "revision": "e9283765abc5dddee2e1f8455509bb188f445818", - "revisionTime": "2018-10-25T01:55:59Z" + "revision": "b64211c448f12368730356d1e36a208246a663d8", + "revisionTime": "2018-10-29T06:23:39Z" }, { "checksumSHA1": "TAkwduKZqLyimyTPPWIllZWYFuE=", |