gen.

chain/consensus/filcns/mine.go

@@ -3,13 +3,13 @@ package filcns
 import (
 	"context"
 
-	"github.com/filecoin-project/lotus/chain"
 	"github.com/ipfs/go-cid"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/crypto"
 
 	"github.com/filecoin-project/lotus/api"
+	"github.com/filecoin-project/lotus/chain"
 	"github.com/filecoin-project/lotus/chain/consensus"
 	"github.com/filecoin-project/lotus/chain/stmgr"
 	"github.com/filecoin-project/lotus/chain/types"

chain/gen/genesis/genesis_eth.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"fmt"
 
+	"golang.org/x/xerrors"
+
 	"github.com/filecoin-project/go-address"
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/big"
@@ -11,14 +13,12 @@ import (
 	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/go-state-types/network"
 
+	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
 	"github.com/filecoin-project/lotus/chain/state"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/chain/types/ethtypes"
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/lotus/chain/actors"
 )
 
 // EthNullAddresses are the Ethereum addresses we want to create zero-balanced EthAccounts in.

chain/messagepool/messagepool.go

@@ -11,7 +11,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/filecoin-project/lotus/chain"
 	"github.com/hashicorp/go-multierror"
 	lru "github.com/hashicorp/golang-lru"
 	"github.com/ipfs/go-cid"
@@ -34,6 +33,7 @@ import (
 
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/build"
+	"github.com/filecoin-project/lotus/chain"
 	"github.com/filecoin-project/lotus/chain/consensus/filcns"
 	"github.com/filecoin-project/lotus/chain/stmgr"
 	"github.com/filecoin-project/lotus/chain/store"

chain/signatures.go

@@ -1,13 +1,15 @@
 package chain
 
 import (
+	"golang.org/x/xerrors"
+
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/crypto"
 	"github.com/filecoin-project/go-state-types/network"
+
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/chain/types/ethtypes"
 	"github.com/filecoin-project/lotus/lib/sigs"
-	"golang.org/x/xerrors"
 )
 
 // AuthenticateMessage authenticates the message by verifying that the supplied

chain/wallet/key/key.go

@@ -1,7 +1,6 @@
 package key
 
 import (
-	"github.com/filecoin-project/lotus/chain/types/ethtypes"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
@@ -9,6 +8,7 @@ import (
 	"github.com/filecoin-project/go-state-types/crypto"
 
 	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/lotus/chain/types/ethtypes"
 	"github.com/filecoin-project/lotus/lib/sigs"
 )
 

cli/eth.go

@@ -8,19 +8,19 @@ import (
 	"fmt"
 	"os"
 
-	amt4 "github.com/filecoin-project/go-amt-ipld/v4"
-	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/go-state-types/big"
-	builtintypes "github.com/filecoin-project/go-state-types/builtin"
-	"github.com/filecoin-project/go-state-types/builtin/v10/eam"
-	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/urfave/cli/v2"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
+	amt4 "github.com/filecoin-project/go-amt-ipld/v4"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/big"
+	builtintypes "github.com/filecoin-project/go-state-types/builtin"
+	"github.com/filecoin-project/go-state-types/builtin/v10/eam"
 
 	"github.com/filecoin-project/lotus/api/v0api"
+	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/chain/types/ethtypes"
 )

documentation/en/cli-lotus.md

@@ -31,7 +31,7 @@ COMMANDS:
      log           Manage logging
      wait-api      Wait for lotus api to come online
      fetch-params  Fetch proving parameters
-     eth           Query eth contract state
+     eth           Ethereum operations
    NETWORK:
      net   Manage P2P Network
      sync  Inspect or interact with the chain syncer
@@ -2090,8 +2090,8 @@ COMMANDS:
      encode                            encode various types
      disputer                          interact with the window post disputer
      prune                             prune the stored chain state and perform garbage collection
-     create-evm-actor                  Create an new EVM actor via the init actor and return its address
+     deploy                            Deploy an EVM smart contract and return its address
-     invoke-evm-actor                  Invoke a contract entry point in an EVM actor
+     invoke                            Invoke an EVM smart contract using the specified CALLDATA
      help, h                           Shows a list of commands or help for one command
 
 OPTIONS:
@@ -2432,27 +2432,27 @@ OPTIONS:
    
 ```
 
-### lotus chain create-evm-actor
+### lotus chain deploy
 ```
 NAME:
-   lotus chain create-evm-actor - Create an new EVM actor via the init actor and return its address
+   lotus chain deploy - Deploy an EVM smart contract and return its address
 
 USAGE:
-   lotus chain create-evm-actor [command options] contract
+   lotus chain deploy [command options] contract
 
 OPTIONS:
-   --from value  optionally specify the account to use for sending the exec message
+   --from value  optionally specify the account to use for sending the creation message
    --hex         use when input contract is in hex (default: false)
    
 ```
 
-### lotus chain invoke-evm-actor
+### lotus chain invoke
 ```
 NAME:
-   lotus chain invoke-evm-actor - Invoke a contract entry point in an EVM actor
+   lotus chain invoke - Invoke an EVM smart contract using the specified CALLDATA
 
 USAGE:
-   lotus chain invoke-evm-actor [command options] address contract-entry-point [input-data]
+   lotus chain invoke [command options] address calldata
 
 OPTIONS:
    --from value   optionally specify the account to use for sending the exec message
@@ -2573,12 +2573,14 @@ OPTIONS:
 ## lotus eth
 ```
 NAME:
-   lotus eth - Query eth contract state
+   lotus eth - Ethereum operations
 
 USAGE:
    lotus eth command [command options] [arguments...]
 
 COMMANDS:
+     deploy            Deploy an EVM smart contract and return its address
+     invoke            Invoke an EVM smart contract using the specified CALLDATA
      stat              Print eth/filecoin addrs and code cid
      call              Simulate an eth contract call
      contract-address  Generate contract address from smart contract code
@@ -2589,6 +2591,34 @@ OPTIONS:
    
 ```
 
+### lotus eth deploy
+```
+NAME:
+   lotus eth deploy - Deploy an EVM smart contract and return its address
+
+USAGE:
+   lotus eth deploy [command options] contract
+
+OPTIONS:
+   --from value  optionally specify the account to use for sending the creation message
+   --hex         use when input contract is in hex (default: false)
+   
+```
+
+### lotus eth invoke
+```
+NAME:
+   lotus eth invoke - Invoke an EVM smart contract using the specified CALLDATA
+
+USAGE:
+   lotus eth invoke [command options] address calldata
+
+OPTIONS:
+   --from value   optionally specify the account to use for sending the exec message
+   --value value  optionally specify the value to be sent with the invokation message (default: 0)
+   
+```
+
 ### lotus eth stat
 ```
 NAME: