Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.5.3 #1156

Merged
merged 13 commits into from
Oct 29, 2021
Merged

1.5.3 #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1fa0bee
default do not sync hosts
Yrp Oct 19, 2021
33f24b2
Optimising copywriting
Yrp Oct 21, 2021
8c93656
up hostui
Oct 21, 2021
61b1170
update sync text
rudya Oct 21, 2021
a3c8406
Merge pull request #1154 from TRON-US/host-sync-text-update
Yrp Oct 21, 2021
707a587
Simplify log output to be more readable
Yrp Oct 22, 2021
ffb0e2b
Merge branch 'feature/1.5.3' of github.com:TRON-US/go-btfs into featu…
Yrp Oct 22, 2021
9358800
Modify sync interval
Yrp Oct 22, 2021
a00c8b1
Simplify log output to be more readable
Yrp Oct 22, 2021
0950b5d
Simplify log output to be more readable
Yrp Oct 22, 2021
082f71d
update libp2p
Yrp Oct 22, 2021
9f846a6
format
Yrp Oct 22, 2021
96029c0
disabled autoupdate
Yrp Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions cmd/btfs/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,15 +371,6 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment
log.Errorf("To disable this multiplexer, please configure `Swarm.Transports.Multiplexers'.")
}

// Btfs auto update.
url := fmt.Sprint(strings.Split(cfg.Addresses.API[0], "/")[2], ":", strings.Split(cfg.Addresses.API[0], "/")[4])

if !cfg.Experimental.DisableAutoUpdate {
go update(url, hValue)
} else {
fmt.Println("Auto-update was disabled as config Experimental.DisableAutoUpdate was set as True")
}

