From 8404b8263de39467bda064cdce59293db5914a40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 18:54:58 +0100
Subject: [PATCH 01/35] coreapi: swarm interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@bc2ae0a441ed2da875bf2d815766e90b2c2a4d9f

This commit was moved from ipfs/boxo@398a8ffdf544dac64be994ce4a34ef3013d9d584
---
 core/coreiface/swarm.go | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 core/coreiface/swarm.go

diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
new file mode 100644
index 000000000..1ec260e07
--- /dev/null
+++ b/core/coreiface/swarm.go
@@ -0,0 +1,37 @@
+package iface
+
+import (
+	"time"
+
+	"context"
+	ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr"
+	peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
+)
+
+// PeerInfo contains information about a peer
+type PeerInfo interface {
+	// ID returns PeerID
+	ID() peer.ID
+
+	// Address returns the multiaddress via which we are connected with the peer
+	Address() ma.Multiaddr
+
+	// Latency returns last known round trip time to the peer
+	Latency() time.Duration
+
+	// Streams returns list of streams established with the peer
+	// TODO: should this return multicodecs?
+	Streams() []string
+}
+
+// SwarmAPI specifies the interface to libp2p swarm
+type SwarmAPI interface {
+	// Connect to a given address
+	Connect(context.Context, ma.Multiaddr) error
+
+	// Disconnect from a given address
+	Disconnect(context.Context, ma.Multiaddr) error
+
+	// Peers returns the list of peers we are connected to
+	Peers(context.Context) ([]PeerInfo, error)
+}

From fc8386301bc0534bac90eeb0b1c3b7b4a908a0b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 19:02:57 +0100
Subject: [PATCH 02/35] coreapi: implement swarm api
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@3ab7f14240700d0e64e011e5fca7c847afc9ce9e

This commit was moved from ipfs/boxo@81615a9f48e0bba90d04b4ac389948124aeff053
---
 core/coreiface/coreapi.go | 3 +++
 core/coreiface/swarm.go   | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 0053d472e..0b153b6f9 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -34,6 +34,9 @@ type CoreAPI interface {
 	// Dht returns an implementation of Dht API
 	Dht() DhtAPI
 
+	// Swarm returns an implementation of Swarm API
+	Swarm() SwarmAPI
+
 	// ResolvePath resolves the path using Unixfs resolver
 	ResolvePath(context.Context, Path) (ResolvedPath, error)
 
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 1ec260e07..1f0b1216f 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -1,9 +1,9 @@
 package iface
 
 import (
+	"context"
 	"time"
 
-	"context"
 	ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr"
 	peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
 )
@@ -17,11 +17,11 @@ type PeerInfo interface {
 	Address() ma.Multiaddr
 
 	// Latency returns last known round trip time to the peer
-	Latency() time.Duration
+	Latency(context.Context) (time.Duration, error)
 
 	// Streams returns list of streams established with the peer
 	// TODO: should this return multicodecs?
-	Streams() []string
+	Streams(context.Context) ([]string, error)
 }
 
 // SwarmAPI specifies the interface to libp2p swarm

From e839e46e938487e891dfea804e4ae18bddbefb4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 5 Apr 2018 20:22:49 +0200
Subject: [PATCH 03/35] fix infinite loop in connInfo.ID
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@89ce6041ad9b851959cdd2434d4f7ab375459599

This commit was moved from ipfs/boxo@7e79c2365ce422f3c26401f2a0c8e1da99515aaf
---
 core/coreiface/swarm.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 1f0b1216f..92817e6f4 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr"
-	peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
+	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
+	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
 )
 
 // PeerInfo contains information about a peer

From 619855cc7a6f166359654b6ac2e6b1e0efcbe000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 11 Sep 2018 20:50:15 +0200
Subject: [PATCH 04/35] swarm cmd: port to new cmd lib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@59f549fe3aa60f48303f6283e09ae05c9224a84c

This commit was moved from ipfs/boxo@6e9149c6f900ec598b0345cc97b0979b53ba8cb0
---
 core/coreiface/swarm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 92817e6f4..2492f2696 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
 	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
+	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
 )
 
 // PeerInfo contains information about a peer

From 284fd898dc3cf0f88b5816cb53d87d41676e9746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 17 Sep 2018 16:45:59 +0200
Subject: [PATCH 05/35] coreapi swarm: rewire connect/disconnect
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@a48b2a807b98f5fe7eb4c1148bf938498a4836ce

This commit was moved from ipfs/boxo@0f6f6ec8a4e5b41f01c658bf46f4d30b69a7ade5
---
 core/coreiface/swarm.go | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 2492f2696..7bd009f16 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -2,14 +2,22 @@ package iface
 
 import (
 	"context"
+	"errors"
 	"time"
 
 	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
-	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
+	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
+	"gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
+	pstore "gx/ipfs/QmfAQMFpgDU2U4BXG64qVr8HSiictfWvkSBz7Y2oDj65st/go-libp2p-peerstore"
 )
 
