Skip to content

Commit 730dd87

Browse files
ucwongucwong
authored
Merge pull request #2505 from CortexFoundation/dev
tx nonce limit
2 parents 45cd500 + ee7cb8e commit 730dd87

File tree

8 files changed

+99
-111
lines changed

8 files changed

+99
-111
lines changed

‎core/txpool/txpool.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,10 @@ func (pool *TxPool) validateTxBasics(tx *types.Transaction, head *types.Header,
605605
if _, err := types.Sender(pool.signer, tx); err != nil {
606606
return ErrInvalidSender
607607
}
608+
// Limit nonce to 2^64-1 per EIP-2681
609+
if tx.Nonce()+1 < tx.Nonce() {
610+
return core.ErrNonceMax
611+
}
608612
// Drop non-local transactions under our own minimal accepted gas price
609613
if !local && tx.GasPriceIntCmp(pool.gasPrice.Load()) < 0 {
610614
return ErrUnderpriced

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.2
77
github.com/CortexFoundation/inference v1.0.2-0.20230307032835-9197d586a4e8
88
github.com/CortexFoundation/statik v0.0.0-20210315012922-8bb8a7b5dc66
9-
github.com/CortexFoundation/torrentfs v1.0.72
9+
github.com/CortexFoundation/torrentfs v1.0.73-0.20250925115507-4b8ce0bdc3be
1010
github.com/Microsoft/go-winio v0.6.2
1111
github.com/VictoriaMetrics/fastcache v1.13.0
1212
github.com/arsham/figurine v1.3.0
@@ -204,7 +204,7 @@ require (
204204
github.com/pion/rtp v1.8.22 // indirect
205205
github.com/pion/sctp v1.8.39 // indirect
206206
github.com/pion/sdp/v3 v3.0.16 // indirect
207-
github.com/pion/srtp/v3 v3.0.7 // indirect
207+
github.com/pion/srtp/v3 v3.0.8 // indirect
208208
github.com/pion/stun/v3 v3.0.0 // indirect
209209
github.com/pion/transport/v2 v2.2.10 // indirect
210210
github.com/pion/transport/v3 v3.0.7 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ github.com/CortexFoundation/statik v0.0.0-20210315012922-8bb8a7b5dc66/go.mod h1:
7070
github.com/CortexFoundation/torrentfs v1.0.13-0.20200623060705-ce027f43f2f8/go.mod h1:Ma+tGhPPvz4CEZHaqEJQMOEGOfHeQBiAoNd1zyc/w3Q=
7171
github.com/CortexFoundation/torrentfs v1.0.14-0.20200703071639-3fcabcabf274/go.mod h1:qnb3YlIJmuetVBtC6Lsejr0Xru+1DNmDCdTqnwy7lhk=
7272
github.com/CortexFoundation/torrentfs v1.0.20-0.20200810031954-d36d26f82fcc/go.mod h1:N5BsicP5ynjXIi/Npl/SRzlJ630n1PJV2sRj0Z0t2HA=
73-
github.com/CortexFoundation/torrentfs v1.0.72 h1:6o92buInEz0Sip/k6QQo6NlykgStNmuUDykl6wQZLj8=
74-
github.com/CortexFoundation/torrentfs v1.0.72/go.mod h1:WQeMtkJ3bA9TJipHQk8Vp+lKfHIw4X9QQDvjAzThbAA=
73+
github.com/CortexFoundation/torrentfs v1.0.73-0.20250925115507-4b8ce0bdc3be h1:ywNWKcvAmW28IZ+9Kw608X2Ff1fEbEUzpBhvfUd51WQ=
74+
github.com/CortexFoundation/torrentfs v1.0.73-0.20250925115507-4b8ce0bdc3be/go.mod h1:WQeMtkJ3bA9TJipHQk8Vp+lKfHIw4X9QQDvjAzThbAA=
7575
github.com/CortexFoundation/wormhole v0.0.2-0.20250807143819-52807b74f358 h1:y0QMrHsFxmrKBJDjYTnsXw8h/rtjO+tMnmK2OdUzZ/w=
7676
github.com/CortexFoundation/wormhole v0.0.2-0.20250807143819-52807b74f358/go.mod h1:R/2T+BS27RdmRWWhoDdgSlordZpUBjVTh8hi4fHoioE=
7777
github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
@@ -1002,8 +1002,8 @@ github.com/pion/sdp/v3 v3.0.16 h1:0dKzYO6gTAvuLaAKQkC02eCPjMIi4NuAr/ibAwrGDCo=
10021002
github.com/pion/sdp/v3 v3.0.16/go.mod h1:9tyKzznud3qiweZcD86kS0ff1pGYB3VX+Bcsmkx6IXo=
10031003
github.com/pion/srtp v1.3.1/go.mod h1:nxEytDDGTN+eNKJ1l5gzOCWQFuksgijorsSlgEjc40Y=
10041004
github.com/pion/srtp v1.3.2/go.mod h1:snPrfN+gVpRBpmats49oxLWfcFB01eH1N9F+N7+dxKI=
1005-
github.com/pion/srtp/v3 v3.0.7 h1:QUElw0A/FUg3MP8/KNMZB3i0m8F9XeMnTum86F7S4bs=
1006-
github.com/pion/srtp/v3 v3.0.7/go.mod h1:qvnHeqbhT7kDdB+OGB05KA/P067G3mm7XBfLaLiaNF0=
1005+
github.com/pion/srtp/v3 v3.0.8 h1:RjRrjcIeQsilPzxvdaElN0CpuQZdMvcl9VZ5UY9suUM=
1006+
github.com/pion/srtp/v3 v3.0.8/go.mod h1:2Sq6YnDH7/UDCvkSoHSDNDeyBcFgWL0sAVycVbAsXFg=
10071007
github.com/pion/stun v0.3.3/go.mod h1:xrCld6XM+6GWDZdvjPlLMsTU21rNxnO6UO8XsAvHr/M=
10081008
github.com/pion/stun/v2 v2.0.0 h1:A5+wXKLAypxQri59+tmQKVs7+l6mMM+3d+eER9ifRU0=
10091009
github.com/pion/stun/v2 v2.0.0/go.mod h1:22qRSh08fSEttYUmJZGlriq9+03jtVmXNODgLccj8GQ=

‎vendor/github.com/CortexFoundation/torrentfs/backend/handler.go‎

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

‎vendor/github.com/pion/srtp/v3/.golangci.yml‎

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

‎vendor/github.com/pion/srtp/v3/srtp.go‎

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/pion/srtp/v3/srtp_cipher_aead_aes_gcm.go‎

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

‎vendor/modules.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ github.com/CortexFoundation/robot/backend
6161
# github.com/CortexFoundation/statik v0.0.0-20210315012922-8bb8a7b5dc66
6262
## explicit; go 1.16
6363
github.com/CortexFoundation/statik
64-
# github.com/CortexFoundation/torrentfs v1.0.72
64+
# github.com/CortexFoundation/torrentfs v1.0.73-0.20250925115507-4b8ce0bdc3be
6565
## explicit; go 1.24.4
6666
github.com/CortexFoundation/torrentfs
6767
github.com/CortexFoundation/torrentfs/backend
@@ -938,8 +938,8 @@ github.com/pion/sctp
938938
# github.com/pion/sdp/v3 v3.0.16
939939
## explicit; go 1.21
940940
github.com/pion/sdp/v3
941-
# github.com/pion/srtp/v3 v3.0.7
942-
## explicit; go 1.20
941+
# github.com/pion/srtp/v3 v3.0.8
942+
## explicit; go 1.21
943943
github.com/pion/srtp/v3
944944
# github.com/pion/stun/v2 v2.0.0
945945
## explicit; go 1.12

0 commit comments

Comments
 (0)