<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< 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 ======= hash: 8f57e2b090be9737f3c4d3157b3675ff5df4a9182928089f48c68593fdc80776 updated: 2017-06-29T21:02:00.000000000-07:00 >>>>>>> 249dae0... log: update to new logging API ======= hash: ec2fde7c4ec4cd438d8c53646a41743440355e53bdd417192a9e9f1db49f19a2 updated: 2017-08-24T17:24:41.5846735-07:00 >>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits ======= hash: cfe436dab405e09a50d3611edb83f5a238f71fd61c12ba7e47c2b02882a75cdf ======= hash: a7b6593b62ad571ed749736405aa456bf2b6163f5d54e61241be56a7baaad6bd >>>>>>> a9231df... build: use neutrino with StartTime rescan option updated: 2017-08-29T15:22:10.322166424-07:00 >>>>>>> e4e29cf... build: update glide files to point to latest btcd+neutrino ======= hash: c781beec4754f9e6c48a9521115015d060430c78dae18d419089ef1dff0f3bde updated: 2017-09-21T18:16:37.809204283-06:00 >>>>>>> 24684c8... build: update glide for new neutrino version ======= hash: 63c716f4c97cabee9b5a1c8cecd5c026550da120b23cfdcb3611492fde5b31bf updated: 2017-10-01T14:31:37.016793293-07:00 >>>>>>> 30ed6c8... build: update glide files to point to latest neutrino+btcutil ======= hash: e472a40c67ce1626e80d8d89631dde8e214903214a72d3a0e8d96e04bcaabd06 updated: 2017-11-02T19:08:54.780005689-07:00 >>>>>>> ba1ef88... build: update glide files for latest btcutil, btcd, and neutrino ======= 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 ======= hash: 83bb1c0a0f5c6396d2387746544592662898af52596d5cdca898b6fbfaa60841 updated: 2017-11-29T14:42:36.82153259-06:00 >>>>>>> 7a32017... multi: add bitcoind back-end (only for API use for now) ======= hash: 8fdbf966a888ff626d377d985e34c32518f81e96dc661433184ce011bad062b2 updated: 2018-01-12T18:42:39.220877425-07:00 >>>>>>> 6c1491e... build+chain: replace pebbe/zmq4 with lightninglabs/gozmq (native Go) ======= hash: 7ff104fae6ac78353955c2ef70405dce8a8c0f071111beaf0fc6ea392c5d9bbd updated: 2018-01-17T18:11:30.867494300-07:00 >>>>>>> de6548c... build: update glide to latest btcd, neutrino, and gozmq imports: - name: github.com/aead/siphash version: e404fcfc888570cadd1610538e2dbc89f66af814 - name: github.com/boltdb/bolt <<<<<<< HEAD version: 583e8937c61f1af6513608ccc75c97b6abdf4ff9 <<<<<<< HEAD - name: github.com/btcsuite/btcd <<<<<<< HEAD version: 47885ab8702485be6b6f87a03d4f3be0bc5c982c ======= version: 58668c182103a00c5038c7130d7a23fad3a3bd34 repo: git@github.com:companyzero/btcdln >>>>>>> 4d479d4... Move spvchain into neutrino and start integration w/btcwallet subpackages: - addrmgr - blockchain - btcec - btcjson - chaincfg - chaincfg/chainhash - connmgr - database - peer - txscript - wire - name: github.com/btcsuite/btclog version: 84c8d2346e9fc8c7b947e243b9c24e6df9fd206a - name: github.com/btcsuite/btcrpcclient <<<<<<< HEAD version: c72658166ae09457e6beb14e9112241e352ebd35 - name: github.com/btcsuite/btcutil version: 5ffa719c3882fd2ec1e8b9f4978066701c31a343 ======= version: e15bd09b466511d8836c4017bc4cbc2e0ff05f82 repo: git@github.com:companyzero/btcrpcclientln - name: github.com/btcsuite/btcutil version: f814b35f15362b1122f55bd9034b6275552cc2f7 repo: git@github.com:companyzero/btcutilln >>>>>>> 4d479d4... Move spvchain into neutrino and start integration w/btcwallet subpackages: - base58 - gcs - gcs/builder - hdkeychain ======= - name: github.com/btcsuite/btclog <<<<<<< HEAD version: 73889fb79bd687870312b6e40effcecffbd57d30 >>>>>>> afb1cbf... build: update glide files to point to roasbeef+neutrino proper ======= version: 266a29b6e5ad061d4c055cec1c0049e4aae47092 >>>>>>> 249dae0... log: update to new logging API - name: github.com/btcsuite/fastsha256 version: 637e656429416087660c84436a2a035d69d54e2e ======= version: 2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8 ======= hash: 7513f0ab812dca7cbcb30de742d99b5d1f51b246a7ed9f83ccc7e705dd2d4665 updated: 2018-03-10T18:35:25.074565861-08:00 imports: - name: github.com/aead/siphash version: e404fcfc888570cadd1610538e2dbc89f66af814 >>>>>>> 46f7390... build: switch from bolt to bbolt - name: github.com/btcsuite/btclog version: 84c8d2346e9fc8c7b947e243b9c24e6df9fd206a >>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits - name: github.com/btcsuite/go-socks version: 4720035b7bfd2a9bb130b1c184f8bbe41b6f0d0f subpackages: - socks - name: github.com/btcsuite/golangcrypto version: 53f62d9b43e87a6c56975cf862af7edf33a8d0df subpackages: - nacl/secretbox - pbkdf2 - poly1305 - ripemd160 - salsa20/salsa - scrypt - ssh/terminal <<<<<<< HEAD <<<<<<< HEAD ======= - name: github.com/btcsuite/seelog version: ae8891d029dd3c269dcfd6f261ad23e761acd99f >>>>>>> 4d479d4... Move spvchain into neutrino and start integration w/btcwallet ======= >>>>>>> 249dae0... log: update to new logging API - name: github.com/btcsuite/websocket version: 31079b6807923eb23992c421b114992b95131b55 - name: github.com/coreos/bbolt version: 4f5275f4ebbf6fe7cb772de987fa96ee674460a7 - name: github.com/davecgh/go-spew version: 346938d642f2ec3594ed81d874461961cd0faa76 subpackages: - spew - name: github.com/golang/protobuf version: ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e subpackages: - proto - ptypes/any - name: github.com/jessevdk/go-flags version: 1679536dcc895411a9f5848d9a0250be7856448c <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits - name: github.com/jrick/logrotate version: a93b200c26cbae3bb09dd0dc2c7c7fe1468a034a subpackages: - rotator <<<<<<< HEAD - name: golang.org/x/crypto version: 84f24dfdf3c414ed893ca1b318d0045ef5a1f607 subpackages: - ripemd160 - name: golang.org/x/net version: 8663ed5da4fd087c3cfb99a996e628b72e2f0948 ======= ======= >>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits - name: github.com/kkdai/bstream version: f391b8402d23024e7c0f624b31267a89998fca95 - name: github.com/lightninglabs/gozmq version: 0d266ba6d55ea65c18c7a02d8992c89355149e80 - name: github.com/lightninglabs/neutrino version: 2241200df496ac8fbbe3ffac5be0f1866ad4330c subpackages: - filterdb - headerfs - name: github.com/roasbeef/btcd version: 9978b939c33973be19b932fa7b936079bb7ba38d subpackages: - addrmgr - blockchain - btcec - btcjson - chaincfg - chaincfg/chainhash - connmgr - database - peer - rpcclient - txscript - wire - name: github.com/roasbeef/btcutil version: c3ff179366044979fb9856c2feb79bd4c2184c7a subpackages: - base58 - bech32 - gcs - gcs/builder - hdkeychain - name: golang.org/x/crypto version: 49796115aa4b964c318aad4f3084fdb41e9aa067 subpackages: - ripemd160 - ssh/terminal - name: golang.org/x/net <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD version: 513929065c19401a1c7b76ecd942f9f86a0c061b >>>>>>> 4d479d4... Move spvchain into neutrino and start integration w/btcwallet ======= version: 57efc9c3d9f91fb3277f8da1cff370539c4d3dc5 >>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits ======= version: 66aacef3dd8a676686c7ae3716979581e8b03c47 >>>>>>> e4e29cf... build: update glide files to point to latest btcd+neutrino ======= 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 - http2/hpack - idna - internal/timeseries - lex/httplex - trace - name: golang.org/x/sys <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD version: cd2c276457edda6df7fb04895d3fd6a6add42926 subpackages: - unix - name: golang.org/x/text version: 6353ef0f924300eea566d3438817aa4d3374817e ======= version: e62c3de784db939836898e5c19ffd41bece347da ======= version: 07c182904dbd53199946ba614a412c61d3c548f5 >>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits ======= version: ab9e364efd8b52800ff7ee48a9ffba4e0ed78dfb >>>>>>> e4e29cf... build: update glide files to point to latest btcd+neutrino ======= 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 ======= version: cc24f0397b10b6321b1a1322b6bd592984fdabf2 >>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits ======= version: 18c65dde6afd36dbc39197ca72008895b8dfbfb6 >>>>>>> e4e29cf... build: update glide files to point to latest btcd+neutrino ======= 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 - unicode/bidi - unicode/norm - name: google.golang.org/genproto version: 411e09b969b1170a9f0c467558eb4c4c110d9c77 subpackages: - googleapis/rpc/status - name: google.golang.org/grpc version: b15215fb911b24a5d61d57feec4233d610530464 subpackages: - codes - credentials - grpclb/grpc_lb_v1 - grpclog - internal - keepalive - metadata - naming - peer - stats - status - tap - transport testImports: []