-// PeerInfo contains information about a peer
-type PeerInfo interface {
+var (
+	ErrNotConnected = errors.New("not connected")
+	ErrConnNotFound = errors.New("conn not found")
+	)
+
+// ConnectionInfo contains information about a peer
+type ConnectionInfo interface {
 	// ID returns PeerID
 	ID() peer.ID
 
@@ -20,18 +28,17 @@ type PeerInfo interface {
 	Latency(context.Context) (time.Duration, error)
 
 	// Streams returns list of streams established with the peer
-	// TODO: should this return multicodecs?
-	Streams(context.Context) ([]string, error)
+	Streams(context.Context) ([]protocol.ID, error)
 }
 
 // SwarmAPI specifies the interface to libp2p swarm
 type SwarmAPI interface {
-	// Connect to a given address
-	Connect(context.Context, ma.Multiaddr) error
+	// Connect to a given peer
+	Connect(context.Context, pstore.PeerInfo) error
 
 	// Disconnect from a given address
 	Disconnect(context.Context, ma.Multiaddr) error
 
 	// Peers returns the list of peers we are connected to
-	Peers(context.Context) ([]PeerInfo, error)
+	Peers(context.Context) ([]ConnectionInfo, error)
 }

From cb1f0c550ff5acbde160286b46a5a18d9a4393df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 17 Sep 2018 19:53:15 +0200
Subject: [PATCH 06/35] coreapi swarm: rewire address listing cmds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@8c35696f74f086858b6acaf8ee6a0ffe570e46cb

This commit was moved from ipfs/boxo@4020059a81eb3f31fec83c825d6ce4d9dd8c65c4
---
 core/coreiface/key.go   |  3 +++
 core/coreiface/swarm.go | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index 4305ae20d..cc6dc8900 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -33,6 +33,9 @@ type KeyAPI interface {
 	// List lists keys stored in keystore
 	List(ctx context.Context) ([]Key, error)
 
+	// Self returns the 'main' node key
+	Self(ctx context.Context) (Key, error)
+
 	// Remove removes keys from keystore. Returns ipns path of the removed key
 	Remove(ctx context.Context, name string) (Key, error)
 }
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 7bd009f16..caa6a70e3 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -9,12 +9,13 @@ import (
 	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
 	"gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
 	pstore "gx/ipfs/QmfAQMFpgDU2U4BXG64qVr8HSiictfWvkSBz7Y2oDj65st/go-libp2p-peerstore"
+	net "gx/ipfs/QmfDPh144WGBqRxZb1TGDHerbMnZATrHZggAPw7putNnBq/go-libp2p-net"
 )
 
 var (
 	ErrNotConnected = errors.New("not connected")
 	ErrConnNotFound = errors.New("conn not found")
-	)
+)
 
 // ConnectionInfo contains information about a peer
 type ConnectionInfo interface {
@@ -24,6 +25,9 @@ type ConnectionInfo interface {
 	// Address returns the multiaddress via which we are connected with the peer
 	Address() ma.Multiaddr
 
+	// Direction returns which way the connection was established
+	Direction() net.Direction
+
 	// Latency returns last known round trip time to the peer
 	Latency(context.Context) (time.Duration, error)
 
@@ -41,4 +45,8 @@ type SwarmAPI interface {
 
 	// Peers returns the list of peers we are connected to
 	Peers(context.Context) ([]ConnectionInfo, error)
+
+	KnownAddrs(context.Context) (map[peer.ID][]ma.Multiaddr, error)
+	LocalAddrs(context.Context) ([]ma.Multiaddr, error)
+	ListenAddrs(context.Context) ([]ma.Multiaddr, error)
 }

From a95fe8e687f56947c1356ee4f10739c541e64891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 2 Oct 2018 12:31:50 +0200
Subject: [PATCH 07/35] coreapi swarm: missing docs, review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@162cac0144b96596576bc9ec7389afaa8eb56135

This commit was moved from ipfs/boxo@9df903d67183fbb9c9ae66de11a4c62f92f7c1ee
---
 core/coreiface/swarm.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index caa6a70e3..8b464e5c1 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -29,10 +29,10 @@ type ConnectionInfo interface {
 	Direction() net.Direction
 
 	// Latency returns last known round trip time to the peer
-	Latency(context.Context) (time.Duration, error)
+	Latency() (time.Duration, error)
 
 	// Streams returns list of streams established with the peer
-	Streams(context.Context) ([]protocol.ID, error)
+	Streams() ([]protocol.ID, error)
 }
 
 // SwarmAPI specifies the interface to libp2p swarm
@@ -46,7 +46,12 @@ type SwarmAPI interface {
 	// Peers returns the list of peers we are connected to
 	Peers(context.Context) ([]ConnectionInfo, error)
 
+	// KnownAddrs returns the list of all addresses this node is aware of
 	KnownAddrs(context.Context) (map[peer.ID][]ma.Multiaddr, error)
+
+	// LocalAddrs returns the list of announced listening addresses
 	LocalAddrs(context.Context) ([]ma.Multiaddr, error)
+
+	// ListenAddrs returns the list of all listening addresses
 	ListenAddrs(context.Context) ([]ma.Multiaddr, error)
 }

From 99c68ac8c97652369fa2eceac144e81f8177bd4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 19 Sep 2018 23:40:45 +0200
Subject: [PATCH 08/35] Cleanup instances of manual resolver construction
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@47db102ccd13e62f40e7372b56b33dcf33e63c60

This commit was moved from ipfs/boxo@b7e28a936c5c9edee31e262c366c30fde7d872ab
---
 core/coreiface/util.go | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/util.go b/core/coreiface/util.go
index 8fd3e058f..6d58bf40d 100644
--- a/core/coreiface/util.go
+++ b/core/coreiface/util.go
@@ -1,10 +1,20 @@
 package iface
 
 import (
+	"context"
 	"io"
 )
 
 type Reader interface {
-	io.ReadSeeker
-	io.Closer
+	ReadSeekCloser
+	Size() uint64
+	CtxReadFull(context.Context, []byte) (int, error)
+}
+
+// A ReadSeekCloser implements interfaces to read, copy, seek and close.
+type ReadSeekCloser interface {
+	io.Reader
+	io.Seeker
+	io.Closer
+	io.WriterTo
 }

From 7d9ebdcebe6a0691a0921c167b2c513037b1cebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Sep 2018 15:00:51 +0200
Subject: [PATCH 09/35] coreapi unixfs: use fileAdder directly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@78136afef00445d43c96ec7c66249b881dcf95ff

This commit was moved from ipfs/boxo@60c358b08ca8bbb2773d19533ddd9b9864f3d360
---
 core/coreiface/options/unixfs.go | 50 ++++++++++++++++++++++++++++++++
 core/coreiface/unixfs.go         |  4 ++-
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 core/coreiface/options/unixfs.go

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
new file mode 100644
index 000000000..8dc9806a7
--- /dev/null
+++ b/core/coreiface/options/unixfs.go
@@ -0,0 +1,50 @@
+package options
+
+import (
+	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
+)
+
+type UnixfsAddSettings struct {
+	CidVersion int
+	MhType     uint64
+
+	InlineLimit int
+}
+
+type UnixfsAddOption func(*UnixfsAddSettings) error
+
+func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, error) {
+	options := &UnixfsAddSettings{
+		CidVersion: -1,
+		MhType:     mh.SHA2_256,
+
+		InlineLimit: 0,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return options, nil
+}
+
+type unixfsOpts struct{}
+
+var Unixfs unixfsOpts
+
+func (unixfsOpts) CidVersion(version int) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.CidVersion = version
+		return nil
+	}
+}
+
+func (unixfsOpts) Hash(mhtype uint64) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.MhType = mhtype
+		return nil
+	}
+}
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 4a3aff6fc..10febd9fa 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -4,13 +4,15 @@ import (
 	"context"
 	"io"
 
+	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+
 	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 
 // UnixfsAPI is the basic interface to immutable files in IPFS
 type UnixfsAPI interface {
 	// Add imports the data from the reader into merkledag file
-	Add(context.Context, io.Reader) (ResolvedPath, error)
+	Add(context.Context, io.ReadCloser, ...options.UnixfsAddOption) (ResolvedPath, error)
 
 	// Cat returns a reader for the file
 	Cat(context.Context, Path) (Reader, error)

From d7afe85fe0523066da04d3274cd6f048328ca12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Sep 2018 15:59:53 +0200
Subject: [PATCH 10/35] coreapi unixfs: cid prefix options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@6c7f760b5d8ae479518992b322a7bd1ccc406247

This commit was moved from ipfs/boxo@0df36df660ece10808c7af055b59cd7052aaa7cf
---
 core/coreiface/options/unixfs.go | 8 ++++++--
 core/coreiface/unixfs.go         | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 8dc9806a7..ffed75577 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -8,7 +8,9 @@ type UnixfsAddSettings struct {
 	CidVersion int
 	MhType     uint64
 
-	InlineLimit int
+	InlineLimit  int
+	RawLeaves    bool
+	RawLeavesSet bool
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -18,7 +20,9 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, error) {
 		CidVersion: -1,
 		MhType:     mh.SHA2_256,
 
-		InlineLimit: 0,
+		InlineLimit:  0,
+		RawLeaves:    false,
+		RawLeavesSet: false,
 	}
 
 	for _, opt := range opts {
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 10febd9fa..acc3b960c 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -10,6 +10,7 @@ import (
 )
 
 // UnixfsAPI is the basic interface to immutable files in IPFS
+// NOTE: This API is heavily WIP, things are guaranteed to break frequently
 type UnixfsAPI interface {
 	// Add imports the data from the reader into merkledag file
 	Add(context.Context, io.ReadCloser, ...options.UnixfsAddOption) (ResolvedPath, error)

From 9e57389b045a5202e2c91037d9cfaa87df751729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Sep 2018 16:19:32 +0200
Subject: [PATCH 11/35] coreapi unixfs: options for RawLeaves / Inline
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@dbdf6fd63ad66e3b5e5649a349ee9ba9534590a0

This commit was moved from ipfs/boxo@6a3bc40fc4c131b19837c1007ba3e65a51de6ab1
---
 core/coreiface/options/unixfs.go | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index ffed75577..3c46ed086 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -52,3 +52,18 @@ func (unixfsOpts) Hash(mhtype uint64) UnixfsAddOption {
 		return nil
 	}
 }
+
+func (unixfsOpts) RawLeaves(enable bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.RawLeaves = enable
+		settings.RawLeavesSet = true
+		return nil
+	}
+}
+
+func (unixfsOpts) InlineLimit(limit int) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.InlineLimit = limit
+		return nil
+	}
+}

