aboutsummaryrefslogtreecommitdiffstats
path: root/rpc/api/eth_js.go
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-06-30 23:27:03 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-06-30 23:27:03 +0800
commitba95e445e16481ea7a94a462347def19b0c2bf2c (patch)
tree23b3b86b1828819f6fffe411567824c2f227e147 /rpc/api/eth_js.go
parent130f3b270a9b2f7bd680188c67013695d5f9412b (diff)
parent8c4d493c66cf14f0bcb8b650045a644722ad8d90 (diff)
downloadgo-tangerine-ba95e445e16481ea7a94a462347def19b0c2bf2c.tar.gz
go-tangerine-ba95e445e16481ea7a94a462347def19b0c2bf2c.tar.zst
go-tangerine-ba95e445e16481ea7a94a462347def19b0c2bf2c.zip
Merge pull request #1328 from bas-vk/issue1327
Add pendingTransactions and resend
Diffstat (limited to 'rpc/api/eth_js.go')
-rw-r--r--rpc/api/eth_js.go15
1 files changed, 15 insertions, 0 deletions
diff --git a/rpc/api/eth_js.go b/rpc/api/eth_js.go
index e1268eb76..4512cc147 100644
--- a/rpc/api/eth_js.go
+++ b/rpc/api/eth_js.go
@@ -14,6 +14,21 @@ web3._extend({
params: 2,
inputFormatter: [web3._extend.formatters.formatInputString,web3._extend.formatters.formatInputString],
outputFormatter: web3._extend.formatters.formatOutputString
+ }),
+ new web3._extend.Method({
+ name: 'resend',
+ call: 'eth_resend',
+ params: 3,
+ inputFormatter: [function(obj) { return obj; },web3._extend.formatters.formatInputString,web3._extend.formatters.formatInputString],
+ outputFormatter: web3._extend.formatters.formatOutputString
+ })
+ ],
+ properties:
+ [
+ new web3._extend.Property({
+ name: 'pendingTransactions',
+ getter: 'eth_pendingTransactions',
+ outputFormatter: function(obj) { return obj; }
})
]
});