From 598394c51a716087098e5f45419b1e2843950a88 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Mon, 5 Jun 2017 18:13:22 -0700 Subject: [PATCH] build: update glide files to point to roasbeef+neutrino proper --- glide.lock | 39 +++++++++++++++++++++++++++++++++++++-- glide.yaml | 19 ++++++++----------- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/glide.lock b/glide.lock index 9e395dd..4ba9353 100644 --- a/glide.lock +++ b/glide.lock @@ -1,15 +1,21 @@ <<<<<<< HEAD +<<<<<<< HEAD hash: 2fe59efc96b0a2839297653da88cde89208f8f8cf4ced2bb1e828def57e3611b updated: 2017-07-19T11:33:58.0769452-04:00 ======= hash: a567152c861b11d05c72b812d894a657b95ae39d08f85c0b7cbf1a235dd8a1a7 updated: 2017-05-18T20:28:25.480256291-06:00 >>>>>>> 4d479d4... Move spvchain into neutrino and start integration w/btcwallet +======= +hash: 59de122918c56a47f9987706a303d54c95929728a1dd74e2f17f38b03274366e +updated: 2017-06-05T18:12:20.300008456-07:00 +>>>>>>> afb1cbf... build: update glide files to point to roasbeef+neutrino proper imports: - name: github.com/aead/siphash version: e404fcfc888570cadd1610538e2dbc89f66af814 - name: github.com/boltdb/bolt version: 583e8937c61f1af6513608ccc75c97b6abdf4ff9 +<<<<<<< HEAD - name: github.com/btcsuite/btcd <<<<<<< HEAD version: 47885ab8702485be6b6f87a03d4f3be0bc5c982c @@ -48,6 +54,10 @@ imports: - gcs - gcs/builder - hdkeychain +======= +- name: github.com/btcsuite/btclog + version: 73889fb79bd687870312b6e40effcecffbd57d30 +>>>>>>> afb1cbf... build: update glide files to point to roasbeef+neutrino proper - name: github.com/btcsuite/fastsha256 version: 637e656429416087660c84436a2a035d69d54e2e - name: github.com/btcsuite/go-socks @@ -97,8 +107,33 @@ imports: - name: github.com/kkdai/bstream version: f391b8402d23024e7c0f624b31267a89998fca95 - name: github.com/lightninglabs/neutrino - version: 8959f0d619d258039cf16044696035386e75392f - repo: git@github.com:lightninglabs/neutrino + version: 2f6910cce3055c11361bffc02e0c653dd9be087e + subpackages: + - filterdb + - headerfs +- name: github.com/roasbeef/btcd + version: 4d38357cee3ed3843cd81a347e1573f037e0301e + subpackages: + - addrmgr + - blockchain + - btcec + - btcjson + - chaincfg + - chaincfg/chainhash + - connmgr + - database + - peer + - txscript + - wire +- name: github.com/roasbeef/btcrpcclient + version: 9a7826550df8071460e2f5dd6ed9139dcbf260b8 +- name: github.com/roasbeef/btcutil + version: a259eaf2ec1b54653cdd67848a41867f280797ee + subpackages: + - base58 + - gcs + - gcs/builder + - hdkeychain - name: golang.org/x/crypto version: 0fe963104e9d1877082f8fb38f816fcd97eb1d10 subpackages: diff --git a/glide.yaml b/glide.yaml index 7c99293..711f937 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,10 +1,9 @@ -package: github.com/btcsuite/btcwallet +package: github.com/roasbeef/btcwallet import: - package: github.com/boltdb/bolt version: ^1.3.0 -- package: github.com/btcsuite/btcd - repo: git@github.com:companyzero/btcdln - version: segwit-cbf +- package: github.com/roasbeef/btcd + version: 4d38357cee3ed3843cd81a347e1573f037e0301e subpackages: - blockchain - btcec @@ -14,16 +13,14 @@ import: - txscript - wire - package: github.com/btcsuite/btclog -- package: github.com/btcsuite/btcrpcclient - repo: git@github.com:companyzero/btcrpcclientln - version: pedro_cbf -- package: github.com/btcsuite/btcutil - repo: git@github.com:companyzero/btcutilln - version: gcs +- package: github.com/roasbeef/btcrpcclient + version: 9a7826550df8071460e2f5dd6ed9139dcbf260b8 +- package: github.com/roasbeef/btcutil + version: a259eaf2ec1b54653cdd67848a41867f280797ee subpackages: - hdkeychain - package: github.com/lightninglabs/neutrino - repo: git@github.com:lightninglabs/neutrino + version: 2f6910cce3055c11361bffc02e0c653dd9be087e - package: github.com/btcsuite/golangcrypto subpackages: - nacl/secretbox