Skip to content

Commit b96e368

Browse files
authored
Merge pull request #1102 from CortexFoundation/dev
1.10.28
2 parents cb1cf42 + 39fed8b commit b96e368

File tree

87 files changed

+5608
-4130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+5608
-4130
lines changed

go.mod

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/Azure/azure-storage-blob-go v0.8.1-0.20191213204130-762620a866ba
77
github.com/CortexFoundation/inference v1.0.2-0.20211021072419-330ffe5ad803
88
github.com/CortexFoundation/statik v0.0.0-20210315012922-8bb8a7b5dc66
9-
github.com/CortexFoundation/torrentfs v1.0.24-0.20211104025409-f2b79130585b
9+
github.com/CortexFoundation/torrentfs v1.0.24-0.20211105023843-9abb4eded018
1010
github.com/VictoriaMetrics/fastcache v1.7.0
1111
github.com/arsham/figurine v1.0.1
1212
github.com/aws/aws-sdk-go-v2 v1.3.0
@@ -55,7 +55,7 @@ require (
5555
github.com/ucwong/tsdb v0.10.4-0.20200518132041-df9cb51f3a80
5656
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
5757
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
58-
golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0
58+
golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70
5959
golang.org/x/text v0.3.7
6060
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
6161
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
@@ -72,20 +72,20 @@ require (
7272
github.com/RoaringBitmap/roaring v0.9.4 // indirect
7373
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
7474
github.com/allegro/bigcache/v3 v3.0.1 // indirect
75-
github.com/anacrolix/chansync v0.3.0-0.0.20211007004133-3f72684c4a93 // indirect
76-
github.com/anacrolix/confluence v1.8.0 // indirect
77-
github.com/anacrolix/dht/v2 v2.10.6-0.20211007004332-99263ec9c1c8 // indirect
78-
github.com/anacrolix/envpprof v1.1.1 // indirect
75+
github.com/anacrolix/chansync v0.3.0 // indirect
76+
github.com/anacrolix/confluence v1.9.0 // indirect
77+
github.com/anacrolix/dht/v2 v2.11.0 // indirect
78+
github.com/anacrolix/envpprof v1.1.2-0.20210622065137-4accee5b7ac4 // indirect
7979
github.com/anacrolix/go-libutp v1.0.4 // indirect
8080
github.com/anacrolix/log v0.10.0 // indirect
8181
github.com/anacrolix/missinggo v1.3.0 // indirect
8282
github.com/anacrolix/missinggo/perf v1.0.0 // indirect
8383
github.com/anacrolix/missinggo/v2 v2.5.2 // indirect
8484
github.com/anacrolix/mmsg v1.0.0 // indirect
85-
github.com/anacrolix/multiless v0.1.1-0.20210529082330-de2f6cf29619 // indirect
85+
github.com/anacrolix/multiless v0.2.0 // indirect
8686
github.com/anacrolix/stm v0.3.0 // indirect
8787
github.com/anacrolix/sync v0.4.0 // indirect
88-
github.com/anacrolix/torrent v1.35.1-0.20211103024906-002de0ebe308 // indirect
88+
github.com/anacrolix/torrent v1.35.1-0.20211104223025-f86af21cd2fe // indirect
8989
github.com/anacrolix/upnp v0.1.2-0.20200416075019-5e9378ed1425 // indirect
9090
github.com/anacrolix/utp v0.1.0 // indirect
9191
github.com/arsham/rainbow v1.0.0 // indirect
@@ -148,8 +148,12 @@ require (
148148
github.com/willf/bitset v1.1.11 // indirect
149149
github.com/willf/bloom v2.0.3+incompatible // indirect
150150
go.etcd.io/bbolt v1.3.7-0.20210702075620-b18879eb6c41 // indirect
151+
go.opencensus.io v0.22.4 // indirect
151152
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
152153
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
153154
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
155+
google.golang.org/api v0.30.0 // indirect
156+
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 // indirect
157+
google.golang.org/grpc v1.31.0 // indirect
154158
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
155159
)

go.sum

Lines changed: 153 additions & 17 deletions
Large diffs are not rendered by default.

params/config.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ var (
9393
var (
9494
MainnetTrustedCheckpoint = &TrustedCheckpoint{
9595
Name: "mainnet",
96-
SectionIndex: 141,
97-
SectionHead: common.HexToHash("0xa4c0a07c5a5080c861e4be0a436da4268d23a72fedd0a12f17cd663a19c60195"),
96+
SectionIndex: 149,
97+
SectionHead: common.HexToHash("0x68f893b88174079660b72daa075ec537e38654d977cee9a394d9b6b02d9f0aba"),
9898
}
9999

100100
DoloresTrustedCheckpoint = &TrustedCheckpoint{
@@ -169,7 +169,7 @@ var (
169169
ConstantinopleBlock: big.NewInt(0),
170170
PetersburgBlock: big.NewInt(0),
171171
IstanbulBlock: big.NewInt(0),
172-
NeoBlock: big.NewInt(5_000_000),
172+
NeoBlock: big.NewInt(0),
173173
Cuckoo: new(CuckooConfig),
174174
}
175175

params/version.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
)
2222

2323
const (
24-
VersionMajor = 1 // Major version component of the current release
25-
VersionMinor = 10 // Minor version component of the current release
26-
VersionPatch = 28 // Patch version component of the current release
27-
VersionMeta = "unstable" // Version metadata to append to the version string
24+
VersionMajor = 1 // Major version component of the current release
25+
VersionMinor = 10 // Minor version component of the current release
26+
VersionPatch = 28 // Patch version component of the current release
27+
VersionMeta = "stable" // Version metadata to append to the version string
2828
)
2929

3030
// Version holds the textual version string.

vendor/github.com/anacrolix/dht/v2/README.md

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/anacrolix/dht/v2/bep44/error.go

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/anacrolix/dht/v2/bep44/item.go

Lines changed: 179 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/anacrolix/dht/v2/bep44/key.go

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/anacrolix/dht/v2/bep44/memory.go

Lines changed: 49 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)