merge ipfs v0.7.0

.gitignore

@@ -29,3 +29,9 @@ go-ipfs-source.tar.gz
 
 docs/examples/go-ipfs-as-a-library/example-folder/Qm*
 /test/sharness/t0054-dag-car-import-export-data/*.car
+
+# ignore build output from snapcraft
+/ipfs_*.snap
+/parts
+/stage
+/prime

Dockerfile

@@ -40,14 +40,14 @@ ENV TINI_VERSION v0.19.0
 RUN set -eux; \
     dpkgArch="$(dpkg --print-architecture)"; \
     case "${dpkgArch##*-}" in \
-        "amd64" | "armhf" | "arm64") tiniArch="tini-$dpkgArch" ;;\
+        "amd64" | "armhf" | "arm64") tiniArch="tini-static-$dpkgArch" ;;\
         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
     esac; \
   cd /tmp \
   && git clone https://github.com/ncopa/su-exec.git \
   && cd su-exec \
   && git checkout -q $SUEXEC_VERSION \
-  && make \
+  && make su-exec-static \
   && cd /tmp \
   && wget -q -O tini https://github.com/krallin/tini/releases/download/$TINI_VERSION/$tiniArch \
   && chmod +x tini
@@ -60,7 +60,7 @@ MAINTAINER TRON-US <support@tron.network>
 ENV SRC_DIR /go-btfs
 COPY --from=0 $SRC_DIR/cmd/btfs/btfs /usr/local/bin/btfs
 COPY --from=0 $SRC_DIR/bin/container_daemon /usr/local/bin/start_btfs
-COPY --from=0 /tmp/su-exec/su-exec /sbin/su-exec
+COPY --from=0 /tmp/su-exec/su-exec-static /sbin/su-exec
 COPY --from=0 /tmp/tini /sbin/tini
 COPY --from=0 /bin/fusermount /usr/local/bin/fusermount
 COPY --from=0 /etc/ssl/certs /etc/ssl/certs

assets/README.md

@@ -45,6 +45,7 @@ commit.
 ```bash
 > go generate .
 > git add bindata.go
+> git add bindata_version_hash.go
 > go mod tidy
 > git commit --amend --no-edit
 

assets/assets.go

@@ -1,5 +1,5 @@
 //go:generate git submodule update --init ./dir-index-html
-//go:generate go run github.com/go-bindata/go-bindata/go-bindata -pkg=assets init-doc dir-index-html/dir-index.html dir-index-html/knownIcons.txt
+//go:generate go run github.com/go-bindata/go-bindata/v3/go-bindata -mode=0644 -modtime=1403768328 -pkg=assets init-doc dir-index-html/dir-index.html dir-index-html/knownIcons.txt
 //go:generate gofmt -w bindata.go
 //go:generate sh -c "sed -i \"s/.*BindataVersionHash.*/BindataVersionHash=\\\"$(git hash-object bindata.go)\\\"/\" bindata_version_hash.go"
 //go:generate gofmt -w bindata_version_hash.go

bin/mkreleaselog

@@ -33,15 +33,22 @@ AUTHORS=(
 
 NL=$'\n'
 
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+
 msg() {
     echo "$*" >&2
 }
 
 statlog() {
-    rpath="$GOPATH/src/$1"
-    start="${2:-}"
-    end="${3:-HEAD}"
-    git -C "$rpath" log --shortstat --no-merges --pretty="tformat:%H%n%aN%n%aE" "$start..$end" | while 
+    local rpath="$GOPATH/src/$1"
+    local start="${2:-}"
+    local end="${3:-HEAD}"
+    local mailmap_file="$rpath/.mailmap"
+    if ! [[ -e "$mailmap_file" ]]; then
+        mailmap_file="$ROOT_DIR/.mailmap"
+    fi
+
+    git -C "$rpath" -c mailmap.file="$mailmap_file" log --use-mailmap --shortstat --no-merges --pretty="tformat:%H%n%aN%n%aE" "$start..$end" | while 
         read hash
         read name
         read email

cmd/btfs/btfs.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/TRON-US/go-btfs/core/commands"
+	commands "github.com/TRON-US/go-btfs/core/commands"
 
 	cmds "github.com/TRON-US/go-btfs-cmds"
 )

cmd/btfs/daemon.go

@@ -39,10 +39,10 @@ import (
 	multierror "github.com/hashicorp/go-multierror"
 	util "github.com/ipfs/go-ipfs-util"
 	mprome "github.com/ipfs/go-metrics-prometheus"
-	"github.com/jbenet/goprocess"
+	goprocess "github.com/jbenet/goprocess"
 	sockets "github.com/libp2p/go-socket-activation"
 	ma "github.com/multiformats/go-multiaddr"
-	manet "github.com/multiformats/go-multiaddr-net"
+	manet "github.com/multiformats/go-multiaddr/net"
 	prometheus "github.com/prometheus/client_golang/prometheus"
 	promauto "github.com/prometheus/client_golang/prometheus/promauto"
 	nodepb "github.com/tron-us/go-btfs-common/protos/node"
@@ -206,6 +206,8 @@ Headers.
 		// cmds.StringOption(swarmAddrKwd, "Address for the swarm socket (overrides config)"),
 	},
 	Subcommands: map[string]*cmds.Command{},
+	NoRemote:    true,
+	Extra:       commands.CreateCmdExtras(commands.SetDoesNotUseConfigAsInput(true)),
 	Run:         daemonFunc,
 }
 

