upgrade web3.js with _extend support

rpc/api/admin_js.go

@@ -1,66 +1,66 @@
 package api
 
 const Admin_JS = `
-web3.extend({
+web3._extend({
 	property: 'admin',
 	methods:
 	[
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'addPeer',
 			call: 'admin_addPeer',
 			params: 1,
-			inputFormatter: [web3.extend.utils.formatInputString],
-			outputFormatter: web3.extend.formatters.formatOutputBool
+			inputFormatter: [web3._extend.utils.formatInputString],
+			outputFormatter: web3._extend.formatters.formatOutputBool
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'peers',
 			call: 'admin_peers',
 			params: 0,
 			inputFormatter: [],
 			outputFormatter: function(obj) { return obj; }
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'exportChain',
 			call: 'admin_exportChain',
 			params: 1,
-			inputFormatter: [web3.extend.utils.formatInputString],
+			inputFormatter: [web3._extend.utils.formatInputString],
 			outputFormatter: function(obj) { return obj; }
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'importChain',
 			call: 'admin_importChain',
 			params: 1,
-			inputFormatter: [web3.extend.utils.formatInputString],
+			inputFormatter: [web3._extend.utils.formatInputString],
 			outputFormatter: function(obj) { return obj; }
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'verbosity',
 			call: 'admin_verbosity',
 			params: 1,
-			inputFormatter: [web3.extend.utils.formatInputInt],
-			outputFormatter: web3.extend.formatters.formatOutputBool
+			inputFormatter: [web3._extend.utils.formatInputInt],
+			outputFormatter: web3._extend.formatters.formatOutputBool
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'syncStatus',
 			call: 'admin_syncStatus',
 			params: 1,
-			inputFormatter: [web3.extend.utils.formatInputInt],
+			inputFormatter: [web3._extend.utils.formatInputInt],
 			outputFormatter: function(obj) { return obj; }
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'setSolc',
 			call: 'admin_setSolc',
 			params: 1,
-			inputFormatter: [web3.extend.utils.formatInputString],
-			outputFormatter: web3.extend.formatters.formatOutputString
+			inputFormatter: [web3._extend.utils.formatInputString],
+			outputFormatter: web3._extend.formatters.formatOutputString
 		})
 	],
 	properties:
 	[
-		new web3.extend.Property({
+		new web3._extend.Property({
 			name: 'nodeInfo',
 			getter: 'admin_nodeInfo',
-			outputFormatter: web3.extend.formatters.formatOutputString
+			outputFormatter: web3._extend.formatters.formatOutputString
 		})
 	]
 });

rpc/api/debug_js.go

@@ -1,44 +1,44 @@
 package api
 
 const Debug_JS = `
