add privatekey file

baseapp/baseapp.go

@@ -3,6 +3,8 @@ package baseapp
 import (
 	"fmt"
 	"github.com/QOSGroup/qbase/baseabci"
+	"github.com/QOSGroup/qstars/config"
+	"github.com/QOSGroup/qstars/utility"
 	"github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/libs/log"
 	"os"
@@ -32,13 +34,21 @@ func InitApp(){
 
 	}
 }
-func NewAPP(rootDir string) QstarsBaseApp {
+
+func NewAPP(rootDir string,cdc *go_amino.Codec) (QstarsBaseApp,error) {
+
+	sconf, err := config.ReadConf(rootDir+"/config/qstarsconf.toml")
+	if err!=nil{
+		return QstarsBaseApp{},err
+	}
+
+	_,_, qCtx.QStarsSignerPriv = utility.PubAddrRetrieval(sconf.QStarsPrivateKey,cdc)
 	logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)).With("module", "main")
 	qstarts := QstarsBaseApp{
 		Logger:  logger,
 		RootDir: rootDir,
 	}
-	return qstarts
+	return qstarts,nil
 }
 
 type QstarsBaseApp struct {
@@ -94,5 +104,6 @@ func (base *QstarsBaseApp) Start() error{
 	base.Baseapp.RegisterAccountProto(bctypes.NewAppAccount)
 	base.Baseapp.RegisterTxQcpResultHandler(base.TxQcpResultHandler)
 	base.Baseapp.RegisterTxQcpSigner(GetServerContext().QStarsSignerPriv)
+
 	return base.loadX()
 }

baseapp/baseapp_test.go

@@ -7,13 +7,16 @@ import (
 	"testing"
 	go_amino "github.com/tendermint/go-amino"
 	"github.com/QOSGroup/qbase/mapper"
+
+	"github.com/QOSGroup/qbase/types"
+	"github.com/QOSGroup/qbase/context"
 )
 
 // TODO update
 func TestInitCmd(t *testing.T) {
-
+	InitApp()
 	cdc := wire.NewCodec()
-	app:=NewAPP("")
+	app,_:=NewAPP("",cdc)
 	mock := new(MockABCI)
 	mock.RegisterKVCdc(cdc)
 	app.Register(mock)
@@ -24,6 +27,9 @@ type MockABCI struct{
 	Cdc *go_amino.Codec
 }
 
+func (mock *MockABCI) MapperName() string {
+	panic("implement me")
+}
 
 func (mock *MockABCI )RegisterKVCdc(cdc *go_amino.Codec){
 	mock.Cdc = cdc
@@ -64,6 +70,9 @@ func (mock MockABCI )Copy() mapper.IMapper{
 	return nil
 }
 
+func (mock *MockABCI )ResultNotify(ctx context.Context, txQcpResult interface{}) *types.Result{
+	return &types.Result{}
+}
 
 func (mock MockABCI )Del(key []byte){
 

config/serverconfig.go

@@ -0,0 +1,37 @@
+package config
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"github.com/BurntSushi/toml"
+)
+
+// person
+type ServerConf struct {
+	QStarsPrivateKey   string `toml:"QStarsPrivateKey"`
+}
+
+
+func ReadConf(fname string) (p *ServerConf, err error) {
+	var (
+		fp       *os.File
+		fcontent []byte
+	)
+	p = new(ServerConf) // &Person{}
+	if fp, err = os.Open(fname); err != nil {
+		fmt.Println("open error ", err)
+		return
+	}
+
+	if fcontent, err = ioutil.ReadAll(fp); err != nil {
+		fmt.Println("ReadAll error ", err)
+		return
+	}
+
+	if err = toml.Unmarshal(fcontent, p); err != nil {
+		fmt.Println("toml.Unmarshal error ", err)
+		return
+	}
+	return
+}

go.mod

@@ -1,8 +1,8 @@
 module github.com/QOSGroup/qstars
 
 require (
-	github.com/BurntSushi/toml v0.3.1 // indirect
-	github.com/QOSGroup/qbase v0.0.3
+	github.com/BurntSushi/toml v0.3.1
+	github.com/QOSGroup/qbase v0.0.4
 	github.com/bartekn/go-bip39 v0.0.0-20171116152956-a05967ea095d
 	github.com/bgentry/speakeasy v0.1.0
 	github.com/brejski/hid v0.0.0-20180408220029-06112dcfcc50 // indirect

star/app.go

@@ -18,7 +18,10 @@ func NewApp(log.Logger, dbm.DB, io.Writer) abci.Application {
 	//cfg := ctx.Config
 	//rootDir := cfg.RootDir
 	rootDir := os.ExpandEnv("$HOME/.qstarsd")
-	app := baseapp.NewAPP(rootDir)
+	app,err := baseapp.NewAPP(rootDir,MakeCodec())
+	if err != nil{
+		return nil
+	}
 	app.Register(kvstore.NewKVStub())
 	app.Register(bank.NewBankStub())
 

x/bank/process.go

@@ -115,7 +115,7 @@ func Send(cdc *wire.Codec, fromstr string, to qbasetypes.Address, coins types.Co
 			nn = int64(qscaccount.Nonce)
 		}
 	}
-
+	nn++
 
 	msg := genStdSendTx(cdc,from,to,cc,priv,nn,chainID)
 	response, err := utils.SendTx(cliCtx, cdc,msg,priv)

x/kvstore/appstub.go

@@ -3,7 +3,6 @@ package kvstore
 import (
 	"fmt"
 	"github.com/QOSGroup/qbase/context"
-	"github.com/QOSGroup/qbase/store"
 	"github.com/QOSGroup/qbase/types"
 	"github.com/QOSGroup/qstars/baseapp"
 	go_amino "github.com/tendermint/go-amino"
@@ -20,8 +19,8 @@ func NewKVStub() KVStub {
 
 func (kv KVStub) StartX(base *baseapp.QstarsBaseApp) error{
 
-	var mainStore = store.NewKVStoreKey("kv")
-	var kvMapper = NewKvMapper(mainStore)
+	//var mainStore = store.NewKVStoreKey("kv")
+	var kvMapper = NewKvMapper()
 	base.Baseapp.RegisterMapper(kvMapper)
 
 	if err := base.Baseapp.LoadLatestVersion(); err != nil {

x/kvstore/kvmapper.go

@@ -2,18 +2,17 @@ package kvstore
 
 import (
 	"github.com/QOSGroup/qbase/mapper"
-	"github.com/QOSGroup/qbase/store"
 )
 
-const KvMapperName = "kvmapper"
+const KvMapperName = "kv"
 
 type KvMapper struct {
 	*mapper.BaseMapper
 }
 
-func NewKvMapper(main store.StoreKey) *KvMapper {
+func NewKvMapper() *KvMapper {
 	var txMapper = KvMapper{}
-	txMapper.BaseMapper = mapper.NewBaseMapper(main)
+	txMapper.BaseMapper = mapper.NewBaseMapper(nil,KvMapperName)
 	return &txMapper
 }
 
@@ -23,9 +22,6 @@ func (mapper *KvMapper) Copy() mapper.IMapper {
 	return cpyMapper
 }
 
-func (mapper *KvMapper) Name() string {
-	return KvMapperName
-}
 
 var _ mapper.IMapper = (*KvMapper)(nil)