From 82ef32dcaf3619bc2d372ef0a634e56e159cc4e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Sep 2018 16:40:31 +0200
Subject: [PATCH 12/35] coreapi unixfs: layout/chunker options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@ee22ac438536720b2646e6071ecc6519f4161a0c

This commit was moved from ipfs/boxo@f858a5213f527b1ff67c45692c9e481301678398
---
 core/coreiface/options/unixfs.go | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 3c46ed086..fe41af9a8 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -4,6 +4,13 @@ import (
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
 )
 
+type Layout int
+
+const (
+	BalancedLayout Layout = iota
+	TrickleLeyout
+)
+
 type UnixfsAddSettings struct {
 	CidVersion int
 	MhType     uint64
@@ -11,6 +18,9 @@ type UnixfsAddSettings struct {
 	InlineLimit  int
 	RawLeaves    bool
 	RawLeavesSet bool
+
+	Chunker string
+	Layout  Layout
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -23,6 +33,9 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, error) {
 		InlineLimit:  0,
 		RawLeaves:    false,
 		RawLeavesSet: false,
+
+		Chunker: "size-262144",
+		Layout:  BalancedLayout,
 	}
 
 	for _, opt := range opts {
@@ -67,3 +80,17 @@ func (unixfsOpts) InlineLimit(limit int) UnixfsAddOption {
 		return nil
 	}
 }
+
+func (unixfsOpts) Chunker(chunker string) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Chunker = chunker
+		return nil
+	}
+}
+
+func (unixfsOpts) Layout(layout Layout) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Layout = layout
+		return nil
+	}
+}

From ac8ff307329da34110495b69df9c003232f78c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Sep 2018 23:05:22 +0200
Subject: [PATCH 13/35] coreapi unixfs: pin/local/hash-only options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@8521907e1a8ac009252669ad3e40be2d93438ad3

This commit was moved from ipfs/boxo@27ded0dea2d8b2ee4c115c9cd40c2d1514927162
---
 core/coreiface/options/unixfs.go | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index fe41af9a8..6012ce77b 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -21,6 +21,10 @@ type UnixfsAddSettings struct {
 
 	Chunker string
 	Layout  Layout
+
+	Pin      bool
+	OnlyHash bool
+	Local    bool
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -36,6 +40,10 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, error) {
 
 		Chunker: "size-262144",
 		Layout:  BalancedLayout,
+
+		Pin:      false,
+		OnlyHash: false,
+		Local:    false,
 	}
 
 	for _, opt := range opts {
@@ -94,3 +102,24 @@ func (unixfsOpts) Layout(layout Layout) UnixfsAddOption {
 		return nil
 	}
 }
+
+func (unixfsOpts) Pin(pin bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Pin = pin
+		return nil
+	}
+}
+
+func (unixfsOpts) HashOnly(hashOnly bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.OnlyHash = hashOnly
+		return nil
+	}
+}
+
+func (unixfsOpts) Local(local bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Local = local
+		return nil
+	}
+}

From 7546c9386701ca6931a8bc0ac3fb202cace91015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Sep 2018 23:15:07 +0200
Subject: [PATCH 14/35] coreapi unixfs: cleanup options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@e62f26507f22f00426172384461c53c7d14b702f

This commit was moved from ipfs/boxo@c3289a5e7d437768d5f1ea158a9e093034097c17
---
 core/coreiface/options/unixfs.go | 41 +++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 6012ce77b..6abfd9622 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -1,7 +1,12 @@
 package options
 
 import (
+	"errors"
+	"fmt"
+
+	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
+	dag "gx/ipfs/QmcBoNcAP6qDjgRBew7yjvCqHq7p5jMstE44jPUBWBxzsV/go-merkledag"
 )
 
 type Layout int
@@ -29,7 +34,7 @@ type UnixfsAddSettings struct {
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
 
-func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, error) {
+func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix, error) {
 	options := &UnixfsAddSettings{
 		CidVersion: -1,
 		MhType:     mh.SHA2_256,
@@ -49,11 +54,41 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, error) {
 	for _, opt := range opts {
 		err := opt(options)
 		if err != nil {
-			return nil, err
+			return nil, cid.Prefix{}, err
 		}
 	}
 
-	return options, nil
+	// (hash != "sha2-256") -> CIDv1
+	if options.MhType != mh.SHA2_256 {
+		switch options.CidVersion {
+		case 0:
+			return nil, cid.Prefix{}, errors.New("CIDv0 only supports sha2-256")
+		case 1, -1:
+			options.CidVersion = 1
+		default:
+			return nil, cid.Prefix{}, fmt.Errorf("unknown CID version: %d", options.CidVersion)
+		}
+	} else {
+		if options.CidVersion < 0 {
+			// Default to CIDv0
+			options.CidVersion = 0
+		}
+	}
+
+	// cidV1 -> raw blocks (by default)
+	if options.CidVersion > 0 && !options.RawLeavesSet {
+		options.RawLeaves = true
+	}
+
+	prefix, err := dag.PrefixForCidVersion(options.CidVersion)
+	if err != nil {
+		return nil, cid.Prefix{}, err
+	}
+
+	prefix.MhType = options.MhType
+	prefix.MhLength = -1
+
+	return options, prefix, nil
 }
 
 type unixfsOpts struct{}

From 8cea9f91e4aa09596b657d00b5d07e1d7b9c1151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 20 Sep 2018 23:44:49 +0200
Subject: [PATCH 15/35] coreapi unixfs: docs on options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@eeb50d8e478fbaff90d4ef5a434834abfff408ad

This commit was moved from ipfs/boxo@0039c7d460983de5c06f86459a0fb00b81ed0505
---
 core/coreiface/options/unixfs.go | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 6abfd9622..9b003e1af 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -13,7 +13,7 @@ type Layout int
 
 const (
 	BalancedLayout Layout = iota
-	TrickleLeyout
+	TrickleLayout
 )
 
 type UnixfsAddSettings struct {
@@ -95,6 +95,8 @@ type unixfsOpts struct{}
 
 var Unixfs unixfsOpts
 
+// CidVersion specifies which CID version to use. Defaults to 0 unless an option
+// that depends on CIDv1 is passed.
 func (unixfsOpts) CidVersion(version int) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.CidVersion = version
@@ -102,6 +104,9 @@ func (unixfsOpts) CidVersion(version int) UnixfsAddOption {
 	}
 }
 
+// Hash function to use. Implies CIDv1 if not set to sha2-256 (default).
+//
+// Table of functions is declared in https://github.com/multiformats/go-multihash/blob/master/multihash.go
 func (unixfsOpts) Hash(mhtype uint64) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.MhType = mhtype
@@ -109,6 +114,8 @@ func (unixfsOpts) Hash(mhtype uint64) UnixfsAddOption {
 	}
 }
 
+// RawLeaves specifies whether to use raw blocks for leaves (data nodes with no
+// links) instead of wrapping them with unixfs structures.
 func (unixfsOpts) RawLeaves(enable bool) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.RawLeaves = enable
@@ -117,6 +124,11 @@ func (unixfsOpts) RawLeaves(enable bool) UnixfsAddOption {
 	}
 }
 
