aboutsummaryrefslogtreecommitdiffstats
path: root/internal
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-05-11 16:49:44 +0800
committerPéter Szilágyi <peterke@gmail.com>2016-05-11 16:49:44 +0800
commitbc6fdad786706019fc5aeb9605f1d23b3c5b7522 (patch)
tree448a5220cd252bddd7c4276314fb82ce894b59f2 /internal
parentc05db38a5ee87c1700faf929db0a9156b263ec95 (diff)
downloaddexon-bc6fdad786706019fc5aeb9605f1d23b3c5b7522.tar
dexon-bc6fdad786706019fc5aeb9605f1d23b3c5b7522.tar.gz
dexon-bc6fdad786706019fc5aeb9605f1d23b3c5b7522.tar.bz2
dexon-bc6fdad786706019fc5aeb9605f1d23b3c5b7522.tar.lz
dexon-bc6fdad786706019fc5aeb9605f1d23b3c5b7522.tar.xz
dexon-bc6fdad786706019fc5aeb9605f1d23b3c5b7522.tar.zst
dexon-bc6fdad786706019fc5aeb9605f1d23b3c5b7522.zip
cmd/geth, internal/web3ext, rpc: surface rpc module, fix shh, fix miner
Diffstat (limited to 'internal')
-rw-r--r--internal/web3ext/web3ext.go247
1 files changed, 131 insertions, 116 deletions
diff --git a/internal/web3ext/web3ext.go b/internal/web3ext/web3ext.go
index 64c1b5044..9ce106cb8 100644
--- a/internal/web3ext/web3ext.go
+++ b/internal/web3ext/web3ext.go
@@ -18,44 +18,17 @@
package web3ext
var Modules = map[string]string{
- "txpool": TxPool_JS,
"admin": Admin_JS,
- "personal": Personal_JS,
+ "debug": Debug_JS,
"eth": Eth_JS,
"miner": Miner_JS,
- "debug": Debug_JS,
"net": Net_JS,
+ "personal": Personal_JS,
+ "rpc": RPC_JS,
+ "shh": Shh_JS,
+ "txpool": TxPool_JS,
}
-const TxPool_JS = `
-web3._extend({
- property: 'txpool',
- methods:
- [
- ],
- properties:
- [
- new web3._extend.Property({
- name: 'content',
- getter: 'txpool_content'
- }),
- new web3._extend.Property({
- name: 'inspect',
- getter: 'txpool_inspect'
- }),
- new web3._extend.Property({
- name: 'status',
- getter: 'txpool_status',
- outputFormatter: function(status) {
- status.pending = web3._extend.utils.toDecimal(status.pending);
- status.queued = web3._extend.utils.toDecimal(status.queued);
- return status;
- }
- })
- ]
-});
-`
-
const Admin_JS = `
web3._extend({
property: 'admin',
@@ -176,88 +149,6 @@ web3._extend({
});
`
-const Personal_JS = `
-web3._extend({
- property: 'personal',
- methods:
- [
- new web3._extend.Method({
- name: 'importRawKey',
- call: 'personal_importRawKey',
- params: 2
- })
- ]
-});
-`
-
-const Eth_JS = `
-web3._extend({
- property: 'eth',
- methods:
- [
- new web3._extend.Method({
- name: 'sign',
- call: 'eth_sign',
- params: 2,
- inputFormatter: [web3._extend.formatters.inputAddressFormatter, null]
- }),
- new web3._extend.Method({
- name: 'resend',
- call: 'eth_resend',
- params: 3,
- inputFormatter: [web3._extend.formatters.inputTransactionFormatter, web3._extend.utils.fromDecimal, web3._extend.utils.fromDecimal]
- }),
- new web3._extend.Method({
- name: 'getNatSpec',
- call: 'eth_getNatSpec',
- params: 1,
- inputFormatter: [web3._extend.formatters.inputTransactionFormatter]
- }),
- new web3._extend.Method({
- name: 'signTransaction',
- call: 'eth_signTransaction',
- params: 1,
- inputFormatter: [web3._extend.formatters.inputTransactionFormatter]
- }),
- new web3._extend.Method({
- name: 'submitTransaction',
- call: 'eth_submitTransaction',
- params: 1,
- inputFormatter: [web3._extend.formatters.inputTransactionFormatter]
- })
- ],
- properties:
- [
- new web3._extend.Property({
- name: 'pendingTransactions',
- getter: 'eth_pendingTransactions',
- outputFormatter: function(txs) {
- var formatted = [];
- for (var i = 0; i < txs.length; i++) {
- formatted.push(web3._extend.formatters.outputTransactionFormatter(txs[i]));
- formatted[i].blockHash = null;
- }
- return formatted;
- }
- })
- ]
-});
-`
-
-const Net_JS = `
-web3._extend({
- property: 'net',
- methods: [],
- properties:
- [
- new web3._extend.Property({
- name: 'version',
- getter: 'net_version'
- })
- ]
-});
-`
-
const Debug_JS = `
web3._extend({
property: 'debug',
@@ -410,6 +301,60 @@ web3._extend({
});
`
+const Eth_JS = `
+web3._extend({
+ property: 'eth',
+ methods:
+ [
+ new web3._extend.Method({
+ name: 'sign',
+ call: 'eth_sign',
+ params: 2,
+ inputFormatter: [web3._extend.formatters.inputAddressFormatter, null]
+ }),
+ new web3._extend.Method({
+ name: 'resend',
+ call: 'eth_resend',
+ params: 3,
+ inputFormatter: [web3._extend.formatters.inputTransactionFormatter, web3._extend.utils.fromDecimal, web3._extend.utils.fromDecimal]
+ }),
+ new web3._extend.Method({
+ name: 'getNatSpec',
+ call: 'eth_getNatSpec',
+ params: 1,
+ inputFormatter: [web3._extend.formatters.inputTransactionFormatter]
+ }),
+ new web3._extend.Method({
+ name: 'signTransaction',
+ call: 'eth_signTransaction',
+ params: 1,
+ inputFormatter: [web3._extend.formatters.inputTransactionFormatter]
+ }),
+ new web3._extend.Method({
+ name: 'submitTransaction',
+ call: 'eth_submitTransaction',
+ params: 1,
+ inputFormatter: [web3._extend.formatters.inputTransactionFormatter]
+ })
+ ],
+ properties:
+ [
+ new web3._extend.Property({
+ name: 'pendingTransactions',
+ getter: 'eth_pendingTransactions',
+ outputFormatter: function(txs) {
+ var formatted = [];
+ for (var i = 0; i < txs.length; i++) {
+ formatted.push(web3._extend.formatters.outputTransactionFormatter(txs[i]));
+ formatted[i].blockHash = null;
+ }
+ return formatted;
+ }
+ })
+ ]
+});
+`
+
const Miner_JS = `
web3._extend({
property: 'miner',
@@ -440,7 +385,7 @@ web3._extend({
name: 'setGasPrice',
call: 'miner_setGasPrice',
params: 1,
- inputFormatter: [web3._extend.utils.fromDecial]
+ inputFormatter: [web3._extend.utils.fromDecimal]
}),
new web3._extend.Method({
name: 'startAutoDAG',
@@ -463,6 +408,48 @@ web3._extend({
});
`
+const Net_JS = `
+web3._extend({
+ property: 'net',
+ methods: [],
+ properties:
+ [
+ new web3._extend.Property({
+ name: 'version',
+ getter: 'net_version'
+ })
+ ]
+});
+`
+
+const Personal_JS = `
+web3._extend({
+ property: 'personal',
+ methods:
+ [
+ new web3._extend.Method({
+ name: 'importRawKey',
+ call: 'personal_importRawKey',
+ params: 2
+ })
+ ]
+});
+`
+
+const RPC_JS = `
+web3._extend({
+ property: 'rpc',
+ methods: [],
+ properties:
+ [
+ new web3._extend.Property({
+ name: 'modules',
+ getter: 'rpc_modules'
+ })
+ ]
+});
+`
+
const Shh_JS = `
web3._extend({
property: 'shh',
@@ -471,7 +458,35 @@ web3._extend({
[
new web3._extend.Property({
name: 'version',
- getter: 'shh_version'
+ getter: 'shh_version',
+ outputFormatter: web3._extend.utils.toDecimal
+ })
+ ]
+});
+`
+
+const TxPool_JS = `
+web3._extend({
+ property: 'txpool',
+ methods: [],
+ properties:
+ [
+ new web3._extend.Property({
+ name: 'content',
+ getter: 'txpool_content'
+ }),
+ new web3._extend.Property({
+ name: 'inspect',
+ getter: 'txpool_inspect'
+ }),
+ new web3._extend.Property({
+ name: 'status',
+ getter: 'txpool_status',
+ outputFormatter: function(status) {
+ status.pending = web3._extend.utils.toDecimal(status.pending);
+ status.queued = web3._extend.utils.toDecimal(status.queued);
+ return status;
+ }
})
]
});