From d0fa0cbbadb592d54d2bdbcb40a6fafbc8ef671b Mon Sep 17 00:00:00 2001 From: Geoff Stuart Date: Fri, 20 Jan 2023 18:23:59 -0500 Subject: [PATCH] Keep hyperspace-related code --- Makefile | 3 +++ build/actors/pack.sh | 2 +- build/params_mainnet.go | 4 ++-- build/params_wallaby.go | 0 build/version.go | 17 ++++++++++------- cli/evm.go | 3 +-- documentation/en/cli-lotus.md | 14 ++++++++++++++ 7 files changed, 31 insertions(+), 12 deletions(-) delete mode 100644 build/params_wallaby.go diff --git a/Makefile b/Makefile index 43c362b86..dedc061b5 100644 --- a/Makefile +++ b/Makefile @@ -84,6 +84,9 @@ butterflynet: build-devnets interopnet: GOFLAGS+=-tags=interopnet interopnet: build-devnets +hyperspacenet: GOFLAGS+=-tags=hyperspacenet +hyperspacenet: build-devnets + lotus: $(BUILD_DEPS) rm -f lotus $(GOCC) build $(GOFLAGS) -o lotus ./cmd/lotus diff --git a/build/actors/pack.sh b/build/actors/pack.sh index c2060e67c..2702c80d5 100755 --- a/build/actors/pack.sh +++ b/build/actors/pack.sh @@ -1,6 +1,6 @@ #!/bin/bash -NETWORKS=(devnet mainnet caterpillarnet butterflynet testing testing-fake-proofs calibrationnet) +NETWORKS=(devnet mainnet caterpillarnet butterflynet testing testing-fake-proofs calibrationnet hyperspace) set -e diff --git a/build/params_mainnet.go b/build/params_mainnet.go index bfa7c0e82..bad165187 100644 --- a/build/params_mainnet.go +++ b/build/params_mainnet.go @@ -1,5 +1,5 @@ -//go:build !debug && !2k && !testground && !calibnet && !butterflynet && !interopnet -// +build !debug,!2k,!testground,!calibnet,!butterflynet,!interopnet +//go:build !debug && !2k && !testground && !calibnet && !butterflynet && !interopnet && !hyperspacenet +// +build !debug,!2k,!testground,!calibnet,!butterflynet,!interopnet,!hyperspacenet package build diff --git a/build/params_wallaby.go b/build/params_wallaby.go deleted file mode 100644 index e69de29bb..000000000 diff --git a/build/version.go b/build/version.go index 70e27ad50..e9cee6ccc 100644 --- a/build/version.go +++ b/build/version.go @@ -6,13 +6,14 @@ var CurrentCommit string var BuildType int const ( - BuildDefault = 0 - BuildMainnet = 0x1 - Build2k = 0x2 - BuildDebug = 0x3 - BuildCalibnet = 0x4 - BuildInteropnet = 0x5 - BuildButterflynet = 0x7 + BuildDefault = 0 + BuildMainnet = 0x1 + Build2k = 0x2 + BuildDebug = 0x3 + BuildCalibnet = 0x4 + BuildInteropnet = 0x5 + BuildButterflynet = 0x7 + BuildHyperspacenet = 0x9 ) func BuildTypeString() string { @@ -31,6 +32,8 @@ func BuildTypeString() string { return "+interopnet" case BuildButterflynet: return "+butterflynet" + case BuildHyperspacenet: + return "+hyperspacenet" default: return "+huh?" } diff --git a/cli/evm.go b/cli/evm.go index 5ea543e61..1a1dfa47f 100644 --- a/cli/evm.go +++ b/cli/evm.go @@ -8,8 +8,6 @@ import ( "fmt" "os" - "github.com/filecoin-project/lotus/chain/actors/builtin" - "github.com/urfave/cli/v2" cbg "github.com/whyrusleeping/cbor-gen" "golang.org/x/xerrors" @@ -23,6 +21,7 @@ import ( "github.com/filecoin-project/lotus/api/v0api" "github.com/filecoin-project/lotus/chain/actors" + "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types/ethtypes" ) diff --git a/documentation/en/cli-lotus.md b/documentation/en/cli-lotus.md index 04d6611bf..1cc89953f 100644 --- a/documentation/en/cli-lotus.md +++ b/documentation/en/cli-lotus.md @@ -1741,6 +1741,7 @@ COMMANDS: network-version Returns the network version miner-proving-deadline Retrieve information about a given miner's proving deadline actor-cids Returns the built-in actor bundle manifest ID & system actor cids + blockhash Get the tipset CID - eth blockhash help, h Shows a list of commands or help for one command OPTIONS: @@ -2064,6 +2065,19 @@ OPTIONS: ``` +### lotus state blockhash +``` +NAME: + lotus state blockhash - Get the tipset CID - eth blockhash + +USAGE: + lotus state blockhash [command options] [arguments...] + +OPTIONS: + --help, -h show help (default: false) + +``` + ## lotus chain ``` NAME: