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.

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

Feat/nv24 #6397

Merged
merged 48 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
61db1e9
feat: Use sophon gateway to sign f3 message
simlecode Sep 26, 2024
102a6b1
Merge pull request #6396 from filecoin-project/feat/use-gateway-for-f…
simlecode Oct 9, 2024
b1d45f1
feat: Checkpoint tipsets that are finalized by F3
simlecode Oct 10, 2024
e8c8173
chore: ci: update go to v1.22
simlecode Oct 10, 2024
f07430e
chore: fix lint
simlecode Oct 10, 2024
c8ec50f
Merge pull request #6398 from filecoin-project/feat/checkpoint-f3-fin…
simlecode Oct 10, 2024
e5d7f6b
feat: add two api
simlecode Oct 10, 2024
c48ff4d
chore: fix test
simlecode Oct 11, 2024
2dbc0fd
chore: disable f3 in test
simlecode Oct 11, 2024
c659687
chore: fix lint
simlecode Oct 11, 2024
f0305bd
Merge pull request #6399 from filecoin-project/feat/tow-f3-api
simlecode Oct 11, 2024
9463a09
feat(f3): add a build parameter specifying F3's initial power table cid
simlecode Oct 11, 2024
04aeefa
Merge pull request #6400 from filecoin-project/feat/initial-power-tab…
simlecode Oct 11, 2024
8f16a0b
feat: implement ticket based F3 participation lease
simlecode Oct 11, 2024
edc71c7
Merge pull request #6401 from filecoin-project/feat/f3-participation-…
simlecode Oct 11, 2024
04dd905
chore: disable f3 in integration test
simlecode Oct 11, 2024
6a87b28
nv24 skeleton
Oct 11, 2024
fc99bfd
Merge pull request #6403 from filecoin-project/fix/test
simlecode Oct 11, 2024
9372999
trim and compress genesis CARs in build
Oct 11, 2024
fa83098
fix: api: add datacap balance to circ supply
Oct 11, 2024
1679e9a
fix: events: remove filter if we fail to add it to the FilterStore
Oct 11, 2024
00d806e
chore(eth): minor optimisation in EthHashFromCid
Oct 11, 2024
9b970df
compress genesis CARs in build
Oct 11, 2024
55f22f7
chore: fix conflicting
simlecode Oct 12, 2024
aaeab38
Merge pull request #6404 from filecoin-project/feat/nv24-2
simlecode Oct 12, 2024
7a36ad2
chore: update ffi
simlecode Oct 11, 2024
4241e58
feat: implement nv24
simlecode Oct 11, 2024
7c99df6
Merge pull request #6405 from filecoin-project/fea/impl-nv24
simlecode Oct 12, 2024
6210e5b
feat: add DDO-friendly StateMinerInitialPledgeForSector
simlecode Oct 12, 2024
eed4655
Merge pull request #6406 from filecoin-project/feat/StateMinerInitial…
simlecode Oct 12, 2024
003fa5b
fix: genesis compress
simlecode Oct 12, 2024
b92c99c
chore: fix lint
simlecode Oct 12, 2024
c9192ca
chore: fix test
simlecode Oct 12, 2024
c868884
chore: fix test
simlecode Oct 12, 2024
c7d67b5
Merge pull request #6407 from filecoin-project/fix/genesis-compress
simlecode Oct 12, 2024
f1d97e0
fix: StateGetBeaconEntry uses chain beacons for historical epochs
simlecode Oct 12, 2024
03ee9ed
Merge pull request #6408 from filecoin-project/feat/StateGetBeaconEntry
simlecode Oct 12, 2024
a3c1afc
ETH RPC: receipts: use correct txtype in receipts
Oct 12, 2024
e1f052e
feat(eth): fix EthGetTransactionCount for pending block parameter
Oct 12, 2024
5411668
Merge pull request #6410 from filecoin-project/feat/ethrpc
simlecode Oct 14, 2024
d8c8d21
[skip changelog] chore: deps: drop direct use of minio/blake2b-simd
Oct 12, 2024
b06a2dd
chore: fix lint
simlecode Oct 14, 2024
dfef682
Merge pull request #6409 from filecoin-project/feat/chore
simlecode Oct 14, 2024
1c1b5aa
feat: Disable f3 environment variables
simlecode Oct 14, 2024
b1f10b4
chore: fix lint
simlecode Oct 14, 2024
a877aa2
Merge pull request #6411 from filecoin-project/feat/disable-f3-env
simlecode Oct 14, 2024
8090449
chore: update network asset
simlecode Oct 14, 2024
f8a7c9c
Merge pull request #6412 from filecoin-project/chore/network-asset
simlecode Oct 14, 2024
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ commands:
executors:
golang:
docker:
- image: cimg/go:1.21.7
- image: cimg/go:1.22.8

