aboutsummaryrefslogtreecommitdiffstats
path: root/internal
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2016-10-17 22:55:28 +0800
committerGitHub <noreply@github.com>2016-10-17 22:55:28 +0800
commit6952fe3a5caf22ae76b7efb332b0d98ad02398de (patch)
tree22711d520c60d600790eafe0ed9490ab6f97caf1 /internal
parentb19b7c39ac1074592c0aea1dc2b282d08d9a42b0 (diff)
parent1a6682c21d812fa2bd068d174d38978664814633 (diff)
downloadgo-tangerine-6952fe3a5caf22ae76b7efb332b0d98ad02398de.tar
go-tangerine-6952fe3a5caf22ae76b7efb332b0d98ad02398de.tar.gz
go-tangerine-6952fe3a5caf22ae76b7efb332b0d98ad02398de.tar.bz2
go-tangerine-6952fe3a5caf22ae76b7efb332b0d98ad02398de.tar.lz
go-tangerine-6952fe3a5caf22ae76b7efb332b0d98ad02398de.tar.xz
go-tangerine-6952fe3a5caf22ae76b7efb332b0d98ad02398de.tar.zst
go-tangerine-6952fe3a5caf22ae76b7efb332b0d98ad02398de.zip
Merge pull request #3100 from kobigurk/develop
internal/ethapi, internal/web3ext: adds raw tx retrieval methods
Diffstat (limited to 'internal')
-rw-r--r--internal/ethapi/api.go43
-rw-r--r--internal/web3ext/web3ext.go13
2 files changed, 55 insertions, 1 deletions
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index 53ea8d186..de88a5d1e 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -597,7 +597,7 @@ func (s *PublicBlockChainAPI) rpcOutputBlock(b *types.Block, inclTx bool, fullTx
"gasUsed": rpc.NewHexNumber(head.GasUsed),
"timestamp": rpc.NewHexNumber(head.Time),
"transactionsRoot": head.TxHash,
- "receiptsRoot": head.ReceiptHash,
+ "receiptsRoot": head.ReceiptHash,
}
if inclTx {
@@ -699,6 +699,16 @@ func newRPCTransactionFromBlockIndex(b *types.Block, txIndex int) (*RPCTransacti
return nil, nil
}
+// newRPCRawTransactionFromBlockIndex returns the bytes of a transaction given a block and a transaction index.
+func newRPCRawTransactionFromBlockIndex(b *types.Block, txIndex int) (rpc.HexBytes, error) {
+ if txIndex >= 0 && txIndex < len(b.Transactions()) {
+ tx := b.Transactions()[txIndex]
+ return rlp.EncodeToBytes(tx)
+ }
+
+ return nil, nil
+}
+
// newRPCTransaction returns a transaction that will serialize to the RPC representation.
func newRPCTransaction(b *types.Block, txHash common.Hash) (*RPCTransaction, error) {
for idx, tx := range b.Transactions() {
@@ -770,6 +780,22 @@ func (s *PublicTransactionPoolAPI) GetTransactionByBlockHashAndIndex(ctx context
return nil, nil
}
+// GetRawTransactionByBlockNumberAndIndex returns the bytes of the transaction for the given block number and index.
+func (s *PublicTransactionPoolAPI) GetRawTransactionByBlockNumberAndIndex(ctx context.Context, blockNr rpc.BlockNumber, index rpc.HexNumber) (rpc.HexBytes, error) {
+ if block, _ := s.b.BlockByNumber(ctx, blockNr); block != nil {
+ return newRPCRawTransactionFromBlockIndex(block, index.Int())
+ }
+ return nil, nil
+}
+
+// GetRawTransactionByBlockHashAndIndex returns the bytes of the transaction for the given block hash and index.
+func (s *PublicTransactionPoolAPI) GetRawTransactionByBlockHashAndIndex(ctx context.Context, blockHash common.Hash, index rpc.HexNumber) (rpc.HexBytes, error) {
+ if block, _ := s.b.GetBlock(ctx, blockHash); block != nil {
+ return newRPCRawTransactionFromBlockIndex(block, index.Int())
+ }
+ return nil, nil
+}
+
// GetTransactionCount returns the number of transactions the given address has sent for the given block number
func (s *PublicTransactionPoolAPI) GetTransactionCount(ctx context.Context, address common.Address, blockNr rpc.BlockNumber) (*rpc.HexNumber, error) {
state, _, err := s.b.StateAndHeaderByNumber(blockNr)
@@ -835,6 +861,21 @@ func (s *PublicTransactionPoolAPI) GetTransactionByHash(ctx context.Context, txH
return nil, nil
}
+// GetRawTransactionByHash returns the bytes of the transaction for the given hash.
+func (s *PublicTransactionPoolAPI) GetRawTransactionByHash(ctx context.Context, txHash common.Hash) (rpc.HexBytes, error) {
+ var tx *types.Transaction
+ var err error
+
+ if tx, _, err = getTransaction(s.b.ChainDb(), s.b, txHash); err != nil {
+ glog.V(logger.Debug).Infof("%v\n", err)
+ return nil, nil
+ } else if tx == nil {
+ return nil, nil
+ }
+
+ return rlp.EncodeToBytes(tx)
+}
+
// GetTransactionReceipt returns the transaction receipt for the given transaction hash.
func (s *PublicTransactionPoolAPI) GetTransactionReceipt(txHash common.Hash) (map[string]interface{}, error) {
receipt := core.GetReceipt(s.b.ChainDb(), txHash)
diff --git a/internal/web3ext/web3ext.go b/internal/web3ext/web3ext.go
index 04b13e483..cbbab0ece 100644
--- a/internal/web3ext/web3ext.go
+++ b/internal/web3ext/web3ext.go
@@ -468,6 +468,19 @@ web3._extend({
call: 'eth_submitTransaction',
params: 1,
inputFormatter: [web3._extend.formatters.inputTransactionFormatter]
+ }),
+ new web3._extend.Method({
+ name: 'getRawTransaction',
+ call: 'eth_getRawTransactionByHash',
+ params: 1
+ }),
+ new web3._extend.Method({
+ name: 'getRawTransactionFromBlock',
+ call: function(args) {
+ return (web3._extend.utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? 'eth_getRawTransactionByBlockHashAndIndex' : 'eth_getRawTransactionByBlockNumberAndIndex';
+ },
+ params: 2,
+ inputFormatter: [web3._extend.formatters.inputBlockNumberFormatter, web3._extend.utils.toHex]
})
],
properties: