deep-stack/ipld-eth-server
4
0
Fork 0
forked from cerc-io/ipld-eth-server
Code Pull Requests Activity

updates for light sync transactions

Browse Source
This commit is contained in:
Rob Mulholand
2019-03-28 14:31:17 -05:00
parent 79e011aad2
commit 54d46638a8
39 changed files with 769 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/datastore/postgres/postgres_test.go
+3 -3
View File
@@ -88,7 +88,7 @@ var _ = Describe("Postgres DB", func() {
badBlock := core.Block{
Number: 123,
Nonce: badNonce,
Transactions: []core.Transaction{},
Transactions: []core.TransactionModel{},
}
node := core.Node{GenesisBlock: "GENESIS", NetworkID: 1, ID: "x123", ClientName: "geth"}
db := test_config.NewTestDB(node)
@@ -146,10 +146,10 @@ var _ = Describe("Postgres DB", func() {
It("does not commit block or transactions if transaction is invalid", func() {
//badHash violates db To field length
badHash := fmt.Sprintf("x %s", strings.Repeat("1", 100))
badTransaction := core.Transaction{To: badHash}
badTransaction := core.TransactionModel{To: badHash}
block := core.Block{
Number: 123,
Transactions: []core.Transaction{badTransaction},
Transactions: []core.TransactionModel{badTransaction},
}
node := core.Node{GenesisBlock: "GENESIS", NetworkID: 1, ID: "x123", ClientName: "geth"}
db, _ := postgres.NewDB(test_config.DBConfig, node)
pkg/datastore/postgres/repositories/block_repository.go
+7 -7
View File
@@ -160,7 +160,7 @@ func (blockRepository BlockRepository) insertBlock(block core.Block) (int64, err
return blockId, nil
}
func (blockRepository BlockRepository) createTransactions(tx *sqlx.Tx, blockId int64, transactions []core.Transaction) error {
func (blockRepository BlockRepository) createTransactions(tx *sqlx.Tx, blockId int64, transactions []core.TransactionModel) error {
for _, transaction := range transactions {
err := blockRepository.createTransaction(tx, blockId, transaction)
if err != nil {
@@ -180,7 +180,7 @@ func nullStringToZero(s string) string {
return s
}
func (blockRepository BlockRepository) createTransaction(tx *sqlx.Tx, blockId int64, transaction core.Transaction) error {
func (blockRepository BlockRepository) createTransaction(tx *sqlx.Tx, blockId int64, transaction core.TransactionModel) error {
_, err := tx.Exec(
`INSERT INTO full_sync_transactions
(block_id, gaslimit, gasprice, hash, input_data, nonce, raw, tx_from, tx_index, tx_to, "value")
@@ -205,11 +205,11 @@ func (blockRepository BlockRepository) createTransaction(tx *sqlx.Tx, blockId in
return nil
}
func hasLogs(transaction core.Transaction) bool {
func hasLogs(transaction core.TransactionModel) bool {
return len(transaction.Receipt.Logs) > 0
}
func hasReceipt(transaction core.Transaction) bool {
func hasReceipt(transaction core.TransactionModel) bool {
return transaction.Receipt.TxHash != ""
}
@@ -302,10 +302,10 @@ func (blockRepository BlockRepository) loadBlock(blockRows *sqlx.Row) (core.Bloc
return block.Block, nil
}
func (blockRepository BlockRepository) LoadTransactions(transactionRows *sqlx.Rows) []core.Transaction {
var transactions []core.Transaction
func (blockRepository BlockRepository) LoadTransactions(transactionRows *sqlx.Rows) []core.TransactionModel {
var transactions []core.TransactionModel
for transactionRows.Next() {
var transaction core.Transaction
var transaction core.TransactionModel
err := transactionRows.StructScan(&transaction)
if err != nil {
log.Fatal(err)
pkg/datastore/postgres/repositories/block_repository_test.go
+9 -9
View File
@@ -133,7 +133,7 @@ var _ = Describe("Saving blocks", func() {
It("saves one transaction associated to the block", func() {
block := core.Block{
Number: 123,
Transactions: []core.Transaction{fakes.FakeTransaction},
Transactions: []core.TransactionModel{fakes.FakeTransaction},
}
_, insertErr := blockRepository.CreateOrUpdateBlock(block)
@@ -147,7 +147,7 @@ var _ = Describe("Saving blocks", func() {
It("saves two transactions associated to the block", func() {
block := core.Block{
Number: 123,
Transactions: []core.Transaction{fakes.FakeTransaction, fakes.FakeTransaction},
Transactions: []core.TransactionModel{fakes.FakeTransaction, fakes.FakeTransaction},
}
_, insertErr := blockRepository.CreateOrUpdateBlock(block)
@@ -163,7 +163,7 @@ var _ = Describe("Saving blocks", func() {
blockOne := core.Block{
Number: 123,
Hash: "xabc",
Transactions: []core.Transaction{
Transactions: []core.TransactionModel{
fakes.GetFakeTransaction("x123", core.Receipt{}),
fakes.GetFakeTransaction("x345", core.Receipt{}),
},
@@ -171,7 +171,7 @@ var _ = Describe("Saving blocks", func() {
blockTwo := core.Block{
Number: 123,
Hash: "xdef",
Transactions: []core.Transaction{
Transactions: []core.TransactionModel{
fakes.GetFakeTransaction("x678", core.Receipt{}),
fakes.GetFakeTransaction("x9ab", core.Receipt{}),
},
@@ -192,14 +192,14 @@ var _ = Describe("Saving blocks", func() {
but block number + node id is`, func() {
blockOne := core.Block{
Number: 123,
Transactions: []core.Transaction{
Transactions: []core.TransactionModel{
fakes.GetFakeTransaction("x123", core.Receipt{}),
fakes.GetFakeTransaction("x345", core.Receipt{}),
},
}
blockTwo := core.Block{
Number: 123,
Transactions: []core.Transaction{
Transactions: []core.TransactionModel{
fakes.GetFakeTransaction("x678", core.Receipt{}),
fakes.GetFakeTransaction("x9ab", core.Receipt{}),
},
@@ -256,8 +256,8 @@ var _ = Describe("Saving blocks", func() {
var raw bytes.Buffer
rlpErr := gethTransaction.EncodeRLP(&raw)
Expect(rlpErr).NotTo(HaveOccurred())
transaction := core.Transaction{
Data: inputData,
transaction := core.TransactionModel{
Data: common.Hex2Bytes(inputData),
From: from,
GasLimit: gasLimit,
GasPrice: gasPrice,
@@ -271,7 +271,7 @@ var _ = Describe("Saving blocks", func() {
}
block := core.Block{
Number: 123,
Transactions: []core.Transaction{transaction},
Transactions: []core.TransactionModel{transaction},
}
_, insertErr := blockRepository.CreateOrUpdateBlock(block)
pkg/datastore/postgres/repositories/contract_repository_test.go
+8 -6
View File
@@ -73,24 +73,26 @@ var _ = Describe("Creating contracts", func() {
blockRepository = repositories.NewBlockRepository(db)
block := core.Block{
Number: 123,
Transactions: []core.Transaction{
Transactions: []core.TransactionModel{
{Hash: "TRANSACTION1", To: "x123", Value: "0"},
{Hash: "TRANSACTION2", To: "x345", Value: "0"},
{Hash: "TRANSACTION3", To: "x123", Value: "0"},
},
}
blockRepository.CreateOrUpdateBlock(block)
_, insertBlockErr := blockRepository.CreateOrUpdateBlock(block)
Expect(insertBlockErr).NotTo(HaveOccurred())
contractRepository.CreateContract(core.Contract{Hash: "x123"})
insertContractErr := contractRepository.CreateContract(core.Contract{Hash: "x123"})
Expect(insertContractErr).NotTo(HaveOccurred())
contract, err := contractRepository.GetContract("x123")
Expect(err).ToNot(HaveOccurred())
sort.Slice(contract.Transactions, func(i, j int) bool {
return contract.Transactions[i].Hash < contract.Transactions[j].Hash
})
Expect(contract.Transactions).To(
Equal([]core.Transaction{
{Hash: "TRANSACTION1", To: "x123", Value: "0"},
{Hash: "TRANSACTION3", To: "x123", Value: "0"},
Equal([]core.TransactionModel{
{Data: []byte{}, Hash: "TRANSACTION1", To: "x123", Value: "0"},
{Data: []byte{}, Hash: "TRANSACTION3", To: "x123", Value: "0"},
}))
})
pkg/datastore/postgres/repositories/header_repository.go
+6 -4
View File
@@ -49,11 +49,13 @@ func (repository HeaderRepository) CreateOrUpdateHeader(header core.Header) (int
return 0, ErrValidHeaderExists
}
func (repository HeaderRepository) CreateTransaction(headerID int64, transaction core.Transaction) error {
func (repository HeaderRepository) CreateTransaction(headerID int64, transaction core.TransactionModel) error {
_, err := repository.database.Exec(`INSERT INTO public.light_sync_transactions
(header_id, hash, tx_to, tx_from, tx_index) VALUES ($1, $2, $3, $4, $5)
ON CONFLICT DO NOTHING`,
headerID, transaction.Hash, transaction.To, transaction.From, transaction.TxIndex)
(header_id, hash, gaslimit, gasprice, input_data, nonce, raw, tx_from, tx_index, tx_to, "value")
VALUES ($1, $2, $3::NUMERIC, $4::NUMERIC, $5, $6::NUMERIC, $7, $8, $9::NUMERIC, $10, $11::NUMERIC)
ON CONFLICT DO NOTHING`, headerID, transaction.Hash, transaction.GasLimit, transaction.GasPrice,
transaction.Data, transaction.Nonce, transaction.Raw, transaction.From, transaction.TxIndex, transaction.To,
transaction.Value)
return err
}
pkg/datastore/postgres/repositories/header_repository_test.go
+31 -14
View File
@@ -188,18 +188,26 @@ var _ = Describe("Block header repository", func() {
toAddress := common.HexToAddress("0x5678")
txHash := common.HexToHash("0x9876")
txIndex := big.NewInt(123)
transaction := core.Transaction{
From: fromAddress.Hex(),
Hash: txHash.Hex(),
To: toAddress.Hex(),
TxIndex: txIndex.Int64(),
transaction := core.TransactionModel{
Data: []byte{},
From: fromAddress.Hex(),
GasLimit: 0,
GasPrice: 0,
Hash: txHash.Hex(),
Nonce: 0,
Raw: []byte{},
To: toAddress.Hex(),
TxIndex: txIndex.Int64(),
Value: "0",
}
insertErr := repo.CreateTransaction(headerID, transaction)
Expect(insertErr).NotTo(HaveOccurred())
var dbTransaction core.Transaction
err = db.Get(&dbTransaction, `SELECT hash, tx_from, tx_to, tx_index FROM public.light_sync_transactions WHERE header_id = $1`, headerID)
var dbTransaction core.TransactionModel
err = db.Get(&dbTransaction,
`SELECT hash, gaslimit, gasprice, input_data, nonce, raw, tx_from, tx_index, tx_to, "value"
FROM public.light_sync_transactions WHERE header_id = $1`, headerID)
Expect(err).NotTo(HaveOccurred())
Expect(dbTransaction).To(Equal(transaction))
})
@@ -211,11 +219,18 @@ var _ = Describe("Block header repository", func() {
toAddress := common.HexToAddress("0x5678")
txHash := common.HexToHash("0x9876")
txIndex := big.NewInt(123)
transaction := core.Transaction{
From: fromAddress.Hex(),
Hash: txHash.Hex(),
To: toAddress.Hex(),
TxIndex: txIndex.Int64(),
transaction := core.TransactionModel{
Data: []byte{},
From: fromAddress.Hex(),
GasLimit: 0,
GasPrice: 0,
Hash: txHash.Hex(),
Nonce: 0,
Raw: []byte{},
Receipt: core.Receipt{},
To: toAddress.Hex(),
TxIndex: txIndex.Int64(),
Value: "0",
}
insertErr := repo.CreateTransaction(headerID, transaction)
@@ -224,8 +239,10 @@ var _ = Describe("Block header repository", func() {
insertTwoErr := repo.CreateTransaction(headerID, transaction)
Expect(insertTwoErr).NotTo(HaveOccurred())
var dbTransactions []core.Transaction
err = db.Select(&dbTransactions, `SELECT hash, tx_from, tx_to, tx_index FROM public.light_sync_transactions WHERE header_id = $1`, headerID)
var dbTransactions []core.TransactionModel
err = db.Select(&dbTransactions,
`SELECT hash, gaslimit, gasprice, input_data, nonce, raw, tx_from, tx_index, tx_to, "value"
FROM public.light_sync_transactions WHERE header_id = $1`, headerID)
Expect(err).NotTo(HaveOccurred())
Expect(len(dbTransactions)).To(Equal(1))
})
pkg/datastore/postgres/repositories/logs_repository_test.go
+1 -1
View File
@@ -204,7 +204,7 @@ var _ = Describe("Logs Repository", func() {
}
transaction := fakes.GetFakeTransaction(receipt.TxHash, receipt)
block := core.Block{Transactions: []core.Transaction{transaction}}
block := core.Block{Transactions: []core.TransactionModel{transaction}}
_, err := blockRepository.CreateOrUpdateBlock(block)
Expect(err).To(Not(HaveOccurred()))
retrievedLogs, err := logsRepository.GetLogs("0x99041f808d598b782d5a3e498681c2452a31da08", 4745407)
pkg/datastore/postgres/repositories/receipts_repository_test.go → pkg/datastore/postgres/repositories/receipt_repository_test.go
+3 -3
View File
@@ -27,7 +27,7 @@ import (
"github.com/vulcanize/vulcanizedb/test_config"
)
var _ = Describe("Receipts Repository", func() {
var _ = Describe("Receipt Repository", func() {
var blockRepository datastore.BlockRepository
var logRepository datastore.LogRepository
var receiptRepository datastore.ReceiptRepository
@@ -119,7 +119,7 @@ var _ = Describe("Receipts Repository", func() {
}
transaction := fakes.GetFakeTransaction(expected.TxHash, expected)
block := core.Block{Transactions: []core.Transaction{transaction}}
block := core.Block{Transactions: []core.TransactionModel{transaction}}
_, err := blockRepository.CreateOrUpdateBlock(block)
@@ -148,7 +148,7 @@ var _ = Describe("Receipts Repository", func() {
transaction := fakes.GetFakeTransaction(receipt.TxHash, receipt)
block := core.Block{
Transactions: []core.Transaction{transaction},
Transactions: []core.TransactionModel{transaction},
}
_, err := blockRepository.CreateOrUpdateBlock(block)