diff --git a/core/types/transaction.go b/core/types/transaction.go index 8d1ea4fa46..5660582baf 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -94,8 +94,6 @@ func newTransaction(nonce uint64, to *common.Address, amount *big.Int, gasLimit if len(data) > 0 { data = common.CopyBytes(data) } - fmt.Println("DASas") - fmt.Println(to) d := txdata{ AccountNonce: nonce, Recipient: to, diff --git a/shyftdb/shyft_database_util.go b/shyftdb/shyft_database_util.go index c14be73f1f..4b30cd615d 100644 --- a/shyftdb/shyft_database_util.go +++ b/shyftdb/shyft_database_util.go @@ -4,20 +4,11 @@ import ( "fmt" "github.com/syndtr/goleveldb/leveldb" + "github.com/syndtr/goleveldb/leveldb/util" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/log" ) -func GetBlock(db *leveldb.DB, block *types.Block) { - hash := block.Header().Hash().Bytes() - bar, err := db.Get(hash, nil) - fmt.Println("Our error is ") - fmt.Println(err) - fmt.Println("Our result is ") - fmt.Println(bar) - -} - func WriteBlock(db *leveldb.DB, block *types.Block) error { hash := block.Header().Hash().Bytes() fmt.Println(hash) @@ -33,22 +24,44 @@ func WriteBlock(db *leveldb.DB, block *types.Block) error { func WriteTransactions(db *leveldb.DB, transactions []*types.Transaction, blockHash []byte) error { for _, tx := range transactions { - txHash := tx.Hash().Bytes() - if err := db.Put(txHash, []byte("Hello hello"), nil); err != nil { + key := append([]byte("tx-")[:], tx.Hash().Bytes()[:]...) + if err := db.Put(key, []byte("Hello hello"), nil); err != nil { log.Crit("Failed to store TX", "err", err) } GetTransaction(db, tx) } + GetAllTransactions(db) return nil } -func GetTransaction(db *leveldb.DB, tx *types.Transaction) { - data, err := db.Get(tx.Hash().Bytes(), nil) +// Meant for internal tests + +func GetBlock(db *leveldb.DB, block *types.Block) { + hash := block.Header().Hash().Bytes() + bar, err := db.Get(hash, nil) + fmt.Println("Our error is ") + fmt.Println(err) + fmt.Println("Our result is ") + fmt.Println(bar) + +} + +func GetAllTransactions(db *leveldb.DB) { + //iter := db.NewIterator(util.BytesPrefix([]byte("tx-")), nil) + iter := db.NewIterator(util.BytesPrefix([]byte("tx-")), nil) + for iter.Next() { + fmt.Println(iter.Key()) + fmt.Println(iter.Value()) + } + iter.Release() +} +func GetTransaction (db *leveldb.DB, tx *types.Transaction) { + key := append([]byte("tx-")[:], tx.Hash().Bytes()[:]...) + value, err := db.Get(key, nil) if err != nil { log.Crit("Could not retrieve data") } - if len(data) > 0 { - fmt.Println("\n\t\t\t DATA \n") - fmt.Println(data) + if len(value) > 0 { + fmt.Println(value) } } \ No newline at end of file diff --git a/simulations/sendTransactions.js b/simulations/sendTransactions.js index 09d39b6b85..9f01473ee7 100644 --- a/simulations/sendTransactions.js +++ b/simulations/sendTransactions.js @@ -2,7 +2,7 @@ var firstAccount = web3.eth.accounts[0] var secondAccount = web3.eth.accounts[1] var thirdAccount = web3.eth.accounts[2] -for (var i = 0; i < 3; i++) { +for (var i = 0; i < 1; i++) { console.log('\t\t' + (i + 1) + ' - Transactions') web3.eth.sendTransaction({ from: web3.eth.accounts[0],