+// InlineLimit sets the amount of bytes below which blocks will be encoded
+// directly into CID instead of being stored and addressed by it's hash
+//
+// Note that while there is no hard limit on the number of bytes here, it should
+// be kept at something reasonably low like 32b (default for 'ipfs add')
 func (unixfsOpts) InlineLimit(limit int) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.InlineLimit = limit
@@ -124,6 +136,11 @@ func (unixfsOpts) InlineLimit(limit int) UnixfsAddOption {
 	}
 }
 
+// Chunker specifies settings for the chunking algorithm to use.
+//
+// Default: size-262144, formats:
+// size-[bytes] - Simple chunker splitting data into blocks of n bytes
+// rabin-[min]-[avg]-[max] - Rabin chunker
 func (unixfsOpts) Chunker(chunker string) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.Chunker = chunker
@@ -131,6 +148,10 @@ func (unixfsOpts) Chunker(chunker string) UnixfsAddOption {
 	}
 }
 
+// Layout tells the adder how to balance data between leaves.
+// options.BalancedLayout is the default, it's optimized for static seekable
+// files.
+// options.TrickleLayout is optimized for streaming data,
 func (unixfsOpts) Layout(layout Layout) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.Layout = layout
@@ -138,6 +159,7 @@ func (unixfsOpts) Layout(layout Layout) UnixfsAddOption {
 	}
 }
 
+// Pin tells the adder to pin the file root recursively after adding
 func (unixfsOpts) Pin(pin bool) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.Pin = pin
@@ -145,6 +167,8 @@ func (unixfsOpts) Pin(pin bool) UnixfsAddOption {
 	}
 }
 
+// HashOnly will make the adder calculate data hash without storing it in the
+// blockstore or announcing it to the network
 func (unixfsOpts) HashOnly(hashOnly bool) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.OnlyHash = hashOnly
@@ -152,6 +176,9 @@ func (unixfsOpts) HashOnly(hashOnly bool) UnixfsAddOption {
 	}
 }
 
+// Local will add the data to blockstore without announcing it to the network
+//
+// Note that this doesn't prevent other nodes from getting this data
 func (unixfsOpts) Local(local bool) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.Local = local

From 33bb77072255f75e8a5a777069b9425a9f81e315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 2 Oct 2018 09:42:50 +0200
Subject: [PATCH 16/35] coreapi unixfs: separate option to enable inlining
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@88ca0a07599ddd51c3db3864b99c1da87bf87eee

This commit was moved from ipfs/boxo@80a937abb79a84f303465f05d86b206e1e90ff75
---
 core/coreiface/options/unixfs.go | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 9b003e1af..df6f4fc71 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -20,6 +20,7 @@ type UnixfsAddSettings struct {
 	CidVersion int
 	MhType     uint64
 
+	Inline       bool
 	InlineLimit  int
 	RawLeaves    bool
 	RawLeavesSet bool
@@ -39,7 +40,8 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		CidVersion: -1,
 		MhType:     mh.SHA2_256,
 
-		InlineLimit:  0,
+		Inline:       false,
+		InlineLimit:  32,
 		RawLeaves:    false,
 		RawLeavesSet: false,
 
@@ -124,11 +126,26 @@ func (unixfsOpts) RawLeaves(enable bool) UnixfsAddOption {
 	}
 }
 
+// Inline tells the adder to inline small blocks into CIDs
+func (unixfsOpts) Inline(enable bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Inline = enable
+		return nil
+	}
+}
+
 // InlineLimit sets the amount of bytes below which blocks will be encoded
-// directly into CID instead of being stored and addressed by it's hash
+// directly into CID instead of being stored and addressed by it's hash.
+// Specifying this option won't enable block inlining. For that use `Inline`
+// option. Default: 32 bytes
 //
-// Note that while there is no hard limit on the number of bytes here, it should
-// be kept at something reasonably low like 32b (default for 'ipfs add')
+// Note that while there is no hard limit on the number of bytes, it should
+// be kept at a reasonably low value, like 64 bytes if you intend to display
+// these hashes. Larger values like 256 bytes will work fine, but may affect
+// de-duplication of smaller blocks.
+//
+// Setting this value too high may cause various problems, such as render some
+// blocks unfetchable
 func (unixfsOpts) InlineLimit(limit int) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.InlineLimit = limit

From d3bbffb3878a9fff3317ec4d439cb636dac9a153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 3 Oct 2018 15:05:46 +0200
Subject: [PATCH 17/35] coreapi unixfs: multi file support in unixfs coreapi
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@9a760d89b5db34fa0fb7be8c71876e2f18dd8fa2