cmd/btfs/init.go

@@ -15,8 +15,9 @@ import (
 	"github.com/TRON-US/go-btfs/cmd/btfs/util"
 	oldcmds "github.com/TRON-US/go-btfs/commands"
 	"github.com/TRON-US/go-btfs/core"
+	"github.com/TRON-US/go-btfs/core/commands"
 	"github.com/TRON-US/go-btfs/namesys"
-	"github.com/TRON-US/go-btfs/repo/fsrepo"
+	fsrepo "github.com/TRON-US/go-btfs/repo/fsrepo"
 
 	cmds "github.com/TRON-US/go-btfs-cmds"
 	config "github.com/TRON-US/go-btfs-config"
@@ -69,6 +70,8 @@ environment variable:
 		// name of the file?
 		// TODO cmds.StringOption("event-logs", "l", "Location for machine-readable event logs."),
 	},
+	NoRemote: true,
+	Extra:    commands.CreateCmdExtras(commands.SetDoesNotUseRepo(true), commands.SetDoesNotUseConfigAsInput(true)),
 	PreRun: func(req *cmds.Request, env cmds.Environment) error {
 		cctx := env.(*oldcmds.Context)
 		daemonLocked, err := fsrepo.LockedByOtherProcess(cctx.ConfigRoot)

cmd/btfs/main.go

@@ -10,7 +10,6 @@ import (
 	"net/http"
 	"os"
 	"runtime/pprof"
-	"strings"
 	"time"
 
 	util "github.com/TRON-US/go-btfs/cmd/btfs/util"
@@ -31,7 +30,7 @@ import (
 	loggables "github.com/libp2p/go-libp2p-loggables"
 	ma "github.com/multiformats/go-multiaddr"
 	madns "github.com/multiformats/go-multiaddr-dns"
-	manet "github.com/multiformats/go-multiaddr-net"
+	manet "github.com/multiformats/go-multiaddr/net"
 )
 
 // log is the command logger
@@ -202,16 +201,17 @@ func apiAddrOption(req *cmds.Request) (ma.Multiaddr, error) {
 func makeExecutor(req *cmds.Request, env interface{}) (cmds.Executor, error) {
 	exe := cmds.NewExecutor(req.Root)
 	cctx := env.(*oldcmds.Context)
-	details := commandDetails(req.Path)
 
 	// Check if the command is disabled.
-	if details.cannotRunOnClient && details.cannotRunOnDaemon {
+	if req.Command.NoLocal && req.Command.NoRemote {
 		return nil, fmt.Errorf("command disabled: %v", req.Path)
 	}
 
 	// Can we just run this locally?
-	if !details.cannotRunOnClient && details.doesNotUseRepo {
-		return exe, nil
+	if !req.Command.NoLocal {
+		if doesNotUseRepo, ok := corecmds.GetDoesNotUseRepo(req.Command.Extra); doesNotUseRepo && ok {
+			return exe, nil
+		}
 	}
 
 	// Get the API option from the commandline.
@@ -225,7 +225,7 @@ func makeExecutor(req *cmds.Request, env interface{}) (cmds.Executor, error) {
 	daemonRequested := apiAddr != nil && req.Command != daemonCmd
 
 	// Run this on the client if required.
-	if details.cannotRunOnDaemon || req.Command.External {
+	if req.Command.NoRemote {
 		if daemonRequested {
 			// User requested that the command be run on the daemon but we can't.
 			// NOTE: We drop this check for the `ipfs daemon` command.
@@ -247,7 +247,7 @@ func makeExecutor(req *cmds.Request, env interface{}) (cmds.Executor, error) {
 
 	// Still no api specified? Run it on the client or fail.
 	if apiAddr == nil {
-		if details.cannotRunOnClient {
+		if req.Command.NoLocal {
 			return nil, fmt.Errorf("command must be run on the daemon: %v", req.Path)
 		}
 		return exe, nil
@@ -293,22 +293,6 @@ func makeExecutor(req *cmds.Request, env interface{}) (cmds.Executor, error) {
 	return cmdhttp.NewClient(host, opts...), nil
 }
 
-// commandDetails returns a command's details for the command given by |path|.
-func commandDetails(path []string) cmdDetails {
-	if len(path) == 0 {
-		// special case root command
-		return cmdDetails{doesNotUseRepo: true}
-	}
-	var details cmdDetails
-	// find the last command in path that has a cmdDetailsMap entry
-	for i := range path {
-		if cmdDetails, found := cmdDetailsMap[strings.Join(path[:i+1], "/")]; found {
-			details = cmdDetails
-		}
-	}
-	return details
-}
-
 func getRepoPath(req *cmds.Request) (string, error) {
 	repoOpt, found := req.Options["config"].(string)
 	if found && repoOpt != "" {

core/commands/active.go

@@ -23,6 +23,7 @@ var ActiveReqsCmd = &cmds.Command{
 Lists running and recently run commands.
 `,
 	},
+	NoLocal: true,
 	Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
 		ctx := env.(*oldcmds.Context)
 		return cmds.EmitOnce(res, ctx.ReqLog.Report())

core/commands/add.go

@@ -64,6 +64,10 @@ Adds contents of <path> to btfs. Use -r to add directories.
 Note that directories are added recursively, to form the btfs
 MerkleDAG.
 
+If the daemon is not running, it will just add locally.
+If the daemon is started later, it will be advertised after a few
+seconds when the reprovider runs.
+
 The wrap option, '-w', wraps the file (or files, if using the
 recursive option) in a directory. This directory contains only
 the files which have been added, and means that the file retains

core/commands/cid.go

@@ -26,6 +26,7 @@ var CidCmd = &cmds.Command{
 		"codecs": codecsCmd,
 		"hashes": hashesCmd,
 	},
+	Extra: CreateCmdExtras(SetDoesNotUseRepo(true)),
 }
 
 const (

core/commands/cmdenv/cidbase_test.go

@@ -24,8 +24,8 @@ func TestEncoderFromPath(t *testing.T) {
 	test(p+"/a/b", enc)
 	test(p+"/a/b/", enc)
 	test(p+"/a/b/c", enc)
-	test("/ipfs/"+p, enc)
-	test("/ipfs/"+p+"/b", enc)
+	test("/btfs/"+p, enc)
+	test("/btfs/"+p+"/b", enc)
 
 	p = "zb2rhfkM4FjkMLaUnygwhuqkETzbYXnUDf1P9MSmdNjW1w1Lk"
 	enc = cidenc.Encoder{
@@ -37,30 +37,30 @@ func TestEncoderFromPath(t *testing.T) {
 	test(p+"/a/b", enc)
 	test(p+"/a/b/", enc)
 	test(p+"/a/b/c", enc)
-	test("/ipfs/"+p, enc)
-	test("/ipfs/"+p+"/b", enc)
-	test("/ipld/"+p, enc)
-	test("/ipns/"+p, enc) // even IPNS should work.
+	test("/btfs/"+p, enc)
+	test("/btfs/"+p+"/b", enc)
+	test("/btld/"+p, enc)
+	test("/btns/"+p, enc) // even IPNS should work.
 
 	p = "bafyreifrcnyjokuw4i4ggkzg534tjlc25lqgt3ttznflmyv5fftdgu52hm"
 	enc = cidenc.Encoder{
 		Base:    mbase.MustNewEncoder(mbase.Base32),
 		Upgrade: true,
 	}
 	test(p, enc)
-	test("/ipfs/"+p, enc)
-	test("/ipld/"+p, enc)
+	test("/btfs/"+p, enc)
+	test("/btld/"+p, enc)
 
 	for _, badPath := range []string{
-		"/ipld/",
-		"/ipld",
-		"/ipld//",
-		"ipld//",
-		"ipld",
+		"/btld/",
+		"/btld",
+		"/btld//",
+		"btld//",
+		"btld",
 		"",
-		"ipns",
-		"/ipfs/asdf",
-		"/ipfs/...",
+		"btns",
+		"/btfs/asdf",
+		"/btfs/...",
 		"...",
 		"abcdefg",
 		"boo",