checkpoint

client/asset/bch/bch.go

@@ -89,6 +89,7 @@ var (
 			rpcWalletDefinition,
 			// electrumWalletDefinition, // getinfo RPC needs backport: https://github.com/Electron-Cash/Electron-Cash/pull/2399
 		},
+		BlockchainClass: asset.BlockchainClassUTXO,
 	}
 
 	externalFeeRate = btc.BitcoreRateFetcher("BCH")

client/asset/btc/btc.go

@@ -216,6 +216,7 @@ var (
 			electrumWalletDefinition,
 		},
 		LegacyWalletIndex: 1,
+		BlockchainClass:   asset.BlockchainClassUTXO,
 	}
 )
 

client/asset/dash/dash.go

@@ -74,6 +74,7 @@ var (
 				ConfigOpts:        configOpts,
 			},
 		},
+		BlockchainClass: asset.BlockchainClassUTXO,
 	}
 )
 

client/asset/dcr/dcr.go

@@ -289,6 +289,7 @@ var (
 				MultiFundingOpts:  multiFundingOpts,
 			},
 		},
+		BlockchainClass: asset.BlockchainClassUTXO,
 	}
 	swapFeeBumpKey      = "swapfeebump"
 	splitKey            = "swapsplit"

client/asset/dgb/dgb.go

@@ -78,6 +78,7 @@ var (
 			DefaultConfigPath: dexbtc.SystemConfigPath("digibyte"),
 			ConfigOpts:        configOpts,
 		}},
+		BlockchainClass: asset.BlockchainClassUTXO,
 	}
 )
 

client/asset/doge/doge.go

@@ -98,6 +98,7 @@ var (
 			DefaultConfigPath: dexbtc.SystemConfigPath("dogecoin"),
 			ConfigOpts:        configOpts,
 		}},
+		BlockchainClass: asset.BlockchainClassUTXO,
 	}
 )
 

client/asset/eth/eth.go

@@ -182,7 +182,7 @@ var (
 			// MaxSwapsInTx and MaxRedeemsInTx are set in (Wallet).Info, since
 			// the value cannot be known until we connect and get network info.
 		},
-		IsAccountBased: true,
+		BlockchainClass: asset.BlockchainClassEVM,
 	}
 
 	// unlimitedAllowance is the maximum supported allowance for an erc20
@@ -660,7 +660,7 @@ func CreateEVMWallet(chainID int64, createWalletParams *asset.CreateWalletParams
 func newWallet(assetCFG *asset.WalletConfig, logger dex.Logger, net dex.Network) (w *ETHWallet, err error) {
 	chainCfg, err := ChainConfig(net)
 	if err != nil {
-		return nil, fmt.Errorf("failed to locate Ethereum genesis configuration for network %s", net)
+		return nil, fmt.Errorf("failed to locate Ethereum genesis configuration for network %s: %v", net, err)
 	}
 	comp, err := NetworkCompatibilityData(net)
 	if err != nil {
@@ -1284,6 +1284,7 @@ func (w *ETHWallet) OpenTokenWallet(tokenCfg *asset.TokenConfig) (asset.Wallet,
 			Name:              token.Name,
 			SupportedVersions: w.wi.SupportedVersions,
 			UnitInfo:          token.UnitInfo,
+			BlockchainClass:   asset.BlockchainClassEVM,
 		},
 		pendingTxCheckBal: new(big.Int),
 	}

client/asset/firo/firo.go

@@ -84,6 +84,7 @@ var (
 				ConfigOpts:  append(btc.ElectrumConfigOpts, btc.CommonConfigOpts("FIRO", true)...),
 			},
 		},
+		BlockchainClass: asset.BlockchainClassUTXO,
 	}
 )
 

client/asset/interface.go

@@ -304,6 +304,17 @@ type Token struct {
 	ContractAddress string            `json:"contractAddress"` // Set in SetNetwork
 }
 
+type BlockchainClass string
+
+const (
+	BlockchainClassUTXO BlockchainClass = "UTXO"
+	BlockchainClassEVM  BlockchainClass = "EVM"
+)
+
+func (c BlockchainClass) IsEVM() bool {
+	return c == BlockchainClassEVM
+}
+
 // WalletInfo is auxiliary information about an ExchangeWallet.
 type WalletInfo struct {
 	// Name is the display name for the currency, e.g. "Decred"
@@ -331,10 +342,8 @@ type WalletInfo struct {
 	// MaxRedeemsInTx is the max amount of redemptions that this wallet can do
 	// in a single transaction.
 	MaxRedeemsInTx uint64
-	// IsAccountBased should be set to true for account-based (EVM) assets, so
-	// that a common seed will be generated and wallets will generate the
-	// same address.
-	IsAccountBased bool
+	// BlockchainClass is the type of the wallet's blockchain.
+	BlockchainClass BlockchainClass
 }
 
 // ConfigOption is a wallet configuration option.

client/asset/ltc/ltc.go

@@ -79,6 +79,7 @@ var (
 			rpcWalletDefinition,
 			electrumWalletDefinition,
 		},
+		BlockchainClass: asset.BlockchainClassUTXO,
 	}
 )
 

client/asset/polygon/polygon.go

@@ -87,7 +87,7 @@ var (
 			// MaxSwapsInTx and MaxRedeemsInTx are set in (Wallet).Info, since
 			// the value cannot be known until we connect and get network info.
 		},
-		IsAccountBased: true,
+		BlockchainClass: asset.BlockchainClassEVM,
 	}
 )
 

client/asset/zcl/zcl.go

@@ -99,6 +99,7 @@ var (
 			ConfigOpts:        configOpts,
 			NoAuth:            true,
 		}},
+		BlockchainClass: asset.BlockchainClassUTXO,
 	}
 )
 

client/asset/zec/zec.go

@@ -139,6 +139,7 @@ var (
 			ConfigOpts:        configOpts,
 			NoAuth:            true,
 		}},
+		BlockchainClass: asset.BlockchainClassUTXO,
 	}
 
 	feeReservesPerLot = dexzec.TxFeesZIP317(dexbtc.RedeemP2PKHInputSize+1, 2*dexbtc.P2PKHOutputSize+1, 0, 0, 0, 0)