This commit was moved from ipfs/boxo@e50aac4cc71c5272b5a53994e958198286a585bc
---
 core/coreiface/unixfs.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index acc3b960c..92168503e 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -2,10 +2,10 @@ package iface
 
 import (
 	"context"
-	"io"
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
+	files "gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit/files"
 	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 
@@ -13,7 +13,7 @@ import (
 // NOTE: This API is heavily WIP, things are guaranteed to break frequently
 type UnixfsAPI interface {
 	// Add imports the data from the reader into merkledag file
-	Add(context.Context, io.ReadCloser, ...options.UnixfsAddOption) (ResolvedPath, error)
+	Add(context.Context, files.File, ...options.UnixfsAddOption) (ResolvedPath, error)
 
 	// Cat returns a reader for the file
 	Cat(context.Context, Path) (Reader, error)

From a7b89529611d0071f0be88d45c64aac557f95668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 3 Oct 2018 17:21:07 +0200
Subject: [PATCH 18/35] coreapi unixfs: unixfs.Get
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@7b2fdc90ee0528d4c0a437d95b1cb0d10c3e8aa5

This commit was moved from ipfs/boxo@15a4331a185c812bab3e229758bcfc79d682ac5d
---
 core/coreiface/unixfs.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 92168503e..69e731822 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -13,8 +13,16 @@ import (
 // NOTE: This API is heavily WIP, things are guaranteed to break frequently
 type UnixfsAPI interface {
 	// Add imports the data from the reader into merkledag file
+	//
+	// TODO: a long useful comment on how to use this for many different scenarios
 	Add(context.Context, files.File, ...options.UnixfsAddOption) (ResolvedPath, error)
 
+	// Get returns a read-only handle to a file tree referenced by a path
+	//
+	// Note that some implementations of this API may apply the specified context
+	// to operations performed on the returned file
+	Get(context.Context, Path) (files.File, error)
+
 	// Cat returns a reader for the file
 	Cat(context.Context, Path) (Reader, error)
 

From ee45dafe78299ac3356a3a49b4ff63cac4c3530d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 3 Oct 2018 22:30:45 +0200
Subject: [PATCH 19/35] coreapi unixfs: wrap option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@b977abfc696b22775fa68736c144760113b27af4

This commit was moved from ipfs/boxo@59fd418b398d9011c79167b82af869751acf2640
---
 core/coreiface/options/unixfs.go | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index df6f4fc71..abbea9681 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -31,6 +31,8 @@ type UnixfsAddSettings struct {
 	Pin      bool
 	OnlyHash bool
 	Local    bool
+
+	Wrap bool
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -51,6 +53,8 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		Pin:      false,
 		OnlyHash: false,
 		Local:    false,
+
+		Wrap: false,
 	}
 
 	for _, opt := range opts {
@@ -202,3 +206,12 @@ func (unixfsOpts) Local(local bool) UnixfsAddOption {
 		return nil
 	}
 }
+
+// Wrap tells the adder to wrap the added file structure with an additional
+// directory.
+func (unixfsOpts) Wrap(wrap bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Wrap = wrap
+		return nil
+	}
+}

From f10ca5c904954029737728199d48ba9346e614e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 3 Oct 2018 22:49:42 +0200
Subject: [PATCH 20/35] coreapi unixfs: hidden opiton
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@cb84af4b44e4660029e87a1c82a3d2ab35acb2cd

This commit was moved from ipfs/boxo@1019fcea4b88f3a45cf81429f81066db1918771f
---
 core/coreiface/options/unixfs.go | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index abbea9681..7d7af5b81 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -32,7 +32,8 @@ type UnixfsAddSettings struct {
 	OnlyHash bool
 	Local    bool
 
-	Wrap bool
+	Wrap   bool
+	Hidden bool
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -54,7 +55,8 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		OnlyHash: false,
 		Local:    false,
 
-		Wrap: false,
+		Wrap:   false,
+		Hidden: false,
 	}
 
 	for _, opt := range opts {
@@ -215,3 +217,11 @@ func (unixfsOpts) Wrap(wrap bool) UnixfsAddOption {
 		return nil
 	}
 }
+
+// Hidden enables adding of hidden files (files prefixed with '.')
+func (unixfsOpts) Hidden(hidden bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Hidden = hidden
+		return nil
+	}
+}

From 48761861ca82c2744d0c33d7bd41ef8f94abdb8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 3 Oct 2018 23:17:18 +0200
Subject: [PATCH 21/35] coreapi unixfs: stdin-name option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@aa7a877686c76f0767fa6fb618972b25f1545bb6

This commit was moved from ipfs/boxo@907d2f239738971d246b9ff9ce5add004adad2c7
---
 core/coreiface/options/unixfs.go | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 7d7af5b81..90ad53e9e 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -32,8 +32,9 @@ type UnixfsAddSettings struct {
 	OnlyHash bool
 	Local    bool
 
-	Wrap   bool
-	Hidden bool
+	Wrap      bool
+	Hidden    bool
+	StdinName string
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -55,8 +56,9 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		OnlyHash: false,
 		Local:    false,
 
-		Wrap:   false,
-		Hidden: false,
+		Wrap:      false,
+		Hidden:    false,
+		StdinName: "",
 	}
 
 	for _, opt := range opts {
@@ -225,3 +227,12 @@ func (unixfsOpts) Hidden(hidden bool) UnixfsAddOption {
 		return nil
 	}
 }
+
+// StdinName is the name set for files which don specify FilePath as
+// os.Stdin.Name()
+func (unixfsOpts) StdinName(name string) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.StdinName = name
+		return nil
+	}
+}

From be5cccd21ac577b26638e777d189a9f27df79058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 4 Oct 2018 01:00:26 +0200
Subject: [PATCH 22/35] coreapi unixfs: progress events
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@df1797113e1dc062a9e53af11b8ea4268c855ef9

This commit was moved from ipfs/boxo@56ef5340a321a06604f4f98efcba4da03b6a4358
---
 core/coreiface/options/unixfs.go | 35 ++++++++++++++++++++++++++++++++
 core/coreiface/unixfs.go         |  9 ++++++++
 2 files changed, 44 insertions(+)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 90ad53e9e..da99b42f6 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -35,6 +35,10 @@ type UnixfsAddSettings struct {
 	Wrap      bool
 	Hidden    bool
 	StdinName string
+
+	Events   chan<- interface{}
+	Silent   bool
+	Progress bool
 }
 
 type UnixfsAddOption func(*UnixfsAddSettings) error
@@ -59,6 +63,10 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		Wrap:      false,
 		Hidden:    false,
 		StdinName: "",
+
+		Events:   nil,
+		Silent:   false,
+		Progress: false,
 	}
 
 	for _, opt := range opts {
@@ -236,3 +244,30 @@ func (unixfsOpts) StdinName(name string) UnixfsAddOption {
 		return nil
 	}
 }
+
+// Events specifies channel which will be used to report events about ongoing
+// Add operation.
+//
+// Note that if this channel blocks it may slowdown the adder
+func (unixfsOpts) Events(sink chan<- interface{}) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Events = sink
+		return nil
+	}
+}
+
+// Silent reduces event output
+func (unixfsOpts) Silent(silent bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Silent = silent
+		return nil
+	}
+}
+
+// Progress tells the adder whether to enable progress events
+func (unixfsOpts) Progress(enable bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.Progress = enable
+		return nil
+	}
+}
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 69e731822..c622e210e 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -9,6 +9,14 @@ import (
 	ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
 )
 
