chore: cleanup v1.20.0

Makefile

@@ -84,12 +84,6 @@ butterflynet: build-devnets
 interopnet: GOFLAGS+=-tags=interopnet
 interopnet: build-devnets
 
-wallabynet: GOFLAGS+=-tags=wallabynet
-wallabynet: build-devnets
-
-hyperspacenet: GOFLAGS+=-tags=hyperspacenet
-hyperspacenet: build-devnets
-
 lotus: $(BUILD_DEPS)
 	rm -f lotus
 	$(GOCC) build $(GOFLAGS) -o lotus ./cmd/lotus

build/actors/pack.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-NETWORKS=(devnet mainnet caterpillarnet butterflynet testing testing-fake-proofs calibrationnet hyperspace)
+NETWORKS=(devnet mainnet caterpillarnet butterflynet testing testing-fake-proofs calibrationnet)
 
 set -e
 

build/params_mainnet.go

@@ -1,5 +1,5 @@
-//go:build !debug && !2k && !testground && !calibnet && !butterflynet && !interopnet && !wallabynet && !hyperspacenet
-// +build !debug,!2k,!testground,!calibnet,!butterflynet,!interopnet,!wallabynet,!hyperspacenet
+//go:build !debug && !2k && !testground && !calibnet && !butterflynet && !interopnet
+// +build !debug,!2k,!testground,!calibnet,!butterflynet,!interopnet
 
 package build
 

build/version.go

@@ -6,15 +6,13 @@ var CurrentCommit string
 var BuildType int
 
 const (
-	BuildDefault       = 0
-	BuildMainnet       = 0x1
-	Build2k            = 0x2
-	BuildDebug         = 0x3
-	BuildCalibnet      = 0x4
-	BuildInteropnet    = 0x5
-	BuildButterflynet  = 0x7
-	BuildWallabynet    = 0x8
-	BuildHyperspacenet = 0x9
+	BuildDefault      = 0
+	BuildMainnet      = 0x1
+	Build2k           = 0x2
+	BuildDebug        = 0x3
+	BuildCalibnet     = 0x4
+	BuildInteropnet   = 0x5
+	BuildButterflynet = 0x7
 )
 
 func BuildTypeString() string {
@@ -33,10 +31,6 @@ func BuildTypeString() string {
 		return "+interopnet"
 	case BuildButterflynet:
 		return "+butterflynet"
-	case BuildWallabynet:
-		return "+wallabynet"
-	case BuildHyperspacenet:
-		return "+hyperspacenet"
 	default:
 		return "+huh?"
 	}

chain/types/ethtypes/eth_types.go

@@ -364,14 +364,7 @@ func (h *EthHash) UnmarshalJSON(b []byte) error {
 }
 
 func decodeHexString(s string, expectedLen int) ([]byte, error) {
-	// Strip the leading 0x or 0X prefix since hex.DecodeString does not support it.
-	if strings.HasPrefix(s, "0x") || strings.HasPrefix(s, "0X") {
-		s = s[2:]
-	}
-	// Sometimes clients will omit a leading zero in a byte; pad so we can decode correctly.
-	if len(s)%2 == 1 {
-		s = "0" + s
-	}
+	s = handleHexStringPrefix(s)
 	if len(s) != expectedLen*2 {
 		return nil, xerrors.Errorf("expected hex string length sans prefix %d, got %d", expectedLen*2, len(s))
 	}
@@ -382,6 +375,27 @@ func decodeHexString(s string, expectedLen int) ([]byte, error) {
 	return b, nil
 }
 
+func DecodeHexString(s string) ([]byte, error) {
+	s = handleHexStringPrefix(s)
+	b, err := hex.DecodeString(s)
+	if err != nil {
+		return nil, xerrors.Errorf("cannot parse hex value: %w", err)
+	}
+	return b, nil
+}
+
+func handleHexStringPrefix(s string) string {
+	// Strip the leading 0x or 0X prefix since hex.DecodeString does not support it.
+	if strings.HasPrefix(s, "0x") || strings.HasPrefix(s, "0X") {
+		s = s[2:]
+	}
+	// Sometimes clients will omit a leading zero in a byte; pad so we can decode correctly.
+	if len(s)%2 == 1 {
+		s = "0" + s
+	}
+	return s
+}
+
 func EthHashFromCid(c cid.Cid) (EthHash, error) {
 	return ParseEthHash(c.Hash().HexString()[8:])
 }