Merge pull request #28 from meshplus/fix/eth_hash_marshal

Fix/eth hash marshal
meshplus · Nov 8, 2022 · c174c76 · c174c76
2 parents 3dfbc57 + bdda18e
commit c174c76
Show file tree

Hide file tree

Showing 6 changed files with 2,466 additions and 54 deletions.
diff --git a/go.mod b/go.mod
@@ -4,9 +4,10 @@ go 1.13
 
 require (
 	github.com/ethereum/go-ethereum v1.10.8
+	github.com/golang/mock v1.6.0
 	github.com/holiman/uint256 v1.2.0
 	github.com/meshplus/bitxhub-kit v1.2.1-0.20210902085548-07f4fa85bfc9
-	github.com/meshplus/bitxhub-model v1.2.1-0.20220815081129-609df840b044
+	github.com/meshplus/bitxhub-model v1.2.1-0.20221027120259-5b585809c2d6
 	github.com/sirupsen/logrus v1.8.1
 	github.com/stretchr/testify v1.8.0
 	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa

diff --git a/go.sum b/go.sum
diff --git a/ledger/chain_ledger.go b/ledger/chain_ledger.go
@@ -12,13 +12,13 @@ type ChainLedger interface {
 	PutBlock(height uint64, block *pb.Block) error
 
 	// GetBlock get block with height
-	GetBlock(height uint64) (*pb.Block, error)
+	GetBlock(height uint64, fullTx bool) (*pb.Block, error)
 
 	// GetBlockSign get the signature of block
 	GetBlockSign(height uint64) ([]byte, error)
 
 	// GetBlockByHash get the block using block hash
-	GetBlockByHash(hash *types.Hash) (*pb.Block, error)
+	GetBlockByHash(hash *types.Hash, fullTx bool) (*pb.Block, error)
 
 	// GetTransaction get the transaction using transaction hash
 	GetTransaction(hash *types.Hash) (pb.Transaction, error)

diff --git a/ledger/mock_ledger/mock_chain_ledger.go b/ledger/mock_ledger/mock_chain_ledger.go