// Start assembling node config
ncfg := &core.BuildCfg{
Repo: repo,
Expand Down
18 changes: 18 additions & 0 deletions core/commands/storage/upload/upload/upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package upload

import (
"context"
"errors"
"fmt"
"github.com/TRON-US/go-btfs/core/commands/storage/hosts"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -135,6 +137,9 @@ Use status command to check for completion:
if err != nil {
return err
}
if !ctxParams.Cfg.Experimental.HostsSyncEnabled {
_ = SyncHosts(ctxParams)
}
hp := helper.GetHostsProvider(ctxParams, make([]string, 0))
if mode, ok := req.Options[hostSelectModeOptionName].(string); ok {
var hostIDs []string
Expand Down Expand Up @@ -179,6 +184,19 @@ Use status command to check for completion:
Type: Res{},
}

func SyncHosts(ctxParams *helper.ContextParams) error {
cfg, err := ctxParams.N.Repo.Config()
if err != nil {
log.Errorf("Failed to get configuration %s", err)
return err
}
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
defer cancel()
m := cfg.Experimental.HostsSyncMode
_, err = hosts.SyncHosts(ctx, ctxParams.N, m)
return err
}

type Res struct {
ID string
}
4 changes: 2 additions & 2 deletions docs/examples/go-ipfs-as-a-library/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ go 1.14

require (
github.com/TRON-US/go-btfs v1.5.0
github.com/TRON-US/go-btfs-config v0.7.0
github.com/TRON-US/go-btfs-config v0.11.2
github.com/TRON-US/go-btfs-files v0.2.0
github.com/TRON-US/interface-go-btfs-core v0.7.0
github.com/ipfs/go-ipfs v0.7.0
github.com/ipfs/go-ipfs-config v0.9.0
github.com/ipfs/go-ipfs-files v0.0.8
github.com/ipfs/interface-go-ipfs-core v0.4.0
github.com/libp2p/go-libp2p-core v0.6.1
github.com/libp2p/go-libp2p-core v0.9.0
github.com/libp2p/go-libp2p-peerstore v0.2.6
github.com/multiformats/go-multiaddr v0.3.1
)
Expand Down
4 changes: 4 additions & 0 deletions docs/examples/go-ipfs-as-a-library/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ github.com/TRON-US/go-btfs-cmds v0.2.13/go.mod h1:GLPyQ0EX9JiL41IZd6yRr42RlxNHov
github.com/TRON-US/go-btfs-config v0.6.0/go.mod h1:82nKCMRhsgY0I8DCasIUpSr6ZP9iHLsZJSMUxytMpEw=
github.com/TRON-US/go-btfs-config v0.7.0 h1:v1O6ggE71k3a6KuwfUgbqFFPMJkZymvyORXDquQTKl8=
github.com/TRON-US/go-btfs-config v0.7.0/go.mod h1:9y6osJENDCjulSNJjSSt1J8OK+ADRatBdYPXRDewbko=
github.com/TRON-US/go-btfs-config v0.11.2 h1:3rDK/jyeEj5hKAlj+iMBy7SB4wuy8ti5aDjaG8cxAt4=
github.com/TRON-US/go-btfs-config v0.11.2/go.mod h1:9y6osJENDCjulSNJjSSt1J8OK+ADRatBdYPXRDewbko=
github.com/TRON-US/go-btfs-files v0.1.1/go.mod h1:tD2vOKLcLCDNMn9rrA27n2VbNpHdKewGzEguIFY+EJ0=
github.com/TRON-US/go-btfs-files v0.2.0/go.mod h1:Qx+rTOIC0xl3ZkosGcEoB4hqExZmTONErPys8K5suEc=
github.com/TRON-US/go-btfs-pinner v0.1.1/go.mod h1:4CVxKEQNNTbuW92BIYwiH9/W63eDNtlt7bK0fCnXSag=
Expand Down Expand Up @@ -864,6 +866,8 @@ github.com/libp2p/go-libp2p-core v0.6.0 h1:u03qofNYTBN+yVg08PuAKylZogVf0xcTEeM8s
github.com/libp2p/go-libp2p-core v0.6.0/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo=
github.com/libp2p/go-libp2p-core v0.6.1 h1:XS+Goh+QegCDojUZp00CaPMfiEADCrLjNZskWE7pvqs=
github.com/libp2p/go-libp2p-core v0.6.1/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
github.com/libp2p/go-libp2p-core v0.9.0 h1:t97Mv0LIBZlP2FXVRNKKVzHJCIjbIWGxYptGId4+htU=
github.com/libp2p/go-libp2p-core v0.9.0/go.mod h1:ESsbz31oC3C1AvMJoGx26RTuCkNhmkSRCqZ0kQtJ2/8=
github.com/libp2p/go-libp2p-crypto v0.0.1/go.mod h1:yJkNyDmO341d5wwXxDUGO0LykUVT72ImHNUqh5D/dBE=
github.com/libp2p/go-libp2p-crypto v0.0.2/go.mod h1:eETI5OUfBnvARGOHrJz2eWNyTUxEGZnBxMcbUjfIj4I=
github.com/libp2p/go-libp2p-crypto v0.1.0 h1:k9MFy+o2zGDNGsaoZl0MA3iZ75qXxr9OOoAZF+sD5OQ=
Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/TRON-US/go-btfs-api v0.3.0
github.com/TRON-US/go-btfs-chunker v0.3.0
github.com/TRON-US/go-btfs-cmds v0.2.13
github.com/TRON-US/go-btfs-config v0.11.1
github.com/TRON-US/go-btfs-config v0.11.2
github.com/TRON-US/go-btfs-files v0.2.0
github.com/TRON-US/go-btfs-pinner v0.1.1
github.com/TRON-US/go-btns v0.1.1
Expand Down Expand Up @@ -79,8 +79,8 @@ require (
github.com/libp2p/go-libp2p-kad-dht v0.9.0
github.com/libp2p/go-libp2p-kbucket v0.4.7
github.com/libp2p/go-libp2p-loggables v0.1.0
github.com/libp2p/go-libp2p-mplex v0.2.4
github.com/libp2p/go-libp2p-noise v0.1.1
github.com/libp2p/go-libp2p-mplex v0.3.0
github.com/libp2p/go-libp2p-noise v0.1.2
github.com/libp2p/go-libp2p-peerstore v0.2.6
github.com/libp2p/go-libp2p-pubsub v0.3.5
github.com/libp2p/go-libp2p-pubsub-router v0.3.2
Expand All @@ -89,7 +89,7 @@ require (
github.com/libp2p/go-libp2p-routing-helpers v0.2.3
github.com/libp2p/go-libp2p-secio v0.2.2
github.com/libp2p/go-libp2p-swarm v0.2.8
github.com/libp2p/go-libp2p-testing v0.2.0
github.com/libp2p/go-libp2p-testing v0.3.0
github.com/libp2p/go-libp2p-tls v0.1.3
github.com/libp2p/go-libp2p-yamux v0.2.8
github.com/libp2p/go-socket-activation v0.0.2
Expand Down
20 changes: 14 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ github.com/TRON-US/go-btfs-chunker v0.3.0/go.mod h1:m0xvt42kqLskWsLF6SQ51AA9cqPz
github.com/TRON-US/go-btfs-cmds v0.2.13 h1:cI2UnlwSR8PIVvfcHT7vCuMRyoHW9NBZim0AoEhdVYY=
github.com/TRON-US/go-btfs-cmds v0.2.13/go.mod h1:GLPyQ0EX9JiL41IZd6yRr42RlxNHovp4V4gXZNE2Rfk=
github.com/TRON-US/go-btfs-config v0.6.0/go.mod h1:82nKCMRhsgY0I8DCasIUpSr6ZP9iHLsZJSMUxytMpEw=
github.com/TRON-US/go-btfs-config v0.11.1 h1:zx1Kg/ywjyWpOXbt0thAiRDvG2hQudpkGcF0eFa+DNg=
github.com/TRON-US/go-btfs-config v0.11.1/go.mod h1:9y6osJENDCjulSNJjSSt1J8OK+ADRatBdYPXRDewbko=
github.com/TRON-US/go-btfs-config v0.11.2 h1:3rDK/jyeEj5hKAlj+iMBy7SB4wuy8ti5aDjaG8cxAt4=
github.com/TRON-US/go-btfs-config v0.11.2/go.mod h1:9y6osJENDCjulSNJjSSt1J8OK+ADRatBdYPXRDewbko=
github.com/TRON-US/go-btfs-files v0.1.1/go.mod h1:tD2vOKLcLCDNMn9rrA27n2VbNpHdKewGzEguIFY+EJ0=
github.com/TRON-US/go-btfs-files v0.2.0 h1:JZ+F0gX8iPmUf1OlrdOdsA8GMGxCHhwQ03jEWWEgVLE=
github.com/TRON-US/go-btfs-files v0.2.0/go.mod h1:Qx+rTOIC0xl3ZkosGcEoB4hqExZmTONErPys8K5suEc=
Expand Down Expand Up @@ -817,8 +817,9 @@ github.com/libp2p/go-libp2p-mplex v0.2.0/go.mod h1:Ejl9IyjvXJ0T9iqUTE1jpYATQ9NM3
github.com/libp2p/go-libp2p-mplex v0.2.1/go.mod h1:SC99Rxs8Vuzrf/6WhmH41kNn13TiYdAWNYHrwImKLnE=
github.com/libp2p/go-libp2p-mplex v0.2.2/go.mod h1:74S9eum0tVQdAfFiKxAyKzNdSuLqw5oadDq7+L/FELo=
github.com/libp2p/go-libp2p-mplex v0.2.3/go.mod h1:CK3p2+9qH9x+7ER/gWWDYJ3QW5ZxWDkm+dVvjfuG3ek=
github.com/libp2p/go-libp2p-mplex v0.2.4 h1:XFFXaN4jhqnIuJVjYOR3k6bnRj0mFfJOlIuDVww+4Zo=
github.com/libp2p/go-libp2p-mplex v0.2.4/go.mod h1:mI7iOezdWFOisvUwaYd3IDrJ4oVmgoXK8H331ui39CE=
github.com/libp2p/go-libp2p-mplex v0.3.0 h1:CZyqqKP0BSGQyPLvpRQougbfXaaaJZdGgzhCpJNuNSk=
github.com/libp2p/go-libp2p-mplex v0.3.0/go.mod h1:l9QWxRbbb5/hQMECEb908GbS9Sm2UAR2KFZKUJEynEs=
github.com/libp2p/go-libp2p-nat v0.0.4/go.mod h1:N9Js/zVtAXqaeT99cXgTV9e75KpnWCvVOiGzlcHmBbY=
github.com/libp2p/go-libp2p-nat v0.0.5/go.mod h1:1qubaE5bTZMJE+E/uu2URroMbzdubFz1ChgiN79yKPE=
github.com/libp2p/go-libp2p-nat v0.0.6 h1:wMWis3kYynCbHoyKLPBEMu4YRLltbm8Mk08HGSfvTkU=
Expand All @@ -828,8 +829,9 @@ github.com/libp2p/go-libp2p-net v0.0.2/go.mod h1:Yt3zgmlsHOgUWSXmt5V/Jpz9upuJBE8
github.com/libp2p/go-libp2p-netutil v0.0.1/go.mod h1:GdusFvujWZI9Vt0X5BKqwWWmZFxecf9Gt03cKxm2f/Q=
github.com/libp2p/go-libp2p-netutil v0.1.0 h1:zscYDNVEcGxyUpMd0JReUZTrpMfia8PmLKcKF72EAMQ=
github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod h1:3Qv/aDqtMLTUyQeundkKsA+YCThNdbQD54k3TqjpbFU=
github.com/libp2p/go-libp2p-noise v0.1.1 h1:vqYQWvnIcHpIoWJKC7Al4D6Hgj0H012TuXRhPwSMGpQ=
github.com/libp2p/go-libp2p-noise v0.1.1/go.mod h1:QDFLdKX7nluB7DEnlVPbz7xlLHdwHFA9HiohJRr3vwM=
github.com/libp2p/go-libp2p-noise v0.1.2 h1:IH9GRihQJTx56obm+GnpdPX4KeVIlvpXrP6xnJ0wxWk=
github.com/libp2p/go-libp2p-noise v0.1.2/go.mod h1:9B10b7ueo7TIxZHHcjcDCo5Hd6kfKT2m77by82SFRfE=
github.com/libp2p/go-libp2p-peer v0.0.1/go.mod h1:nXQvOBbwVqoP+T5Y5nCjeH4sP9IX/J0AMzcDUVruVoo=
github.com/libp2p/go-libp2p-peer v0.1.1/go.mod h1:jkF12jGB4Gk/IOo+yomm+7oLWxF278F7UnrYUQ1Q8es=
github.com/libp2p/go-libp2p-peer v0.2.0 h1:EQ8kMjaCUwt/Y5uLgjT8iY2qg0mGUT0N1zUjer50DsY=
Expand Down Expand Up @@ -885,8 +887,10 @@ github.com/libp2p/go-libp2p-testing v0.0.3/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MB
github.com/libp2p/go-libp2p-testing v0.0.4/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
github.com/libp2p/go-libp2p-testing v0.1.0/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
github.com/libp2p/go-libp2p-testing v0.1.1/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
github.com/libp2p/go-libp2p-testing v0.2.0 h1:DdC8Dthjf97Hz3t3siZCRD1U3nuNxQgEyTWvLh6ayvw=
github.com/libp2p/go-libp2p-testing v0.1.2-0.20200422005655-8775583591d8/go.mod h1:Qy8sAncLKpwXtS2dSnDOP8ktexIAHKu+J+pnZOFZLTc=
github.com/libp2p/go-libp2p-testing v0.2.0/go.mod h1:Qy8sAncLKpwXtS2dSnDOP8ktexIAHKu+J+pnZOFZLTc=
github.com/libp2p/go-libp2p-testing v0.3.0 h1:ZiBYstPamsi7y6NJZebRudUzsYmVkt998hltyLqf8+g=
github.com/libp2p/go-libp2p-testing v0.3.0/go.mod h1:efZkql4UZ7OVsEfaxNHZPzIehtsBXMrXnCfJIgDti5g=
github.com/libp2p/go-libp2p-tls v0.1.3 h1:twKMhMu44jQO+HgQK9X8NHO5HkeJu2QbhLzLJpa8oNM=
github.com/libp2p/go-libp2p-tls v0.1.3/go.mod h1:wZfuewxOndz5RTnCAxFliGjvYSDA40sKitV4c50uI1M=
github.com/libp2p/go-libp2p-transport v0.0.1/go.mod h1:UzbUs9X+PHOSw7S3ZmeOxfnwaQY5vGDzZmKPod3N3tk=
Expand All @@ -913,8 +917,9 @@ github.com/libp2p/go-mplex v0.0.3/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTW
github.com/libp2p/go-mplex v0.0.4/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0=
github.com/libp2p/go-mplex v0.1.0/go.mod h1:SXgmdki2kwCUlCCbfGLEgHjC4pFqhTp0ZoV6aiKgxDU=
github.com/libp2p/go-mplex v0.1.1/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk=
github.com/libp2p/go-mplex v0.1.2 h1:qOg1s+WdGLlpkrczDqmhYzyk3vCfsQ8+RxRTQjOZWwI=
github.com/libp2p/go-mplex v0.1.2/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk=
github.com/libp2p/go-mplex v0.2.0 h1:Ov/D+8oBlbRkjBs1R1Iua8hJ8cUfbdiW8EOdZuxcgaI=
github.com/libp2p/go-mplex v0.2.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ6msjvYQ=
github.com/libp2p/go-msgio v0.0.2/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
github.com/libp2p/go-msgio v0.0.3/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
Expand Down Expand Up @@ -1442,6 +1447,7 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190618222545-ea8f1a30c443/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
Expand Down Expand Up @@ -1757,7 +1763,9 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.34.0 h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=
google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
Expand Down
1 change: 0 additions & 1 deletion hostui/css/app.0b411fe4.css
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions hostui/css/app.112acf0d.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion hostui/css/app.4131e976.css
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion hostui/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>BTFS UI</title><link href=css/app.4131e976.css rel=preload as=style><link href=css/chunk-vendors.99b1ddc7.css rel=preload as=style><link href=js/app.dfca71ae.js rel=preload as=script><link href=js/chunk-vendors.eb8e6980.js rel=preload as=script><link href=css/chunk-vendors.99b1ddc7.css rel=stylesheet><link href=css/app.4131e976.css rel=stylesheet></head><body><noscript><strong>We're sorry but BTFS-UI doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.eb8e6980.js></script><script src=js/app.dfca71ae.js></script></body></html>
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>BTFS UI</title><link href=css/app.112acf0d.css rel=preload as=style><link href=css/chunk-vendors.99b1ddc7.css rel=preload as=style><link href=js/app.62b69ced.js rel=preload as=script><link href=js/chunk-vendors.5e7a0a8d.js rel=preload as=script><link href=css/chunk-vendors.99b1ddc7.css rel=stylesheet><link href=css/app.112acf0d.css rel=stylesheet></head><body><noscript><strong>We're sorry but BTFS-UI doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.5e7a0a8d.js></script><script src=js/app.62b69ced.js></script></body></html>
2 changes: 2 additions & 0 deletions hostui/js/app.62b69ced.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions hostui/js/app.62b69ced.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions hostui/js/app.7dc7722f.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion hostui/js/app.7dc7722f.js.map
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions hostui/js/app.dfca71ae.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion hostui/js/app.dfca71ae.js.map
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions hostui/js/chunk-vendors.eb8e6980.js → hostui/js/chunk-vendors.5e7a0a8d.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hostui/js/chunk-vendors.eb8e6980.js.map → hostui/js/chunk-vendors.5e7a0a8d.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkged.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion spin/contracts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
)

const (
hostContractsSyncPeriod = 60 * time.Minute
hostContractsSyncPeriod = 2 * 60 * time.Minute
hostContractsSyncTimeout = 10 * time.Minute
)

Expand Down
11 changes: 10 additions & 1 deletion spin/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package spin

import (
"context"
"strings"
"time"
)

Expand All @@ -14,7 +15,15 @@ func periodicSync(period, timeout time.Duration, msg string, syncFunc func(conte
defer cancel()
err := syncFunc(ctx)
if err != nil {
log.Errorf("Failed to sync %s: %s", msg, err)
if strings.Contains(err.Error(), "Cannot query to get stats, please wait for host validation") {
log.Infof("Currently syncing the BTFS network, " +
"which may last several hours depending on network conditions. Please be patient.")
} else if strings.Contains(err.Error(), "Cannot query to get hosts") {
log.Errorf("Cannot query to get hosts. " +
"If you are not a renter, i.e. don't need to upload files, you can ignore it.")
} else {
log.Errorf("Failed to sync %s: %s", msg, err)
}
}
}
}
6 changes: 3 additions & 3 deletions spin/hosts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
)

const (
hostSyncPeriod = 60 * time.Minute
hostStatsSyncPeriod = 30 * time.Minute
hostSettingsSyncPeriod = 60 * time.Minute
hostSyncPeriod = 2 * 60 * time.Minute
hostStatsSyncPeriod = 2 * 60 * time.Minute
hostSettingsSyncPeriod = 2 * 60 * time.Minute
hostSyncTimeout = 30 * time.Second
hostSortTimeout = 5 * time.Minute
)
Expand Down
2 changes: 1 addition & 1 deletion spin/tron.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
)

const (
bttTxSyncPeriod = 3 * time.Minute
bttTxSyncPeriod = 2 * 60 * time.Minute
bttTxSyncTimeout = 1 * time.Minute
)

Expand Down
2 changes: 1 addition & 1 deletion version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package btfs
var CurrentCommit string

// CurrentVersionNumber is the current application's version literal
const CurrentVersionNumber = "1.5.2"
const CurrentVersionNumber = "1.5.3"

const ApiVersion = "/go-btfs/" + CurrentVersionNumber + "/"

Expand Down