Merge pull request #6397 from filecoin-project/feat/nv24

Feat/nv24

Author: simlecode

.circleci/config.yml

@@ -72,7 +72,7 @@ commands:
 executors:
   golang:
     docker:
-      - image: cimg/go:1.21.7
+      - image: cimg/go:1.22.8
 
 jobs:
   test_all:

.github/workflows/baisc_checks.yml

@@ -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

.github/workflows/common_build_upload.yml

@@ -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
@@ -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

.github/workflows/common_go.yml

@@ -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

.github/workflows/test.yml

@@ -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

app/node/builder.go

@@ -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")
 	}

app/node/node.go

@@ -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

app/submodule/chain/chaininfo_api.go

@@ -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)
@@ -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,
 	}