-web3.extend({
+web3._extend({
 	property: 'debug',
 	methods:
 	[
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'printBlock',
 			call: 'debug_printBlock',
 			params: 1,
-			inputFormatter: [web3.extend.formatters.formatInputInt],
-			outputFormatter: web3.extend.formatters.formatOutputString
+			inputFormatter: [web3._extend.formatters.formatInputInt],
+			outputFormatter: web3._extend.formatters.formatOutputString
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'getBlockRlp',
 			call: 'debug_getBlockRlp',
 			params: 1,
-			inputFormatter: [web3.extend.formatters.formatInputInt],
-			outputFormatter: web3.extend.formatters.formatOutputString
+			inputFormatter: [web3._extend.formatters.formatInputInt],
+			outputFormatter: web3._extend.formatters.formatOutputString
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'setHead',
 			call: 'debug_setHead',
 			params: 1,
-			inputFormatter: [web3.extend.formatters.formatInputInt],
-			outputFormatter: web3.extend.formatters.formatOutputBool
+			inputFormatter: [web3._extend.formatters.formatInputInt],
+			outputFormatter: web3._extend.formatters.formatOutputBool
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'processBlock',
 			call: 'debug_processBlock',
 			params: 1,
-			inputFormatter: [web3.extend.formatters.formatInputInt],
+			inputFormatter: [web3._extend.formatters.formatInputInt],
 			outputFormatter: function(obj) { return obj; }
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'seedHash',
 			call: 'debug_seedHash',
 			params: 1,
-			inputFormatter: [web3.extend.formatters.formatInputInt],
-			outputFormatter: web3.extend.formatters.formatOutputString
+			inputFormatter: [web3._extend.formatters.formatInputInt],
+			outputFormatter: web3._extend.formatters.formatOutputString
 		})
 	],
 	properties:

rpc/api/miner_js.go

@@ -1,73 +1,73 @@
 package api
 
 const Miner_JS = `
-web3.extend({
+web3._extend({
 	property: 'miner',
 	methods:
 	[
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'start',
 			call: 'miner_start',
 			params: 1,
-			inputFormatter: [web3.extend.formatters.formatInputInt],
-			outputFormatter: web3.extend.formatters.formatOutputBool
+			inputFormatter: [web3._extend.formatters.formatInputInt],
+			outputFormatter: web3._extend.formatters.formatOutputBool
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'stop',
 			call: 'miner_stop',
 			params: 1,
-			inputFormatter: [web3.extend.formatters.formatInputInt],
-			outputFormatter: web3.extend.formatters.formatOutputBool
+			inputFormatter: [web3._extend.formatters.formatInputInt],
+			outputFormatter: web3._extend.formatters.formatOutputBool
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'getHashrate',
 			call: 'miner_hashrate',
 			params: 0,
 			inputFormatter: [],
-			outputFormatter: web3.extend.utils.toDecimal
+			outputFormatter: web3._extend.utils.toDecimal
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'setExtra',
 			call: 'miner_setExtra',
 			params: 1,
-			inputFormatter: [web3.extend.utils.formatInputString],
-			outputFormatter: web3.extend.formatters.formatOutputBool
+			inputFormatter: [web3._extend.utils.formatInputString],
+			outputFormatter: web3._extend.formatters.formatOutputBool
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'setGasPrice',
 			call: 'miner_setGasPrice',
 			params: 1,
-			inputFormatter: [web3.extend.utils.formatInputString],
-			outputFormatter: web3.extend.formatters.formatOutputBool
+			inputFormatter: [web3._extend.utils.formatInputString],
+			outputFormatter: web3._extend.formatters.formatOutputBool
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'startAutoDAG',
 			call: 'miner_startAutoDAG',
 			params: 0,
 			inputFormatter: [],
-			outputFormatter: web3.extend.formatters.formatOutputBool
+			outputFormatter: web3._extend.formatters.formatOutputBool
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'stopAutoDAG',
 			call: 'miner_stopAutoDAG',
 			params: 0,
 			inputFormatter: [],
-			outputFormatter: web3.extend.formatters.formatOutputBool
+			outputFormatter: web3._extend.formatters.formatOutputBool
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'makeDAG',
 			call: 'miner_makeDAG',
 			params: 1,
-			inputFormatter: [web3.extend.formatters.inputDefaultBlockNumberFormatter],
-			outputFormatter: web3.extend.formatters.formatOutputBool
+			inputFormatter: [web3._extend.formatters.inputDefaultBlockNumberFormatter],
+			outputFormatter: web3._extend.formatters.formatOutputBool
 		})
 	],
 	properties:
 	[
-		new web3.extend.Property({
+		new web3._extend.Property({
 			name: 'hashrate',
 			getter: 'miner_hashrate',
-			outputFormatter: web3.extend.utils.toDecimal
+			outputFormatter: web3._extend.utils.toDecimal
 		})
 	]
 });

rpc/api/net_js.go

@@ -1,32 +1,32 @@
 package api
 
 const Net_JS = `
-web3.extend({
+web3._extend({
 	property: 'network',
 	methods:
 	[
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'addPeer',
 			call: 'net_addPeer',
 			params: 1,
-			inputFormatter: [web3.extend.utils.formatInputString],
-			outputFormatter: web3.extend.formatters.formatOutputBool
+			inputFormatter: [web3._extend.utils.formatInputString],
+			outputFormatter: web3._extend.formatters.formatOutputBool
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'id',
 			call: 'net_id',
 			params: 0,
 			inputFormatter: [],
-			outputFormatter: web3.extend.formatters.formatOutputString
+			outputFormatter: web3._extend.formatters.formatOutputString
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'getPeerCount',
 			call: 'net_peerCount',
 			params: 0,
 			inputFormatter: [],
-			outputFormatter: web3.extend.formatters.formatOutputString
+			outputFormatter: web3._extend.formatters.formatOutputString
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'peers',
 			call: 'net_peers',
 			params: 0,
@@ -36,15 +36,15 @@ web3.extend({
 	],
 	properties:
 	[
-		new web3.extend.Property({
+		new web3._extend.Property({
 			name: 'listening',
 			getter: 'net_listening',
-			outputFormatter: web3.extend.formatters.formatOutputBool
+			outputFormatter: web3._extend.formatters.formatOutputBool
 		}),
-		new web3.extend.Property({
+		new web3._extend.Property({
 			name: 'peerCount',
 			getter: 'net_peerCount',
-			outputFormatter: web3.extend.utils.toDecimal
+			outputFormatter: web3._extend.utils.toDecimal
 		})
 	]
 });

rpc/api/personal_js.go

@@ -1,30 +1,30 @@
 package api
 
 const Personal_JS = `
-web3.extend({
+web3._extend({
 	property: 'personal',
 	methods:
 	[
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'listAccounts',
 			call: 'personal_listAccounts',
 			params: 0,
 			inputFormatter: [],
 			outputFormatter: function(obj) { return obj; }
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'newAccount',
 			call: 'personal_newAccount',
 			params: 1,
-			inputFormatter: [web3.extend.formatters.formatInputString],
-			outputFormatter: web3.extend.formatters.formatOutputString
+			inputFormatter: [web3._extend.formatters.formatInputString],
+			outputFormatter: web3._extend.formatters.formatOutputString
 		}),
-		new web3.extend.Method({
+		new web3._extend.Method({
 			name: 'unlockAccount',
 			call: 'personal_unlockAccount',
 			params: 3,
-			inputFormatter: [web3.extend.formatters.formatInputString,web3.extend.formatters.formatInputString,web3.extend.formatters.formatInputInt],
-			outputFormatter: web3.extend.formatters.formatOutputBool
+			inputFormatter: [web3._extend.formatters.formatInputString,web3._extend.formatters.formatInputString,web3._extend.formatters.formatInputInt],
+			outputFormatter: web3._extend.formatters.formatOutputBool
 		})
 	],
 	properties: