gx update and fix code to use new Cid type

License: MIT Signed-off-by: Kevin Atkinson <k@kevina.org>
ipfs · Sep 12, 2018 · 417545d · 417545d
1 parent 3c0e451
commit 417545d
Show file tree

Hide file tree

Showing 86 changed files with 246 additions and 246 deletions.
diff --git a/assets/assets.go b/assets/assets.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ipfs/go-ipfs/core"
 	"github.com/ipfs/go-ipfs/core/coreunix"
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
-	uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io"
+	uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
 
 	// this import keeps gx from thinking the dep isn't used
 	_ "gx/ipfs/QmdZ4PvPHFQVLLEve7DgoKDcSY19wwpGBB1GKjjKi2rEL1/dir-index-html"

diff --git a/blocks/blockstoreutil/remove.go b/blocks/blockstoreutil/remove.go
@@ -9,7 +9,7 @@ import (
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore"
-	bs "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore"
+	bs "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
 )
 
 // RemovedBlock is used to respresent the result of removing a block.

diff --git a/core/builder.go b/core/builder.go
@@ -14,10 +14,10 @@ import (
 	repo "github.com/ipfs/go-ipfs/repo"
 	cidv0v1 "github.com/ipfs/go-ipfs/thirdparty/cidv0v1"
 	"github.com/ipfs/go-ipfs/thirdparty/verifbs"
-	resolver "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver"
-	uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io"
-	dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag"
-	bserv "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice"
+	uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
+	resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
+	dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
+	bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
 
 	ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
 	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
@@ -26,14 +26,14 @@ import (
 	retry "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/retrystore"
 	dsync "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/sync"
 	libp2p "gx/ipfs/QmUEqyXr97aUbNmQADHYNknjwjjdVpJXEt1UZXmSG81EV4/go-libp2p"
-	bstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore"
+	offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
 	cfg "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config"
-	offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline"
 	ipns "gx/ipfs/QmbUUxB9ErnEQdwTzy6HTxucnBvAH4am6vsfbD8CiqKhi9/go-ipns"
 	record "gx/ipfs/QmdHb9aBELnQKTVhvvA3hsQbRgUAwsWUzBP2vZ6Y5FBYvE/go-libp2p-record"
 	pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
 	pstoremem "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore/pstoremem"
 	p2phost "gx/ipfs/QmeMYW7Nj8jnnEfs9qhm7SxKkoDPUWXu3MsxX6BFwz34tf/go-libp2p-host"
+	bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
 	metrics "gx/ipfs/QmekzFM3hPZjTjUFGTABdQkEnQ3PTiMstY198PwSFr5w1Q/go-metrics-interface"
 )
 

diff --git a/core/commands/add.go b/core/commands/add.go
@@ -11,20 +11,20 @@ import (
 	cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
 	"github.com/ipfs/go-ipfs/core/coreunix"
 	filestore "github.com/ipfs/go-ipfs/filestore"
-	ft "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs"
-	dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag"
-	dagtest "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag/test"
-	blockservice "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice"
+	ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
+	dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
+	dagtest "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag/test"
+	blockservice "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
 
 	cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
 	pb "gx/ipfs/QmPtj12fdwuAqj9sBSTNUxBNu8kCGNp8b3o8yUzMm5GHpq/pb"
-	mfs "gx/ipfs/QmQ3spMujNBUbincFv411z9mKaYMqTu9UmCa1EyDN1NjPF/go-mfs"
 	cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
 	files "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit/files"
-	bstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore"
+	mfs "gx/ipfs/QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno/go-mfs"
+	offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
 	cidutil "gx/ipfs/QmXQPZefix3RAoFm9eRE1NA5Gv13DRQdQaLYmZta1vnxyh/go-cidutil"
-	offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline"
+	bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
 )
 
 // ErrDepthLimitExceeded indicates that the max depth has been exceeded.

diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go
@@ -9,8 +9,8 @@ import (
 	lgc "github.com/ipfs/go-ipfs/commands/legacy"
 	cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
 	e "github.com/ipfs/go-ipfs/core/commands/e"
-	bitswap "gx/ipfs/QmeHVXHezY1kHH9DNFtU5VCFras2oJmu9SKeBcExQUrxBH/go-bitswap"
-	decision "gx/ipfs/QmeHVXHezY1kHH9DNFtU5VCFras2oJmu9SKeBcExQUrxBH/go-bitswap/decision"
+	bitswap "gx/ipfs/QmQPWVDYeWvxN75cP4MGrbMVpADm2XqpM4KxgvbxkYk16u/go-bitswap"
+	decision "gx/ipfs/QmQPWVDYeWvxN75cP4MGrbMVpADm2XqpM4KxgvbxkYk16u/go-bitswap/decision"
 
 	"gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
 	cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"

diff --git a/core/commands/dag/dag.go b/core/commands/dag/dag.go
@@ -11,7 +11,7 @@ import (
 	e "github.com/ipfs/go-ipfs/core/commands/e"
 	coredag "github.com/ipfs/go-ipfs/core/coredag"
 	pin "github.com/ipfs/go-ipfs/pin"
-	path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path"
+	path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"

diff --git a/core/commands/dht.go b/core/commands/dht.go
@@ -10,16 +10,16 @@ import (
 
 	cmds "github.com/ipfs/go-ipfs/commands"
 	e "github.com/ipfs/go-ipfs/core/commands/e"
-	path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path"
-	dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag"
+	path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
+	dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
 	"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
 	b58 "gx/ipfs/QmWFAMPqsEyUX7gDUsRVmMWz59FxSpJ1b2v6bJ1yYzo7jY/go-base58-fast/base58"
-	routing "gx/ipfs/QmcZQouj6bSDga3D7W9cYKSZUrLkBG7C4jXsaFSNsuujpw/go-libp2p-routing"
-	notif "gx/ipfs/QmcZQouj6bSDga3D7W9cYKSZUrLkBG7C4jXsaFSNsuujpw/go-libp2p-routing/notifications"
 	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
+	routing "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing"
+	notif "gx/ipfs/QmdKS5YtmuSWKuLLgbHG176mS3VX3AKiyVmaaiAfvgcuch/go-libp2p-routing/notifications"
 	pstore "gx/ipfs/Qmda4cPRvSRyox3SqgJN6DfSZGU5TtHufPTp9uXjFj71X6/go-libp2p-peerstore"
 )
 

diff --git a/core/commands/files.go b/core/commands/files.go
@@ -16,21 +16,21 @@ import (
 	core "github.com/ipfs/go-ipfs/core"
 	cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
 	e "github.com/ipfs/go-ipfs/core/commands/e"
-	path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path"
-	resolver "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver"
-	ft "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs"
-	uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io"
-	dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag"
-	bservice "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice"
+	ft "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
+	uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
+	path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
+	resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
+	dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
+	bservice "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
 
 	humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
-	mfs "gx/ipfs/QmQ3spMujNBUbincFv411z9mKaYMqTu9UmCa1EyDN1NjPF/go-mfs"
 	logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
 	cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
-	offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline"
+	mfs "gx/ipfs/QmVcoYLHSe31tE18fQznFzEPawkCh9JvWR7zckfwZh1nno/go-mfs"
+	offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
 	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 

diff --git a/core/commands/get.go b/core/commands/get.go
@@ -14,12 +14,12 @@ import (
 	e "github.com/ipfs/go-ipfs/core/commands/e"
 
 	"gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
+	uarchive "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/archive"
 	"gx/ipfs/QmPtj12fdwuAqj9sBSTNUxBNu8kCGNp8b3o8yUzMm5GHpq/pb"
 	tar "gx/ipfs/QmQine7gvHncNevKtG9QXxf3nXcwSj6aDDmMm52mHofEEp/tar-utils"
+	path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
 	"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
-	path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path"
-	uarchive "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/archive"
-	dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag"
+	dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
 )
 
 var ErrInvalidCompressionLevel = errors.New("compression level must be between 1 and 9")

diff --git a/core/commands/ls.go b/core/commands/ls.go
@@ -9,17 +9,17 @@ import (
 	cmds "github.com/ipfs/go-ipfs/commands"
 	core "github.com/ipfs/go-ipfs/core"
 	e "github.com/ipfs/go-ipfs/core/commands/e"
-	path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path"
-	resolver "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver"
-	unixfs "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs"
-	uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io"
-	unixfspb "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/pb"
-	merkledag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag"
-	blockservice "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice"
+	unixfs "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
+	uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
+	unixfspb "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/pb"
+	path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
+	resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
+	merkledag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
+	blockservice "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
-	offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline"
+	offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
 	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 

diff --git a/core/commands/name/ipns.go b/core/commands/name/ipns.go
@@ -13,10 +13,10 @@ import (
 	nsopts "github.com/ipfs/go-ipfs/namesys/opts"
 
 	cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
-	offline "gx/ipfs/QmRFXthtrsTZBYCdqKY2FbaGcs1YB4kt1J2Viq7EBErK8y/go-ipfs-routing/offline"
 	logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
+	path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
 	"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
-	path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path"
+	offline "gx/ipfs/QmSbZCrt5cSiCNcXFZKoGjukcEf4DRdTzexqzEWATZDdz6/go-ipfs-routing/offline"
 )
 
 var log = logging.Logger("core/commands/ipns")

diff --git a/core/commands/name/publish.go b/core/commands/name/publish.go
@@ -15,8 +15,8 @@ import (
 	"gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
 	crypto "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
 	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
+	path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
 	"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
-	path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path"
 )
 
 var PublishCmd = &cmds.Command{

diff --git a/core/commands/object/object.go b/core/commands/object/object.go
@@ -19,7 +19,7 @@ import (
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
 	cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
-	dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag"
+	dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
 	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 

diff --git a/core/commands/pin.go b/core/commands/pin.go
@@ -12,16 +12,16 @@ import (
 	e "github.com/ipfs/go-ipfs/core/commands/e"
 	corerepo "github.com/ipfs/go-ipfs/core/corerepo"
 	pin "github.com/ipfs/go-ipfs/pin"
-	uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io"
+	uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
+	path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
+	resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
 	"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
+	dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
 	"gx/ipfs/QmVkMRSkXrpjqrroEXWuYBvDBnXCdMMY6gsKicBGVGUqKT/go-verifcid"
-	path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path"
-	resolver "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver"
-	offline "gx/ipfs/QmYv6jVYyd6H6v6o4fT8tGq9YCRKEKLcURdcbu73M4g2Se/go-ipfs-exchange-offline"
-	dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag"
-	bserv "gx/ipfs/QmeKoXwwVmtoZ3oKk4KTBabf3FSfisuVrZZq77P6wamKgo/go-blockservice"
+	offline "gx/ipfs/QmXHsHBveZF6ueKzDJbUg476gmrbzoR1yijiyH5SZAEuDT/go-ipfs-exchange-offline"
+	bserv "gx/ipfs/QmYHXfGs5GVxXN233aFr5Jenvd7NG4qZ7pmjfyz7yvG93m/go-blockservice"
 )
 
 var PinCmd = &cmds.Command{

diff --git a/core/commands/refs.go b/core/commands/refs.go
@@ -12,8 +12,8 @@ import (
 	e "github.com/ipfs/go-ipfs/core/commands/e"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
+	path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
 	cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
-	path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path"
 	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 

diff --git a/core/commands/repo.go b/core/commands/repo.go
@@ -19,8 +19,8 @@ import (
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
 	cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
-	bstore "gx/ipfs/QmUsUm3rSDh3yfc1JXU6fvbVfA8bv9qbk6gnbWjRXdRtNw/go-ipfs-blockstore"
 	config "gx/ipfs/QmYVqYJTVjetcf1guieEgWpK1PZtHPytP624vKzTF1P3r2/go-ipfs-config"
+	bstore "gx/ipfs/QmeMussyD8s3fQ3pM19ZsfbxvomEqPV9FvczLMWyBDYSnS/go-ipfs-blockstore"
 )
 
 type RepoVersion struct {

diff --git a/core/commands/resolve.go b/core/commands/resolve.go
@@ -12,7 +12,7 @@ import (
 	ncmd "github.com/ipfs/go-ipfs/core/commands/name"
 	ns "github.com/ipfs/go-ipfs/namesys"
 	nsopts "github.com/ipfs/go-ipfs/namesys/opts"
-	path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path"
+	path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
 
 	"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
 )

diff --git a/core/commands/tar.go b/core/commands/tar.go
@@ -9,8 +9,8 @@ import (
 	e "github.com/ipfs/go-ipfs/core/commands/e"
 	"github.com/ipfs/go-ipfs/core/coreunix"
 	tar "github.com/ipfs/go-ipfs/tar"
-	path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path"
-	dag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag"
+	path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
+	dag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
 
 	"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
 )

diff --git a/core/commands/unixfs/ls.go b/core/commands/unixfs/ls.go
@@ -12,12 +12,12 @@ import (
 	cmds "github.com/ipfs/go-ipfs/commands"
 	core "github.com/ipfs/go-ipfs/core"
 	e "github.com/ipfs/go-ipfs/core/commands/e"
-	path "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path"
-	resolver "gx/ipfs/QmYLH2cuZibRqjqwpDYRQbEBePETk9HckZcYn3UroTuiUk/go-path/resolver"
-	unixfs "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs"
-	uio "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/io"
-	unixfspb "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/pb"
-	merkledag "gx/ipfs/Qmc68D3Dta37BCB9yMbsWRCUdytjHiv8kRsyStSkthQzo3/go-merkledag"
+	unixfs "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs"
+	uio "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/io"
+	unixfspb "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/pb"
+	path "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path"
+	resolver "gx/ipfs/QmRYx6fJzTWFoeTo3qQn64iDrVC154Gy9waQDhvKRr2ND3/go-path/resolver"
+	merkledag "gx/ipfs/QmURqt1jB9Yu3X4Tr9WQJf36QGN7vi8mGTzjnX2ij1CJwC/go-merkledag"
 )
 
 type LsLink struct {

diff --git a/core/commands/urlstore.go b/core/commands/urlstore.go
@@ -10,11 +10,11 @@ import (
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
+	balanced "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer/balanced"
+	ihelper "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer/helpers"
+	trickle "gx/ipfs/QmPXzQ9LAFGZjcifFANCQFQiYt5SXgJziGoxUfJULVpHyA/go-unixfs/importer/trickle"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
 	cmdkit "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
-	balanced "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/importer/balanced"
-	ihelper "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/importer/helpers"
-	trickle "gx/ipfs/QmZWandwex7x4snD5YAbdXphKpk5JsM8VRefqJ55HjgaZo/go-unixfs/importer/trickle"
 	chunk "gx/ipfs/QmdSeG9s4EQ9TGruJJS9Us38TQDZtMmFGwzTYUDVqNTURm/go-ipfs-chunker"
 )