diff --git a/glide.lock b/glide.lock index 02beb598cf..9656174dfb 100644 --- a/glide.lock +++ b/glide.lock @@ -8,6 +8,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD hash: 2fe59efc96b0a2839297653da88cde89208f8f8cf4ced2bb1e828def57e3611b updated: 2017-07-19T11:33:58.0769452-04:00 ======= @@ -49,6 +50,10 @@ updated: 2017-11-02T19:08:54.780005689-07:00 hash: 9c53c13264c73f55b38f70bc6075962334438be3877fa92e51f6d35f90fe1f1a updated: 2017-11-03T12:30:39.76652975-07:00 >>>>>>> 80e2080... build: update to latest btcd+btcutil+neutrino +======= +hash: 8217b51c2a5fc4df53200de6315f4c1f4a084a516f38c77b815e0a02ac71e332 +updated: 2017-11-18T15:17:20.95646706-08:00 +>>>>>>> dc5f652... build: update to latest btcd and neutrino imports: - name: github.com/aead/siphash version: e404fcfc888570cadd1610538e2dbc89f66af814 @@ -138,7 +143,7 @@ imports: subpackages: - spew - name: github.com/golang/protobuf - version: 130e6b02ab059e7b717a096f397c5b60111cae74 + version: ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e subpackages: - proto - ptypes/any @@ -165,12 +170,12 @@ imports: - name: github.com/kkdai/bstream version: f391b8402d23024e7c0f624b31267a89998fca95 - name: github.com/lightninglabs/neutrino - version: 58df9631183049cdee3d29ca6950a75834b23dd7 + version: 36dd930b83e6db89495e74fa7516a9fbe5ecfd60 subpackages: - filterdb - headerfs - name: github.com/roasbeef/btcd - version: 2cabbb06420ead94822468af58c0cb82e9e17ffc + version: 5d9e4e1fa749fa2f1675802a4c9f10ef0ada04d1 subpackages: - addrmgr - blockchain @@ -200,6 +205,7 @@ imports: - name: golang.org/x/net <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD version: 513929065c19401a1c7b76ecd942f9f86a0c061b >>>>>>> 4d479d4... Move spvchain into neutrino and start integration w/btcwallet @@ -212,6 +218,9 @@ imports: ======= version: 1087133bc4af3073e18add999345c6ae75918503 >>>>>>> ba1ef88... build: update glide files for latest btcutil, btcd, and neutrino +======= + version: 66aacef3dd8a676686c7ae3716979581e8b03c47 +>>>>>>> dc5f652... build: update to latest btcd and neutrino subpackages: - context - http2 @@ -224,6 +233,7 @@ imports: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD version: cd2c276457edda6df7fb04895d3fd6a6add42926 subpackages: @@ -241,12 +251,16 @@ imports: ======= version: 686000749eaec0b8855b8eef5336cf63899fe51d >>>>>>> ba1ef88... build: update glide files for latest btcutil, btcd, and neutrino +======= + version: ab9e364efd8b52800ff7ee48a9ffba4e0ed78dfb +>>>>>>> dc5f652... build: update to latest btcd and neutrino subpackages: - unix - windows - name: golang.org/x/text <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD version: 19e51611da83d6be54ddafce4a4af510cb3e9ea4 >>>>>>> 4d479d4... Move spvchain into neutrino and start integration w/btcwallet @@ -259,6 +273,9 @@ imports: ======= version: c01e4764d870b77f8abe5096ee19ad20d80e8075 >>>>>>> ba1ef88... build: update glide files for latest btcutil, btcd, and neutrino +======= + version: 18c65dde6afd36dbc39197ca72008895b8dfbfb6 +>>>>>>> dc5f652... build: update to latest btcd and neutrino subpackages: - secure/bidirule - transform diff --git a/glide.yaml b/glide.yaml index a005e716c1..81f6e20e35 100644 --- a/glide.yaml +++ b/glide.yaml @@ -3,7 +3,7 @@ import: - package: github.com/boltdb/bolt version: ^1.3.0 - package: github.com/roasbeef/btcd - version: 2cabbb06420ead94822468af58c0cb82e9e17ffc + version: 5d9e4e1fa749fa2f1675802a4c9f10ef0ada04d1 subpackages: - blockchain - btcec @@ -18,7 +18,7 @@ import: subpackages: - hdkeychain - package: github.com/lightninglabs/neutrino - version: 58df9631183049cdee3d29ca6950a75834b23dd7 + version: 36dd930b83e6db89495e74fa7516a9fbe5ecfd60 - package: github.com/btcsuite/golangcrypto subpackages: - nacl/secretbox