Skip to content

P
plugin
Commit 33f71495 authored by liuyuhang's avatar liuyuhang
Browse files
Options

Merge remote-tracking branch 'upstream/master'

parents fdb7ab3f 29c863b1
Show whitespace changes
Inline Side-by-side
Showing with 660 additions and 256 deletions
Makefile
View file @ 33f71495
......@@ -14,7 +14,7 @@ LDFLAGS := -ldflags "-w -s"
PKG_LIST_VET := `go list ./... | grep -v "vendor" | grep -v plugin/dapp/evm/executor/vm/common/crypto/bn256`
PKG_LIST := `go list ./... | grep -v "vendor" | grep -v "chain33/test" | grep -v "mocks" | grep -v "pbft"`
PKG_LIST_INEFFASSIGN= `go list -f {{.Dir}} ./... | grep -v "vendor"`
BUILD_FLAGS = -ldflags "-X github.com/33cn/chain33/common/version.GitCommit=`git rev-parse --short=8 HEAD`"
BUILD_FLAGS = -ldflags "-X github.com/33cn/plugin/vendor/github.com/33cn/chain33/common/version.GitCommit=`git rev-parse --short=8 HEAD`"
MKPATH=$(abspath $(lastword $(MAKEFILE_LIST)))
MKDIR=$(dir $(MKPATH))
proj := "build"
......@@ -23,8 +23,8 @@ proj := "build"
default: build depends
build:
@go build $(BUILD_FLAGS) -v -i -o $(APP)
@go build -v -i -o $(CLI) $(SRC_CLI)
go build $(BUILD_FLAGS) -v -i -o $(APP)
go build $(BUILD_FLAGS) -v -i -o $(CLI) $(SRC_CLI)
@cp chain33.toml $(CHAIN33_PATH)/build/system-test-rpc.sh build/
build_ci: depends ## Build the binary file for CI
......
chain33.toml
View file @ 33f71495
Title="chain33"
TestNet=true
FixTime=false
version="6.1.1"
version="6.2.0"
[log]
# 日志级别，支持debug(dbug)/info/warn/error(eror)/crit
......@@ -152,6 +152,8 @@ pruneHeight=10000
enableMemTree=true
# 是否使能mavl叶子节点数据载入内存
enableMemVal=true
# 缓存close ticket数目，该缓存越大同步速度越快，最大设置到1500000
tkCloseCacheLen=100000
[store.sub.kvmvccmavl]
enableMVCCIter=true
......@@ -163,6 +165,8 @@ pruneHeight=10000
enableMemTree=true
# 是否使能mavl叶子节点数据载入内存
enableMemVal=true
# 缓存close ticket数目，该缓存越大同步速度越快，最大设置到1500000
tkCloseCacheLen=100000
[wallet]
minFee=100000
......
plugin/dapp/trade/cmd/build.sh 100644 → 100755
View file @ 33f71495
File mode changed from 100644 to 100755
plugin/dapp/trade/cmd/build/test-rpc.sh 100644 → 100755
View file @ 33f71495
File mode changed from 100644 to 100755
plugin/mempool/para/base.go
View file @ 33f71495
......@@ -55,7 +55,7 @@ func (mem *Mempool) SetQueueClient(client queue.Client) {
tx := msg.GetData().(*types.Transaction)
reply, err = mem.mainGrpcCli.SendTransaction(context.Background(), tx)
case types.EventGetProperFee:
reply, err = mem.mainGrpcCli.GetProperFee(context.Background(), &types.ReqNil{})
reply, err = mem.mainGrpcCli.GetProperFee(context.Background(), &types.ReqProperFee{})
default:
msg.Reply(client.NewMessage(mem.key, types.EventReply, types.ErrActionNotSupport))
}
......
plugin/store/kvmvccmavl/kvmvcc_mavl.go
View file @ 33f71495
......@@ -87,6 +87,8 @@ type subMavlConfig struct {
EnableMemTree bool `json:"enableMemTree"`
// 是否使能内存树中叶子节点
EnableMemVal bool `json:"enableMemVal"`
// 缓存close ticket数目
TkCloseCacheLen int32 `json:"tkCloseCacheLen"`
}
type subConfig struct {
......@@ -99,6 +101,8 @@ type subConfig struct {
EnableMemTree bool `json:"enableMemTree"`
// 是否使能内存树中叶子节点
EnableMemVal bool `json:"enableMemVal"`
// 缓存close ticket数目
TkCloseCacheLen int32 `json:"tkCloseCacheLen"`
}
// New construct KVMVCCStore module
......@@ -119,6 +123,7 @@ func New(cfg *types.Store, sub []byte) queue.Module {
subMavlcfg.PruneHeight = subcfg.PruneHeight
subMavlcfg.EnableMemTree = subcfg.EnableMemTree
subMavlcfg.EnableMemVal = subcfg.EnableMemVal
subMavlcfg.TkCloseCacheLen = subcfg.TkCloseCacheLen
}
bs := drivers.NewBaseStore(cfg)
......
plugin/store/kvmvccmavl/mavl.go
View file @ 33f71495
......@@ -42,6 +42,7 @@ func NewMavl(sub *subMavlConfig, db dbm.DB) *MavlStore {
subcfg.PruneHeight = sub.PruneHeight
subcfg.EnableMemTree = sub.EnableMemTree
subcfg.EnableMemVal = sub.EnableMemVal
subcfg.TkCloseCacheLen = sub.TkCloseCacheLen
}
mavls := &MavlStore{db, &sync.Map{}, subcfg.EnableMavlPrefix, subcfg.EnableMVCC, subcfg.EnableMavlPrune, subcfg.PruneHeight}
mavl.EnableMavlPrefix(subcfg.EnableMavlPrefix)
......@@ -50,6 +51,7 @@ func NewMavl(sub *subMavlConfig, db dbm.DB) *MavlStore {
mavl.SetPruneHeight(int(subcfg.PruneHeight))
mavl.EnableMemTree(subcfg.EnableMemTree)
mavl.EnableMemVal(subcfg.EnableMemVal)
mavl.TkCloseCacheLen(subcfg.TkCloseCacheLen)
return mavls
}
......
vendor/github.com/33cn/chain33/blockchain/blockstore.go
View file @ 33f71495
......@@ -1239,13 +1239,19 @@ func (bs *BlockStore) SetStoreUpgradeMeta(meta *types.UpgradeMeta) error {
return bs.db.SetSync(version.StoreDBMeta, verByte)
}
//SequenceMustValid 配置的合法性检测
func (bs *BlockStore) SequenceMustValid(recordSequence bool) {
const (
seqStatusOk = iota
seqStatusNeedCreate
seqStatusNeedDelete
)
//CheckSequenceStatus 配置的合法性检测
func (bs *BlockStore) CheckSequenceStatus(recordSequence bool) int {
lastHeight := bs.Height()
lastSequence, err := bs.LoadBlockLastSequence()
if err != nil {
if err != types.ErrHeightNotExist {
storeLog.Error("SequenceMustValid", "LoadBlockLastSequence err", err)
storeLog.Error("CheckSequenceStatus", "LoadBlockLastSequence err", err)
panic(err)
}
}
......@@ -1253,32 +1259,140 @@ func (bs *BlockStore) SequenceMustValid(recordSequence bool) {
if recordSequence {
//中途开启isRecordBlockSequence报错
if lastSequence == -1 && lastHeight != -1 {
storeLog.Error("SequenceMustValid", "lastHeight", lastHeight, "lastSequence", lastSequence)
panic("isRecordBlockSequence is true must Synchronizing data from zero block")
storeLog.Error("CheckSequenceStatus", "lastHeight", lastHeight, "lastSequence", lastSequence)
return seqStatusNeedCreate
}
//lastSequence 必须大于等于lastheight
if lastHeight > lastSequence {
storeLog.Error("SequenceMustValid", "lastHeight", lastHeight, "lastSequence", lastSequence)
panic("lastSequence must greater than or equal to lastHeight")
storeLog.Error("CheckSequenceStatus", "lastHeight", lastHeight, "lastSequence", lastSequence)
return seqStatusNeedCreate
}
//通过lastSequence获取对应的blockhash ！= lastHeader.hash 报错
if lastSequence != -1 {
blockSequence, err := bs.GetBlockSequence(lastSequence)
if err != nil {
storeLog.Error("SequenceMustValid", "lastSequence", lastSequence, "GetBlockSequence err", err)
storeLog.Error("CheckSequenceStatus", "lastSequence", lastSequence, "GetBlockSequence err", err)
panic(err)
}
lastHeader := bs.LastHeader()
if !bytes.Equal(lastHeader.Hash, blockSequence.Hash) {
storeLog.Error("SequenceMustValid:", "lastHeight", lastHeight, "lastSequence", lastSequence, "lastHeader.Hash", common.ToHex(lastHeader.Hash), "blockSequence.Hash", common.ToHex(blockSequence.Hash))
panic("The hash values of lastSequence and lastHeight are different.")
storeLog.Error("CheckSequenceStatus:", "lastHeight", lastHeight, "lastSequence", lastSequence, "lastHeader.Hash", common.ToHex(lastHeader.Hash), "blockSequence.Hash", common.ToHex(blockSequence.Hash))
return seqStatusNeedCreate
}
}
return
return seqStatusOk
}
//去使能isRecordBlockSequence时的检测
if lastSequence != -1 {
storeLog.Error("SequenceMustValid", "lastSequence", lastSequence)
panic("can not disable isRecordBlockSequence")
storeLog.Error("CheckSequenceStatus", "lastSequence", lastSequence)
return seqStatusNeedDelete
}
return seqStatusOk
}
//CreateSequences 根据高度生成sequence记录
func (bs *BlockStore) CreateSequences(batchSize int64) {
lastSeq, err := bs.LoadBlockLastSequence()
if err != nil {
if err != types.ErrHeightNotExist {
storeLog.Error("CreateSequences LoadBlockLastSequence", "error", err)
panic("CreateSequences LoadBlockLastSequence" + err.Error())
}
}
storeLog.Info("CreateSequences LoadBlockLastSequence", "start", lastSeq)
newBatch := bs.NewBatch(true)
lastHeight := bs.Height()
for i := lastSeq + 1; i <= lastHeight; i++ {
seq := i
header, err := bs.GetBlockHeaderByHeight(i)
if err != nil {
storeLog.Error("CreateSequences GetBlockHeaderByHeight", "height", i, "error", err)
panic("CreateSequences GetBlockHeaderByHeight" + err.Error())
}
// seq->hash
var blockSequence types.BlockSequence
blockSequence.Hash = header.Hash
blockSequence.Type = AddBlock
BlockSequenceByte, err := proto.Marshal(&blockSequence)
if err != nil {
storeLog.Error("CreateSequences Marshal BlockSequence", "height", i, "hash", common.ToHex(header.Hash), "error", err)
panic("CreateSequences Marshal BlockSequence" + err.Error())
}
newBatch.Set(calcSequenceToHashKey(seq, bs.isParaChain), BlockSequenceByte)
// hash -> seq
sequenceBytes := types.Encode(&types.Int64{Data: seq})
newBatch.Set(calcHashToSequenceKey(header.Hash, bs.isParaChain), sequenceBytes)
if i-lastSeq == batchSize {
storeLog.Info("CreateSequences ", "height", i)
newBatch.Set(calcLastSeqKey(bs.isParaChain), types.Encode(&types.Int64{Data: i}))
err = newBatch.Write()
if err != nil {
storeLog.Error("CreateSequences newBatch.Write", "error", err)
panic("CreateSequences newBatch.Write" + err.Error())
}
lastSeq = i
newBatch.Reset()
}
}
// last seq
newBatch.Set(calcLastSeqKey(bs.isParaChain), types.Encode(&types.Int64{Data: lastHeight}))
err = newBatch.Write()
if err != nil {
storeLog.Error("CreateSequences newBatch.Write", "error", err)
panic("CreateSequences newBatch.Write" + err.Error())
}
storeLog.Info("CreateSequences done")
}
//DeleteSequences 删除本地数据库里的sequence记录
func (bs *BlockStore) DeleteSequences(batchSize int64) {
lastSeq, err := bs.LoadBlockLastSequence()
if err != nil {
if err != types.ErrHeightNotExist {
storeLog.Error("DeleteSequences LoadBlockLastSequence", "error", err)
panic("DeleteSequences LoadBlockLastSequence" + err.Error())
}
}
storeLog.Info("DeleteSequences LoadBlockLastSequence", "start", lastSeq)
newBatch := bs.NewBatch(true)
for i := lastSeq; i >= 0; i-- {
seq := i
header, err := bs.GetBlockHeaderByHeight(i)
if err != nil {
storeLog.Error("DeleteSequences GetBlockHeaderByHeight", "height", i, "error", err)
panic("DeleteSequences GetBlockHeaderByHeight" + err.Error())
}
// seq->hash
newBatch.Delete(calcSequenceToHashKey(seq, bs.isParaChain))
// hash -> seq
newBatch.Delete(calcHashToSequenceKey(header.Hash, bs.isParaChain))
if lastSeq-i == batchSize {
storeLog.Info("DeleteSequences ", "height", i)
newBatch.Set(calcLastSeqKey(bs.isParaChain), types.Encode(&types.Int64{Data: i - 1}))
err = newBatch.Write()
if err != nil {
storeLog.Error("DeleteSequences newBatch.Write", "error", err)
panic("DeleteSequences newBatch.Write" + err.Error())
}
lastSeq = i - 1
newBatch.Reset()
}
}
// last seq
newBatch.Delete(calcLastSeqKey(bs.isParaChain))
err = newBatch.Write()
if err != nil {
storeLog.Error("DeleteSequences newBatch.Write", "error", err)
panic("DeleteSequences newBatch.Write" + err.Error())
}
storeLog.Info("DeleteSequences done")
}
vendor/github.com/33cn/chain33/blockchain/blockstore_test.go
View file @ 33f71495
......@@ -6,7 +6,10 @@ import (
"io/ioutil"
"os"
"fmt"
dbm "github.com/33cn/chain33/common/db"
"github.com/33cn/chain33/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
......@@ -135,3 +138,48 @@ func TestParaSeqSaveAndGet(t *testing.T) {
_, err = chain.ProcGetMainSeqByHash([]byte("s0-not-exist"))
assert.NotNil(t, err)
}
func TestSeqCreateAndDelete(t *testing.T) {
dir, err := ioutil.TempDir("", "example")
assert.Nil(t, err)
defer os.RemoveAll(dir) // clean up
os.RemoveAll(dir) //删除已存在目录
blockStoreDB := dbm.NewDB("blockchain", "leveldb", dir, 100)
blockStore := NewBlockStore(nil, blockStoreDB, nil)
assert.NotNil(t, blockStore)
blockStore.saveSequence = false
blockStore.isParaChain = true
batch := blockStore.NewBatch(true)
for i := 0; i <= 100; i++ {
var header types.Header
h0 := calcHeightToBlockHeaderKey(int64(i))
header.Hash = []byte(fmt.Sprintf("%d", i))
types.Encode(&header)
batch.Set(h0, types.Encode(&header))
}
blockStore.height = 100
batch.Write()
blockStore.saveSequence = true
blockStore.CreateSequences(10)
seq, err := blockStore.LoadBlockLastSequence()
assert.Nil(t, err)
assert.Equal(t, int64(100), seq)
seq, err = blockStore.GetSequenceByHash([]byte("1"))
assert.Nil(t, err)
assert.Equal(t, int64(1), seq)
seq, err = blockStore.GetSequenceByHash([]byte("0"))
assert.Nil(t, err)
assert.Equal(t, int64(0), seq)
blockStore.saveSequence = false
blockStore.DeleteSequences(10)
seq, err = blockStore.LoadBlockLastSequence()
assert.NotNil(t, err)
assert.Equal(t, int64(-1), seq)
}
vendor/github.com/33cn/chain33/blockchain/chain.go
View file @ 33f71495
......@@ -18,7 +18,7 @@ import (
log "github.com/33cn/chain33/common/log/log15"
"github.com/33cn/chain33/queue"
"github.com/33cn/chain33/types"
"github.com/hashicorp/golang-lru"
lru "github.com/hashicorp/golang-lru"
)
//var
......@@ -245,7 +245,12 @@ func (chain *BlockChain) GetOrphanPool() *OrphanPool {
//InitBlockChain 区块链初始化
func (chain *BlockChain) InitBlockChain() {
//isRecordBlockSequence配置的合法性检测
chain.blockStore.SequenceMustValid(chain.isRecordBlockSequence)
seqStatus := chain.blockStore.CheckSequenceStatus(chain.isRecordBlockSequence)
if seqStatus == seqStatusNeedCreate {
chain.blockStore.CreateSequences(100000)
} else if seqStatus == seqStatusNeedDelete {
chain.blockStore.DeleteSequences(100000)
}
//先缓存最新的128个block信息到cache中
curheight := chain.GetBlockHeight()
......
vendor/github.com/33cn/chain33/build/system-test-rpc.sh
View file @ 33f71495
......@@ -339,8 +339,12 @@ chain33_GetSeqCallBackLastNum() {
}
chain33_GetCoinSymbol() {
symbol="bty"
if [ "$IS_PARA" == true ]; then
symbol="paracoin"
fi
r1=$(curl -ksd '{"method":"Chain33.GetCoinSymbol","params":[]}' ${MAIN_HTTP} | jq -r ".result.data")
[ "$r1" == "bty" ]
[ "$r1" == "$symbol" ]
echo_rst "$FUNCNAME" "$?"
}
......
vendor/github.com/33cn/chain33/client/mocks/api.go
View file @ 33f71495
......@@ -522,13 +522,13 @@ func (_m *QueueProtocolAPI) GetNetInfo() (*types.NodeNetInfo, error) {
return r0, r1
}
// GetProperFee provides a mock function with given fields:
func (_m *QueueProtocolAPI) GetProperFee() (*types.ReplyProperFee, error) {
ret := _m.Called()
// GetProperFee provides a mock function with given fields: req
func (_m *QueueProtocolAPI) GetProperFee(req *types.ReqProperFee) (*types.ReplyProperFee, error) {
ret := _m.Called(req)
var r0 *types.ReplyProperFee
if rf, ok := ret.Get(0).(func() *types.ReplyProperFee); ok {
r0 = rf()
if rf, ok := ret.Get(0).(func(*types.ReqProperFee) *types.ReplyProperFee); ok {
r0 = rf(req)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*types.ReplyProperFee)
......@@ -536,8 +536,8 @@ func (_m *QueueProtocolAPI) GetProperFee() (*types.ReplyProperFee, error) {
}
var r1 error
if rf, ok := ret.Get(1).(func() error); ok {
r1 = rf()
if rf, ok := ret.Get(1).(func(*types.ReqProperFee) error); ok {
r1 = rf(req)
} else {
r1 = ret.Error(1)
}
......
vendor/github.com/33cn/chain33/client/queueprotocol.go
View file @ 33f71495
......@@ -469,8 +469,8 @@ func (q *QueueProtocol) GetLastMempool() (*types.ReplyTxList, error) {
}
// GetProperFee get proper fee from mempool
func (q *QueueProtocol) GetProperFee() (*types.ReplyProperFee, error) {
msg, err := q.query(mempoolKey, types.EventGetProperFee, &types.ReqNil{})
func (q *QueueProtocol) GetProperFee(req *types.ReqProperFee) (*types.ReplyProperFee, error) {
msg, err := q.query(mempoolKey, types.EventGetProperFee, req)
if err != nil {
log.Error("GetProperFee", "Error", err.Error())
return nil, err
......
vendor/github.com/33cn/chain33/client/queueprotocol_test.go
View file @ 33f71495
......@@ -343,7 +343,11 @@ func testGetLastMempool(t *testing.T, api client.QueueProtocolAPI) {
}
func testGetProperFee(t *testing.T, api client.QueueProtocolAPI) {
_, err := api.GetProperFee()
_, err := api.GetProperFee(nil)
if err != nil {
t.Error("Call GetProperFee Failed.", err)
}
_, err = api.GetProperFee(&types.ReqProperFee{})
if err != nil {
t.Error("Call GetProperFee Failed.", err)
}
......@@ -989,7 +993,7 @@ func testGetLastMemPoolGRPC(t *testing.T, rpc *mockGRPCSystem) {
func testGetProperFeeGRPC(t *testing.T, rpc *mockGRPCSystem) {
var res types.ReplyProperFee
err := rpc.newRpcCtx("GetProperFee", &types.ReqNil{}, &res)
err := rpc.newRpcCtx("GetProperFee", &types.ReqProperFee{}, &res)
if err != nil {
t.Error("Call GetProperFee Failed.", err)
}
......
vendor/github.com/33cn/chain33/client/queueprotocolapi.go
View file @ 33f71495
......@@ -25,7 +25,7 @@ type QueueProtocolAPI interface {
// types.EventGetLastMempool
GetLastMempool() (*types.ReplyTxList, error)
// types.EventGetProperFee
GetProperFee() (*types.ReplyProperFee, error)
GetProperFee(req *types.ReqProperFee) (*types.ReplyProperFee, error)
// +++++++++++++++ execs interfaces begin
// types.EventBlockChainQuery
Query(driver, funcname string, param types.Message) (types.Message, error)
......
vendor/github.com/33cn/chain33/client/rpc_ctx_test.go
View file @ 33f71495
......@@ -220,7 +220,7 @@ func (c *GrpcCtx) Run() (err error) {
}
errRet = err
case "GetProperFee":
reply, err := rpc.GetProperFee(context.Background(), c.Params.(*types.ReqNil))
reply, err := rpc.GetProperFee(context.Background(), c.Params.(*types.ReqProperFee))
if err == nil {
*c.Res.(*types.ReplyProperFee) = *reply
}
......
vendor/github.com/33cn/chain33/cmd/chain33/bityuan.toml
View file @ 33f71495
......@@ -98,6 +98,8 @@ pruneHeight=10000
enableMemTree=false
# 是否使能mavl叶子节点数据载入内存
enableMemVal=false
# 缓存close ticket数目，该缓存越大同步速度越快，最大设置到1500000
tkCloseCacheLen=100000
[wallet]
# walletdb路径
......
vendor/github.com/33cn/chain33/cmd/chain33/chain33.test.toml
View file @ 33f71495
......@@ -152,6 +152,8 @@ pruneHeight=10000
enableMemTree=false
# 是否使能mavl叶子节点数据载入内存
enableMemVal=false
# 缓存close ticket数目，该缓存越大同步速度越快，最大设置到1500000
tkCloseCacheLen=100000
[wallet]
minFee=1000000
......
vendor/github.com/33cn/chain33/cmd/chain33/chain33.toml
View file @ 33f71495
......@@ -226,6 +226,8 @@ pruneHeight=10000
enableMemTree=false
# 是否使能mavl叶子节点数据载入内存
enableMemVal=false
# 缓存close ticket数目，该缓存越大同步速度越快，最大设置到1500000
tkCloseCacheLen=100000
[wallet]
# 交易发送最低手续费，单位0.00000001BTY(1e-8),默认100000，即0.001BTY
......
vendor/github.com/33cn/chain33/common/db/mvcc_test.go
View file @ 33f71495
......@@ -195,8 +195,9 @@ func TestAddDelMVCC(t *testing.T) {
_, err = m.AddMVCC(genkv(2), hashN(2), hashN(1), 1)
assert.Equal(t, err, types.ErrPrevVersion)
//hash 2 还不存在
_, err = m.AddMVCC(genkv(2), hashN(2), hashN(0), 3)
assert.Equal(t, err, types.ErrPrevVersion)
assert.Equal(t, err, types.ErrNotFound)
_, err = m.AddMVCC(genkv(2), hashN(2), hashN(3), 3)
assert.Equal(t, err, types.ErrNotFound)
......
vendor/github.com/33cn/chain33/p2p/nat/nat.go
View file @ 33f71495
......@@ -25,6 +25,7 @@ import (
"errors"
"fmt"
"log"
//"log"
"net"
"strings"
......@@ -32,7 +33,7 @@ import (
"time"
//"github.com/ethereum/go-ethereum/log"
"github.com/jackpal/go-nat-pmp"
natpmp "github.com/jackpal/go-nat-pmp"
)
// Interface An implementation of nat.Interface can map local ports to ports
......
vendor/github.com/33cn/chain33/p2p/nat/natpmp.go
View file @ 33f71495
......@@ -26,7 +26,7 @@ import (
"strings"
"time"
"github.com/jackpal/go-nat-pmp"
natpmp "github.com/jackpal/go-nat-pmp"
)
// natPMPClient adapts the NAT-PMP protocol implementation so it conforms to
......
vendor/github.com/33cn/chain33/rpc/grpchandler.go
View file @ 33f71495
......@@ -206,8 +206,8 @@ func (g *Grpc) GetLastMemPool(ctx context.Context, in *pb.ReqNil) (*pb.ReplyTxLi
}
// GetProperFee return last mempool proper fee
func (g *Grpc) GetProperFee(ctx context.Context, in *pb.ReqNil) (*pb.ReplyProperFee, error) {
return g.cli.GetProperFee()
func (g *Grpc) GetProperFee(ctx context.Context, in *pb.ReqProperFee) (*pb.ReplyProperFee, error) {
return g.cli.GetProperFee(in)
}
// GetBlockOverview get block overview
......
vendor/github.com/33cn/chain33/rpc/grpchandler_test.go
View file @ 33f71495
......@@ -203,11 +203,11 @@ func TestGetLastMemPool(t *testing.T) {
}
func testGetProperFeeOK(t *testing.T) {
qapi.On("GetProperFee").Return(nil, nil)
data, err := g.GetProperFee(getOkCtx(), nil)
var in *types.ReqProperFee
qapi.On("GetProperFee", in).Return(nil, nil)
data, err := g.GetProperFee(getOkCtx(), in)
assert.Nil(t, err, "the error should be nil")
assert.Nil(t, data)
}
func TestGetProperFee(t *testing.T) {
......
vendor/github.com/33cn/chain33/rpc/jrpchandler.go
View file @ 33f71495
......@@ -614,8 +614,8 @@ func (c *Chain33) GetLastMemPool(in types.ReqNil, result *interface{}) error {
}
// GetProperFee get contents in proper fee
func (c *Chain33) GetProperFee(in types.ReqNil, result *interface{}) error {
reply, err := c.cli.GetProperFee()
func (c *Chain33) GetProperFee(in types.ReqProperFee, result *interface{}) error {
reply, err := c.cli.GetProperFee(&in)
if err != nil {
return err
}
......
vendor/github.com/33cn/chain33/rpc/jrpchandler_test.go
View file @ 33f71495
......@@ -929,12 +929,11 @@ func TestChain33_GetProperFee(t *testing.T) {
api := new(mocks.QueueProtocolAPI)
testChain33 := newTestChain33(api)
// expected := &types.ReqBlocks{}
api.On("GetProperFee").Return(nil, errors.New("error value"))
expected := types.ReqProperFee{}
api.On("GetProperFee", &expected).Return(nil, errors.New("error value"))
var testResult interface{}
actual := types.ReqNil{}
err := testChain33.GetProperFee(actual, &testResult)
err := testChain33.GetProperFee(expected, &testResult)
t.Log(err)
assert.Equal(t, nil, testResult)
assert.NotNil(t, err)
......
vendor/github.com/33cn/chain33/system/mempool/base.go
View file @ 33f71495
......@@ -282,10 +282,16 @@ func (mem *Mempool) RemoveTxsOfBlock(block *types.Block) bool {
}
// GetProperFeeRate 获取合适的手续费率
func (mem *Mempool) GetProperFeeRate() int64 {
func (mem *Mempool) GetProperFeeRate(req *types.ReqProperFee) int64 {
if req == nil || req.TxCount == 0 {
req = &types.ReqProperFee{TxCount: 20}
}
if req.TxSize == 0 {
req.TxSize = 10240
}
baseFeeRate := mem.cache.GetProperFee()
if mem.cfg.IsLevelFee {
levelFeeRate := mem.getLevelFeeRate(mem.cfg.MinTxFee)
levelFeeRate := mem.getLevelFeeRate(mem.cfg.MinTxFee, req.TxCount, req.TxSize)
if levelFeeRate > baseFeeRate {
return levelFeeRate
}
......@@ -293,15 +299,15 @@ func (mem *Mempool) GetProperFeeRate() int64 {
return baseFeeRate
}
// getLevelFeeRate 获取合适的阶梯手续费率
func (mem *Mempool) getLevelFeeRate(baseFeeRate int64) int64 {
// getLevelFeeRate 获取合适的阶梯手续费率, 可以外部传入count, size进行前瞻性估计
func (mem *Mempool) getLevelFeeRate(baseFeeRate int64, appendCount, appendSize int32) int64 {
var feeRate int64
sumByte := mem.cache.TotalByte()
sumByte := mem.cache.TotalByte() + int64(appendSize)
maxTxNumber := types.GetP(mem.Height()).MaxTxNumber
switch {
case sumByte >= int64(types.MaxBlockSize/20) || int64(mem.Size()) >= maxTxNumber/2:
case sumByte >= int64(types.MaxBlockSize/20) || int64(mem.Size()+int(appendCount)) >= maxTxNumber/2:
feeRate = 100 * baseFeeRate
case sumByte >= int64(types.MaxBlockSize/100) || int64(mem.Size()) >= maxTxNumber/10:
case sumByte >= int64(types.MaxBlockSize/100) || int64(mem.Size()+int(appendCount)) >= maxTxNumber/10:
feeRate = 10 * baseFeeRate
default:
feeRate = baseFeeRate
......
vendor/github.com/33cn/chain33/system/mempool/check.go
View file @ 33f71495
......@@ -124,7 +124,7 @@ func (mem *Mempool) checkTxs(msg *queue.Message) *queue.Message {
// checkLevelFee 检查阶梯手续费
func (mem *Mempool) checkLevelFee(tx *types.TransactionCache) error {
//获取mempool里所有交易手续费总和
feeRate := mem.getLevelFeeRate(mem.cfg.MinTxFee)
feeRate := mem.getLevelFeeRate(mem.cfg.MinTxFee, 0, 0)
totalfee, err := tx.GetTotalFee(feeRate)
if err != nil {
return err
......
vendor/github.com/33cn/chain33/system/mempool/eventprocess.go
View file @ 33f71495
......@@ -194,7 +194,8 @@ func (mem *Mempool) eventGetAddrTxs(msg *queue.Message) {
// eventGetProperFee 获取排队策略中合适的手续费率
func (mem *Mempool) eventGetProperFee(msg *queue.Message) {
properFee := mem.GetProperFeeRate()
req, _ := msg.GetData().(*types.ReqProperFee)
properFee := mem.GetProperFeeRate(req)
msg.Reply(mem.client.NewMessage("rpc", types.EventReplyProperFee,
&types.ReplyProperFee{ProperFee: properFee}))
}
......
vendor/github.com/33cn/chain33/system/mempool/mempool_test.go
View file @ 33f71495
......@@ -624,10 +624,26 @@ func TestGetLatestTx(t *testing.T) {
}
}
func testProperFee(t *testing.T, client queue.Client, req *types.ReqProperFee, expectFee int64) int64 {
msg := client.NewMessage("mempool", types.EventGetProperFee, req)
client.Send(msg, true)
reply, err := client.Wait(msg)
if err != nil {
t.Error(err)
return 0
}
fee := reply.GetData().(*types.ReplyProperFee).GetProperFee()
assert.Equal(t, expectFee, fee)
return fee
}
func TestGetProperFee(t *testing.T) {
q, mem := initEnv(0)
defer q.Close()
defer mem.Close()
defer func() {
mem.cfg.IsLevelFee = false
}()
// add 10 txs
err := add10Tx(mem.client)
......@@ -635,24 +651,24 @@ func TestGetProperFee(t *testing.T) {
t.Error("add tx error", err.Error())
return
}
maxTxNum := types.GetP(mem.Height()).MaxTxNumber
maxSize := types.MaxBlockSize
msg11 := mem.client.NewMessage("mempool", types.EventTx, tx11)
mem.client.Send(msg11, true)
mem.client.Wait(msg11)
msg := mem.client.NewMessage("mempool", types.EventGetProperFee, nil)
mem.client.Send(msg, true)
reply, err := mem.client.Wait(msg)
if err != nil {
t.Error(err)
return
}
if reply.GetData().(*types.ReplyProperFee).GetProperFee() != mem.cfg.MinTxFee {
t.Error("TestGetProperFee failed", reply.GetData().(*types.ReplyProperFee).GetProperFee(), mem.cfg.MinTxFee)
}
baseFee := testProperFee(t, mem.client, nil, mem.cfg.MinTxFee)
mem.cfg.IsLevelFee = true
testProperFee(t, mem.client, nil, baseFee)
testProperFee(t, mem.client, &types.ReqProperFee{}, baseFee)
//more than 1/2 max num
testProperFee(t, mem.client, &types.ReqProperFee{TxCount: int32(maxTxNum / 2)}, 100*baseFee)
//more than 1/10 max num
testProperFee(t, mem.client, &types.ReqProperFee{TxCount: int32(maxTxNum / 10)}, 10*baseFee)
//more than 1/20 max size
testProperFee(t, mem.client, &types.ReqProperFee{TxCount: 1, TxSize: int32(maxSize / 20)}, 100*baseFee)
//more than 1/100 max size
testProperFee(t, mem.client, &types.ReqProperFee{TxCount: 1, TxSize: int32(maxSize / 100)}, 10*baseFee)
}
func TestCheckLowFee(t *testing.T) {
......
vendor/github.com/33cn/chain33/system/store/mavl/db/memmavl.go
View file @ 33f71495
......@@ -12,7 +12,7 @@ import (
"github.com/33cn/chain33/common"
dbm "github.com/33cn/chain33/common/db"
farm "github.com/dgryski/go-farm"
"github.com/hashicorp/golang-lru"
lru "github.com/hashicorp/golang-lru"
)
// MemTreeOpera memtree操作接口
......
vendor/github.com/33cn/chain33/system/store/mavl/db/tree.go
View file @ 33f71495
......@@ -18,7 +18,7 @@ import (
"github.com/33cn/chain33/types"
farm "github.com/dgryski/go-farm"
"github.com/golang/protobuf/proto"
"github.com/hashicorp/golang-lru"
lru "github.com/hashicorp/golang-lru"
)
const (
......@@ -44,6 +44,7 @@ var (
enableMemVal bool
memTree MemTreeOpera
tkCloseCache MemTreeOpera
tkCloseCacheLen int32 = 10 * 10000
)
// EnableMavlPrefix 使能mavl加前缀
......@@ -66,6 +67,11 @@ func EnableMemVal(enable bool) {
enableMemVal = enable
}
// TkCloseCacheLen 设置缓存close ticket数目
func TkCloseCacheLen(len int32) {
tkCloseCacheLen = len
}
// ReleaseGlobalMem 释放全局缓存
func ReleaseGlobalMem() {
if memTree != nil {
......@@ -110,7 +116,7 @@ func NewTree(db dbm.DB, sync bool) *Tree {
// 使能情况下非空创建当前整tree的缓存
if enableMemTree && memTree == nil {
memTree = NewTreeMap(50 * 10000)
tkCloseCache = NewTreeARC(10 * 10000)
tkCloseCache = NewTreeARC(int(tkCloseCacheLen))
}
return &Tree{
ndb: ndb,
......
vendor/github.com/33cn/chain33/system/store/mavl/mavl.go
View file @ 33f71495
......@@ -39,6 +39,7 @@ type Store struct {
pruneHeight int32
enableMemTree bool
enableMemVal bool
tkCloseCacheLen int32
}
func init() {
......@@ -57,6 +58,8 @@ type subConfig struct {
EnableMemTree bool `json:"enableMemTree"`
// 是否使能内存树中叶子节点
EnableMemVal bool `json:"enableMemVal"`
// 缓存close ticket数目
TkCloseCacheLen int32 `json:"tkCloseCacheLen"`
}
// New new mavl store module
......@@ -67,19 +70,21 @@ func New(cfg *types.Store, sub []byte) queue.Module {
types.MustDecode(sub, &subcfg)
}
mavls := &Store{bs, &sync.Map{}, subcfg.EnableMavlPrefix, subcfg.EnableMVCC,
subcfg.EnableMavlPrune, subcfg.PruneHeight, subcfg.EnableMemTree, subcfg.EnableMemVal}
subcfg.EnableMavlPrune, subcfg.PruneHeight, subcfg.EnableMemTree, subcfg.EnableMemVal, subcfg.TkCloseCacheLen}
mavls.enableMavlPrefix = subcfg.EnableMavlPrefix
mavls.enableMVCC = subcfg.EnableMVCC
mavls.enableMavlPrune = subcfg.EnableMavlPrune
mavls.pruneHeight = subcfg.PruneHeight
mavls.enableMemTree = subcfg.EnableMemTree
mavls.enableMemVal = subcfg.EnableMemVal
mavls.tkCloseCacheLen = subcfg.TkCloseCacheLen
mavl.EnableMavlPrefix(mavls.enableMavlPrefix)
mavl.EnableMVCC(mavls.enableMVCC)
mavl.EnablePrune(mavls.enableMavlPrune)
mavl.SetPruneHeight(int(mavls.pruneHeight))
mavl.EnableMemTree(mavls.enableMemTree)
mavl.EnableMemVal(mavls.enableMemVal)
mavl.TkCloseCacheLen(mavls.tkCloseCacheLen)
bs.SetChild(mavls)
return mavls
}
......
vendor/github.com/33cn/chain33/types/mocks/chain33client.go
View file @ 33f71495
......@@ -763,7 +763,7 @@ func (_m *Chain33Client) GetPeerInfo(ctx context.Context, in *types.ReqNil, opts
}
// GetProperFee provides a mock function with given fields: ctx, in, opts
func (_m *Chain33Client) GetProperFee(ctx context.Context, in *types.ReqNil, opts ...grpc.CallOption) (*types.ReplyProperFee, error) {
func (_m *Chain33Client) GetProperFee(ctx context.Context, in *types.ReqProperFee, opts ...grpc.CallOption) (*types.ReplyProperFee, error) {
_va := make([]interface{}, len(opts))
for _i := range opts {
_va[_i] = opts[_i]
......@@ -774,7 +774,7 @@ func (_m *Chain33Client) GetProperFee(ctx context.Context, in *types.ReqNil, opt
ret := _m.Called(_ca...)
var r0 *types.ReplyProperFee
if rf, ok := ret.Get(0).(func(context.Context, *types.ReqNil, ...grpc.CallOption) *types.ReplyProperFee); ok {
if rf, ok := ret.Get(0).(func(context.Context, *types.ReqProperFee, ...grpc.CallOption) *types.ReplyProperFee); ok {
r0 = rf(ctx, in, opts...)
} else {
if ret.Get(0) != nil {
......@@ -783,7 +783,7 @@ func (_m *Chain33Client) GetProperFee(ctx context.Context, in *types.ReqNil, opt
}
var r1 error
if rf, ok := ret.Get(1).(func(context.Context, *types.ReqNil, ...grpc.CallOption) error); ok {
if rf, ok := ret.Get(1).(func(context.Context, *types.ReqProperFee, ...grpc.CallOption) error); ok {
r1 = rf(ctx, in, opts...)
} else {
r1 = ret.Error(1)
......
vendor/github.com/33cn/chain33/types/proto/rpc.proto
View file @ 33f71495
......@@ -75,7 +75,7 @@ service chain33 {
rpc GetLastMemPool(ReqNil) returns (ReplyTxList) {}
//获取最新的ProperFee
rpc GetProperFee(ReqNil) returns (ReplyProperFee) {}
rpc GetProperFee(ReqProperFee) returns (ReplyProperFee) {}
// 获取钱包状态
rpc GetWalletStatus(ReqNil) returns (WalletStatus) {}
......
vendor/github.com/33cn/chain33/types/proto/transaction.proto
View file @ 33f71495
......@@ -165,6 +165,11 @@ message ReplyTxList {
repeated Transaction txs = 1;
}
message ReqProperFee {
int32 txCount = 1;
int32 txSize = 2;
}
message ReplyProperFee {
int64 properFee = 1;
}
......
vendor/github.com/33cn/chain33/types/rpc.pb.go
View file @ 33f71495
......@@ -26,74 +26,74 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
func init() { proto.RegisterFile("rpc.proto", fileDescriptor_77a6da22d6a3feb1) }
var fileDescriptor_77a6da22d6a3feb1 = []byte{
// 1057 bytes of a gzipped FileDescriptorProto
// 1061 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x6d, 0x6f, 0xdb, 0x36,
0x10, 0xd6, 0x87, 0xad, 0x69, 0x58, 0x27, 0x71, 0x98, 0x34, 0x68, 0x85, 0x15, 0x05, 0x04, 0x0c,
0x1b, 0x30, 0xd4, 0x6e, 0xed, 0x35, 0x7b, 0x29, 0x36, 0x20, 0x4e, 0x66, 0xc7, 0x98, 0xeb, 0xb9,
0x91, 0xbb, 0x01, 0xfb, 0x46, 0xcb, 0x37, 0x47, 0x88, 0x4c, 0x2a, 0x24, 0x15, 0xdb, 0xff, 0x78,
0x3f, 0x63, 0x20, 0x25, 0xea, 0xdd, 0x49, 0xf6, 0x4d, 0xbc, 0xbb, 0xe7, 0xee, 0xc8, 0x7b, 0xee,
0x4e, 0x68, 0x97, 0x87, 0x5e, 0x2b, 0xe4, 0x4c, 0x32, 0xfc, 0xa5, 0xdc, 0x84, 0x20, 0xec, 0x86,
0xc7, 0x96, 0x4b, 0x46, 0x63, 0xa1, 0x7d, 0x28, 0x39, 0xa1, 0x82, 0x78, 0xd2, 0x4f, 0x45, 0xcd,
0x59, 0xc0, 0xbc, 0x1b, 0xef, 0x9a, 0xf8, 0x46, 0xd2, 0x58, 0x91, 0x20, 0x00, 0x99, 0x9c, 0x76,
0xc3, 0x4e, 0x98, 0x7c, 0xee, 0x11, 0xcf, 0x63, 0x11, 0x35, 0x9a, 0x7d, 0x58, 0x83, 0x17, 0x49,
0xc6, 0xe3, 0x73, 0xe7, 0xdf, 0x13, 0xb4, 0xa3, 0xfd, 0x74, 0xbb, 0xf8, 0x0d, 0xda, 0x1d, 0x80,
0xec, 0x29, 0xd7, 0x02, 0x37, 0x5b, 0x3a, 0x97, 0xd6, 0x15, 0xdc, 0xc6, 0x12, 0xbb, 0x91, 0x4a,
0xc2, 0x60, 0xe3, 0x58, 0xb8, 0x8d, 0xf6, 0x06, 0x20, 0x47, 0x44, 0xc8, 0x4b, 0x20, 0x73, 0xe0,
0x78, 0x2f, 0x83, 0x8c, 0xfd, 0xc0, 0x36, 0xc7, 0x58, 0xeb, 0x58, 0xf8, 0x67, 0x74, 0x7c, 0xce,
0x81, 0x48, 0xb8, 0x22, 0xab, 0x69, 0x76, 0x27, 0x7c, 0x90, 0x18, 0xc6, 0xca, 0xe9, 0xda, 0x36,
0x82, 0xcf, 0x54, 0xf8, 0x0b, 0x3a, 0x5d, 0x3b, 0x16, 0xbe, 0x40, 0xcd, 0x0c, 0xbb, 0x1e, 0x70,
0x16, 0x85, 0xf8, 0x55, 0x11, 0x97, 0x79, 0xd4, 0xea, 0x3a, 0x2f, 0xbf, 0xa2, 0xe6, 0xa7, 0x08,
0xf8, 0x26, 0x1f, 0x7d, 0x3f, 0xcb, 0xfa, 0x92, 0x88, 0x6b, 0xfb, 0x45, 0x72, 0xce, 0xd9, 0x5c,
0x80, 0x24, 0x7e, 0xe0, 0x58, 0xf8, 0x3d, 0x3a, 0x70, 0x81, 0xce, 0xf3, 0x70, 0x5c, 0x35, 0xaf,
0xbc, 0xd4, 0x2f, 0xe8, 0x78, 0x00, 0x32, 0x67, 0xd1, 0xdb, 0x9c, 0xcd, 0xe7, 0x3c, 0x1f, 0x5a,
0x9d, 0xed, 0xa3, 0x3c, 0x6e, 0xba, 0x1e, 0xd2, 0x7f, 0x98, 0x70, 0x2c, 0x3c, 0x40, 0x27, 0x65,
0xb8, 0xca, 0x14, 0x0a, 0x45, 0x8a, 0x25, 0xf6, 0xcb, 0x6d, 0xd9, 0x2b, 0x47, 0xef, 0x10, 0x1a,
0x80, 0xfc, 0x08, 0xcb, 0x09, 0x63, 0x41, 0xb9, 0x5c, 0xb8, 0x18, 0x7c, 0xe4, 0x0b, 0xa9, 0x6f,
0xfc, 0x6c, 0x00, 0xf2, 0x2c, 0xe6, 0x90, 0x28, 0x63, 0x9e, 0x27, 0xc7, 0xbf, 0x34, 0xf9, 0x8c,
0x95, 0x2e, 0x35, 0x1a, 0xc3, 0x2a, 0x11, 0xe0, 0xe3, 0x1c, 0x2a, 0x95, 0xda, 0xc7, 0x75, 0x60,
0xc7, 0xc2, 0x57, 0xe8, 0x79, 0x2c, 0xca, 0xdd, 0x41, 0x65, 0x83, 0x5f, 0x67, 0x6e, 0x6a, 0x0d,
0xec, 0x93, 0x82, 0xc7, 0xe9, 0x3a, 0xbb, 0x79, 0x1f, 0xed, 0x0d, 0x97, 0x21, 0xe3, 0x72, 0xc2,
0xfd, 0xbb, 0x1b, 0xd8, 0xa4, 0xdc, 0x49, 0x7d, 0x15, 0xd4, 0x5b, 0x73, 0xeb, 0xa1, 0x3d, 0x4d,
0x00, 0xa6, 0xea, 0x05, 0x42, 0x54, 0xfd, 0x14, 0xd4, 0x76, 0x33, 0xff, 0xa8, 0xaa, 0x44, 0x8e,
0x85, 0x3b, 0xe8, 0xa9, 0xab, 0xb2, 0xeb, 0x03, 0xe0, 0x93, 0x2a, 0x5c, 0xf6, 0x01, 0x2a, 0x0c,
0xfa, 0x80, 0x76, 0x5c, 0xd5, 0x6b, 0xb3, 0x00, 0xbf, 0xa8, 0x81, 0x8c, 0xc8, 0x0c, 0x82, 0x7b,
0x92, 0x6e, 0x7c, 0x04, 0xbe, 0x80, 0x1e, 0x09, 0x08, 0xf5, 0x00, 0x7f, 0x55, 0xf6, 0x90, 0xd7,
0x16, 0x79, 0x10, 0xb3, 0xca, 0xb1, 0xf0, 0x29, 0xda, 0x75, 0x41, 0x4e, 0x88, 0x10, 0xab, 0x39,
0x7e, 0x59, 0x93, 0x42, 0xac, 0xaa, 0x24, 0xfe, 0x35, 0xfa, 0x62, 0xc4, 0xbc, 0x9b, 0x32, 0x71,
0xca, 0x66, 0x6f, 0xd0, 0x93, 0xcf, 0x54, 0x1b, 0x1e, 0x15, 0x2e, 0x11, 0x0b, 0x6b, 0x46, 0x8f,
0x62, 0xe5, 0x04, 0x80, 0xab, 0x1e, 0x29, 0x3b, 0x37, 0x8d, 0xaf, 0xf4, 0x29, 0x8d, 0xf7, 0x93,
0x59, 0xf5, 0xbf, 0xd8, 0x7f, 0x8a, 0x1a, 0x2a, 0x0e, 0x67, 0x21, 0x70, 0x55, 0xae, 0x2d, 0xf4,
0xd7, 0xa0, 0xd4, 0xca, 0xb1, 0xf0, 0x0f, 0xe8, 0x60, 0x00, 0x32, 0x79, 0x1b, 0x49, 0x64, 0x54,
0xe9, 0x9c, 0xe2, 0x35, 0x63, 0x1b, 0xdd, 0x37, 0x4d, 0x33, 0x82, 0xff, 0xb8, 0x03, 0x7e, 0xe7,
0xc3, 0xaa, 0x32, 0xa0, 0x4c, 0x99, 0x0b, 0x56, 0x8e, 0x85, 0x7f, 0xd4, 0x41, 0x15, 0xf3, 0xea,
0xa0, 0x85, 0x01, 0x93, 0x37, 0xd2, 0x73, 0xa1, 0x61, 0xa2, 0xaa, 0x08, 0xf9, 0x5c, 0x87, 0x54,
0xd6, 0x92, 0xf8, 0x1d, 0xda, 0x19, 0x00, 0x75, 0x01, 0xe6, 0xe9, 0x04, 0x4c, 0xce, 0x23, 0x42,
0x17, 0x45, 0x88, 0x92, 0x1a, 0x88, 0x2c, 0x41, 0xf4, 0xb9, 0xb7, 0x99, 0xac, 0x6a, 0x21, 0x6d,
0xf4, 0xd4, 0x25, 0x77, 0xa0, 0x31, 0x26, 0x77, 0x23, 0xd0, 0xa0, 0x32, 0x31, 0x3a, 0x7a, 0xc2,
0x19, 0xa2, 0x1f, 0xe6, 0x76, 0x58, 0xc2, 0x6e, 0xc3, 0x8d, 0xdc, 0xac, 0xea, 0x20, 0xa4, 0x97,
0xc2, 0xb9, 0x5a, 0x83, 0xe9, 0xac, 0xd2, 0xa7, 0xdf, 0x92, 0x65, 0x59, 0x17, 0x47, 0xe9, 0xe2,
0xea, 0x3d, 0x12, 0x73, 0x8a, 0xf6, 0xe3, 0x38, 0x8c, 0x0a, 0xa0, 0x22, 0x12, 0x8f, 0xc4, 0xfd,
0x84, 0x0e, 0x2b, 0x1b, 0x2e, 0xbd, 0x9a, 0xd9, 0x99, 0x43, 0x5a, 0xb7, 0xef, 0xde, 0x6a, 0xda,
0x5f, 0xc2, 0x7a, 0xba, 0x8e, 0x77, 0x46, 0x85, 0x4c, 0x8d, 0x74, 0x49, 0xaf, 0x35, 0xe2, 0x3d,
0x7a, 0x76, 0x11, 0x2d, 0x43, 0x33, 0x26, 0x73, 0x0b, 0xc6, 0x95, 0xdc, 0xa7, 0x8b, 0x62, 0xa3,
0xc4, 0x32, 0xc7, 0xc2, 0x2d, 0xb4, 0xf3, 0x27, 0x70, 0xa1, 0x32, 0xdb, 0xd2, 0x58, 0x89, 0x5a,
0xf5, 0xab, 0x63, 0xe1, 0x6f, 0xd0, 0x93, 0xa1, 0x70, 0x37, 0xd4, 0x7b, 0x68, 0x30, 0xb4, 0xd1,
0xfe, 0x50, 0x8c, 0x65, 0x78, 0xae, 0xc8, 0xf9, 0x18, 0x40, 0x0b, 0xed, 0x8c, 0x41, 0xd6, 0x8d,
0x05, 0x93, 0xc9, 0x98, 0xcd, 0x21, 0x31, 0xd1, 0x4f, 0xa4, 0xba, 0xa6, 0x4f, 0x24, 0x09, 0xfa,
0xc4, 0x0f, 0x22, 0x0e, 0xdb, 0x22, 0x0c, 0xa9, 0xec, 0x76, 0xf4, 0x13, 0x1d, 0x27, 0xb3, 0x44,
0x77, 0x8c, 0x0b, 0xb7, 0x11, 0x28, 0xb6, 0x6d, 0x87, 0x9d, 0x7e, 0xef, 0x58, 0xb8, 0x8b, 0x0e,
0x35, 0xdd, 0x63, 0xeb, 0x07, 0xca, 0x61, 0x40, 0x1f, 0xb2, 0x79, 0x70, 0xcf, 0xd2, 0x3f, 0xca,
0x4f, 0x84, 0x6c, 0xe9, 0xbd, 0xd5, 0x3f, 0x68, 0x09, 0xd8, 0x85, 0x5b, 0x5c, 0xf0, 0x9e, 0xf2,
0xc5, 0xdc, 0xc2, 0xb1, 0xf0, 0x77, 0x08, 0x9d, 0x07, 0x4c, 0xc0, 0xa7, 0x08, 0x22, 0x78, 0xe8,
0xa5, 0xfb, 0xfa, 0x42, 0x67, 0x41, 0xa0, 0x98, 0x6b, 0x5a, 0x2e, 0xb7, 0x9d, 0x8a, 0x9a, 0x74,
0x58, 0x16, 0xc5, 0x9a, 0xdf, 0xbb, 0xae, 0xbf, 0xa0, 0xfa, 0xc7, 0x0e, 0x1f, 0xe5, 0x08, 0x67,
0x84, 0xc5, 0x39, 0x9b, 0x8a, 0x1d, 0x0b, 0x0f, 0x91, 0x1d, 0x37, 0xc0, 0x98, 0x25, 0xfe, 0xea,
0x7e, 0xcd, 0x32, 0xe5, 0x3d, 0xae, 0x4e, 0x51, 0x43, 0x77, 0xe7, 0x15, 0xa1, 0xf3, 0x71, 0xb4,
0xc4, 0x19, 0xcf, 0x6f, 0x95, 0x48, 0x57, 0xa7, 0x6e, 0x10, 0x7e, 0xab, 0xa7, 0x5a, 0x9f, 0xf1,
0xc2, 0x8e, 0xfb, 0x1d, 0x36, 0xe5, 0x5a, 0xf6, 0x5e, 0xff, 0xfd, 0x6a, 0xe1, 0xcb, 0xeb, 0x68,
0xd6, 0xf2, 0xd8, 0xb2, 0xdd, 0xed, 0x7a, 0xb4, 0x9d, 0xfc, 0x79, 0xb7, 0xb5, 0xe1, 0xec, 0x89,
0xfe, 0x25, 0xef, 0xfe, 0x17, 0x00, 0x00, 0xff, 0xff, 0x13, 0xe5, 0x27, 0xe0, 0x11, 0x0c, 0x00,
0x00,
0x10, 0xd6, 0x87, 0x2d, 0x69, 0x58, 0x27, 0x71, 0x98, 0x34, 0x68, 0x85, 0x15, 0x05, 0x04, 0x0c,
0x1b, 0x30, 0xd4, 0x6e, 0xed, 0x35, 0x7b, 0xe9, 0x36, 0x20, 0x4e, 0x66, 0xc7, 0x58, 0xea, 0xa5,
0x91, 0xbb, 0x01, 0xfb, 0x46, 0xcb, 0x37, 0x47, 0x88, 0x4c, 0xca, 0x24, 0x15, 0xdb, 0x7f, 0x7a,
0xbf, 0x61, 0x20, 0x25, 0xea, 0xdd, 0x49, 0xfa, 0x4d, 0xbc, 0xbb, 0xe7, 0x78, 0x24, 0x9f, 0x7b,
0x4e, 0x68, 0x87, 0x87, 0x5e, 0x2b, 0xe4, 0x4c, 0x32, 0xfc, 0xa5, 0x5c, 0x87, 0x20, 0xec, 0x86,
0xc7, 0xe6, 0x73, 0x46, 0x63, 0xa3, 0x7d, 0x20, 0x39, 0xa1, 0x82, 0x78, 0xd2, 0x4f, 0x4d, 0xcd,
0x49, 0xc0, 0xbc, 0x5b, 0xef, 0x86, 0xf8, 0xc6, 0xd2, 0x58, 0x92, 0x20, 0x00, 0x99, 0xac, 0x76,
0xc2, 0x4e, 0x98, 0x7c, 0xee, 0x12, 0xcf, 0x63, 0x11, 0x35, 0x9e, 0x3d, 0x58, 0x81, 0x17, 0x49,
0xc6, 0xe3, 0x75, 0xe7, 0xbf, 0x63, 0xb4, 0xad, 0xf3, 0x74, 0xbb, 0xf8, 0x35, 0xda, 0x19, 0x80,
0xec, 0xa9, 0xd4, 0x02, 0x37, 0x5b, 0xba, 0x96, 0xd6, 0x35, 0x2c, 0x62, 0x8b, 0xdd, 0x48, 0x2d,
0x61, 0xb0, 0x76, 0x2c, 0xdc, 0x46, 0xbb, 0x03, 0x90, 0x97, 0x44, 0xc8, 0x0b, 0x20, 0x53, 0xe0,
0x78, 0x37, 0x83, 0x8c, 0xfc, 0xc0, 0x36, 0xcb, 0xd8, 0xeb, 0x58, 0xf8, 0x67, 0x74, 0x74, 0xc6,
0x81, 0x48, 0xb8, 0x26, 0xcb, 0x71, 0x76, 0x26, 0xbc, 0x9f, 0x04, 0xc6, 0xce, 0xf1, 0xca, 0x36,
0x86, 0x4f, 0x54, 0xf8, 0x33, 0x3a, 0x5e, 0x39, 0x16, 0x3e, 0x47, 0xcd, 0x0c, 0xbb, 0x1a, 0x70,
0x16, 0x85, 0xf8, 0x65, 0x11, 0x97, 0x65, 0xd4, 0xee, 0xba, 0x2c, 0xbf, 0xa1, 0xe6, 0xc7, 0x08,
0xf8, 0x3a, 0xbf, 0xfb, 0x5e, 0x56, 0xf5, 0x05, 0x11, 0x37, 0xf6, 0xf3, 0x64, 0x9d, 0x8b, 0x39,
0x07, 0x49, 0xfc, 0xc0, 0xb1, 0xf0, 0x3b, 0xb4, 0xef, 0x02, 0x9d, 0xe6, 0xe1, 0xb8, 0x1a, 0x5e,
0xb9, 0xa9, 0x5f, 0xd1, 0xd1, 0x00, 0x64, 0x2e, 0xa2, 0xb7, 0x3e, 0x9d, 0x4e, 0x79, 0x7e, 0x6b,
0xb5, 0xb6, 0x0f, 0xf3, 0xb8, 0xf1, 0x6a, 0x48, 0xff, 0x65, 0xc2, 0xb1, 0xf0, 0x00, 0x1d, 0x97,
0xe1, 0xaa, 0x52, 0x28, 0x3c, 0x52, 0x6c, 0xb1, 0x5f, 0x6c, 0xaa, 0x5e, 0x25, 0x7a, 0x8b, 0xd0,
0x00, 0xe4, 0x07, 0x98, 0x5f, 0x31, 0x16, 0x94, 0x9f, 0x0b, 0x17, 0x37, 0xbf, 0xf4, 0x85, 0xd4,
0x27, 0x7e, 0x3a, 0x00, 0x79, 0x1a, 0x73, 0x48, 0x94, 0x31, 0xcf, 0x92, 0xe5, 0xdf, 0x9a, 0x7c,
0x26, 0x4a, 0x3f, 0x35, 0x1a, 0xc1, 0x32, 0x31, 0xe0, 0xa3, 0x1c, 0x2a, 0xb5, 0xda, 0x47, 0x75,
0x60, 0xc7, 0xc2, 0xd7, 0xe8, 0x59, 0x6c, 0xca, 0x9d, 0x41, 0x55, 0x83, 0x5f, 0x65, 0x69, 0x6a,
0x03, 0xec, 0xe3, 0x42, 0xc6, 0xf1, 0x2a, 0x3b, 0x79, 0x1f, 0xed, 0x0e, 0xe7, 0x21, 0xe3, 0xf2,
0x8a, 0xfb, 0x77, 0xb7, 0xb0, 0x4e, 0xb9, 0x93, 0xe6, 0x2a, 0xb8, 0x37, 0xd6, 0xd6, 0x43, 0xbb,
0x9a, 0x00, 0x4c, 0xbd, 0x17, 0x08, 0x51, 0xcd, 0x53, 0x70, 0xdb, 0xcd, 0xfc, 0xa5, 0xaa, 0x27,
0x72, 0x2c, 0xdc, 0x41, 0x4f, 0x5c, 0x55, 0x5d, 0x1f, 0x00, 0x1f, 0x57, 0xe1, 0xb2, 0x0f, 0x50,
0x61, 0xd0, 0x7b, 0xb4, 0xed, 0xaa, 0x5e, 0x9b, 0x04, 0xf8, 0x79, 0x0d, 0xe4, 0x92, 0x4c, 0x20,
0xb8, 0xa7, 0xe8, 0xc6, 0x07, 0xe0, 0x33, 0xe8, 0x91, 0x80, 0x50, 0x0f, 0xf0, 0x57, 0xe5, 0x0c,
0x79, 0x6f, 0x91, 0x07, 0x31, 0xab, 0x1c, 0x0b, 0x9f, 0xa0, 0x1d, 0x17, 0xe4, 0x15, 0x11, 0x62,
0x39, 0xc5, 0x2f, 0x6a, 0x4a, 0x88, 0x5d, 0x95, 0xc2, 0xbf, 0x46, 0x5f, 0x5c, 0x32, 0xef, 0xb6,
0x4c, 0x9c, 0x72, 0xd8, 0x6b, 0xb4, 0xf5, 0x89, 0xea, 0xc0, 0xc3, 0xc2, 0x21, 0x62, 0x63, 0x8d,
0xf4, 0x28, 0x56, 0x5e, 0x01, 0x70, 0xd5, 0x23, 0xe5, 0xe4, 0xa6, 0xf1, 0x95, 0x3f, 0xa5, 0xf1,
0x5e, 0xa2, 0x55, 0x9f, 0xc5, 0xfe, 0x5f, 0x50, 0x43, 0xed, 0xc3, 0x59, 0x08, 0x5c, 0x3d, 0x57,
0xd6, 0xa0, 0x8b, 0xd4, 0x98, 0x36, 0x81, 0x86, 0xa6, 0x66, 0xc7, 0xc2, 0x3f, 0xa0, 0xfd, 0x01,
0xc8, 0xe4, 0x86, 0x24, 0x91, 0x51, 0xa5, 0x7f, 0x8a, 0x87, 0x8d, 0x63, 0x74, 0xf7, 0x34, 0x8d,
0x10, 0xff, 0x79, 0x07, 0xfc, 0xce, 0x87, 0x65, 0x45, 0xa6, 0xcc, 0x63, 0x17, 0xa2, 0x1c, 0x0b,
0xff, 0xa8, 0x37, 0x55, 0xfc, 0xab, 0x83, 0x16, 0x64, 0x26, 0x1f, 0xa4, 0xd5, 0xa1, 0x61, 0x76,
0x55, 0x3b, 0xe4, 0x6b, 0x1d, 0x52, 0x59, 0x4b, 0xe5, 0xb7, 0x68, 0x7b, 0x00, 0xd4, 0x05, 0x98,
0xa6, 0x3a, 0x98, 0xac, 0x2f, 0x09, 0x9d, 0x15, 0x21, 0xca, 0x6a, 0x20, 0xb2, 0x04, 0xd1, 0xeb,
0xde, 0xfa, 0x6a, 0x59, 0x0b, 0x69, 0xa3, 0x27, 0x2e, 0xb9, 0x03, 0x8d, 0x31, 0xb5, 0x1b, 0x83,
0x06, 0x95, 0xe9, 0xd1, 0xd1, 0x3a, 0x67, 0xe8, 0x7e, 0x90, 0x9b, 0x64, 0x09, 0xc7, 0x0d, 0x43,
0x72, 0x8a, 0xd5, 0x41, 0x48, 0x8f, 0x86, 0x33, 0x35, 0x0c, 0x53, 0xc5, 0xd2, 0xab, 0xdf, 0x93,
0x91, 0x59, 0xb7, 0x8f, 0xf2, 0xc5, 0xaf, 0xf7, 0x48, 0xcc, 0x09, 0xda, 0x8b, 0xf7, 0x61, 0x54,
0x00, 0x15, 0x91, 0x78, 0x24, 0xee, 0x27, 0x74, 0x50, 0x99, 0x73, 0xe9, 0xd1, 0xcc, 0xe4, 0x1c,
0xd2, 0xba, 0xa9, 0xf7, 0x46, 0x93, 0xff, 0x02, 0x56, 0xe3, 0x55, 0x3c, 0x39, 0x2a, 0x64, 0x6a,
0xa4, 0xa3, 0x7a, 0xa5, 0x11, 0xef, 0xd0, 0xd3, 0xf3, 0x68, 0x1e, 0x1a, 0xb1, 0xcc, 0x8d, 0x19,
0x57, 0x72, 0x9f, 0xce, 0x8a, 0xed, 0x12, 0xdb, 0x1c, 0x0b, 0xb7, 0xd0, 0xf6, 0x5f, 0xc0, 0x85,
0xaa, 0x6c, 0x43, 0x7b, 0x25, 0x6e, 0xd5, 0xb5, 0x8e, 0x85, 0xbf, 0x41, 0x5b, 0x43, 0xe1, 0xae,
0xa9, 0xf7, 0x90, 0x3c, 0xb4, 0xd1, 0xde, 0x50, 0x8c, 0x64, 0x78, 0xa6, 0xc8, 0xf9, 0x18, 0x40,
0x0b, 0x6d, 0x8f, 0x40, 0xd6, 0x89, 0x83, 0xa9, 0x64, 0xc4, 0xa6, 0x90, 0x84, 0xe8, 0x2b, 0x52,
0x5d, 0xd3, 0x27, 0x92, 0x04, 0x7d, 0xe2, 0x07, 0x11, 0x87, 0x4d, 0x3b, 0x0c, 0xa9, 0xec, 0x76,
0xf4, 0x15, 0x1d, 0x25, 0x8a, 0xa2, 0x3b, 0xc6, 0x85, 0x45, 0x04, 0x8a, 0x6d, 0x9b, 0x61, 0x27,
0xdf, 0x3b, 0x16, 0xee, 0xa2, 0x03, 0x4d, 0xf7, 0x38, 0xfa, 0x81, 0xe7, 0x30, 0xa0, 0xf7, 0x99,
0x1e, 0xdc, 0x33, 0xfa, 0x0f, 0xf3, 0x8a, 0x90, 0x8d, 0xbe, 0x37, 0xfa, 0x37, 0x2d, 0x01, 0xbb,
0xb0, 0xc0, 0x85, 0xec, 0x29, 0x5f, 0xcc, 0x29, 0x1c, 0x0b, 0x7f, 0x87, 0xd0, 0x59, 0xc0, 0x04,
0x7c, 0x8c, 0x20, 0x82, 0x87, 0x6e, 0xba, 0xaf, 0x0f, 0x74, 0x1a, 0x04, 0x8a, 0xb9, 0xa6, 0xe5,
0x72, 0x33, 0xaa, 0xe8, 0x49, 0xc5, 0xb2, 0x68, 0xd6, 0xfc, 0xde, 0x71, 0xfd, 0x19, 0xd5, 0xbf,
0x77, 0x79, 0x9d, 0x4d, 0x8d, 0x45, 0x9d, 0x4d, 0xcd, 0x8e, 0x85, 0x87, 0xc8, 0x8e, 0x1b, 0x60,
0xc4, 0x92, 0x7c, 0x75, 0x3f, 0x68, 0x99, 0xf3, 0x9e, 0x54, 0x27, 0xa8, 0xa1, 0xbb, 0xf3, 0x9a,
0xd0, 0xe9, 0x28, 0x9a, 0xe3, 0x8c, 0xe7, 0x0b, 0x65, 0xd2, 0xaf, 0x53, 0x27, 0x84, 0xdf, 0x6a,
0x55, 0xeb, 0x33, 0x5e, 0x98, 0x74, 0x7f, 0xc0, 0xba, 0xfc, 0x96, 0xbd, 0x57, 0xff, 0xbc, 0x9c,
0xf9, 0xf2, 0x26, 0x9a, 0xb4, 0x3c, 0x36, 0x6f, 0x77, 0xbb, 0x1e, 0x6d, 0x27, 0xff, 0xdf, 0x6d,
0x1d, 0x38, 0xd9, 0xd2, 0x3f, 0xe6, 0xdd, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x17, 0x59, 0x3a,
0x90, 0x17, 0x0c, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
......@@ -154,7 +154,7 @@ type Chain33Client interface {
//获取最新的Mempool
GetLastMemPool(ctx context.Context, in *ReqNil, opts ...grpc.CallOption) (*ReplyTxList, error)
//获取最新的ProperFee
GetProperFee(ctx context.Context, in *ReqNil, opts ...grpc.CallOption) (*ReplyProperFee, error)
GetProperFee(ctx context.Context, in *ReqProperFee, opts ...grpc.CallOption) (*ReplyProperFee, error)
// 获取钱包状态
GetWalletStatus(ctx context.Context, in *ReqNil, opts ...grpc.CallOption) (*WalletStatus, error)
//区块浏览器接口
......@@ -416,7 +416,7 @@ func (c *chain33Client) GetLastMemPool(ctx context.Context, in *ReqNil, opts ...
return out, nil
}
func (c *chain33Client) GetProperFee(ctx context.Context, in *ReqNil, opts ...grpc.CallOption) (*ReplyProperFee, error) {
func (c *chain33Client) GetProperFee(ctx context.Context, in *ReqProperFee, opts ...grpc.CallOption) (*ReplyProperFee, error) {
out := new(ReplyProperFee)
err := c.cc.Invoke(ctx, "/types.chain33/GetProperFee", in, out, opts...)
if err != nil {
......@@ -734,7 +734,7 @@ type Chain33Server interface {
//获取最新的Mempool
GetLastMemPool(context.Context, *ReqNil) (*ReplyTxList, error)
//获取最新的ProperFee
GetProperFee(context.Context, *ReqNil) (*ReplyProperFee, error)
GetProperFee(context.Context, *ReqProperFee) (*ReplyProperFee, error)
// 获取钱包状态
GetWalletStatus(context.Context, *ReqNil) (*WalletStatus, error)
//区块浏览器接口
......@@ -1191,7 +1191,7 @@ func _Chain33_GetLastMemPool_Handler(srv interface{}, ctx context.Context, dec f
}
func _Chain33_GetProperFee_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(ReqNil)
in := new(ReqProperFee)
if err := dec(in); err != nil {
return nil, err
}
......@@ -1203,7 +1203,7 @@ func _Chain33_GetProperFee_Handler(srv interface{}, ctx context.Context, dec fun
FullMethod: "/types.chain33/GetProperFee",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(Chain33Server).GetProperFee(ctx, req.(*ReqNil))
return srv.(Chain33Server).GetProperFee(ctx, req.(*ReqProperFee))
}
return interceptor(ctx, in, info, handler)
}
......
vendor/github.com/33cn/chain33/types/transaction.pb.go
View file @ 33f71495
......@@ -1322,6 +1322,53 @@ func (m *ReplyTxList) GetTxs() []*Transaction {
return nil
}
type ReqProperFee struct {
TxCount int32 `protobuf:"varint,1,opt,name=txCount,proto3" json:"txCount,omitempty"`
TxSize int32 `protobuf:"varint,2,opt,name=txSize,proto3" json:"txSize,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReqProperFee) Reset() { *m = ReqProperFee{} }
func (m *ReqProperFee) String() string { return proto.CompactTextString(m) }
func (*ReqProperFee) ProtoMessage() {}
func (*ReqProperFee) Descriptor() ([]byte, []int) {
return fileDescriptor_2cc4e03d2c28c490, []int{22}
}
func (m *ReqProperFee) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReqProperFee.Unmarshal(m, b)
}
func (m *ReqProperFee) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReqProperFee.Marshal(b, m, deterministic)
}
func (m *ReqProperFee) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReqProperFee.Merge(m, src)
}
func (m *ReqProperFee) XXX_Size() int {
return xxx_messageInfo_ReqProperFee.Size(m)
}
func (m *ReqProperFee) XXX_DiscardUnknown() {
xxx_messageInfo_ReqProperFee.DiscardUnknown(m)
}
var xxx_messageInfo_ReqProperFee proto.InternalMessageInfo
func (m *ReqProperFee) GetTxCount() int32 {
if m != nil {
return m.TxCount
}
return 0
}
func (m *ReqProperFee) GetTxSize() int32 {
if m != nil {
return m.TxSize
}
return 0
}
type ReplyProperFee struct {
ProperFee int64 `protobuf:"varint,1,opt,name=properFee,proto3" json:"properFee,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
......@@ -1333,7 +1380,7 @@ func (m *ReplyProperFee) Reset() { *m = ReplyProperFee{} }
func (m *ReplyProperFee) String() string { return proto.CompactTextString(m) }
func (*ReplyProperFee) ProtoMessage() {}
func (*ReplyProperFee) Descriptor() ([]byte, []int) {
return fileDescriptor_2cc4e03d2c28c490, []int{22}
return fileDescriptor_2cc4e03d2c28c490, []int{23}
}
func (m *ReplyProperFee) XXX_Unmarshal(b []byte) error {
......@@ -1374,7 +1421,7 @@ func (m *TxHashList) Reset() { *m = TxHashList{} }
func (m *TxHashList) String() string { return proto.CompactTextString(m) }
func (*TxHashList) ProtoMessage() {}
func (*TxHashList) Descriptor() ([]byte, []int) {
return fileDescriptor_2cc4e03d2c28c490, []int{23}
return fileDescriptor_2cc4e03d2c28c490, []int{24}
}
func (m *TxHashList) XXX_Unmarshal(b []byte) error {
......@@ -1427,7 +1474,7 @@ func (m *ReplyTxInfos) Reset() { *m = ReplyTxInfos{} }
func (m *ReplyTxInfos) String() string { return proto.CompactTextString(m) }
func (*ReplyTxInfos) ProtoMessage() {}
func (*ReplyTxInfos) Descriptor() ([]byte, []int) {
return fileDescriptor_2cc4e03d2c28c490, []int{24}
return fileDescriptor_2cc4e03d2c28c490, []int{25}
}
func (m *ReplyTxInfos) XXX_Unmarshal(b []byte) error {
......@@ -1467,7 +1514,7 @@ func (m *ReceiptLog) Reset() { *m = ReceiptLog{} }
func (m *ReceiptLog) String() string { return proto.CompactTextString(m) }
func (*ReceiptLog) ProtoMessage() {}
func (*ReceiptLog) Descriptor() ([]byte, []int) {
return fileDescriptor_2cc4e03d2c28c490, []int{25}
return fileDescriptor_2cc4e03d2c28c490, []int{26}
}
func (m *ReceiptLog) XXX_Unmarshal(b []byte) error {
......@@ -1518,7 +1565,7 @@ func (m *Receipt) Reset() { *m = Receipt{} }
func (m *Receipt) String() string { return proto.CompactTextString(m) }
func (*Receipt) ProtoMessage() {}
func (*Receipt) Descriptor() ([]byte, []int) {
return fileDescriptor_2cc4e03d2c28c490, []int{26}
return fileDescriptor_2cc4e03d2c28c490, []int{27}
}
func (m *Receipt) XXX_Unmarshal(b []byte) error {
......@@ -1572,7 +1619,7 @@ func (m *ReceiptData) Reset() { *m = ReceiptData{} }
func (m *ReceiptData) String() string { return proto.CompactTextString(m) }
func (*ReceiptData) ProtoMessage() {}
func (*ReceiptData) Descriptor() ([]byte, []int) {
return fileDescriptor_2cc4e03d2c28c490, []int{27}
return fileDescriptor_2cc4e03d2c28c490, []int{28}
}
func (m *ReceiptData) XXX_Unmarshal(b []byte) error {
......@@ -1623,7 +1670,7 @@ func (m *TxResult) Reset() { *m = TxResult{} }
func (m *TxResult) String() string { return proto.CompactTextString(m) }
func (*TxResult) ProtoMessage() {}
func (*TxResult) Descriptor() ([]byte, []int) {
return fileDescriptor_2cc4e03d2c28c490, []int{28}
return fileDescriptor_2cc4e03d2c28c490, []int{29}
}
func (m *TxResult) XXX_Unmarshal(b []byte) error {
......@@ -1706,7 +1753,7 @@ func (m *TransactionDetail) Reset() { *m = TransactionDetail{} }
func (m *TransactionDetail) String() string { return proto.CompactTextString(m) }
func (*TransactionDetail) ProtoMessage() {}
func (*TransactionDetail) Descriptor() ([]byte, []int) {
return fileDescriptor_2cc4e03d2c28c490, []int{29}
return fileDescriptor_2cc4e03d2c28c490, []int{30}
}
func (m *TransactionDetail) XXX_Unmarshal(b []byte) error {
......@@ -1808,7 +1855,7 @@ func (m *TransactionDetails) Reset() { *m = TransactionDetails{} }
func (m *TransactionDetails) String() string { return proto.CompactTextString(m) }
func (*TransactionDetails) ProtoMessage() {}
func (*TransactionDetails) Descriptor() ([]byte, []int) {
return fileDescriptor_2cc4e03d2c28c490, []int{30}
return fileDescriptor_2cc4e03d2c28c490, []int{31}
}
func (m *TransactionDetails) XXX_Unmarshal(b []byte) error {
......@@ -1847,7 +1894,7 @@ func (m *ReqAddrs) Reset() { *m = ReqAddrs{} }
func (m *ReqAddrs) String() string { return proto.CompactTextString(m) }
func (*ReqAddrs) ProtoMessage() {}
func (*ReqAddrs) Descriptor() ([]byte, []int) {
return fileDescriptor_2cc4e03d2c28c490, []int{31}
return fileDescriptor_2cc4e03d2c28c490, []int{32}
}
func (m *ReqAddrs) XXX_Unmarshal(b []byte) error {
......@@ -1886,7 +1933,7 @@ func (m *ReqDecodeRawTransaction) Reset() { *m = ReqDecodeRawTransaction
func (m *ReqDecodeRawTransaction) String() string { return proto.CompactTextString(m) }
func (*ReqDecodeRawTransaction) ProtoMessage() {}
func (*ReqDecodeRawTransaction) Descriptor() ([]byte, []int) {
return fileDescriptor_2cc4e03d2c28c490, []int{32}
return fileDescriptor_2cc4e03d2c28c490, []int{33}
}
func (m *ReqDecodeRawTransaction) XXX_Unmarshal(b []byte) error {
......@@ -1926,7 +1973,7 @@ func (m *UserWrite) Reset() { *m = UserWrite{} }
func (m *UserWrite) String() string { return proto.CompactTextString(m) }
func (*UserWrite) ProtoMessage() {}
func (*UserWrite) Descriptor() ([]byte, []int) {
return fileDescriptor_2cc4e03d2c28c490, []int{33}
return fileDescriptor_2cc4e03d2c28c490, []int{34}
}
func (m *UserWrite) XXX_Unmarshal(b []byte) error {
......@@ -1974,7 +2021,7 @@ func (m *UpgradeMeta) Reset() { *m = UpgradeMeta{} }
func (m *UpgradeMeta) String() string { return proto.CompactTextString(m) }
func (*UpgradeMeta) ProtoMessage() {}
func (*UpgradeMeta) Descriptor() ([]byte, []int) {
return fileDescriptor_2cc4e03d2c28c490, []int{34}
return fileDescriptor_2cc4e03d2c28c490, []int{35}
}
func (m *UpgradeMeta) XXX_Unmarshal(b []byte) error {
......@@ -2029,7 +2076,7 @@ func (m *ReqTxHashList) Reset() { *m = ReqTxHashList{} }
func (m *ReqTxHashList) String() string { return proto.CompactTextString(m) }
func (*ReqTxHashList) ProtoMessage() {}
func (*ReqTxHashList) Descriptor() ([]byte, []int) {
return fileDescriptor_2cc4e03d2c28c490, []int{35}
return fileDescriptor_2cc4e03d2c28c490, []int{36}
}
func (m *ReqTxHashList) XXX_Unmarshal(b []byte) error {
......@@ -2087,6 +2134,7 @@ func init() {
proto.RegisterType((*ReplyTxInfo)(nil), "types.ReplyTxInfo")
proto.RegisterType((*ReqTxList)(nil), "types.ReqTxList")
proto.RegisterType((*ReplyTxList)(nil), "types.ReplyTxList")
proto.RegisterType((*ReqProperFee)(nil), "types.ReqProperFee")
proto.RegisterType((*ReplyProperFee)(nil), "types.ReplyProperFee")
proto.RegisterType((*TxHashList)(nil), "types.TxHashList")
proto.RegisterType((*ReplyTxInfos)(nil), "types.ReplyTxInfos")
......@@ -2106,90 +2154,91 @@ func init() {
func init() { proto.RegisterFile("transaction.proto", fileDescriptor_2cc4e03d2c28c490) }
var fileDescriptor_2cc4e03d2c28c490 = []byte{
// 1351 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xdd, 0x8e, 0x13, 0xc7,
0x12, 0x96, 0x3d, 0x1e, 0xaf, 0x5d, 0xf6, 0x72, 0xd8, 0xd1, 0x0a, 0x2c, 0x74, 0x0e, 0xf8, 0x8c,
0x88, 0x84, 0x10, 0xf2, 0x4a, 0xbb, 0xdc, 0x25, 0x52, 0x02, 0x6c, 0x02, 0xab, 0x05, 0x42, 0x1a,
0x03, 0x51, 0x92, 0x9b, 0xde, 0x71, 0xad, 0x3d, 0xc1, 0x9e, 0xf6, 0xf6, 0xb4, 0x97, 0xf1, 0x0b,
0xe4, 0x26, 0xb9, 0xcb, 0x23, 0xe5, 0x05, 0xf2, 0x18, 0x79, 0x8c, 0xa8, 0xab, 0xbb, 0x67, 0xda,
0x6b, 0x1b, 0x71, 0x11, 0x29, 0x77, 0x5d, 0xd5, 0xe5, 0xaa, 0xaf, 0xbe, 0xfa, 0x99, 0x36, 0xec,
0x29, 0xc9, 0xb3, 0x9c, 0x27, 0x2a, 0x15, 0xd9, 0x60, 0x2e, 0x85, 0x12, 0x51, 0xa8, 0x96, 0x73,
0xcc, 0x6f, 0x75, 0x13, 0x31, 0x9b, 0x39, 0x65, 0xfc, 0x02, 0x76, 0x1f, 0xe5, 0x39, 0xaa, 0xfc,
0x29, 0x66, 0x98, 0xa7, 0x79, 0x74, 0x03, 0x9a, 0x7c, 0x26, 0x16, 0x99, 0xea, 0xd5, 0xfb, 0xb5,
0x7b, 0x01, 0xb3, 0x52, 0x74, 0x17, 0x76, 0x25, 0xaa, 0x85, 0xcc, 0x1e, 0x8d, 0x46, 0x12, 0xf3,
0xbc, 0x17, 0xf4, 0x6b, 0xf7, 0xda, 0x6c, 0x55, 0x19, 0xff, 0x56, 0x83, 0x7d, 0xe3, 0x6f, 0xa8,
0xe3, 0x9f, 0xa3, 0x1c, 0x8a, 0xaf, 0x0b, 0x4c, 0xa2, 0xff, 0x42, 0x3b, 0x11, 0x69, 0xa6, 0xc4,
0x7b, 0xcc, 0x7a, 0x35, 0xfa, 0x69, 0xa5, 0xd8, 0x1a, 0x34, 0x82, 0x46, 0x26, 0x14, 0x52, 0xac,
0x2e, 0xa3, 0x73, 0x74, 0x0b, 0x5a, 0x58, 0x60, 0xf2, 0x92, 0xcf, 0xb0, 0xd7, 0x20, 0x47, 0xa5,
0x1c, 0x5d, 0x83, 0xba, 0x12, 0xbd, 0x90, 0xb4, 0x75, 0x25, 0xe2, 0x5f, 0x6a, 0x70, 0xcd, 0xc0,
0x79, 0x97, 0xaa, 0xc9, 0x48, 0xf2, 0x0f, 0xff, 0x12, 0x90, 0x9f, 0x1d, 0x0e, 0x47, 0xcb, 0x3f,
0x88, 0xc3, 0xc4, 0x6a, 0x94, 0xb1, 0x4e, 0x21, 0xa4, 0x58, 0xda, 0x58, 0x03, 0xb2, 0xde, 0xe9,
0xac, 0x1d, 0xe7, 0xcb, 0xd9, 0x99, 0x98, 0x92, 0xe3, 0x36, 0xb3, 0x92, 0x17, 0x30, 0xf0, 0x03,
0xc6, 0x7f, 0xd5, 0xa0, 0xf5, 0x44, 0x22, 0x57, 0x38, 0x2c, 0x6c, 0xa4, 0x9a, 0x8b, 0xb4, 0x15,
0xe5, 0x75, 0x08, 0xce, 0x11, 0xad, 0x27, 0x7d, 0x2c, 0x71, 0x37, 0x3c, 0xdc, 0xb7, 0x01, 0xd2,
0xb2, 0x2e, 0xc4, 0x55, 0x8b, 0x79, 0x9a, 0xa8, 0x07, 0x3b, 0x69, 0x3e, 0x24, 0x7e, 0x9a, 0x74,
0xe9, 0xc4, 0xa8, 0x0f, 0x1d, 0xa2, 0xe9, 0xb5, 0xc9, 0x64, 0x87, 0x00, 0xf9, 0xaa, 0x95, 0xda,
0xb4, 0xae, 0xd4, 0xe6, 0x06, 0x34, 0xf5, 0x19, 0x65, 0xaf, 0x6d, 0x28, 0x30, 0x52, 0x9c, 0x41,
0x97, 0xe1, 0x3b, 0x99, 0x2a, 0x64, 0xfc, 0x83, 0xcd, 0xb6, 0x28, 0xb3, 0x75, 0xd9, 0x07, 0x7e,
0xf6, 0x58, 0xcc, 0x53, 0xe9, 0xaa, 0x6f, 0x25, 0x97, 0x7d, 0x58, 0x65, 0xbf, 0x0f, 0x61, 0x9a,
0x8d, 0xb0, 0xa0, 0x3c, 0x42, 0x66, 0x84, 0xf8, 0x3e, 0xdc, 0xb0, 0xcc, 0x56, 0xa3, 0xfa, 0x54,
0x8a, 0xc5, 0x5c, 0x7b, 0x50, 0x45, 0xde, 0xab, 0xf5, 0x83, 0x7b, 0x6d, 0xa6, 0x8f, 0xf1, 0x6d,
0x68, 0xbd, 0xc9, 0xf2, 0x74, 0x9c, 0x0d, 0x0b, 0xcd, 0xe5, 0x88, 0x2b, 0x4e, 0xc8, 0xba, 0x8c,
0xce, 0xb1, 0x80, 0xce, 0x4b, 0xf1, 0x98, 0x4f, 0x79, 0x96, 0xe8, 0x42, 0xed, 0x43, 0xa8, 0x8a,
0x67, 0xe8, 0xd0, 0x1b, 0x41, 0x13, 0x3a, 0xe7, 0x4b, 0x3d, 0xaa, 0xb6, 0xf8, 0x4e, 0xa4, 0x1b,
0x99, 0x5e, 0xbe, 0xc7, 0xa5, 0xcd, 0xcf, 0x89, 0xdb, 0x92, 0x8c, 0x7f, 0xad, 0x43, 0xc7, 0xc3,
0xed, 0x91, 0x6a, 0x60, 0x59, 0xc9, 0xc6, 0x9c, 0x0a, 0x3e, 0xa2, 0x98, 0x5d, 0xe6, 0xc4, 0x68,
0x00, 0x6d, 0x9d, 0x10, 0x57, 0x0b, 0x69, 0x5a, 0xa5, 0x73, 0x78, 0x7d, 0x40, 0x2b, 0x6a, 0xf0,
0xda, 0xe9, 0x59, 0x65, 0xe2, 0x68, 0x6d, 0x54, 0xb4, 0x56, 0xd8, 0x0c, 0xd7, 0xae, 0x00, 0xfb,
0x10, 0x66, 0x22, 0x4b, 0x90, 0xe8, 0x0e, 0x98, 0x11, 0x6c, 0xf9, 0x76, 0xca, 0xf2, 0xdd, 0x06,
0x18, 0x6b, 0xb6, 0x9f, 0x50, 0x03, 0xb7, 0xa8, 0x32, 0x9e, 0x46, 0x7b, 0x9f, 0x20, 0x1f, 0xd9,
0x36, 0xe9, 0x32, 0x2b, 0x51, 0x2b, 0x63, 0xa1, 0x7a, 0x60, 0x5b, 0x19, 0x0b, 0x15, 0x3f, 0x84,
0xae, 0x47, 0x46, 0x1e, 0xdd, 0xad, 0x0a, 0xd8, 0x39, 0x8c, 0x6c, 0x56, 0x9e, 0x85, 0x29, 0xea,
0x97, 0xb0, 0xcb, 0xd2, 0x6c, 0x5c, 0x66, 0x1b, 0x0d, 0x20, 0x4c, 0x15, 0xce, 0xdc, 0x0f, 0x7b,
0xf6, 0x87, 0x2b, 0x46, 0x27, 0x0a, 0x67, 0xcc, 0x98, 0xc5, 0x27, 0xb0, 0xb7, 0x76, 0xa7, 0x71,
0xcf, 0x17, 0x67, 0xba, 0x94, 0xda, 0x4b, 0x97, 0x59, 0x49, 0x2f, 0x9c, 0x8a, 0xef, 0x3a, 0x5d,
0x55, 0x8a, 0xf8, 0x3b, 0x68, 0x57, 0x38, 0x34, 0x55, 0x4b, 0x2a, 0x64, 0xc8, 0xea, 0x6a, 0xe9,
0xb9, 0x34, 0x35, 0xdc, 0xe8, 0xd2, 0xac, 0x24, 0xcf, 0xe5, 0x4f, 0xd0, 0xd5, 0xcd, 0xf5, 0xed,
0x25, 0xca, 0xcb, 0x14, 0x69, 0x9e, 0x25, 0x26, 0xe9, 0xa5, 0xed, 0x91, 0x80, 0x39, 0x51, 0xdf,
0x9c, 0x99, 0xde, 0xb5, 0x8b, 0xc4, 0x89, 0xfa, 0x46, 0x15, 0x4f, 0xbc, 0xbd, 0xe4, 0xc4, 0xf8,
0xf7, 0x1a, 0xec, 0x30, 0xbc, 0xa0, 0xf6, 0x8d, 0xa0, 0xc1, 0x75, 0x57, 0xdb, 0x45, 0xc7, 0xad,
0xee, 0x7c, 0xca, 0xc7, 0xe4, 0x30, 0x64, 0x74, 0xd6, 0x8d, 0x91, 0x94, 0xbe, 0x42, 0x66, 0x04,
0x9d, 0xc5, 0x28, 0x95, 0x48, 0x85, 0xa1, 0xf6, 0x0a, 0x59, 0xa5, 0x30, 0x6d, 0x90, 0x8e, 0x27,
0xca, 0x35, 0x99, 0x91, 0x56, 0x67, 0x3a, 0x70, 0x33, 0xfd, 0x3d, 0x00, 0xc3, 0x8b, 0x57, 0x32,
0xbd, 0xe4, 0xc9, 0xb2, 0x8a, 0x57, 0xdb, 0x1a, 0xaf, 0xbe, 0x3d, 0x5e, 0xe0, 0xc7, 0x8b, 0x6f,
0x42, 0xf8, 0x0c, 0x8b, 0xf5, 0xb5, 0x14, 0x2f, 0xa0, 0xc3, 0x70, 0x3e, 0x5d, 0x0e, 0x8b, 0x93,
0xec, 0x5c, 0xe8, 0xbc, 0x27, 0x3c, 0x9f, 0xb8, 0xed, 0xa0, 0xcf, 0x9e, 0xcf, 0xfa, 0xe6, 0x1c,
0x02, 0x2f, 0x87, 0xe8, 0x2e, 0x34, 0x39, 0x7d, 0xab, 0x7a, 0x0d, 0x6a, 0xc3, 0xae, 0x6d, 0x43,
0xfa, 0xa8, 0x30, 0x7b, 0x17, 0xff, 0x1f, 0xda, 0x0c, 0x2f, 0x86, 0xc5, 0xf3, 0x34, 0x57, 0xab,
0x89, 0x06, 0x36, 0xd1, 0xf8, 0xa8, 0x44, 0x46, 0x46, 0x9f, 0x36, 0x14, 0x03, 0xb8, 0x46, 0x3f,
0x7a, 0x25, 0xc5, 0x1c, 0xe5, 0x37, 0x88, 0x9a, 0xaf, 0xb9, 0x13, 0x6c, 0x80, 0x4a, 0x11, 0x33,
0x80, 0x61, 0xf1, 0x8c, 0xe7, 0x13, 0x8a, 0xa1, 0x33, 0xe5, 0xf9, 0x04, 0x73, 0xd7, 0xfc, 0x46,
0xaa, 0x00, 0xd6, 0x3d, 0x80, 0xde, 0x02, 0x09, 0xfa, 0x41, 0xb5, 0x40, 0xe2, 0x2f, 0xf4, 0x97,
0xa0, 0xa4, 0x34, 0x8f, 0x1e, 0xe8, 0x2e, 0xa4, 0xe3, 0x15, 0xf4, 0x9e, 0x15, 0x73, 0x26, 0xf1,
0x40, 0xf7, 0x40, 0x82, 0xe9, 0x5c, 0x3d, 0x17, 0xe3, 0xb5, 0x59, 0xba, 0x0e, 0xc1, 0x54, 0x8c,
0xed, 0x20, 0xe9, 0x63, 0xcc, 0x75, 0x23, 0x93, 0xfd, 0x9a, 0xf1, 0x1d, 0xa8, 0x9f, 0xbe, 0xa5,
0x61, 0xed, 0x1c, 0xfe, 0xc7, 0xc6, 0x3c, 0xc5, 0xe5, 0x5b, 0x3e, 0x5d, 0x20, 0xab, 0x9f, 0xbe,
0x8d, 0x3e, 0x83, 0xc6, 0x54, 0x8c, 0x73, 0xc2, 0xdf, 0x39, 0xdc, 0x2b, 0x61, 0xb9, 0xf0, 0x8c,
0xae, 0xe3, 0x63, 0x5d, 0x09, 0xd2, 0x1d, 0x73, 0xc5, 0xd7, 0xc2, 0x7c, 0xa2, 0x97, 0x3f, 0x6b,
0xd0, 0x1a, 0x16, 0x0c, 0xf3, 0xc5, 0x54, 0x79, 0x3d, 0x55, 0xdb, 0xdc, 0x53, 0x75, 0xef, 0x5b,
0x17, 0xc5, 0xd4, 0xb4, 0x66, 0xcb, 0x6f, 0x2a, 0xbd, 0xfe, 0xbe, 0x3e, 0x84, 0x8e, 0x34, 0x21,
0x47, 0xdc, 0x3e, 0x15, 0x7c, 0xa6, 0x4b, 0xf8, 0xcc, 0x37, 0xd3, 0xdd, 0x71, 0x36, 0x15, 0xc9,
0x7b, 0x95, 0xce, 0xdc, 0x77, 0xa0, 0x52, 0xe8, 0x25, 0x6f, 0x22, 0xd0, 0x4b, 0xa0, 0x49, 0x43,
0xe3, 0x69, 0xe2, 0x3f, 0xea, 0xb0, 0xe7, 0xe1, 0x38, 0x46, 0xc5, 0xd3, 0xa9, 0x45, 0x5b, 0xfb,
0x28, 0xda, 0x07, 0xb4, 0xcd, 0x34, 0x0c, 0xca, 0x74, 0x33, 0x52, 0x67, 0x42, 0x1b, 0x54, 0x0a,
0x71, 0x6e, 0x38, 0xd6, 0x1b, 0x94, 0x24, 0x8f, 0xc5, 0xc6, 0x66, 0x16, 0x43, 0x7f, 0x32, 0x57,
0x72, 0x6d, 0x5e, 0xcd, 0xb5, 0x7a, 0x8d, 0xed, 0xac, 0xbc, 0xc6, 0x6e, 0x41, 0xeb, 0x5c, 0x8a,
0x19, 0x6d, 0x48, 0xfb, 0x16, 0x72, 0xf2, 0x15, 0x7e, 0xda, 0x57, 0xf9, 0xf1, 0x76, 0x01, 0x7c,
0x64, 0x17, 0x7c, 0x05, 0xd1, 0x1a, 0x89, 0x79, 0x74, 0xdf, 0x9f, 0xf7, 0xde, 0x3a, 0x8d, 0xc6,
0xce, 0x4c, 0x7d, 0x1f, 0x5a, 0x76, 0x99, 0xd3, 0xac, 0x6a, 0x6c, 0xee, 0xfd, 0x63, 0x84, 0xf8,
0x00, 0x6e, 0x32, 0xbc, 0x38, 0xc6, 0x44, 0x8c, 0xe8, 0x7d, 0xe6, 0xbd, 0x3d, 0x36, 0xbe, 0x76,
0xe2, 0xcf, 0xa1, 0xfd, 0x26, 0x47, 0x49, 0x0f, 0x3a, 0x32, 0x11, 0xf3, 0x34, 0x29, 0x4d, 0xb4,
0xa0, 0xbf, 0x2e, 0x89, 0xc8, 0x14, 0xda, 0xbd, 0xd0, 0x66, 0x4e, 0x8c, 0x7f, 0x84, 0xce, 0x9b,
0xf9, 0x58, 0xf2, 0x11, 0xbe, 0x40, 0xc5, 0x35, 0x85, 0xb9, 0xe2, 0x52, 0xa5, 0xd9, 0x98, 0x3c,
0xb4, 0x58, 0x29, 0x6b, 0x27, 0x97, 0x28, 0x73, 0xb7, 0xcc, 0xdb, 0xcc, 0x89, 0x5b, 0x57, 0xf9,
0x09, 0xec, 0xd2, 0xea, 0xdc, 0xb2, 0xb5, 0xda, 0xe5, 0xd6, 0xea, 0x43, 0x27, 0xcd, 0x5f, 0x4f,
0x84, 0x54, 0xda, 0x94, 0xdc, 0xb7, 0x98, 0xaf, 0x7a, 0x7c, 0xe7, 0x87, 0xff, 0x8d, 0x53, 0x35,
0x59, 0x9c, 0x0d, 0x12, 0x31, 0x3b, 0x38, 0x3a, 0x4a, 0xb2, 0x83, 0x64, 0xc2, 0xd3, 0xec, 0xe8,
0xe8, 0x80, 0xf8, 0x3e, 0x6b, 0xd2, 0xdf, 0xbc, 0xa3, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x09,
0x74, 0x67, 0x46, 0x10, 0x0e, 0x00, 0x00,
// 1374 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcd, 0x6e, 0x1b, 0xb7,
0x16, 0x86, 0x34, 0x1a, 0x5b, 0x73, 0x24, 0xe7, 0xc6, 0x03, 0x23, 0x11, 0x82, 0xdc, 0xc4, 0x97,
0xc8, 0x05, 0x82, 0x20, 0x90, 0x01, 0x3b, 0xbb, 0x7b, 0x81, 0xe6, 0xc7, 0x6d, 0x62, 0x38, 0x49,
0x53, 0x5a, 0x49, 0x8a, 0xb6, 0x1b, 0x7a, 0x44, 0x4b, 0x6c, 0xa4, 0xa1, 0xcc, 0xa1, 0x9c, 0x51,
0x1f, 0xa0, 0x9b, 0x76, 0xd7, 0x47, 0xea, 0x0b, 0xf4, 0x31, 0xfa, 0x18, 0x05, 0x0f, 0xc9, 0x19,
0xca, 0x96, 0x82, 0x2c, 0x0a, 0x74, 0xc7, 0xef, 0xcc, 0xd1, 0xf9, 0xf9, 0xce, 0x0f, 0x29, 0xd8,
0xd6, 0x8a, 0xe5, 0x05, 0xcb, 0xb4, 0x90, 0x79, 0x7f, 0xa6, 0xa4, 0x96, 0x69, 0xac, 0x17, 0x33,
0x5e, 0xdc, 0xea, 0x66, 0x72, 0x3a, 0xf5, 0x42, 0xf2, 0x0a, 0xb6, 0x9e, 0x14, 0x05, 0xd7, 0xc5,
0x73, 0x9e, 0xf3, 0x42, 0x14, 0xe9, 0x0d, 0xd8, 0x60, 0x53, 0x39, 0xcf, 0x75, 0xaf, 0xb9, 0xdb,
0xb8, 0x1f, 0x51, 0x87, 0xd2, 0x7b, 0xb0, 0xa5, 0xb8, 0x9e, 0xab, 0xfc, 0xc9, 0x70, 0xa8, 0x78,
0x51, 0xf4, 0xa2, 0xdd, 0xc6, 0xfd, 0x84, 0x2e, 0x0b, 0xc9, 0xaf, 0x0d, 0xd8, 0xb1, 0xf6, 0x06,
0xc6, 0xff, 0x19, 0x57, 0x03, 0xf9, 0x65, 0xc9, 0xb3, 0xf4, 0x36, 0x24, 0x99, 0x14, 0xb9, 0x96,
0x1f, 0x78, 0xde, 0x6b, 0xe0, 0x4f, 0x6b, 0xc1, 0x5a, 0xa7, 0x29, 0xb4, 0x72, 0xa9, 0x39, 0xfa,
0xea, 0x52, 0x3c, 0xa7, 0xb7, 0xa0, 0xcd, 0x4b, 0x9e, 0xbd, 0x66, 0x53, 0xde, 0x6b, 0xa1, 0xa1,
0x0a, 0xa7, 0xd7, 0xa0, 0xa9, 0x65, 0x2f, 0x46, 0x69, 0x53, 0x4b, 0xf2, 0x73, 0x03, 0xae, 0xd9,
0x70, 0xde, 0x0b, 0x3d, 0x1e, 0x2a, 0xf6, 0xf1, 0x1f, 0x0a, 0xe4, 0x47, 0x1f, 0x87, 0xa7, 0xe5,
0x6f, 0x8c, 0xc3, 0xfa, 0x6a, 0x55, 0xbe, 0x8e, 0x21, 0x46, 0x5f, 0x46, 0xd9, 0x04, 0xe4, 0xac,
0xe3, 0xd9, 0x18, 0x2e, 0x16, 0xd3, 0x53, 0x39, 0x41, 0xc3, 0x09, 0x75, 0x28, 0x70, 0x18, 0x85,
0x0e, 0xc9, 0x9f, 0x0d, 0x68, 0x3f, 0x53, 0x9c, 0x69, 0x3e, 0x28, 0x9d, 0xa7, 0x86, 0xf7, 0xb4,
0x36, 0xca, 0xeb, 0x10, 0x9d, 0x71, 0xee, 0x2c, 0x99, 0x63, 0x15, 0x77, 0x2b, 0x88, 0xfb, 0x0e,
0x80, 0xa8, 0xea, 0x82, 0x5c, 0xb5, 0x69, 0x20, 0x49, 0x7b, 0xb0, 0x29, 0x8a, 0x01, 0xf2, 0xb3,
0x81, 0x1f, 0x3d, 0x4c, 0x77, 0xa1, 0x83, 0x34, 0x9d, 0xd8, 0x4c, 0x36, 0x31, 0xa0, 0x50, 0xb4,
0x54, 0x9b, 0xf6, 0xa5, 0xda, 0xdc, 0x80, 0x0d, 0x73, 0xe6, 0xaa, 0x97, 0x58, 0x0a, 0x2c, 0x22,
0x39, 0x74, 0x29, 0x7f, 0xaf, 0x84, 0xe6, 0x94, 0x7d, 0x74, 0xd9, 0x96, 0x55, 0xb6, 0x3e, 0xfb,
0x28, 0xcc, 0x9e, 0x97, 0x33, 0xa1, 0x7c, 0xf5, 0x1d, 0xf2, 0xd9, 0xc7, 0x75, 0xf6, 0x3b, 0x10,
0x8b, 0x7c, 0xc8, 0x4b, 0xcc, 0x23, 0xa6, 0x16, 0x90, 0x07, 0x70, 0xc3, 0x31, 0x5b, 0x8f, 0xea,
0x73, 0x25, 0xe7, 0x33, 0x63, 0x41, 0x97, 0x45, 0xaf, 0xb1, 0x1b, 0xdd, 0x4f, 0xa8, 0x39, 0x92,
0x3b, 0xd0, 0x7e, 0x9b, 0x17, 0x62, 0x94, 0x0f, 0x4a, 0xc3, 0xe5, 0x90, 0x69, 0x86, 0x91, 0x75,
0x29, 0x9e, 0x89, 0x84, 0xce, 0x6b, 0xf9, 0x94, 0x4d, 0x58, 0x9e, 0x99, 0x42, 0xed, 0x40, 0xac,
0xcb, 0x17, 0xdc, 0x47, 0x6f, 0x81, 0x21, 0x74, 0xc6, 0x16, 0x66, 0x54, 0x5d, 0xf1, 0x3d, 0xc4,
0x2f, 0x4a, 0x5c, 0x7c, 0xe0, 0x0b, 0x97, 0x9f, 0x87, 0xeb, 0x92, 0x24, 0xbf, 0x34, 0xa1, 0x13,
0xc4, 0x1d, 0x90, 0x6a, 0xc3, 0x72, 0xc8, 0xf9, 0x9c, 0x48, 0x36, 0x44, 0x9f, 0x5d, 0xea, 0x61,
0xda, 0x87, 0xc4, 0x24, 0xc4, 0xf4, 0x5c, 0xd9, 0x56, 0xe9, 0xec, 0x5f, 0xef, 0xe3, 0x8a, 0xea,
0x9f, 0x78, 0x39, 0xad, 0x55, 0x3c, 0xad, 0xad, 0x9a, 0xd6, 0x3a, 0x36, 0xcb, 0xb5, 0x2f, 0xc0,
0x0e, 0xc4, 0xb9, 0xcc, 0x33, 0x8e, 0x74, 0x47, 0xd4, 0x02, 0x57, 0xbe, 0xcd, 0xaa, 0x7c, 0x77,
0x00, 0x46, 0x86, 0xed, 0x67, 0xd8, 0xc0, 0x6d, 0xac, 0x4c, 0x20, 0x31, 0xd6, 0xc7, 0x9c, 0x0d,
0x5d, 0x9b, 0x74, 0xa9, 0x43, 0xd8, 0xca, 0xbc, 0xd4, 0x3d, 0x70, 0xad, 0xcc, 0x4b, 0x4d, 0x1e,
0x41, 0x37, 0x20, 0xa3, 0x48, 0xef, 0xd5, 0x05, 0xec, 0xec, 0xa7, 0x2e, 0xab, 0x40, 0xc3, 0x16,
0xf5, 0x0b, 0xd8, 0xa2, 0x22, 0x1f, 0x55, 0xd9, 0xa6, 0x7d, 0x88, 0x85, 0xe6, 0x53, 0xff, 0xc3,
0x9e, 0xfb, 0xe1, 0x92, 0xd2, 0x91, 0xe6, 0x53, 0x6a, 0xd5, 0xc8, 0x11, 0x6c, 0x5f, 0xf9, 0x66,
0xe2, 0x9e, 0xcd, 0x4f, 0x4d, 0x29, 0x8d, 0x95, 0x2e, 0x75, 0xc8, 0x2c, 0x9c, 0x9a, 0xef, 0x26,
0x7e, 0xaa, 0x05, 0xe4, 0x1b, 0x48, 0xea, 0x38, 0x0c, 0x55, 0x0b, 0x2c, 0x64, 0x4c, 0x9b, 0x7a,
0x11, 0x98, 0xb4, 0x35, 0x5c, 0x69, 0xd2, 0xae, 0xa4, 0xc0, 0xe4, 0x0f, 0xd0, 0x35, 0xcd, 0xf5,
0xf5, 0x05, 0x57, 0x17, 0x82, 0xe3, 0x3c, 0x2b, 0x9e, 0x89, 0x0b, 0xd7, 0x23, 0x11, 0xf5, 0xd0,
0x7c, 0x39, 0xb5, 0xbd, 0xeb, 0x16, 0x89, 0x87, 0xe6, 0x8b, 0x2e, 0x9f, 0x05, 0x7b, 0xc9, 0x43,
0xf2, 0x5b, 0x03, 0x36, 0x29, 0x3f, 0xc7, 0xf6, 0x4d, 0xa1, 0xc5, 0x4c, 0x57, 0xbb, 0x45, 0xc7,
0x9c, 0xec, 0x6c, 0xc2, 0x46, 0x68, 0x30, 0xa6, 0x78, 0x36, 0x8d, 0x91, 0x55, 0xb6, 0x62, 0x6a,
0x81, 0xc9, 0x62, 0x28, 0x14, 0xc7, 0xc2, 0x60, 0x7b, 0xc5, 0xb4, 0x16, 0xd8, 0x36, 0x10, 0xa3,
0xb1, 0xf6, 0x4d, 0x66, 0xd1, 0xf2, 0x4c, 0x47, 0x7e, 0xa6, 0xbf, 0x05, 0xa0, 0xfc, 0xfc, 0x8d,
0x12, 0x17, 0x2c, 0x5b, 0xd4, 0xfe, 0x1a, 0x6b, 0xfd, 0x35, 0xd7, 0xfb, 0x8b, 0x42, 0x7f, 0xe4,
0x26, 0xc4, 0x2f, 0x78, 0x79, 0x75, 0x2d, 0x91, 0x39, 0x74, 0x28, 0x9f, 0x4d, 0x16, 0x83, 0xf2,
0x28, 0x3f, 0x93, 0x26, 0xef, 0x31, 0x2b, 0xc6, 0x7e, 0x3b, 0x98, 0x73, 0x60, 0xb3, 0xb9, 0x3a,
0x87, 0x28, 0xc8, 0x21, 0xbd, 0x07, 0x1b, 0x0c, 0xef, 0xaa, 0x5e, 0x0b, 0xdb, 0xb0, 0xeb, 0xda,
0x10, 0x2f, 0x15, 0xea, 0xbe, 0x91, 0xff, 0x40, 0x42, 0xf9, 0xf9, 0xa0, 0x7c, 0x29, 0x0a, 0xbd,
0x9c, 0x68, 0xe4, 0x12, 0x25, 0x07, 0x55, 0x64, 0xa8, 0xf4, 0x79, 0x43, 0xf1, 0xd8, 0x6c, 0xe1,
0xf3, 0x37, 0x4a, 0xce, 0xb8, 0xfa, 0x8a, 0x2f, 0x75, 0x80, 0x65, 0xd1, 0x43, 0x93, 0x95, 0x2e,
0x4f, 0xc4, 0x4f, 0xdc, 0x91, 0xe8, 0x10, 0xe9, 0xc3, 0x35, 0x74, 0x5b, 0xdb, 0xb8, 0x0d, 0xc9,
0xcc, 0x03, 0x17, 0x62, 0x2d, 0x20, 0x14, 0x60, 0x50, 0xbe, 0x60, 0xc5, 0x18, 0xa3, 0x34, 0x5c,
0xb1, 0x62, 0xcc, 0x0b, 0x3f, 0x3e, 0x16, 0xd5, 0x29, 0x36, 0x83, 0x14, 0x83, 0x15, 0x14, 0xed,
0x46, 0xf5, 0x0a, 0x22, 0xff, 0x37, 0x59, 0x54, 0x45, 0x29, 0xd2, 0x87, 0x26, 0x0b, 0x3c, 0x5e,
0xca, 0x3f, 0xd0, 0xa2, 0x5e, 0x85, 0xf4, 0x4d, 0x17, 0x65, 0x5c, 0xcc, 0xf4, 0x4b, 0x39, 0xba,
0x32, 0x8d, 0xd7, 0x21, 0x9a, 0xc8, 0x91, 0x1b, 0x45, 0x73, 0x24, 0xcc, 0x8c, 0x02, 0xea, 0x5f,
0x51, 0xbe, 0x0b, 0xcd, 0xe3, 0x77, 0x38, 0xee, 0x9d, 0xfd, 0x7f, 0x39, 0x9f, 0xc7, 0x7c, 0xf1,
0x8e, 0x4d, 0xe6, 0x9c, 0x36, 0x8f, 0xdf, 0xa5, 0xff, 0x85, 0xd6, 0x44, 0x8e, 0x0a, 0x8c, 0xbf,
0xb3, 0xbf, 0x5d, 0x85, 0xe5, 0xdd, 0x53, 0xfc, 0x4c, 0x0e, 0x4d, 0x2d, 0x51, 0x76, 0xc8, 0x34,
0xbb, 0xe2, 0xe6, 0x33, 0xad, 0xfc, 0xd1, 0x80, 0xf6, 0xa0, 0xa4, 0xbc, 0x98, 0x4f, 0x74, 0xd0,
0x95, 0x8d, 0xd5, 0x5d, 0xd9, 0x0c, 0x6e, 0xcb, 0x94, 0x60, 0xdb, 0xdb, 0x7b, 0x62, 0x55, 0xf3,
0x98, 0x1b, 0xfa, 0x11, 0x74, 0x94, 0x75, 0x39, 0x64, 0xee, 0xb1, 0x11, 0x32, 0x5d, 0x85, 0x4f,
0x43, 0x35, 0xd3, 0x1d, 0xa7, 0x13, 0x99, 0x7d, 0xd0, 0x62, 0xea, 0x6f, 0x92, 0x5a, 0x60, 0xae,
0x09, 0xeb, 0x01, 0xdf, 0x12, 0x1b, 0x38, 0x76, 0x81, 0x84, 0xfc, 0xde, 0x84, 0xed, 0x20, 0x8e,
0x43, 0xae, 0x99, 0x98, 0xb8, 0x68, 0x1b, 0x9f, 0x8c, 0xf6, 0x21, 0xee, 0x43, 0x13, 0x06, 0x66,
0xba, 0x3a, 0x52, 0xaf, 0x82, 0x3b, 0x58, 0x49, 0x79, 0x66, 0x39, 0x36, 0x3b, 0x18, 0x51, 0xc0,
0x62, 0x6b, 0x35, 0x8b, 0x71, 0x38, 0xdb, 0x4b, 0xb9, 0x6e, 0x5c, 0xce, 0xb5, 0x7e, 0xcf, 0x6d,
0x2e, 0xbd, 0xe7, 0x6e, 0x41, 0xfb, 0x4c, 0xc9, 0x29, 0xee, 0x58, 0xf7, 0x9a, 0xf2, 0xf8, 0x12,
0x3f, 0xc9, 0x65, 0x7e, 0x82, 0x6d, 0x02, 0x9f, 0xd8, 0x26, 0x8f, 0x21, 0xbd, 0x42, 0x62, 0x91,
0x3e, 0x08, 0x37, 0x46, 0xef, 0x2a, 0x8d, 0x56, 0xcf, 0xee, 0x8d, 0x5d, 0x68, 0xbb, 0xeb, 0x00,
0x67, 0xd5, 0xc4, 0xe6, 0x5f, 0x50, 0x16, 0x90, 0x3d, 0xb8, 0x49, 0xf9, 0xf9, 0x21, 0xcf, 0xe4,
0x10, 0x5f, 0x78, 0xc1, 0xeb, 0x65, 0xe5, 0x7b, 0x89, 0xfc, 0x0f, 0x92, 0xb7, 0x05, 0x57, 0xf8,
0x24, 0x44, 0x15, 0x39, 0x13, 0x59, 0xa5, 0x62, 0x80, 0xd9, 0x4e, 0x99, 0xcc, 0x35, 0x77, 0x7b,
0x21, 0xa1, 0x1e, 0x92, 0xef, 0xa1, 0xf3, 0x76, 0x36, 0x52, 0x6c, 0xc8, 0x5f, 0x71, 0xcd, 0x0c,
0x85, 0x85, 0x66, 0x4a, 0x8b, 0x7c, 0x84, 0x16, 0xda, 0xb4, 0xc2, 0xc6, 0xc8, 0x05, 0x57, 0x85,
0xbf, 0x0e, 0x12, 0xea, 0xe1, 0xda, 0xcb, 0xe0, 0x08, 0xb6, 0x70, 0xf9, 0xae, 0xd9, 0x5a, 0x49,
0xb5, 0xb5, 0x76, 0xa1, 0x23, 0x8a, 0x93, 0xb1, 0x54, 0xda, 0xa8, 0xa2, 0xf9, 0x36, 0x0d, 0x45,
0x4f, 0xef, 0x7e, 0xf7, 0xef, 0x91, 0xd0, 0xe3, 0xf9, 0x69, 0x3f, 0x93, 0xd3, 0xbd, 0x83, 0x83,
0x2c, 0xdf, 0xcb, 0xc6, 0x4c, 0xe4, 0x07, 0x07, 0x7b, 0xc8, 0xf7, 0xe9, 0x06, 0xfe, 0x51, 0x3c,
0xf8, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x1c, 0xb7, 0x24, 0x71, 0x52, 0x0e, 0x00, 0x00,
}
vendor/github.com/33cn/chain33/wallet/bipwallet/go-bip32/utils.go
View file @ 33f71495
......@@ -15,7 +15,7 @@ import (
"io"
"github.com/33cn/chain33/wallet/bipwallet/basen"
"github.com/33cn/chain33/wallet/bipwallet/btcutilecc"
btcutil "github.com/33cn/chain33/wallet/bipwallet/btcutilecc"
"golang.org/x/crypto/ripemd160"
)
......
vendor/github.com/33cn/chain33/wallet/seedtool/main.go 0 → 100644
View file @ 33f71495
package main
import (
"flag"
"log"
"os"
"strings"
"github.com/33cn/chain33/common/address"
"github.com/33cn/chain33/types"
"github.com/33cn/chain33/wallet"
"github.com/33cn/chain33/wallet/bipwallet"
"net/http"
_ "net/http/pprof"
)
var seed = flag.String("seed", "", "source seed")
var targetaddr = flag.String("addr", "", "address of target")
var lang = flag.Int("lang", 1, "lang: 0 englist, 1 chinese")
var oldseed = flag.Bool("oldseed", false, "is seed old")
var accountnum = flag.Int("nacc", 5, "gen account count")
func main() {
flag.Parse()
wallet.InitSeedLibrary()
log.Println("seed", *seed)
log.Println("target", *targetaddr)
go http.ListenAndServe("localhost:6060", nil)
seedlist := strings.Split(*seed, " ")
//第一种情况，用户写错一个字
n := 0
wordlist := wallet.ChineseSeedCache
if *lang == 0 {
wordlist = wallet.EnglishSeedCache
}
checkseed(*seed)
for k := range wordlist {
log.Println("change ", k, int(100*(float64(n)/float64(2048))))
n++
var seeds []string
for i := 0; i < len(seedlist); i++ {
item := seedlist[i]
seedlist[i] = k
newseed := strings.Join(seedlist, " ")
seeds = append(seeds, newseed)
seedlist[i] = item
}
checkmultithread(seeds)
}
log.Println("not found")
}
func checkmultithread(seeds []string) {
done := make(chan struct{}, len(seeds))
for i := 0; i < len(seeds); i++ {
go func(seed string) {
checkseed(seed)
done <- struct{}{}
}(seeds[i])
}
for i := 0; i < len(seeds); i++ {
<-done
}
}
func checkseed(newseed string) {
addrlist, err := genaddrlist(newseed)
if err != nil {
return
}
if _, ok := addrlist[*targetaddr]; ok {
log.Println("find new seed", newseed)
os.Exit(0)
}
}
func genaddrlist(seed string) (map[string]bool, error) {
var wallet *bipwallet.HDWallet
var err error
if *oldseed {
wallet, err = bipwallet.NewWalletFromSeed(bipwallet.TypeBty, []byte(seed))
if err != nil {
log.Println("GetPrivkeyBySeed NewWalletFromSeed", "err", err)
return nil, types.ErrNewWalletFromSeed
}
} else {
wallet, err = bipwallet.NewWalletFromMnemonic(bipwallet.TypeBty, seed)
if err != nil {
//log.Println("GetPrivkeyBySeed NewWalletFromMnemonic", "err", err)
wallet, err = bipwallet.NewWalletFromSeed(bipwallet.TypeBty, []byte(seed))
if err != nil {
log.Println("GetPrivkeyBySeed NewWalletFromSeed", "err", err)
return nil, types.ErrNewWalletFromSeed
}
}
}
addrlist := make(map[string]bool)
for index := 0; index <= *accountnum; index++ {
//通过索引生成Key pair
_, pub, err := childkey(wallet, uint32(index))
if err != nil {
log.Println("GetPrivkeyBySeed NewKeyPair", "err", err)
return nil, types.ErrNewKeyPair
}
addr := address.PubKeyToAddress(pub)
addrlist[addr.String()] = true
}
return addrlist, err
}
func childkey(w *bipwallet.HDWallet, index uint32) (priv, pub []byte, err error) {
if *oldseed {
key, err := w.MasterKey.NewChildKey(index)
if err != nil {
return nil, nil, err
}
return key.Key, key.PublicKey().Key, err
}
return w.NewKeyPair(index)
}
vendor/github.com/33cn/chain33/wallet/sendtx.go
View file @ 33f71495
......@@ -113,10 +113,11 @@ func (wallet *Wallet) sendTransaction(payload types.Message, execer []byte, priv
}
tx := &types.Transaction{Execer: execer, Payload: types.Encode(payload), Fee: minFee, To: to}
tx.Nonce = rand.Int63()
tx.Fee, err = tx.GetRealFee(wallet.getFee())
proper, err := wallet.api.GetProperFee(nil)
if err != nil {
return nil, err
}
tx.Fee = proper.ProperFee
tx.SetExpire(time.Second * 120)
tx.Sign(int32(SignType), priv)
reply, err := wallet.sendTx(tx)
......@@ -226,11 +227,11 @@ func (wallet *Wallet) createSendToAddress(addrto string, amount int64, note stri
return nil, err
}
tx.SetExpire(time.Second * 120)
fee, err := tx.GetRealFee(wallet.getFee())
proper, err := wallet.api.GetProperFee(nil)
if err != nil {
return nil, err
}
tx.Fee = fee
tx.Fee = proper.ProperFee
if tx.To == "" {
tx.To = addrto
}
......
vendor/github.com/33cn/chain33/wallet/wallet_test.go
View file @ 33f71495
......@@ -35,7 +35,6 @@ func initEnv() (*Wallet, queue.Module, queue.Queue) {
wallet := New(cfg.Wallet, sub.Wallet)
wallet.SetQueueClient(q.Client())
store := store.New(cfg.Store, sub.Store)
store.SetQueueClient(q.Client())
......@@ -133,6 +132,8 @@ func mempoolModProc(q queue.Queue) {
//walletlog.Info("mempool", "msg.Ty", msg.Ty)
if msg.Ty == types.EventTx {
msg.Reply(client.NewMessage("wallet", types.EventReply, &types.Reply{IsOk: true}))
} else if msg.Ty == types.EventGetProperFee {
msg.Reply(client.NewMessage("wallet", types.EventReply, &types.ReplyProperFee{ProperFee: 1000000}))
}
}
}()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment