Skip to content

internal: remove eth_{compile,getWork,submitWork} from console #31856 #1408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gzliudan merged 1 commit into from
Sep 3, 2025
Merged

internal: remove eth_{compile,getWork,submitWork} from console #31856 #1408

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 41 additions & 76 deletions internal/jsre/deps/web3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,7 @@ module.exports = SolidityTypeInt;
You should have received a copy of the GNU Lesser General Public License
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
*/
/**
/**
* @file param.js
* @author Marek Kotewicz <marek@ethdev.com>
* @date 2015
Expand All @@ -1211,7 +1211,7 @@ var SolidityParam = function (value, offset) {

/**
* This method should be used to get length of params's dynamic part
*
*
* @method dynamicPartLength
* @returns {Number} length of dynamic part (in bytes)
*/
Expand Down Expand Up @@ -1239,7 +1239,7 @@ SolidityParam.prototype.withOffset = function (offset) {
* @param {SolidityParam} result of combination
*/
SolidityParam.prototype.combine = function (param) {
return new SolidityParam(this.value + param.value);
return new SolidityParam(this.value + param.value);
};

/**
Expand Down Expand Up @@ -1271,8 +1271,8 @@ SolidityParam.prototype.offsetAsBytes = function () {
*/
SolidityParam.prototype.staticPart = function () {
if (!this.isDynamic()) {
return this.value;
}
return this.value;
}
return this.offsetAsBytes();
};

