Merge branch 'master' of https://github.com/ipfs/go-ipfs into upstream

Author: jes

.codeclimate.yml

@@ -11,6 +11,12 @@ exclude_paths:
 engines:
   fixme:
     enabled: true
+    config:
+      strings:
+      - FIXME
+      - HACK
+      - XXX
+      - BUG
   golint:
     enabled: true
   govet:

.gx/lastpubver

@@ -1 +1 @@
-0.4.8: QmPnTPuoB9y4Wzm3j8BdUmoqG7icmN7zGazDLuT4Duke9S
+0.4.9: QmQuvzi7p2qv9oduQ8o6fhPXDBCns9ryjjxqumyNvE5gZs

CHANGELOG.md

@@ -2,6 +2,31 @@
 
 ### 0.4.9 - 2017-04-30
 
+Ipfs 0.4.9 is a maintenance release that contains several useful bugfixes and
+improvements. Notably, `ipfs add` has gained the ability to select which CID
+version will be output. The common ipfs hash that looks like this:
+`QmRjNgF2mRLDT8AzCPsQbw1EYF2hDTFgfUmJokJPhCApYP` is a multihash. Multihashes
+allow us to specify the hashing algorithm that was used to verify the data, but
+it doesn't give us any indication of what format that data might be. To address
+that issue, we are adding another couple of bytes to the prefix that will allow us
+to indicate the format of the data referenced by the hash. This new format is
+called a Content ID, or CID for short. The previous bare multihashes will still
+be fully supported throughout the entire application as CID version 0. The new
+format with the type information will be CID version 1. To give an example,
+the content referenced by the hash above is "Hello Ipfs!". That same content,
+in the same format (dag-protobuf) using CIDv1 is
+`zb2rhkgXZVkT2xvDiuUsJENPSbWJy7fdYnsboLBzzEjjZMRoG`.
+
+CIDv1 hashes are supported in ipfs versions back to 0.4.5. Nodes running 0.4.4
+and older will not be able to load content via CIDv1 and we recommend that they
+update to a newer version.
+
+There are many other use cases for CIDs. Plugins can be written to
+allow ipfs to natively address content from any other merkletree based system,
+such as git, bitcoin, zcash and ethereum -- a few systems we've already started work on.
+
+Aside from the CID flag, there were many other changes as noted below:
+
 - Features
   - Add support for using CidV1 in 'ipfs add' ([ipfs/go-ipfs#3743](https://github.com/ipfs/go-ipfs/pull/3743))
 - Improvements

README.md

@@ -70,6 +70,7 @@ From there:
 ### From Linux package managers
 
 - [Arch Linux](#arch-linux)
+- [Nix](#nix)
 - [Snap](#snap)
 
 #### Arch Linux
@@ -83,6 +84,15 @@ Development version of go-ipfs is also on AUR under
 [go-ipfs-git](https://aur.archlinux.org/packages/go-ipfs-git/).
 You can install it using your favourite AUR Helper or manually from AUR.
 
+### Nix
+
+For Linux and MacOSX you can use the purely functional package manager [Nix](https://nixos.org/nix/):
+
+```
+$ nix-env -i ipfs
+```
+You can also install the Package by using it's attribute name, which is also `ipfs`.
+
 #### Snap
 
 With snap, in any of the [supported Linux distributions](https://snapcraft.io/docs/core/install):
@@ -114,6 +124,8 @@ $ cd $GOPATH/src/github.com/ipfs/go-ipfs
 $ make install
 ```
 
+If you are building on FreeBSD instead of `make install` use `gmake install`.
+
 #### Building on less common systems
 
 If your operating system isn't officially supported, but you still want to try

Rules.mk

@@ -53,9 +53,6 @@ include $(dir)/Rules.mk
 dir := exchange/bitswap/message/pb
 include $(dir)/Rules.mk
 
-dir := diagnostics/pb
-include $(dir)/Rules.mk
-
 dir := pin/internal/pb
 include $(dir)/Rules.mk
 
@@ -70,7 +67,6 @@ include $(dir)/Rules.mk
 #     core targets     #
 # -------------------- #
 
-
 build: $(TGT_BIN)
 .PHONY: build
 
@@ -146,6 +142,7 @@ help:
 	@echo '  test_go_short'
 	@echo '  test_go_expensive'
 	@echo '  test_go_race'
+	@echo '  test_go_megacheck'	 - Run the `megacheck` vetting tool
 	@echo '  test_sharness_short'
 	@echo '  test_sharness_expensive'
 	@echo '  test_sharness_race'

bin/check_version

@@ -35,7 +35,7 @@ check_at_least_version() {
     # if the second dot doesn't match, we consider it a prerelease
 
     if MIN_MIN=$(expr "$MIN_VERS" : "[^.]*\.\([0-9]\+\)"); then
-        # this captured digit is neccessary, since expr returns code 1 if the output is empty
+        # this captured digit is necessary, since expr returns code 1 if the output is empty
         if expr "$MIN_VERS" : "[^.]*\.[0-9]*\([0-9]\.\|[0-9]\$\)" >/dev/null; then
             MIN_PRERELEASE="0"
         else
@@ -48,7 +48,7 @@ check_at_least_version() {
         MIN_FIX="0"
     fi
     if CUR_MIN=$(expr "$CUR_VERS" : "[^.]*\.\([0-9]\+\)"); then
-        # this captured digit is neccessary, since expr returns code 1 if the output is empty
+        # this captured digit is necessary, since expr returns code 1 if the output is empty
         if expr "$CUR_VERS" : "[^.]*\.[0-9]*\([0-9]\.\|[0-9]\$\)" >/dev/null; then
             CUR_PRERELEASE="0"
         else

blocks/blocks_test.go

@@ -91,9 +91,8 @@ func TestManualHash(t *testing.T) {
 
 	u.Debug = true
 
-	block, err = NewBlockWithCid(data, c)
+	_, err = NewBlockWithCid(data, c)
 	if err != ErrWrongHash {
 		t.Fatal(err)
 	}
-
 }

blocks/blockstore/arc_cache_test.go

@@ -30,7 +30,7 @@ func testArcCached(ctx context.Context, bs Blockstore) (*arccache, error) {
 func createStores(t *testing.T) (*arccache, Blockstore, *callbackDatastore) {
 	cd := &callbackDatastore{f: func() {}, ds: ds.NewMapDatastore()}
 	bs := NewBlockstore(syncds.MutexWrap(cd))
-	arc, err := testArcCached(nil, bs)
+	arc, err := testArcCached(context.TODO(), bs)
 	if err != nil {
 		t.Fatal(err)
 	}

blocks/blockstore/blockstore.go

@@ -102,10 +102,6 @@ func NewBlockstore(d ds.Batching) Blockstore {
 type blockstore struct {
 	datastore ds.Batching
 
-	lk      sync.RWMutex
-	gcreq   int32
-	gcreqlk sync.Mutex
-
 	rehash bool
 }
 
@@ -246,9 +242,8 @@ func NewGCLocker() GCLocker {
 }
 
 type gclocker struct {
-	lk      sync.RWMutex
-	gcreq   int32
-	gcreqlk sync.Mutex
+	lk    sync.RWMutex
+	gcreq int32
 }
 
 // Unlocker represents an object which can Unlock

blocks/blockstore/bloom_cache.go

@@ -118,7 +118,7 @@ func (b *bloomcache) hasCached(k *cid.Cid) (has bool, ok bool) {
 	}
 	if b.BloomActive() {
 		blr := b.bloom.HasTS(k.Bytes())
-		if blr == false { // not contained in bloom is only conclusive answer bloom gives
+		if !blr { // not contained in bloom is only conclusive answer bloom gives
 			b.hits.Inc()
 			return false, true
 		}