Skip to content

Commit

Permalink
Release 2.3.2 (#326)
Browse files Browse the repository at this point in the history
* feat: drop escrow api and wallet api

* fix: rename the btfs protocol to p2p (#311)

* fix: rename the btfs protocol to p2p

* test: rm escrow releated

* Simple node (#314)

* feat: deamon start

* chore: del guaid starts and ends

* chore: add isSimpleMode

* feat: mod simple node info by config

* chore: add simple node

* chore: build

* chore:

* feat: add sync-simple-mode

* mod: go mod

---------

Co-authored-by: fish <920886811@163.com>

* chore: drop dashboard url output

* Pre 2.3.2 (#322)

* feat: directory atomatic sharding

* feat[gateway]: sync latest ipfs gateway (#318)

* feat: add notices (#312)

* feat: add new mux

* feat[gateway]: sync ipfs gateway

* test: wan lan dht test case

* feat: upgrade conns inbound (#319)

* fix[gateway]: ipns to btns (#320)

* chore: del some simplemod cmd

* feature[gateway]: using btfs dir-index.html (#321)

Co-authored-by: Shannon Han <shannon.han@tron.network>

* chore: replace 'TRON-US' deps to 'bittorrent'

* chore: mannauly go fmt code

---------

Co-authored-by: steve <stevzhang01@gmail.com>
Co-authored-by: Shawn-Huang-Tron <107823650+Shawn-Huang-Tron@users.noreply.github.com>
Co-authored-by: fish <920886811@163.com>
Co-authored-by: Hanzc <1297411677@qq.com>
Co-authored-by: Shannon Han <shannon.han@tron.network>

* fix: go-btfs-files tag

* fix: lauchpad.net/gocheck deps issue

* chore: add new bootstap node (#324)

Co-authored-by: fish <920886811@163.com>

* test: update test case (#325)

Co-authored-by: shawn <shawn@shawndeMacBook-Pro.local>

* test: update test case (#327)

* test: update test case

* test: add and fix some test cases

---------

Co-authored-by: shawn <shawn@shawndeMacBook-Pro.local>

* feat: update config connMgr default (#328)

* feat: update version and dashboard address (#330)

* feat: update version and dashboard address

* fix: update comment

---------

Co-authored-by: fish <920886811@163.com>
Co-authored-by: Shawn-Huang-Tron <107823650+Shawn-Huang-Tron@users.noreply.github.com>
Co-authored-by: laocheng-cheng <73106671+laocheng-cheng@users.noreply.github.com>
Co-authored-by: steve <stevzhang01@gmail.com>
Co-authored-by: Hanzc <1297411677@qq.com>
Co-authored-by: Shannon Han <shannon.han@tron.network>
Co-authored-by: shawn <shawn@shawndeMacBook-Pro.local>
  • Loading branch information
8 people committed Jun 26, 2023
1 parent d8f1075 commit 58978cb
Show file tree
Hide file tree
Showing 311 changed files with 47,665 additions and 6,077 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,8 @@ cmd/btfs/btfs
cmd/btfs/btfs.upgrade
cmd/btfs/ttt
cmd/btfs/tt
cmd/btfs/t*
cmd/btfs/t*
cmd/btfs/btfs.1.*
cmd/btfs/btfs.2.*
cmd/btfs/btfs.3.*
btfs.linux.*
6 changes: 3 additions & 3 deletions assets/assets.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"github.com/bittorrent/go-btfs/core"
"github.com/bittorrent/go-btfs/core/coreapi"

files "github.com/TRON-US/go-btfs-files"
options "github.com/TRON-US/interface-go-btfs-core/options"
"github.com/TRON-US/interface-go-btfs-core/path"
files "github.com/bittorrent/go-btfs-files"
options "github.com/bittorrent/interface-go-btfs-core/options"
"github.com/bittorrent/interface-go-btfs-core/path"
cid "github.com/ipfs/go-cid"
)

Expand Down
14 changes: 8 additions & 6 deletions assets/bindata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion autoupdate/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/bittorrent/go-btfs/logger"

"github.com/TRON-US/go-btfs-api"
"github.com/bittorrent/go-btfs-api"
)

var log = logger.InitLogger("update.log").Sugar()
Expand Down
2 changes: 1 addition & 1 deletion bigint/bigint.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (i *BigInt) UnmarshalJSON(b []byte) error {
return nil
}

//Wrap wraps big.Int pointer into BigInt struct.
// Wrap wraps big.Int pointer into BigInt struct.
func Wrap(i *big.Int) *BigInt {
return &BigInt{Int: i}
}
12 changes: 7 additions & 5 deletions bindata/bindata.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,13 @@ var _bindata = map[string]func() (*asset, error){
// directory embedded in the file by go-bindata.
// For example if you run go-bindata on data/... and data contains the
// following hierarchy:
// data/
// foo.txt
// img/
// a.png
// b.png
//
// data/
// foo.txt
// img/
// a.png
// b.png
//
// then AssetDir("data") would return []string{"foo.txt", "img"}
// AssetDir("data/img") would return []string{"a.png", "b.png"}
// AssetDir("foo.txt") and AssetDir("notexist") would return an error
Expand Down
2 changes: 1 addition & 1 deletion chain/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package config

import (
"errors"
cfg "github.com/TRON-US/go-btfs-config"
cfg "github.com/bittorrent/go-btfs-config"
"github.com/ethereum/go-ethereum/common"
)

Expand Down
6 changes: 3 additions & 3 deletions chain/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ import (
"encoding/base64"
"errors"
"fmt"
config "github.com/TRON-US/go-btfs-config"
config "github.com/bittorrent/go-btfs-config"
"io/ioutil"
"math/rand"
"os"
"time"

cmds "github.com/bittorrent/go-btfs-cmds"
"github.com/bittorrent/go-btfs-common/crypto"
onlinePb "github.com/bittorrent/go-btfs-common/protos/online"
oldcmds "github.com/bittorrent/go-btfs/commands"
"github.com/bittorrent/go-btfs/core/commands/storage/path"
"github.com/bittorrent/go-btfs/settlement/swap/vault"
cpt "github.com/bittorrent/go-btfs/transaction/crypto"
"github.com/bittorrent/go-btfs/transaction/storage"
"github.com/ethereum/go-ethereum/common"
"github.com/tron-us/go-btfs-common/crypto"
onlinePb "github.com/tron-us/go-btfs-common/protos/online"
)

// after btfs init
Expand Down
2 changes: 1 addition & 1 deletion cmd/btfs/autoupdate.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"strings"
"time"

"github.com/TRON-US/go-btfs-api"
btfs_version "github.com/bittorrent/go-btfs"
"github.com/bittorrent/go-btfs-api"
"github.com/mholt/archiver/v3"
"github.com/pkg/errors"
"gopkg.in/yaml.v2"
Expand Down
2 changes: 1 addition & 1 deletion cmd/btfs/chain_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"gotest.tools/assert"

Cfg "github.com/TRON-US/go-btfs-config"
cmds "github.com/bittorrent/go-btfs-cmds"
Cfg "github.com/bittorrent/go-btfs-config"
"github.com/bittorrent/go-btfs/chain"
)

Expand Down
Loading

0 comments on commit 58978cb

Please sign in to comment.