diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2019-03-12 12:23:16 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 21:32:58 +0800 |
| commit | 4ccf46bcec17b207f915f358f8b23055cd603a5a (patch) | |
| tree | 6fc5a2401d8c4df4e7544376286bcc3f2dc0cca1 /vendor/vendor.json | |
| parent | dc20741f407fc9f180811dbda618056a08941252 (diff) | |
| download | dexon-4ccf46bcec17b207f915f358f8b23055cd603a5a.tar dexon-4ccf46bcec17b207f915f358f8b23055cd603a5a.tar.gz dexon-4ccf46bcec17b207f915f358f8b23055cd603a5a.tar.bz2 dexon-4ccf46bcec17b207f915f358f8b23055cd603a5a.tar.lz dexon-4ccf46bcec17b207f915f358f8b23055cd603a5a.tar.xz dexon-4ccf46bcec17b207f915f358f8b23055cd603a5a.tar.zst dexon-4ccf46bcec17b207f915f358f8b23055cd603a5a.zip | |
vendor: sync to latest core and fix conflict
Diffstat (limited to 'vendor/vendor.json')
| -rw-r--r-- | vendor/vendor.json | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/vendor/vendor.json b/vendor/vendor.json index 963c8f4fa..bf03adcfb 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -141,16 +141,16 @@ { "checksumSHA1": "8EuKVkP1v/w5fRuuvUaXX5k/F+I=", "path": "github.com/dexon-foundation/dexon-consensus/common", - "revision": "ac3187e706bc11f1b36e32015a6e51a96cc8cfe9", - "revisionTime": "2019-03-09T16:39:54Z", + "revision": "bdd9130c05828a158cb8088eec3561f8b1d0f956", + "revisionTime": "2019-03-12T03:51:26Z", "version": "single-chain", "versionExact": "single-chain" }, { - "checksumSHA1": "2zv4HDhSnwpziM4Yk9A7cKIm8yo=", + "checksumSHA1": "2Yi/kGqXHl5F7T3tGfDUS6UZ12I=", "path": "github.com/dexon-foundation/dexon-consensus/core", - "revision": "ac3187e706bc11f1b36e32015a6e51a96cc8cfe9", - "revisionTime": "2019-03-09T16:39:54Z", + "revision": "bdd9130c05828a158cb8088eec3561f8b1d0f956", + "revisionTime": "2019-03-12T03:51:26Z", "version": "single-chain", "versionExact": "single-chain" }, @@ -165,64 +165,64 @@ { "checksumSHA1": "tQSbYCu5P00lUhKsx3IbBZCuSLY=", "path": "github.com/dexon-foundation/dexon-consensus/core/crypto", - "revision": "ac3187e706bc11f1b36e32015a6e51a96cc8cfe9", - "revisionTime": "2019-03-09T16:39:54Z", + "revision": "bdd9130c05828a158cb8088eec3561f8b1d0f956", + "revisionTime": "2019-03-12T03:51:26Z", "version": "single-chain", "versionExact": "single-chain" }, { "checksumSHA1": "vTI0nncFqZ052WvofDhFxLw1Bk4=", "path": "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg", - "revision": "ac3187e706bc11f1b36e32015a6e51a96cc8cfe9", - "revisionTime": "2019-03-09T16:39:54Z", + "revision": "bdd9130c05828a158cb8088eec3561f8b1d0f956", + "revisionTime": "2019-03-12T03:51:26Z", "version": "single-chain", "versionExact": "single-chain" }, { "checksumSHA1": "BhLKK8RveoLaeXc9UyUKMwQqchU=", "path": "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa", - "revision": "ac3187e706bc11f1b36e32015a6e51a96cc8cfe9", - "revisionTime": "2019-03-09T16:39:54Z", + "revision": "bdd9130c05828a158cb8088eec3561f8b1d0f956", + "revisionTime": "2019-03-12T03:51:26Z", "version": "single-chain", "versionExact": "single-chain" }, { "checksumSHA1": "zpuCdMT8MGsy4pLgHKpg/Wd4izU=", "path": "github.com/dexon-foundation/dexon-consensus/core/db", - "revision": "ac3187e706bc11f1b36e32015a6e51a96cc8cfe9", - "revisionTime": "2019-03-09T16:39:54Z", + "revision": "bdd9130c05828a158cb8088eec3561f8b1d0f956", + "revisionTime": "2019-03-12T03:51:26Z", "version": "single-chain", "versionExact": "single-chain" }, { - "checksumSHA1": "KC7POL7Km89JIWSvrmGpSakHF+4=", + "checksumSHA1": "wN+K5gI8+j/7l3SB0DYZ8MkTAwo=", "path": "github.com/dexon-foundation/dexon-consensus/core/syncer", - "revision": "ac3187e706bc11f1b36e32015a6e51a96cc8cfe9", - "revisionTime": "2019-03-09T16:39:54Z", + "revision": "bdd9130c05828a158cb8088eec3561f8b1d0f956", + "revisionTime": "2019-03-12T03:51:26Z", "version": "single-chain", "versionExact": "single-chain" }, { "checksumSHA1": "id8imcgp3SqYhIx0k3Chd0VZrUQ=", "path": "github.com/dexon-foundation/dexon-consensus/core/types", - "revision": "ac3187e706bc11f1b36e32015a6e51a96cc8cfe9", - "revisionTime": "2019-03-09T16:39:54Z", + "revision": "bdd9130c05828a158cb8088eec3561f8b1d0f956", + "revisionTime": "2019-03-12T03:51:26Z", "version": "single-chain", "versionExact": "single-chain" }, { - "checksumSHA1": "s28gYj+iji8oT7N7Su6HIFHMuwI=", + "checksumSHA1": "QXRBX9UmvX4wszA9qlyJtzYcTOw=", "path": "github.com/dexon-foundation/dexon-consensus/core/types/dkg", - "revision": "ac3187e706bc11f1b36e32015a6e51a96cc8cfe9", - "revisionTime": "2019-03-09T16:39:54Z", + "revision": "bdd9130c05828a158cb8088eec3561f8b1d0f956", + "revisionTime": "2019-03-12T03:51:26Z", "version": "single-chain", "versionExact": "single-chain" }, { - "checksumSHA1": "ydfH9XlrRroxsWcvKlGeIDDchB0=", + "checksumSHA1": "AAHXrIvOxLg0CGKh5eKe9VcTOp0=", "path": "github.com/dexon-foundation/dexon-consensus/core/utils", - "revision": "ac3187e706bc11f1b36e32015a6e51a96cc8cfe9", - "revisionTime": "2019-03-09T16:39:54Z", + "revision": "bdd9130c05828a158cb8088eec3561f8b1d0f956", + "revisionTime": "2019-03-12T03:51:26Z", "version": "single-chain", "versionExact": "single-chain" }, |