+// TODO: ideas on making this more coreapi-ish without breaking the http API?
+type AddEvent struct {
+	Name  string
+	Hash  string `json:",omitempty"`
+	Bytes int64  `json:",omitempty"`
+	Size  string `json:",omitempty"`
+}
+
 // UnixfsAPI is the basic interface to immutable files in IPFS
 // NOTE: This API is heavily WIP, things are guaranteed to break frequently
 type UnixfsAPI interface {
@@ -24,6 +32,7 @@ type UnixfsAPI interface {
 	Get(context.Context, Path) (files.File, error)
 
 	// Cat returns a reader for the file
+	// TODO: Remove in favour of Get (if we use Get on a file we still have reader directly, so..)
 	Cat(context.Context, Path) (Reader, error)
 
 	// Ls returns the list of links in a directory

From dfb14f3974d44b6dd1670233c57d24552b9fbd83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 4 Oct 2018 01:24:57 +0200
Subject: [PATCH 23/35] coreapi unixfs: filestore opts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@97fb3e4d819ee3ee511a719da6d1bef4695a2dad

This commit was moved from ipfs/boxo@90e8604702cde52200882080a6a8b5b3e0818d13
---
 core/coreiface/options/unixfs.go | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index da99b42f6..810e3c6e8 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -31,6 +31,8 @@ type UnixfsAddSettings struct {
 	Pin      bool
 	OnlyHash bool
 	Local    bool
+	FsCache  bool
+	NoCopy   bool
 
 	Wrap      bool
 	Hidden    bool
@@ -59,6 +61,8 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		Pin:      false,
 		OnlyHash: false,
 		Local:    false,
+		FsCache:  false,
+		NoCopy:   false,
 
 		Wrap:      false,
 		Hidden:    false,
@@ -76,6 +80,17 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
 		}
 	}
 
+	// nocopy -> rawblocks
+	if options.NoCopy && !options.RawLeaves {
+		// fixed?
+		if options.RawLeavesSet {
+			return nil, cid.Prefix{}, fmt.Errorf("nocopy option requires '--raw-leaves' to be enabled as well")
+		}
+
+		// No, satisfy mandatory constraint.
+		options.RawLeaves = true
+	}
+
 	// (hash != "sha2-256") -> CIDv1
 	if options.MhType != mh.SHA2_256 {
 		switch options.CidVersion {
@@ -271,3 +286,23 @@ func (unixfsOpts) Progress(enable bool) UnixfsAddOption {
 		return nil
 	}
 }
+
+// FsCache tells the adder to check the filestore for pre-existing blocks
+//
+// Experimental
+func (unixfsOpts) FsCache(enable bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.FsCache = enable
+		return nil
+	}
+}
+
+// NoCopy tells the adder to add the files using filestore. Implies RawLeaves.
+//
+// Experimental
+func (unixfsOpts) Nocopy(enable bool) UnixfsAddOption {
+	return func(settings *UnixfsAddSettings) error {
+		settings.NoCopy = enable
+		return nil
+	}
+}

From e59b75ae4394525d2902dfb8bffc89214ef5e759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 4 Oct 2018 20:39:43 +0200
Subject: [PATCH 24/35] coreapi unixfs: fix inline doc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@641542e1596817f70eeac14f87b3c49ef2d5e80a

This commit was moved from ipfs/boxo@f46082072957d0f4634a70baec4f0ef573c89408
---
 core/coreiface/options/unixfs.go | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 810e3c6e8..9249af895 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -170,13 +170,10 @@ func (unixfsOpts) Inline(enable bool) UnixfsAddOption {
 // Specifying this option won't enable block inlining. For that use `Inline`
 // option. Default: 32 bytes
 //
-// Note that while there is no hard limit on the number of bytes, it should
-// be kept at a reasonably low value, like 64 bytes if you intend to display
-// these hashes. Larger values like 256 bytes will work fine, but may affect
-// de-duplication of smaller blocks.
-//
-// Setting this value too high may cause various problems, such as render some
-// blocks unfetchable
+// Note that while there is no hard limit on the number of bytes, it should be
+// kept at a reasonably low value, such as 64 and no more than 1k. Setting this
+// value too high may cause various problems, such as render some
+// blocks unfetchable.
 func (unixfsOpts) InlineLimit(limit int) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.InlineLimit = limit

From 4c5803a3f45eb4c1ae769b0ffe0b4fc2f4300404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 4 Oct 2018 22:11:17 +0200
Subject: [PATCH 25/35] coreapi name: add some missing options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@0ad4722d65f9b8a3021320835291d2161091fd63

This commit was moved from ipfs/boxo@34497dfcf9b4083f51925ee9e7b9ccd14c8f69ce
---
 core/coreiface/options/name.go | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/core/coreiface/options/name.go b/core/coreiface/options/name.go
index ba3691b03..c614db3ab 100644
--- a/core/coreiface/options/name.go
+++ b/core/coreiface/options/name.go
@@ -13,6 +13,10 @@ const (
 type NamePublishSettings struct {
 	ValidTime time.Duration
 	Key       string
+
+	TTL *time.Duration
+
+	AllowOffline bool
 }
 
 type NameResolveSettings struct {
@@ -29,6 +33,8 @@ func NamePublishOptions(opts ...NamePublishOption) (*NamePublishSettings, error)
 	options := &NamePublishSettings{
 		ValidTime: DefaultNameValidTime,
 		Key:       "self",
+
+		AllowOffline: false,
 	}
 
 	for _, opt := range opts {
@@ -82,6 +88,24 @@ func (nameOpts) Key(key string) NamePublishOption {
 	}
 }
 
+// AllowOffline is an option for Name.Publish which specifies whether to allow
+// publishing when the node is offline. Default value is false
+func (nameOpts) AllowOffline(allow bool) NamePublishOption {
+	return func(settings *NamePublishSettings) error {
+		settings.AllowOffline = allow
+		return nil
+	}
+}
+
+// TTL is an option for Name.Publish which specifies the time duration the
+// published record should be cached for (caution: experimental).
+func (nameOpts) TTL(ttl time.Duration) NamePublishOption {
+	return func(settings *NamePublishSettings) error {
+		settings.TTL = &ttl
+		return nil
+	}
+}
+
 // Local is an option for Name.Resolve which specifies if the lookup should be
 // offline. Default value is false
 func (nameOpts) Local(local bool) NameResolveOption {

From db11d51180922f44d45cf15f274e7617d17cec12 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Wed, 3 Oct 2018 07:35:57 +0200
Subject: [PATCH 26/35] gx: update go-datastore, go-libp2p-swarm

License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>


This commit was moved from ipfs/interface-go-ipfs-core@b9309ab1a51ec1b68e8c5561b0f02a610fd93f97

This commit was moved from ipfs/boxo@b00a9c91219246fb5cb954b1a50578eeb009dcae
---
 core/coreiface/dht.go   | 2 +-
 core/coreiface/path.go  | 2 +-
 core/coreiface/swarm.go | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 2309ceb90..4a76f4d39 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
+	pstore "gx/ipfs/QmSJ36wcYQyEViJUWUEhJU81tw1KdakTKqLLHbvYbA9zDv/go-libp2p-peerstore"
 	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
-	pstore "gx/ipfs/QmfAQMFpgDU2U4BXG64qVr8HSiictfWvkSBz7Y2oDj65st/go-libp2p-peerstore"
 )
 
 // DhtAPI specifies the interface to the DHT
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 0beab0663..0f06e8cc2 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmcjwUb36Z16NJkvDX6ccXPqsFswo6AsRXynyXcLLCphV2/go-path"
+	ipfspath "gx/ipfs/QmbE9gr6c2FomTgc2pRZRTooHpchJ1uaZKremypyWJMV4t/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 8b464e5c1..58caf6759 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -5,11 +5,11 @@ import (
 	"errors"
 	"time"
 
+	net "gx/ipfs/QmQdLcvoy3JuSqhV6iwQ9T6Cv7hWLAdzob4jUZRPqFL67Z/go-libp2p-net"
+	pstore "gx/ipfs/QmSJ36wcYQyEViJUWUEhJU81tw1KdakTKqLLHbvYbA9zDv/go-libp2p-peerstore"
 	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
 	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
 	"gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
-	pstore "gx/ipfs/QmfAQMFpgDU2U4BXG64qVr8HSiictfWvkSBz7Y2oDj65st/go-libp2p-peerstore"
-	net "gx/ipfs/QmfDPh144WGBqRxZb1TGDHerbMnZATrHZggAPw7putNnBq/go-libp2p-net"
 )
 
 var (

From cd6d30548a305d5a32118c7dae7286c521fbbfa0 Mon Sep 17 00:00:00 2001
From: Kevin Atkinson <k@kevina.org>
Date: Thu, 4 Oct 2018 19:11:27 -0400
Subject: [PATCH 27/35] gx update go-libp2p-peerstore

License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>


This commit was moved from ipfs/interface-go-ipfs-core@c8a6219cf25b4dfc1208523ec0bb2ee2efc2d85d

This commit was moved from ipfs/boxo@0ef081eae1b8bdaf52870fe9f483ba05c7ca69ef
---
 core/coreiface/path.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 0f06e8cc2..5748bf465 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmbE9gr6c2FomTgc2pRZRTooHpchJ1uaZKremypyWJMV4t/go-path"
+	ipfspath "gx/ipfs/QmYh33CFYYEgQNSZ9PEP7ZN57dhErRZ7NfLS1BUA9GBBRk/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )

From 59de96e6341ed97ed94bcebe098df14182fd289e Mon Sep 17 00:00:00 2001
From: Kevin Atkinson <k@kevina.org>
Date: Thu, 4 Oct 2018 19:32:33 -0400
Subject: [PATCH 28/35] gx update libp2p/go-buffer-pool

License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>


This commit was moved from ipfs/interface-go-ipfs-core@349cbd1463198c9a811b6cc3c09c44608cdd486d

This commit was moved from ipfs/boxo@3f8596df8b398139db13cb06f2c55c6738fc6528
---
 core/coreiface/path.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 5748bf465..63b15fb50 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmYh33CFYYEgQNSZ9PEP7ZN57dhErRZ7NfLS1BUA9GBBRk/go-path"
+	ipfspath "gx/ipfs/QmV4QxScV9Y7LbaWhHazFfRd8uyeUd4pAH8a7fFFbi5odJ/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )

From 1aa388cb87a449376a0d003ca44fbdced70af394 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Thu, 4 Oct 2018 21:12:53 -0700
Subject: [PATCH 29/35] update unixfs inline option comment to give us room to
 change things

(addressing CR)

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@7d577641499b51b4d98ae7e10fed2fd5bf9d516a

This commit was moved from ipfs/boxo@b06611e7da0ebaef24e0b3db614716c940882793
---
 core/coreiface/options/unixfs.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 9249af895..d486981c3 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -171,9 +171,8 @@ func (unixfsOpts) Inline(enable bool) UnixfsAddOption {
 // option. Default: 32 bytes
 //
 // Note that while there is no hard limit on the number of bytes, it should be
-// kept at a reasonably low value, such as 64 and no more than 1k. Setting this
-// value too high may cause various problems, such as render some
-// blocks unfetchable.
+// kept at a reasonably low value, such as 64; implementations may choose to
+// reject anything larger.
 func (unixfsOpts) InlineLimit(limit int) UnixfsAddOption {
 	return func(settings *UnixfsAddSettings) error {
 		settings.InlineLimit = limit

From f9a93470069c116015b79f33f105275896f9917a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 19:23:38 +0100
Subject: [PATCH 30/35] coreapi: pubsub interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@ccaec46f3deaf46e20f9c265d5920f68251e4da4

This commit was moved from ipfs/boxo@f06c01e06b04ec7a27b0738f984e0f30b005c711
---
 core/coreiface/options/pubsub.go | 56 ++++++++++++++++++++++++++++++++
 core/coreiface/pubsub.go         | 51 +++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 core/coreiface/options/pubsub.go
 create mode 100644 core/coreiface/pubsub.go

diff --git a/core/coreiface/options/pubsub.go b/core/coreiface/options/pubsub.go
new file mode 100644
index 000000000..e276d7e4a
--- /dev/null
+++ b/core/coreiface/options/pubsub.go
@@ -0,0 +1,56 @@
+package options
+
+type PubSubPeersSettings struct {
+	Topic string
+}
+
+type PubSubSubscribeSettings struct {
+	Discover bool
+}
+
+type PubSubPeersOption func(*PubSubPeersSettings) error
+type PubSubSubscribeOption func(*PubSubSubscribeSettings) error
+
+func PubSubPeersOptions(opts ...PubSubPeersOption) (*PubSubPeersSettings, error) {
+	options := &PubSubPeersSettings{
+		Topic: "",
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
+func PubSubSubscribeOptions(opts ...PubSubSubscribeOption) (*PubSubSubscribeSettings, error) {
+	options := &PubSubSubscribeSettings{
+		Discover: false,
+	}
+
+	for _, opt := range opts {
+		err := opt(options)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return options, nil
+}
+
+type PubSubOptions struct{}
+
+func (api *PubSubOptions) WithTopic(topic string) PubSubPeersOption {
+	return func(settings *PubSubPeersSettings) error {
+		settings.Topic = topic
+		return nil
+	}
+}
+
+func (api *PubSubOptions) WithDiscover(discover bool) PubSubSubscribeOption {
+	return func(settings *PubSubSubscribeSettings) error {
+		settings.Discover = discover
+		return nil
+	}
+}
diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
new file mode 100644
index 000000000..f78734a09
--- /dev/null
+++ b/core/coreiface/pubsub.go
@@ -0,0 +1,51 @@
+package iface
+
+import (
+	"context"
+	"io"
+
+	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+
+	peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
+)
+
+// PubSubSubscription is an active PubSub subscription
+type PubSubSubscription interface {
+	io.Closer
+
+	// Chan return incoming message channel
+	Chan(context.Context) <-chan PubSubMessage
+}
+
+// PubSubMessage is a single PubSub message
+type PubSubMessage interface {
+	// From returns id of a peer from which the message has arrived
+	From() peer.ID
+
+	// Data returns the message body
+	Data() []byte
+}
+
+// PubSubAPI specifies the interface to PubSub
+type PubSubAPI interface {
+	// Ls lists subscribed topics by name
+	Ls(context.Context) ([]string, error)
+
+	// Peers list peers we are currently pubsubbing with
+	// TODO: WithTopic
+	Peers(context.Context, ...options.PubSubPeersOption) ([]peer.ID, error)
+
+	// WithTopic is an option for peers which specifies a topic filter for the
+	// function
+	WithTopic(topic string) options.PubSubPeersOption
+
+	// Publish a message to a given pubsub topic
+	Publish(context.Context, string, []byte) error
+
+	// Subscribe to messages on a given topic
+	Subscribe(context.Context, string) (PubSubSubscription, error)
+
+	// WithDiscover is an option for Subscribe which specifies whether to try to
+	// discover other peers subscribed to the same topic
+	WithDiscover(discover bool) options.PubSubSubscribeOption
+}

From 729bb03d1b244e9ec7e27a28fa347ec79c15ae0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Sat, 10 Mar 2018 19:28:22 +0100
Subject: [PATCH 31/35] coreapi: implement pubsub api
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@0d0069ff23a4dd26fa62fd91e5875b2526742da5

This commit was moved from ipfs/boxo@1b8732304c12b825e9a8fd69b51494c9c67f39d0
---
 core/coreiface/coreapi.go        |  3 +++
 core/coreiface/errors.go         |  2 +-
 core/coreiface/options/pubsub.go |  8 +++++---
 core/coreiface/pubsub.go         | 16 ++++------------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index 0b153b6f9..bc889237b 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -37,6 +37,9 @@ type CoreAPI interface {
 	// Swarm returns an implementation of Swarm API
 	Swarm() SwarmAPI
 
+	// PubSub returns an implementation of PubSub API
+	PubSub() PubSubAPI
+
 	// ResolvePath resolves the path using Unixfs resolver
 	ResolvePath(context.Context, Path) (ResolvedPath, error)
 
diff --git a/core/coreiface/errors.go b/core/coreiface/errors.go
index 81f978971..072275409 100644
--- a/core/coreiface/errors.go
+++ b/core/coreiface/errors.go
@@ -4,5 +4,5 @@ import "errors"
 
 var (
 	ErrIsDir   = errors.New("object is a directory")
-	ErrOffline = errors.New("can't resolve, ipfs node is offline")
+	ErrOffline = errors.New("this action must be run in online mode, try running 'ipfs daemon' first")
 )
diff --git a/core/coreiface/options/pubsub.go b/core/coreiface/options/pubsub.go
index e276d7e4a..f0a614d58 100644
--- a/core/coreiface/options/pubsub.go
+++ b/core/coreiface/options/pubsub.go
@@ -39,16 +39,18 @@ func PubSubSubscribeOptions(opts ...PubSubSubscribeOption) (*PubSubSubscribeSett
 	return options, nil
 }
 
-type PubSubOptions struct{}
+type pubsubOpts struct{}
 
-func (api *PubSubOptions) WithTopic(topic string) PubSubPeersOption {
+var PubBub nameOpts
+
+func (pubsubOpts) Topic(topic string) PubSubPeersOption {
 	return func(settings *PubSubPeersSettings) error {
 		settings.Topic = topic
 		return nil
 	}
 }
 
-func (api *PubSubOptions) WithDiscover(discover bool) PubSubSubscribeOption {
+func (pubsubOpts) Discover(discover bool) PubSubSubscribeOption {
 	return func(settings *PubSubSubscribeSettings) error {
 		settings.Discover = discover
 		return nil
diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
index f78734a09..4b52ed6d6 100644
--- a/core/coreiface/pubsub.go
+++ b/core/coreiface/pubsub.go
@@ -6,15 +6,15 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
+	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
 )
 
 // PubSubSubscription is an active PubSub subscription
 type PubSubSubscription interface {
 	io.Closer
 
-	// Chan return incoming message channel
-	Chan(context.Context) <-chan PubSubMessage
+	// Next return the next incoming message
+	Next(context.Context) (PubSubMessage, error)
 }
 
 // PubSubMessage is a single PubSub message
@@ -35,17 +35,9 @@ type PubSubAPI interface {
 	// TODO: WithTopic
 	Peers(context.Context, ...options.PubSubPeersOption) ([]peer.ID, error)
 
-	// WithTopic is an option for peers which specifies a topic filter for the
-	// function
-	WithTopic(topic string) options.PubSubPeersOption
-
 	// Publish a message to a given pubsub topic
 	Publish(context.Context, string, []byte) error
 
 	// Subscribe to messages on a given topic
-	Subscribe(context.Context, string) (PubSubSubscription, error)
-
-	// WithDiscover is an option for Subscribe which specifies whether to try to
-	// discover other peers subscribed to the same topic
-	WithDiscover(discover bool) options.PubSubSubscribeOption
+	Subscribe(context.Context, string, ...options.PubSubSubscribeOption) (PubSubSubscription, error)
 }

From 3f6b34dd1a4845caa7c781d07328d58e9beabbe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 11 Sep 2018 05:43:54 +0200
Subject: [PATCH 32/35] coreapi pubsub: add tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@3f9a6ce3446d2d5746c6d9976c9325f1673c8e99

This commit was moved from ipfs/boxo@d23f749f57daa3b22c91036530b9430bfebec610
---
 core/coreiface/options/pubsub.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/coreiface/options/pubsub.go b/core/coreiface/options/pubsub.go
index f0a614d58..c387d613d 100644
--- a/core/coreiface/options/pubsub.go
+++ b/core/coreiface/options/pubsub.go
@@ -41,7 +41,7 @@ func PubSubSubscribeOptions(opts ...PubSubSubscribeOption) (*PubSubSubscribeSett
 
 type pubsubOpts struct{}
 
-var PubBub nameOpts
+var PubSub pubsubOpts
 
 func (pubsubOpts) Topic(topic string) PubSubPeersOption {
 	return func(settings *PubSubPeersSettings) error {

From d5d6e5c13bd0db3b26c5c06a050eda92dc6c1437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 11 Sep 2018 12:52:40 +0200
Subject: [PATCH 33/35] pubsub cmd: switch to coreapi
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@706e552037bd75687b5ff0cedb9802bc7f2d4617

This commit was moved from ipfs/boxo@add2ae0705df01044239e9ed5691974847332408
---
 core/coreiface/pubsub.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
index 4b52ed6d6..4c9a1d73e 100644
--- a/core/coreiface/pubsub.go
+++ b/core/coreiface/pubsub.go
@@ -6,7 +6,7 @@ import (
 
 	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
+	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
 )
 
 // PubSubSubscription is an active PubSub subscription
@@ -24,6 +24,12 @@ type PubSubMessage interface {
 
 	// Data returns the message body
 	Data() []byte
+
+	// Seq returns message identifier
+	Seq() []byte
+
+	// Topics returns list of topics this message was set to
+	Topics() []string
 }
 
 // PubSubAPI specifies the interface to PubSub

From 57fdb89f375e9a589d52e765d658b385ac28508b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 26 Sep 2018 18:24:35 +0200
Subject: [PATCH 34/35] coreapi pubsub: fix review nits
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>


This commit was moved from ipfs/interface-go-ipfs-core@162e182a2c2f67c227b7dd4b3d661d3b15ca1d7b

This commit was moved from ipfs/boxo@0373c3c9aee429624a99c6a1c080027923ec6e6f
---
 core/coreiface/pubsub.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
index 4c9a1d73e..d7a21e02f 100644
--- a/core/coreiface/pubsub.go
+++ b/core/coreiface/pubsub.go
@@ -38,7 +38,6 @@ type PubSubAPI interface {
 	Ls(context.Context) ([]string, error)
 
 	// Peers list peers we are currently pubsubbing with
-	// TODO: WithTopic
 	Peers(context.Context, ...options.PubSubPeersOption) ([]peer.ID, error)
 
 	// Publish a message to a given pubsub topic

From fae14756dcdbd3b313f0dd3e861db5cbb676bdab Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 5 Oct 2018 14:11:56 -0700
Subject: [PATCH 35/35] gx: update stuff

* go-datastore and friends: GetSize
* badger: new release, fewer allocations
* go-mplex: send fewer packets
* go-bitswap: pack multiple blocks in a single message, fewer allocations
* go-buffer-pool: replace the buffer pool from go-msgio
* yamux: fixed data race and uses go-buffer-pool for stream read-buffers to
  reduce memory and allocations.
* go-libp2p-secio: get rid of a hot-spot allocation
* go-libp2p-peerstore: reduced allocations (at the cost of some memory)

More?

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>


This commit was moved from ipfs/interface-go-ipfs-core@144aa5240ff7e379b34dd0e1adf9f8c1e991b3cc

This commit was moved from ipfs/boxo@b77e7021ee4b2093d2e2a98f5274ace254a537e1
---
 core/coreiface/dht.go            | 2 +-
 core/coreiface/options/unixfs.go | 2 +-
 core/coreiface/path.go           | 2 +-
 core/coreiface/swarm.go          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 4a76f4d39..3096c8fb7 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 
-	pstore "gx/ipfs/QmSJ36wcYQyEViJUWUEhJU81tw1KdakTKqLLHbvYbA9zDv/go-libp2p-peerstore"
+	pstore "gx/ipfs/QmXEyLwySuDMXejWBu8XwdkX2WuGKk8x9jFwz8js7j72UX/go-libp2p-peerstore"
 	peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
 )
 
diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 6a54b2d39..b4661b793 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -6,7 +6,7 @@ import (
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 	mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
-	dag "gx/ipfs/QmTGpm48qm4fUZ9E5hMXy4ZngJUYCMKu15rTMVR3BSEnPm/go-merkledag"
+	dag "gx/ipfs/QmXTw4By9FMZAt7qJm4JoJuNBrBgqMMzkS4AjKc4zqTUVd/go-merkledag"
 )
 
 type Layout int
diff --git a/core/coreiface/path.go b/core/coreiface/path.go
index 63b15fb50..9bb46b4b4 100644
--- a/core/coreiface/path.go
+++ b/core/coreiface/path.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	ipfspath "gx/ipfs/QmV4QxScV9Y7LbaWhHazFfRd8uyeUd4pAH8a7fFFbi5odJ/go-path"
+	ipfspath "gx/ipfs/QmQmMu1vsgsjxyB8tzrA6ZTCTCLDLVaXMb4Q57r2v886Sx/go-path"
 
 	cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
 )
diff --git a/core/coreiface/swarm.go b/core/coreiface/swarm.go
index 58caf6759..d8bca395c 100644
--- a/core/coreiface/swarm.go
+++ b/core/coreiface/swarm.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"time"
 
-	net "gx/ipfs/QmQdLcvoy3JuSqhV6iwQ9T6Cv7hWLAdzob4jUZRPqFL67Z/go-libp2p-net"
-	pstore "gx/ipfs/QmSJ36wcYQyEViJUWUEhJU81tw1KdakTKqLLHbvYbA9zDv/go-libp2p-peerstore"
+	net "gx/ipfs/QmWUPYHpNv4YahaBYXovuEJttgfqcNcN9Gg4arhQYcRoqa/go-libp2p-net"
+	pstore "gx/ipfs/QmXEyLwySuDMXejWBu8XwdkX2WuGKk8x9jFwz8js7j72UX/go-libp2p-peerstore"
 	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
 	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
 	"gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"