fixup! feat(eth)!: add Eth APIs to /v2, fix minor incompatibilities

Author: rvagg

api/v2api/full.go

@@ -42,8 +42,7 @@ type FullNode interface {
 	// In a case where no selector is provided, an error is returned. The selector
 	// must be explicitly specified.
 	//
-	// For more details, refer to the types.TipSetSelector and
-	// types.NewTipSetSelector.
+	// For more details, refer to the types.TipSetSelector.
 	//
 	// Example usage:
 	//

chain/types/ethtypes/eth_types.go

@@ -73,7 +73,7 @@ func (e *EthUint64) UnmarshalJSON(b []byte) error {
 		*e = EthUint64(eint)
 		return nil
 	}
-	return fmt.Errorf("cannot interpret %s as a hex-encoded uint64, or a number", string(b))
+	return xerrors.Errorf("cannot interpret %s as a hex-encoded uint64, or a number", string(b))
 }
 
 func EthUint64FromHex(s string) (EthUint64, error) {
@@ -257,17 +257,17 @@ func (c *EthCall) ToFilecoinMessage() (*types.Message, error) {
 		var err error
 		from, err = (EthAddress{}).ToFilecoinAddress()
 		if err != nil {
-			return nil, fmt.Errorf("failed to construct the ethereum system address: %w", err)
+			return nil, xerrors.Errorf("failed to construct the ethereum system address: %w", err)
 		}
 	} else {
 		// The from address must be translatable to an f4 address.
 		var err error
 		from, err = c.From.ToFilecoinAddress()
 		if err != nil {
-			return nil, fmt.Errorf("failed to translate sender address (%s): %w", c.From.String(), err)
+			return nil, xerrors.Errorf("failed to translate sender address (%s): %w", c.From.String(), err)
 		}
 		if p := from.Protocol(); p != address.Delegated {
-			return nil, fmt.Errorf("expected a class 4 address, got: %d: %w", p, err)
+			return nil, xerrors.Errorf("expected a class 4 address, got: %d", p)
 		}
 	}
 
@@ -276,7 +276,7 @@ func (c *EthCall) ToFilecoinMessage() (*types.Message, error) {
 		initcode := abi.CborBytes(c.Data)
 		params2, err := actors.SerializeParams(&initcode)
 		if err != nil {
-			return nil, fmt.Errorf("failed to serialize params: %w", err)
+			return nil, xerrors.Errorf("failed to serialize params: %w", err)
 		}
 		params = params2
 	}
@@ -398,10 +398,10 @@ func EthAddressFromPubKey(pubk []byte) ([]byte, error) {
 	// but putting this check here for defensiveness), strip the prefix
 	const pubKeyLen = 65
 	if len(pubk) != pubKeyLen {
-		return nil, fmt.Errorf("public key should have %d in length, but got %d", pubKeyLen, len(pubk))
+		return nil, xerrors.Errorf("public key should have %d in length, but got %d", pubKeyLen, len(pubk))
 	}
 	if pubk[0] != 0x04 {
-		return nil, fmt.Errorf("expected first byte of secp256k1 to be 0x04 (uncompressed)")
+		return nil, xerrors.Errorf("expected first byte of secp256k1 to be 0x04 (uncompressed)")
 	}
 	pubk = pubk[1:]
 
@@ -523,7 +523,7 @@ func (ea EthAddress) ToFilecoinAddress() (address.Address, error) {
 	// Ethereum Address Manager.
 	addr, err := address.NewDelegatedAddress(builtintypes.EthereumAddressManagerActorID, ea[:])
 	if err != nil {
-		return address.Undef, fmt.Errorf("failed to translate supplied address (%s) into a "+
+		return address.Undef, xerrors.Errorf("failed to translate supplied address (%s) into a "+
 			"Filecoin f4 address: %w", hex.EncodeToString(ea[:]), err)
 	}
 	return addr, nil
@@ -600,12 +600,12 @@ func handleHexStringPrefix(s string) string {
 func EthHashFromCid(c cid.Cid) (EthHash, error) {
 	hash, found := bytes.CutPrefix(c.Bytes(), expectedHashPrefix)
 	if !found {
-		return EthHash{}, fmt.Errorf("CID does not have the expected prefix")
+		return EthHash{}, xerrors.Errorf("CID does not have the expected prefix")
 	}
 
 	if len(hash) != EthHashLength {
 		// this shouldn't be possible since the prefix has the length, but just in case
-		return EthHash{}, fmt.Errorf("CID hash length is not 32 bytes")
+		return EthHash{}, xerrors.Errorf("CID hash length is not 32 bytes")
 	}
 
 	var h EthHash
@@ -1101,7 +1101,7 @@ func (e *EthBlockNumberOrHash) UnmarshalJSON(b []byte) error {
 	if err != nil {
 		return err
 	}
-	if str == "earliest" || str == "pending" || str == "latest" {
+	if str == "earliest" || str == "pending" || str == "latest" || str == "finalized" {
 		e.PredefinedBlock = &str
 		return nil
 	}