Renamed eth to quai in api and backend

cmd/utils/cmd.go

@@ -5,13 +5,12 @@ import (
 
 	"github.com/dominant-strategies/go-quai/common"
 	"github.com/dominant-strategies/go-quai/core/vm"
-	"github.com/dominant-strategies/go-quai/eth"
-	quai "github.com/dominant-strategies/go-quai/eth"
-	"github.com/dominant-strategies/go-quai/eth/ethconfig"
 	"github.com/dominant-strategies/go-quai/internal/quaiapi"
 	"github.com/dominant-strategies/go-quai/log"
 	"github.com/dominant-strategies/go-quai/node"
 	"github.com/dominant-strategies/go-quai/params"
+	"github.com/dominant-strategies/go-quai/quai"
+	"github.com/dominant-strategies/go-quai/quai/quaiconfig"
 	"github.com/dominant-strategies/go-quai/quaistats"
 	"github.com/spf13/viper"
 	"io"
@@ -25,7 +24,7 @@ type quaistatsConfig struct {
 }
 
 type quaiConfig struct {
-	Quai     ethconfig.Config
+	Quai     quaiconfig.Config
 	Node     node.Config
 	Ethstats quaistatsConfig
 }
@@ -62,7 +61,7 @@ func StartQuaiBackend() (*quai.QuaiBackend, error) {
 		stackZone.Wait()
 	}()
 
-	return &eth.QuaiBackend{}, nil
+	return &quai.QuaiBackend{}, nil
 }
 
 func StartNode(stack *node.Node) {
@@ -76,7 +75,7 @@ func StartNode(stack *node.Node) {
 func makeConfigNode(nodeLocation common.Location) (*node.Node, quaiConfig) {
 	// Load defaults.
 	cfg := quaiConfig{
-		Quai: ethconfig.Defaults,
+		Quai: quaiconfig.Defaults,
 		Node: defaultNodeConfig(),
 	}
 
@@ -129,8 +128,8 @@ func makeFullNode(nodeLocation common.Location) *node.Node {
 // RegisterQuaiService adds a Quai client to the stack.
 // The second return value is the full node instance, which may be nil if the
 // node is running as a light client.
-func RegisterQuaiService(stack *node.Node, cfg ethconfig.Config, nodeCtx int) (quaiapi.Backend, error) {
-	backend, err := eth.New(stack, &cfg, nodeCtx)
+func RegisterQuaiService(stack *node.Node, cfg quaiconfig.Config, nodeCtx int) (quaiapi.Backend, error) {
+	backend, err := quai.New(stack, &cfg, nodeCtx)
 	if err != nil {
 		Fatalf("Failed to register the Quai service: %v", err)
 	}

cmd/utils/flags.go

@@ -19,12 +19,12 @@ import (
 	"github.com/dominant-strategies/go-quai/common/fdlimit"
 	"github.com/dominant-strategies/go-quai/core"
 	"github.com/dominant-strategies/go-quai/core/rawdb"
-	"github.com/dominant-strategies/go-quai/eth/ethconfig"
-	"github.com/dominant-strategies/go-quai/eth/gasprice"
 	"github.com/dominant-strategies/go-quai/ethdb"
 	"github.com/dominant-strategies/go-quai/log"
 	"github.com/dominant-strategies/go-quai/node"
 	"github.com/dominant-strategies/go-quai/params"
+	"github.com/dominant-strategies/go-quai/quai/gasprice"
+	"github.com/dominant-strategies/go-quai/quai/quaiconfig"
 	gopsutil "github.com/shirou/gopsutil/mem"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -939,7 +939,7 @@ func setWS(cfg *node.Config, nodeLocation common.Location) {
 }
 
 // setDomUrl sets the dominant chain websocket url.
-func setDomUrl(cfg *ethconfig.Config, nodeLocation common.Location) {
+func setDomUrl(cfg *quaiconfig.Config, nodeLocation common.Location) {
 	// only set the dom url if the node is not prime
 	if nodeLocation != nil {
 		if len(nodeLocation) == 1 {
@@ -952,7 +952,7 @@ func setDomUrl(cfg *ethconfig.Config, nodeLocation common.Location) {
 }
 
 // setSubUrls sets the subordinate chain urls
-func setSubUrls(cfg *ethconfig.Config, nodeLocation common.Location) {
+func setSubUrls(cfg *quaiconfig.Config, nodeLocation common.Location) {
 	// only set the sub urls if its not the zone
 	if len(nodeLocation) != 2 {
 		if nodeLocation == nil {
@@ -965,7 +965,7 @@ func setSubUrls(cfg *ethconfig.Config, nodeLocation common.Location) {
 
 // setGasLimitCeil sets the gas limit ceils based on the network that is
 // running
-func setGasLimitCeil(cfg *ethconfig.Config) {
+func setGasLimitCeil(cfg *quaiconfig.Config) {
 	switch {
 	case viper.GetBool(ColosseumFlag.Name):
 		cfg.Miner.GasCeil = params.ColosseumGasCeil
@@ -990,7 +990,7 @@ func makeSubUrls() []string {
 }
 
 // setSlicesRunning sets the slices running flag
-func setSlicesRunning(cfg *ethconfig.Config) {
+func setSlicesRunning(cfg *quaiconfig.Config) {
 	slices := strings.Split(viper.GetString(SlicesRunningFlag.Name), ",")
 
 	// Sanity checks
@@ -1033,7 +1033,7 @@ func HexAddress(account string, nodeLocation common.Location) (common.Address, e
 
 // setEtherbase retrieves the etherbase either from the directly specified
 // command line flags or from the keystore if CLI indexed.
-func setEtherbase(cfg *ethconfig.Config) {
+func setEtherbase(cfg *quaiconfig.Config) {
 	coinbaseMap, err := ParseCoinbaseAddresses()
 	if err != nil {
 		log.Fatalf("error parsing coinbase addresses: %s", err)
@@ -1195,7 +1195,7 @@ func setTxPool(cfg *core.TxPoolConfig, nodeLocation common.Location) {
 	}
 }
 
-func setConsensusEngineConfig(cfg *ethconfig.Config) {
+func setConsensusEngineConfig(cfg *quaiconfig.Config) {
 	if cfg.ConsensusEngine == "blake3" {
 		// Override any default configs for hard coded networks.
 		switch {
@@ -1266,7 +1266,7 @@ func setConsensusEngineConfig(cfg *ethconfig.Config) {
 	}
 }
 
-func setWhitelist(cfg *ethconfig.Config) {
+func setWhitelist(cfg *quaiconfig.Config) {
 	whitelist := viper.GetString(WhitelistFlag.Name)
 	if whitelist == "" {
 		return
@@ -1328,8 +1328,8 @@ func CheckExclusive(args ...interface{}) {
 	}
 }
 
-// SetQuaiConfig applies eth-related command line flags to the config.
-func SetQuaiConfig(stack *node.Node, cfg *ethconfig.Config, nodeLocation common.Location) {
+// SetQuaiConfig applies quai-related command line flags to the config.
+func SetQuaiConfig(stack *node.Node, cfg *quaiconfig.Config, nodeLocation common.Location) {
 	// Avoid conflicting network flags
 	CheckExclusive(ColosseumFlag, DeveloperFlag, GardenFlag, OrchardFlag, LocalFlag, LighthouseFlag)
 	CheckExclusive(DeveloperFlag, ExternalSignerFlag) // Can't use both ephemeral unlocked and external signer

internal/quaiapi/api.go

@@ -35,9 +35,9 @@ import (
 	"github.com/dominant-strategies/go-quai/core/types"
 	"github.com/dominant-strategies/go-quai/core/vm"
 	"github.com/dominant-strategies/go-quai/crypto"
-	"github.com/dominant-strategies/go-quai/eth/abi"
 	"github.com/dominant-strategies/go-quai/log"
 	"github.com/dominant-strategies/go-quai/params"
+	"github.com/dominant-strategies/go-quai/quai/abi"
 	"github.com/dominant-strategies/go-quai/rlp"
 	"github.com/dominant-strategies/go-quai/rpc"
 )

p2p/node/api.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/dominant-strategies/go-quai/cmd/utils"
 	"github.com/dominant-strategies/go-quai/core/types"
-	"github.com/dominant-strategies/go-quai/eth"
 	"github.com/dominant-strategies/go-quai/log"
 	"github.com/dominant-strategies/go-quai/p2p"
 	quaiprotocol "github.com/dominant-strategies/go-quai/p2p/protocol"
+	"github.com/dominant-strategies/go-quai/quai"
 
 	"github.com/dominant-strategies/go-quai/common"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
@@ -92,7 +92,7 @@ func (p *P2PNode) Stop() error {
 	}
 }
 
-func (p *P2PNode) SetConsensusBackend(be eth.ConsensusAPI) {
+func (p *P2PNode) SetConsensusBackend(be quai.ConsensusAPI) {
 	p.consensus = be
 }
 

p2p/node/node.go

@@ -22,10 +22,10 @@ import (
 	"github.com/dominant-strategies/go-quai/cmd/utils"
 	"github.com/dominant-strategies/go-quai/common"
 	"github.com/dominant-strategies/go-quai/core/types"
-	"github.com/dominant-strategies/go-quai/eth"
 	"github.com/dominant-strategies/go-quai/log"
 	"github.com/dominant-strategies/go-quai/p2p/protocol"
 	"github.com/dominant-strategies/go-quai/p2p/pubsubManager"
+	"github.com/dominant-strategies/go-quai/quai"
 	lru "github.com/hashicorp/golang-lru/v2"
 )
 
@@ -35,7 +35,7 @@ type P2PNode struct {
 	host.Host
 
 	// Backend for handling consensus data
-	consensus eth.ConsensusAPI
+	consensus quai.ConsensusAPI
 
 	// List of peers to introduce us to the network
 	bootpeers []peer.AddrInfo