diff --git a/internal/web3ext/web3ext.go b/internal/web3ext/web3ext.go index 00e2710d31..f697d5e7b4 100644 --- a/internal/web3ext/web3ext.go +++ b/internal/web3ext/web3ext.go @@ -22,7 +22,6 @@ var Modules = map[string]string{ "admin": Admin_JS, "personal": Personal_JS, "exp": Eth_JS, - "eth": Eth_JS, "miner": Miner_JS, "debug": Debug_JS, "net": Net_JS, @@ -198,31 +197,31 @@ web3._extend({ [ new web3._extend.Method({ name: 'sign', - call: 'eth_sign', + call: 'exp_sign', params: 2, inputFormatter: [web3._extend.formatters.inputAddressFormatter, null] }), new web3._extend.Method({ name: 'resend', - call: 'eth_resend', + call: 'exp_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', + call: 'exp_getNatSpec', params: 1, inputFormatter: [web3._extend.formatters.inputTransactionFormatter] }), new web3._extend.Method({ name: 'signTransaction', - call: 'eth_signTransaction', + call: 'exp_signTransaction', params: 1, inputFormatter: [web3._extend.formatters.inputTransactionFormatter] }), new web3._extend.Method({ name: 'submitTransaction', - call: 'eth_submitTransaction', + call: 'exp_submitTransaction', params: 1, inputFormatter: [web3._extend.formatters.inputTransactionFormatter] }) @@ -231,7 +230,7 @@ web3._extend({ [ new web3._extend.Property({ name: 'pendingTransactions', - getter: 'eth_pendingTransactions', + getter: 'exp_pendingTransactions', outputFormatter: function(txs) { var formatted = []; for (var i = 0; i < txs.length; i++) { diff --git a/jsre/expanse_js.go b/jsre/expanse_js.go index c1c3778a17..6cc314a742 100644 --- a/jsre/expanse_js.go +++ b/jsre/expanse_js.go @@ -2857,7 +2857,7 @@ var addFunctionsToContract = function (contract) { contract.abi.filter(function (json) { return json.type === 'function'; }).map(function (json) { - return new SolidityFunction(contract._eth, json, contract.address); + return new SolidityFunction(contract._exp, json, contract.address); }).forEach(function (f) { f.attachToContract(contract); }); diff --git a/rpc/server.go b/rpc/server.go index a94df17477..8d6a366fea 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -34,8 +34,8 @@ const ( notificationBufferSize = 10000 // max buffered notifications before codec is closed - DefaultIPCApis = "admin,eth,debug,miner,net,shh,txpool,personal,web3" - DefaultHTTPApis = "eth,net,web3" + DefaultIPCApis = "admin,exp,debug,miner,net,shh,txpool,personal,web3" + DefaultHTTPApis = "exp,net,web3" ) // CodecOption specifies which type of messages this codec supports