Skip to content

Commit d66bbc4

Browse files
authored
Merge branch 'master' into feat/frc-102-signing
2 parents b050917 + dc30466 commit d66bbc4

File tree

158 files changed

+3675
-428
lines changed

Some content is hidden

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

158 files changed

+3675
-428
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,15 @@ jobs:
185185
prefix: ${{ matrix.project == 'node' && 'lotus' || format('lotus-{0}', matrix.project) }}
186186
version: ${{ fromJSON(steps.project.outputs.config).version }}
187187
run: |
188+
mkdir dist
189+
pushd dist
188190
for directory in darwin_arm64 linux_amd64_v1; do
189191
archive_name="${prefix}_v${version}_${directory}"
190192
cp -r ../$directory $archive_name
191193
tar -czf $archive_name.tar.gz $archive_name
192194
rm -r $archive_name
193195
done
196+
popd
194197
ls -la .
195198
- name: Install Kubo (checksums generation dependency)
196199
uses: ipfs/download-ipfs-distribution-action@v1

CHANGELOG.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,24 @@
88
> * [CHANGELOG_1.2x.md](./documentation/changelog/CHANGELOG_1.2x.md) - v1.20.0 to v1.29.2
99
1010
# UNRELEASED
11-
- The minimum supported Golang version is now `1.24.7`
12-
- feat(gateway): expose StateGetRandomnessDigestFromBeacon ([filecoin-project/lotus#13339](https://github.com/filecoin-project/lotus/pull/13339))
13-
- chore(deps): update of quic-go to v0.54.1 and go-libp2p to v0.43.0 ([filecoin-project/lotus#13361](https://github.com/filecoin-project/lotus/pull/13361))
14-
- feat(spcli): add a `deposit-margin-factor` option to `lotus-miner actor new` and `lotus-shed miner create` so the sent deposit still covers the on-chain requirement if it rises between lookup and execution
15-
- feat(cli): lotus evm deploy prints message CID ([filecoin-project/lotus#13378](https://github.com/filecoin-project/lotus/pull/13378))
11+
1612
- feat(cli): wallet sign and verify apply FRC-102 personal_sign prefix for delegated addresses ([filecoin-project/lotus#13388](https://github.com/filecoin-project/lotus/pull/13388))
1713

14+
## 👌 Improvements
15+
- docs: fix outdated link in documentation ([#13436](https://github.com/filecoin-project/lotus/pull/13436))
16+
- docs: fix dead link in documentation ([#13437](https://github.com/filecoin-project/lotus/pull/13437))
17+
18+
# UNRELEASED v1.34.2
19+
20+
See https://github.com/filecoin-project/lotus/blob/release/v1.34.2/CHANGELOG.md
21+
1822
# Node and Miner v1.34.1 / 2025-09-15
1923

2024
This is a non-critical patch release that fixes an issue with the Lotus `v1.34.0` release where the incorrect version of filecoin-ffi was included. Lotus `v1.34.0` used filecoin-ffi `v1.34.0-dev` when it should have used `v1.34.0`. This isn’t critical since it’s the same filecoin-ffi version used during the nv27 Calibration network upgrade, but for consistency with other Node implementations like Forest, we are creating this release. This ensures the inclusion of ref-fvm `v4.7.3` update that was missing in v1.34.0. All users of v1.34.0 are encouraged to upgrade to v1.34.1.
2125

2226
# Node and Miner v1.34.0 / 2025-09-11
2327

24-
This is a **MANDATORY Lotus v1.34.0 release**, which will deliver the Filecoin network version 27, codenamed “Golden Week” 🏮. This release candidate sets the upgrade epoch for the Mainnet network to **Epoch 5348280: 2025-09-24T23:00:00Z**. (See the [local time for other timezones](https://www.worldtimebuddy.com/?qm=1&lid=100,5128581,5368361,1816670&h=100&date=2025-9-24&sln=23-24&hf=1&c=1196).)
28+
This is a **MANDATORY Lotus v1.34.0 release**, which will deliver the Filecoin network version 27, codenamed “Golden Week” 🏮. This release candidate sets the upgrade epoch for the Mainnet network to **Epoch 5348280: 2025-09-24T23:00:00Z**. (See the [local time for other timezones](https://www.worldtimebuddy.com/?qm=1&lid=100,5128581,5368361,1816670&h=100&date=2025-9-24&sln=23-24&hf=1&c=1196).)
2529

2630
## ☢️ Upgrade Warnings ☢️
2731
- All Lotus node and Storage Provider (SP) operators must upgrade to v1.34.x before the specified date for the Mainnet network.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ARG GOFLAGS=""
4646
RUN make buildall
4747

4848
#####################################
49-
FROM ubuntu:20.04 AS lotus-base
49+
FROM ubuntu:22.04 AS lotus-base
5050
MAINTAINER Lotus Development Team
5151

5252
# Base resources

api/api_errors.go

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package api
22

33
import (
4+
"bytes"
45
"errors"
56
"fmt"
67
"reflect"
@@ -10,6 +11,8 @@ import (
1011
"github.com/filecoin-project/go-jsonrpc"
1112
"github.com/filecoin-project/go-state-types/abi"
1213
"github.com/filecoin-project/go-state-types/exitcode"
14+
15+
"github.com/filecoin-project/lotus/chain/types/ethtypes"
1316
)
1417

1518
var invalidExecutionRevertedMsg = xerrors.New("invalid execution reverted error")
@@ -36,7 +39,7 @@ var (
3639
ErrF3Disabled = &errF3Disabled{}
3740
// ErrF3ParticipationTicketInvalid signals that F3ParticipationTicket cannot be decoded.
3841
ErrF3ParticipationTicketInvalid = &errF3ParticipationTicketInvalid{}
39-
// ErrF3ParticipationTicketExpired signals that the current GPBFT instance as surpassed the expiry of the ticket.
42+
// ErrF3ParticipationTicketExpired signals that the current GPBFT instance has surpassed the expiry of the ticket.
4043
ErrF3ParticipationTicketExpired = &errF3ParticipationTicketExpired{}
4144
// ErrF3ParticipationIssuerMismatch signals that the ticket is not issued by the current node.
4245
ErrF3ParticipationIssuerMismatch = &errF3ParticipationIssuerMismatch{}
@@ -167,12 +170,31 @@ func (e *ErrExecutionReverted) ToJSONRPCError() (jsonrpc.JSONRPCError, error) {
167170

168171
// NewErrExecutionReverted creates a new ErrExecutionReverted with the given reason.
169172
func NewErrExecutionReverted(exitCode exitcode.ExitCode, error, reason string, data []byte) *ErrExecutionReverted {
173+
revertReason := ""
174+
if reason != "" {
175+
revertReason = fmt.Sprintf(", revert reason=[%s]", reason)
176+
}
170177
return &ErrExecutionReverted{
171-
Message: fmt.Sprintf("message execution failed (exit=[%s], revert reason=[%s], vm error=[%s])", exitCode, reason, error),
178+
Message: fmt.Sprintf("message execution failed (exit=[%s]%s, vm error=[%s])", exitCode, revertReason, error),
172179
Data: fmt.Sprintf("0x%x", data),
173180
}
174181
}
175182

183+
// NewErrExecutionRevertedFromResult creates an ErrExecutionReverted from an InvocResult.
184+
// It decodes the CBOR-encoded return data and parses any Ethereum revert reason.
185+
func NewErrExecutionRevertedFromResult(res *InvocResult) error {
186+
reason := ""
187+
var cbytes abi.CborBytes
188+
if err := cbytes.UnmarshalCBOR(bytes.NewReader(res.MsgRct.Return)); err == nil {
189+
if len(cbytes) > 0 {
190+
reason = ethtypes.ParseEthRevert(cbytes)
191+
} else {
192+
reason = "none"
193+
}
194+
} // else likely a non-ethereum error
195+
return NewErrExecutionReverted(res.MsgRct.ExitCode, res.Error, reason, cbytes)
196+
}
197+
176198
type ErrNullRound struct {
177199
Epoch abi.ChainEpoch
178200
Message string

api/api_full.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ type FullNode interface {
318318
// MpoolBatchPushUntrusted batch pushes a signed message to mempool from untrusted sources.
319319
MpoolBatchPushUntrusted(context.Context, []*types.SignedMessage) ([]cid.Cid, error) //perm:write
320320

321-
// MpoolBatchPushMessage batch pushes a unsigned message to mempool.
321+
// MpoolBatchPushMessage batch pushes an unsigned message to mempool.
322322
MpoolBatchPushMessage(context.Context, []*types.Message, *MessageSendSpec) ([]*types.SignedMessage, error) //perm:sign
323323

324324
// MpoolCheckMessages performs logical checks on a batch of messages

api/miner_subsystems.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
)
77

88
// MinerSubsystem represents a miner subsystem. Int and string values are not
9-
// guaranteed to be stable over time is not
109
// guaranteed to be stable over time.
1110
type MinerSubsystem int
1211

api/mocks/mock_full.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.

api/types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ type ForkUpgradeParams struct {
196196
UpgradeTeepHeight abi.ChainEpoch
197197
UpgradeTockHeight abi.ChainEpoch
198198
UpgradeGoldenWeekHeight abi.ChainEpoch
199+
UpgradeXxHeight abi.ChainEpoch
199200
}
200201

201202
// ChainExportConfig holds configuration for chain ranged exports.

api/v0api/full.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ type FullNode interface {
245245
// MpoolBatchPushUntrusted batch pushes a signed message to mempool from untrusted sources.
246246
MpoolBatchPushUntrusted(context.Context, []*types.SignedMessage) ([]cid.Cid, error) //perm:write
247247

248-
// MpoolBatchPushMessage batch pushes a unsigned message to mempool.
248+
// MpoolBatchPushMessage batch pushes an unsigned message to mempool.
249249
MpoolBatchPushMessage(context.Context, []*types.Message, *api.MessageSendSpec) ([]*types.SignedMessage, error) //perm:sign
250250

251251
// MpoolGetNonce gets next nonce for the specified sender.

api/v0api/v0mocks/mock_full.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.

0 commit comments

Comments
 (0)