jobs:
test_all:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/baisc_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'
cache: true

- name: install deps
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/common_build_upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'
cache: true

- name: install deps
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'
cache: true

- name: install more deps
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/common_go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'
cache: true

- name: vars
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'
cache: true

- name: install deps
Expand Down
2 changes: 1 addition & 1 deletion app/node/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func (b *Builder) build(ctx context.Context) (*Node, error) {
return nil, errors.Wrap(err, "failed to build node.wallet")
}

nd.f3, err = f3.NewF3Submodule(ctx, nd.repo, nd.chain, nd.network, nd.wallet.API())
nd.f3, err = f3.NewF3Submodule(ctx, nd.repo, nd.chain, nd.network, nd.wallet.GetWalletSign(), nd.syncer)
if err != nil {
return nil, errors.Wrap(err, "failed to build node.f3")
}
Expand Down
6 changes: 6 additions & 0 deletions app/node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,12 @@ func (node *Node) Stop(ctx context.Context) {
log.Warnf("error shutdown jaeger-tracing: %w", err)
}
}

node.Wallet().WalletGateway.Close()

if err := node.f3.Stop(ctx); err != nil {
log.Warnf("error closing f3: %w", err)
}
}

// RunRPCAndWait start rpc server and listen to signal to exit
Expand Down
16 changes: 16 additions & 0 deletions app/submodule/chain/chaininfo_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,21 @@ func (cia *chainInfoAPI) VerifyEntry(parent, child *types.BeaconEntry, height ab
// the entry has not yet been produced, the call will block until the entry
// becomes available
func (cia *chainInfoAPI) StateGetBeaconEntry(ctx context.Context, epoch abi.ChainEpoch) (*types.BeaconEntry, error) {
ts := cia.chain.ChainReader.GetHead()
if epoch <= ts.Height() {
if epoch < 0 {
epoch = 0
}
// get the beacon entry off the chain
ts, err := cia.chain.ChainReader.GetTipSet(ctx, types.EmptyTSK)
if err != nil {
return nil, err
}
r := chain.NewChainRandomnessSource(cia.chain.ChainReader, ts.Key(), cia.chain.Drand, cia.chain.Fork.GetNetworkVersion)
return r.GetBeaconEntry(ctx, epoch)
}

// else we're asking for the future, get it from drand and block until it arrives
b := cia.chain.Drand.BeaconForEpoch(epoch)
nv := cia.chain.Fork.GetNetworkVersion(ctx, epoch)
rr := b.MaxBeaconRoundForEpoch(nv, epoch)
Expand Down Expand Up @@ -745,6 +760,7 @@ func (cia *chainInfoAPI) StateGetNetworkParams(ctx context.Context) (*types.Netw
UpgradeDragonHeight: cfg.NetworkParams.ForkUpgradeParam.UpgradeDragonHeight,
UpgradePhoenixHeight: cfg.NetworkParams.ForkUpgradeParam.UpgradePhoenixHeight,
UpgradeWaffleHeight: cfg.NetworkParams.ForkUpgradeParam.UpgradeWaffleHeight,
UpgradeTuktukHeight: cfg.NetworkParams.ForkUpgradeParam.UpgradeTuktukHeight,
},
Eip155ChainID: cfg.NetworkParams.Eip155ChainID,
}
Expand Down
Loading
Loading