"path"
"reflect"
- dbm "github.com/tendermint/tmlibs/db"
-
"github.com/vapor/account"
"github.com/vapor/asset"
"github.com/vapor/blockchain/pseudohsm"
"github.com/vapor/blockchain/signers"
- "github.com/vapor/common"
- "github.com/vapor/config"
- "github.com/vapor/consensus"
"github.com/vapor/crypto/ed25519/chainkd"
+ dbm "github.com/vapor/database/leveldb"
+ "github.com/vapor/event"
"github.com/vapor/protocol"
"github.com/vapor/protocol/bc/types"
w "github.com/vapor/wallet"
if err != nil {
return nil, err
}
- return ctx.Wallet.AssetReg.Define(acc.XPubs, len(acc.XPubs), nil, assetAlias, nil)
+ return ctx.Wallet.AssetReg.Define(acc.XPubs, len(acc.XPubs), nil, 0, assetAlias, nil)
}
func (ctx *walletTestContext) newBlock(txs []*types.Tx, coinbaseAccount string) (*types.Block, error) {
}
func (ctx *walletTestContext) update(block *types.Block) error {
- if err := SolveAndUpdate(ctx.Chain, block); err != nil {
+ if _, err := ctx.Chain.ProcessBlock(block); err != nil {
return err
}
if err := ctx.Wallet.AttachBlock(block); err != nil {
if err != nil {
return err
}
- config.CommonConfig.Consensus.Dpos.Coinbase = "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep"
- address, err := common.DecodeAddress(config.CommonConfig.Consensus.Dpos.Coinbase, &consensus.SoloNetParams)
- if err != nil {
- return err
- }
walletDB := dbm.NewDB("wallet", "leveldb", path.Join(dirPath, "wallet_db"))
accountManager := account.NewManager(walletDB, chain)
assets := asset.NewRegistry(walletDB, chain)
- wallet, err := w.NewWallet(walletDB, accountManager, assets, hsm, chain, address)
+ dispatcher := event.NewDispatcher()
+ wallet, err := w.NewWallet(walletDB, accountManager, assets, hsm, chain, dispatcher, false)
if err != nil {
return err
}