Skip to content

Commit

Permalink
Feature/relay (#45)
Browse files Browse the repository at this point in the history
* v1 circuit relay working
* bump version
  • Loading branch information
asabya authored May 3, 2022
1 parent 511bc01 commit 3ec3b2f
Show file tree
Hide file tree
Showing 18 changed files with 308 additions and 270 deletions.
4 changes: 2 additions & 2 deletions .version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
mobile=0.0.15
cli=0.0.6
mobile=0.0.16
cli=0.0.7
13 changes: 12 additions & 1 deletion cli/cmd/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (
"os"
"os/signal"

"github.com/datahop/ipfs-lite/internal/ipfs"

"github.com/datahop/ipfs-lite/pkg"
logging "github.com/ipfs/go-log/v2"
"github.com/spf13/cobra"
Expand All @@ -22,11 +24,16 @@ This command is used to start the Datahop Daemon.
`,
Run: func(cmd *cobra.Command, args []string) {
sk, _ := cmd.Flags().GetString("secret")
done, err := comm.Start(sk)
autoDownload, _ := cmd.Flags().GetBool("dl")
bootstrap, _ := cmd.Flags().GetBool("bootstrap")
done, err := comm.Start(sk, autoDownload)
if err != nil {
log.Error(err)
os.Exit(1)
}
if bootstrap {
comm.Node.Bootstrap(ipfs.DefaultBootstrapPeers())
}
cfg, err := comm.Repo.Config()
if err != nil {
log.Error(err)
Expand Down Expand Up @@ -64,5 +71,9 @@ $$ $$ |$$ $$ | $$ $$/ $$ $$ |$$ | $$ |$$ $$/ $$ $$/ $$
}
command.Flags().String("secret", "",
"Group secret key")
command.Flags().Bool("dl", true,
"Auto download content")
command.Flags().Bool("bootstrap", true,
"Bootstrap with datahop bootstrap nodes")
return command
}
2 changes: 1 addition & 1 deletion cli/cmd/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Example:
inf.Addresses = addrs
}
// disk usage
du, err := datastore.DiskUsage(comm.Context, comm.Repo.Datastore())
du, err := datastore.DiskUsage(comm.Repo.Datastore())
if err != nil {
log.Error("Unable to get datastore usage ", err)
return err
Expand Down
63 changes: 31 additions & 32 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,59 +4,58 @@ go 1.16

require (
github.com/asabya/go-ipc-uds v0.1.1
github.com/bits-and-blooms/bloom/v3 v3.1.0
github.com/bits-and-blooms/bloom/v3 v3.2.0
github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2
github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f // indirect
github.com/grandcat/zeroconf v1.0.0
github.com/h2non/filetype v1.1.3
github.com/ipfs/go-bitswap v0.5.1
github.com/ipfs/go-blockservice v0.2.1
github.com/ipfs/go-cid v0.1.0
github.com/ipfs/go-datastore v0.5.1
github.com/ipfs/go-ds-crdt v0.2.1
github.com/ipfs/go-ds-leveldb v0.5.0
github.com/ipfs/go-fetcher v1.6.1
github.com/ipfs/go-bitswap v0.4.0
github.com/ipfs/go-blockservice v0.1.7
github.com/ipfs/go-cid v0.0.7
github.com/ipfs/go-datastore v0.4.6
github.com/ipfs/go-ds-crdt v0.1.20
github.com/ipfs/go-ds-leveldb v0.4.2
github.com/ipfs/go-fetcher v1.5.0
github.com/ipfs/go-fs-lock v0.0.7
github.com/ipfs/go-ipfs-blockstore v1.1.0
github.com/ipfs/go-ipfs-blockstore v1.0.3
github.com/ipfs/go-ipfs-chunker v0.0.5
github.com/ipfs/go-ipfs-files v0.0.9
github.com/ipfs/go-ipfs-files v0.0.8
github.com/ipfs/go-ipfs-posinfo v0.0.1
github.com/ipfs/go-ipld-cbor v0.0.5
github.com/ipfs/go-ipld-format v0.2.0
github.com/ipfs/go-ipns v0.1.2
github.com/ipfs/go-log/v2 v2.3.0
github.com/ipfs/go-merkledag v0.5.1
github.com/ipfs/go-mfs v0.2.1
github.com/ipfs/go-path v0.2.1
github.com/ipfs/go-unixfs v0.3.1
github.com/ipfs/go-merkledag v0.4.0
github.com/ipfs/go-mfs v0.1.2
github.com/ipfs/go-path v0.1.2
github.com/ipfs/go-unixfs v0.2.5
github.com/ipfs/go-unixfsnode v1.1.3
github.com/ipfs/go-verifcid v0.0.1
github.com/ipfs/interface-go-ipfs-core v0.5.2
github.com/ipfs/interface-go-ipfs-core v0.5.1
github.com/ipld/go-codec-dagpb v1.3.0
github.com/ipld/go-ipld-prime v0.14.1
github.com/libp2p/go-libp2p v0.16.0
github.com/ipld/go-ipld-prime v0.12.2
github.com/libp2p/go-libp2p v0.15.0
github.com/libp2p/go-libp2p-circuit v0.4.0
github.com/libp2p/go-libp2p-connmgr v0.2.4
github.com/libp2p/go-libp2p-core v0.11.0
github.com/libp2p/go-libp2p-kad-dht v0.15.0
github.com/libp2p/go-libp2p-pubsub v0.6.0
github.com/libp2p/go-libp2p-core v0.9.0
github.com/libp2p/go-libp2p-kad-dht v0.13.1
github.com/libp2p/go-libp2p-pubsub v0.5.4
github.com/libp2p/go-libp2p-quic-transport v0.12.0 // indirect
github.com/libp2p/go-libp2p-record v0.1.3
github.com/libp2p/go-libp2p-swarm v0.8.0
github.com/libp2p/go-libp2p-tls v0.3.1
github.com/libp2p/go-tcp-transport v0.4.0
github.com/libp2p/go-libp2p-swarm v0.5.3
github.com/libp2p/go-libp2p-tls v0.2.0
github.com/libp2p/go-tcp-transport v0.2.8
github.com/mitchellh/go-homedir v1.1.0
github.com/multiformats/go-multiaddr v0.4.1
github.com/multiformats/go-multihash v0.1.0
github.com/multiformats/go-multiaddr v0.4.0
github.com/multiformats/go-multihash v0.0.15
github.com/plexsysio/taskmanager v0.0.0-20211220123746-de5ebdd49ae2
github.com/smartystreets/assertions v1.0.1 // indirect
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.3
github.com/warpfork/go-testmark v0.9.0 // indirect
github.com/whyrusleeping/cbor-gen v0.0.0-20210219115102-f37d292932f2 // indirect
go.uber.org/goleak v1.1.11 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
golang.org/x/sys v0.0.0-20211025112917-711f33c9992c // indirect
golang.org/x/tools v0.1.8-0.20211022200916-316ba0b74098 // indirect
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
google.golang.org/protobuf v1.27.1

)
Loading

0 comments on commit 3ec3b2f

Please sign in to comment.