Expand Down Expand Up @@ -1304,7 +1304,7 @@ SolidityParam.prototype.encode = function () {
* @returns {String}
*/
SolidityParam.encodeList = function (params) {

// updating offsets
var totalOffset = params.length * 32;
var offsetParams = params.map(function (param) {
Expand Down Expand Up @@ -1746,13 +1746,13 @@ if (typeof XMLHttpRequest === 'undefined') {

/**
* Utils
*
*
* @module utils
*/

/**
* Utility functions
*
*
* @class [utils] config
* @constructor
*/
Expand Down Expand Up @@ -1819,7 +1819,7 @@ module.exports = {
You should have received a copy of the GNU Lesser General Public License
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
*/
/**
/**
* @file sha3.js
* @author Marek Kotewicz <marek@ethdev.com>
* @date 2015
Expand Down Expand Up @@ -2739,7 +2739,7 @@ module.exports = AllSolidityEvents;
You should have received a copy of the GNU Lesser General Public License
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
*/
/**
/**
* @file batch.js
* @author Marek Kotewicz <marek@ethdev.com>
* @date 2015
Expand Down Expand Up @@ -2784,7 +2784,7 @@ Batch.prototype.execute = function () {
requests[index].callback(null, (requests[index].format ? requests[index].format(result.result) : result.result));
}
});
});
});
};

module.exports = Batch;
Expand Down Expand Up @@ -2971,7 +2971,7 @@ var ContractFactory = function (eth, abi) {
*/
this.new = function () {
/*jshint maxcomplexity: 7 */

var contract = new Contract(this.eth, this.abi);

// parse arguments
Expand Down Expand Up @@ -3119,7 +3119,7 @@ module.exports = ContractFactory;
You should have received a copy of the GNU Lesser General Public License
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
*/
/**
/**
* @file errors.js
* @author Marek Kotewicz <marek@ethdev.com>
* @date 2015
Expand Down Expand Up @@ -3394,7 +3394,7 @@ var extend = function (web3) {
}
};

ex.formatters = formatters;
ex.formatters = formatters;
ex.utils = utils;
ex.Method = Method;
ex.Property = Property;
Expand Down Expand Up @@ -4464,7 +4464,7 @@ module.exports = HttpProvider;
You should have received a copy of the GNU Lesser General Public License
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
*/
/**
/**
* @file iban.js
* @author Marek Kotewicz <marek@ethdev.com>
* @date 2015
Expand Down Expand Up @@ -4664,7 +4664,7 @@ Iban.prototype.address = function () {
var base36 = this._iban.substr(4);
var asBn = new BigNumber(base36, 36);
return padLeft(asBn.toString(16), 20);
}
}

return '';
};
Expand Down Expand Up @@ -4709,7 +4709,7 @@ var IpcProvider = function (path, net) {
var _this = this;
this.responseCallbacks = {};
this.path = path;

this.connection = net.connect({path: this.path});

this.connection.on('error', function(e){
Expand All @@ -4719,7 +4719,7 @@ var IpcProvider = function (path, net) {

this.connection.on('end', function(){
_this._timeout();
});
});


// LISTEN FOR CONNECTION RESPONSES
Expand Down Expand Up @@ -4758,7 +4758,7 @@ Will parse the response and make an array out of it.
IpcProvider.prototype._parseResponse = function(data) {
var _this = this,
returnValues = [];

// DE-CHUNKER
var dechunkedData = data
.replace(/\}[\n\r]?\{/g,'}|--|{') // }{
Expand Down Expand Up @@ -4862,7 +4862,7 @@ IpcProvider.prototype.send = function (payload) {
try {
result = JSON.parse(data);
} catch(e) {
throw errors.InvalidResponse(data);
throw errors.InvalidResponse(data);
}

return result;
Expand Down Expand Up @@ -5037,7 +5037,7 @@ Method.prototype.extractCallback = function (args) {

/**
* Should be called to check if the number of arguments is correct
*
*
* @method validateArgs
* @param {Array} arguments
* @throws {Error} if it is not
Expand All @@ -5050,7 +5050,7 @@ Method.prototype.validateArgs = function (args) {

/**
* Should be called to format input args of method
*
*
* @method formatInput
* @param {Array}
* @return {Array}
Expand Down Expand Up @@ -5104,7 +5104,7 @@ Method.prototype.attachToObject = function (obj) {
obj[name[0]] = obj[name[0]] || {};
obj[name[0]][name[1]] = func;
} else {
obj[name[0]] = func;
obj[name[0]] = func;
}
};

Expand Down Expand Up @@ -5167,8 +5167,8 @@ var DB = function (web3) {
this._requestManager = web3._requestManager;

var self = this;
methods().forEach(function(method) {

methods().forEach(function(method) {
method.attachToObject(self);
method.setRequestManager(web3._requestManager);
});
Expand Down Expand Up @@ -5441,7 +5441,7 @@ var methods = function () {
inputFormatter: [null, formatters.inputDefaultBlockNumberFormatter],
outputFormatter: utils.toDecimal
});

var sendRawTransaction = new Method({
name: 'sendRawTransaction',
call: 'eth_sendRawTransaction',
Expand Down Expand Up @@ -5485,36 +5485,6 @@ var methods = function () {
outputFormatter: utils.toDecimal
});

var compileSolidity = new Method({
name: 'compile.solidity',
call: 'eth_compileSolidity',
params: 1
});

var compileLLL = new Method({
name: 'compile.lll',
call: 'eth_compileLLL',
params: 1
});

var compileSerpent = new Method({
name: 'compile.serpent',
call: 'eth_compileSerpent',
params: 1
});

var submitWork = new Method({
name: 'submitWork',
call: 'eth_submitWork',
params: 3
});

var getWork = new Method({
name: 'getWork',
call: 'eth_getWork',
params: 0
});

var getCandidateStatus = new Method({
name: 'getCandidateStatus',
call: 'eth_getCandidateStatus',
Expand Down Expand Up @@ -5551,12 +5521,7 @@ var methods = function () {
sendRawTransaction,
signTransaction,
sendTransaction,
sign,
compileSolidity,
compileLLL,
compileSerpent,
submitWork,
getWork
sign
];
};

Expand Down Expand Up @@ -5661,7 +5626,7 @@ var Net = function (web3) {

var self = this;

properties().forEach(function(p) {
properties().forEach(function(p) {
p.attachToObject(self);
p.setRequestManager(web3._requestManager);
});
Expand Down Expand Up @@ -6220,7 +6185,7 @@ module.exports = {
You should have received a copy of the GNU Lesser General Public License
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
*/
/**
/**
* @file namereg.js
* @author Marek Kotewicz <marek@ethdev.com>
* @date 2015
Expand Down Expand Up @@ -6407,7 +6372,7 @@ module.exports = Property;
You should have received a copy of the GNU Lesser General Public License
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
*/
/**
/**
* @file requestmanager.js
* @author Jeffrey Wilcke <jeff@ethdev.com>
* @author Marek Kotewicz <marek@ethdev.com>
Expand Down Expand Up @@ -6474,7 +6439,7 @@ RequestManager.prototype.sendAsync = function (data, callback) {
if (err) {
return callback(err);
}

if (!Jsonrpc.isValidResponse(result)) {
return callback(errors.InvalidResponse(result));
}
Expand Down Expand Up @@ -6507,7 +6472,7 @@ RequestManager.prototype.sendBatch = function (data, callback) {
}

callback(err, results);
});
});
};

/**
Expand Down Expand Up @@ -6611,7 +6576,7 @@ RequestManager.prototype.poll = function () {
}

var payload = Jsonrpc.toBatchPayload(pollsData);

// map the request id to they poll id
var pollsIdMap = {};
payload.forEach(function(load, index){
Expand Down Expand Up @@ -6641,7 +6606,7 @@ RequestManager.prototype.poll = function () {
} else
return false;
}).filter(function (result) {
return !!result;
return !!result;
}).filter(function (result) {
var valid = Jsonrpc.isValidResponse(result);
if (!valid) {
Expand Down Expand Up @@ -6716,16 +6681,16 @@ var pollSyncing = function(self) {

self.callbacks.forEach(function (callback) {
if (self.lastSyncState !== sync) {

// call the callback with true first so the app can stop anything, before receiving the sync data
if(!self.lastSyncState && utils.isObject(sync))
callback(null, true);

// call on the next CPU cycle, so the actions of the sync stop can be processes first
setTimeout(function() {
callback(null, sync);
}, 0);

self.lastSyncState = sync;
}
});
Expand Down Expand Up @@ -6780,7 +6745,7 @@ module.exports = IsSyncing;
You should have received a copy of the GNU Lesser General Public License
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
*/
/**
/**
* @file transfer.js
* @author Marek Kotewicz <marek@ethdev.com>
* @date 2015
Expand All @@ -6799,15 +6764,15 @@ var exchangeAbi = require('../contracts/SmartExchange.json');
* @param {Function} callback, callback
*/
var transfer = function (eth, from, to, value, callback) {
var iban = new Iban(to);
var iban = new Iban(to);
if (!iban.isValid()) {
throw new Error('invalid iban address');
}

if (iban.isDirect()) {
return transferToAddress(eth, from, iban.address(), value, callback);
}

if (!callback) {
var address = eth.icapNamereg().addr(iban.institution());
return deposit(eth, from, address, value, iban.client());
Expand All @@ -6816,7 +6781,7 @@ var transfer = function (eth, from, to, value, callback) {
eth.icapNamereg().addr(iban.institution(), function (err, address) {
return deposit(eth, from, address, value, iban.client(), callback);
});

};

/**
Expand Down