forked from cerc-io/plugeth
fixed merge conflicts
This commit is contained in:
commit
7af9cc70d0
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,6 +4,7 @@
|
||||
# or operating system, you probably want to add a global ignore instead:
|
||||
# git config --global core.excludesfile ~/.gitignore_global
|
||||
|
||||
*.swp
|
||||
/tmp
|
||||
*/**/*un~
|
||||
*un~
|
||||
|
2
dist/ethereum.js
vendored
2
dist/ethereum.js
vendored
File diff suppressed because one or more lines are too long
2
dist/ethereum.js.map
vendored
2
dist/ethereum.js.map
vendored
File diff suppressed because one or more lines are too long
2
dist/ethereum.min.js
vendored
2
dist/ethereum.min.js
vendored
File diff suppressed because one or more lines are too long
72
gulpfile.js
72
gulpfile.js
@ -16,27 +16,9 @@ var source = require('vinyl-source-stream');
|
||||
var exorcist = require('exorcist');
|
||||
var bower = require('bower');
|
||||
|
||||
|
||||
var DEST = './dist/';
|
||||
|
||||
gulp.task('bower', function(cb){
|
||||
bower.commands.install().on('end', function (installed){
|
||||
console.log(installed);
|
||||
cb();
|
||||
});
|
||||
});
|
||||
|
||||
gulp.task('lint', function(){
|
||||
return gulp.src(['./*.js', './lib/*.js'])
|
||||
.pipe(jshint())
|
||||
.pipe(jshint.reporter('default'));
|
||||
});
|
||||
|
||||
gulp.task('clean', ['lint'], function(cb) {
|
||||
del([ DEST ], cb);
|
||||
});
|
||||
|
||||
gulp.task('prepare', ['clean'], function () {
|
||||
var build = function(src, dst) {
|
||||
return browserify({
|
||||
debug: true,
|
||||
insert_global_vars: false,
|
||||
@ -44,7 +26,7 @@ gulp.task('prepare', ['clean'], function () {
|
||||
bundleExternal: false
|
||||
})
|
||||
.add('./')
|
||||
.require('./index.js', {expose: 'web3'})
|
||||
.require('./' + src + '.js', {expose: 'web3'})
|
||||
.transform('envify', {
|
||||
NODE_ENV: 'build'
|
||||
})
|
||||
@ -63,20 +45,54 @@ gulp.task('prepare', ['clean'], function () {
|
||||
warnings: true
|
||||
})
|
||||
.bundle()
|
||||
.pipe(exorcist(path.join( DEST, 'ethereum.js.map')))
|
||||
.pipe(source('ethereum.js'))
|
||||
.pipe(exorcist(path.join( DEST, dst + '.js.map')))
|
||||
.pipe(source(dst + '.js'))
|
||||
.pipe(gulp.dest( DEST ));
|
||||
};
|
||||
|
||||
var uglifyFile = function(file) {
|
||||
return gulp.src( DEST + file + '.js')
|
||||
.pipe(uglify())
|
||||
.pipe(rename(file + '.min.js'))
|
||||
.pipe(gulp.dest( DEST ));
|
||||
};
|
||||
|
||||
gulp.task('bower', function(cb){
|
||||
bower.commands.install().on('end', function (installed){
|
||||
console.log(installed);
|
||||
cb();
|
||||
});
|
||||
});
|
||||
|
||||
gulp.task('build', ['prepare'], function(){
|
||||
return gulp.src( DEST + 'ethereum.js')
|
||||
.pipe(uglify())
|
||||
.pipe(rename('ethereum.min.js'))
|
||||
.pipe(gulp.dest( DEST ));
|
||||
gulp.task('lint', function(){
|
||||
return gulp.src(['./*.js', './lib/*.js'])
|
||||
.pipe(jshint())
|
||||
.pipe(jshint.reporter('default'));
|
||||
});
|
||||
|
||||
gulp.task('clean', ['lint'], function(cb) {
|
||||
del([ DEST ], cb);
|
||||
});
|
||||
|
||||
gulp.task('build', ['clean'], function () {
|
||||
return build('index', 'ethereum');
|
||||
});
|
||||
|
||||
gulp.task('buildQt', ['clean'], function () {
|
||||
return build('index_qt', 'ethereum_qt');
|
||||
});
|
||||
|
||||
gulp.task('uglify', ['build'], function(){
|
||||
return uglifyFile('ethereum');
|
||||
});
|
||||
|
||||
gulp.task('uglifyQt', ['buildQt'], function () {
|
||||
return uglifyFile('ethereum_qt');
|
||||
});
|
||||
|
||||
gulp.task('watch', function() {
|
||||
gulp.watch(['./lib/*.js'], ['lint', 'prepare', 'build']);
|
||||
});
|
||||
|
||||
gulp.task('default', ['bower', 'lint', 'prepare', 'build']);
|
||||
gulp.task('default', ['bower', 'lint', 'build', 'uglify']);
|
||||
gulp.task('qt', ['bower', 'lint', 'buildQt', 'uglifyQt']);
|
||||
|
4
index_qt.js
Normal file
4
index_qt.js
Normal file
@ -0,0 +1,4 @@
|
||||
var web3 = require('./lib/main');
|
||||
web3.providers.QtProvider = require('./lib/qt');
|
||||
|
||||
module.exports = web3;
|
97
lib/main.js
97
lib/main.js
@ -15,17 +15,12 @@
|
||||
along with ethereum.js. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/** @file main.js
|
||||
* @authors:
|
||||
* Jeffrey Wilcke <jeff@ethdev.com>
|
||||
* Marek Kotewicz <marek@ethdev.com>
|
||||
* Marian Oancea <marian@ethdev.com>
|
||||
* @date 2014
|
||||
*/
|
||||
|
||||
|
||||
function isPromise(o) {
|
||||
return o instanceof Promise;
|
||||
}
|
||||
* @authors:
|
||||
* Jeffrey Wilcke <jeff@ethdev.com>
|
||||
* Marek Kotewicz <marek@ethdev.com>
|
||||
* Marian Oancea <marian@ethdev.com>
|
||||
* @date 2014
|
||||
*/
|
||||
|
||||
function flattenPromise (obj) {
|
||||
if (obj instanceof Promise) {
|
||||
@ -46,7 +41,7 @@
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
if (obj instanceof Object) {
|
||||
return new Promise(function (resolve) {
|
||||
var keys = Object.keys(obj);
|
||||
@ -68,82 +63,83 @@
|
||||
|
||||
var ethMethods = function () {
|
||||
var blockCall = function (args) {
|
||||
return typeof args[0] === "string" ? "blockByHash" : "blockByNumber";
|
||||
return typeof args[0] === "string" ? "eth_blockByHash" : "eth_blockByNumber";
|
||||
};
|
||||
|
||||
var transactionCall = function (args) {
|
||||
return typeof args[0] === "string" ? 'transactionByHash' : 'transactionByNumber';
|
||||
return typeof args[0] === "string" ? 'eth_transactionByHash' : 'eth_transactionByNumber';
|
||||
};
|
||||
|
||||
var uncleCall = function (args) {
|
||||
return typeof args[0] === "string" ? 'uncleByHash' : 'uncleByNumber';
|
||||
return typeof args[0] === "string" ? 'eth_uncleByHash' : 'eth_uncleByNumber';
|
||||
};
|
||||
|
||||
var methods = [
|
||||
{ name: 'balanceAt', call: 'balanceAt' },
|
||||
{ name: 'stateAt', call: 'stateAt' },
|
||||
{ name: 'countAt', call: 'countAt'},
|
||||
{ name: 'codeAt', call: 'codeAt' },
|
||||
{ name: 'transact', call: 'transact' },
|
||||
{ name: 'call', call: 'call' },
|
||||
{ name: 'balanceAt', call: 'eth_balanceAt' },
|
||||
{ name: 'stateAt', call: 'eth_stateAt' },
|
||||
{ name: 'countAt', call: 'eth_countAt'},
|
||||
{ name: 'codeAt', call: 'eth_codeAt' },
|
||||
{ name: 'transact', call: 'eth_transact' },
|
||||
{ name: 'call', call: 'eth_call' },
|
||||
{ name: 'block', call: blockCall },
|
||||
{ name: 'transaction', call: transactionCall },
|
||||
{ name: 'uncle', call: uncleCall },
|
||||
{ name: 'compile', call: 'compile' }
|
||||
{ name: 'compile', call: 'eth_compile' },
|
||||
{ name: 'lll', call: 'eth_lll' }
|
||||
];
|
||||
return methods;
|
||||
};
|
||||
|
||||
var ethProperties = function () {
|
||||
return [
|
||||
{ name: 'coinbase', getter: 'coinbase', setter: 'setCoinbase' },
|
||||
{ name: 'listening', getter: 'listening', setter: 'setListening' },
|
||||
{ name: 'mining', getter: 'mining', setter: 'setMining' },
|
||||
{ name: 'gasPrice', getter: 'gasPrice' },
|
||||
{ name: 'account', getter: 'account' },
|
||||
{ name: 'accounts', getter: 'accounts' },
|
||||
{ name: 'peerCount', getter: 'peerCount' },
|
||||
{ name: 'defaultBlock', getter: 'defaultBlock', setter: 'setDefaultBlock' },
|
||||
{ name: 'number', getter: 'number'}
|
||||
{ name: 'coinbase', getter: 'eth_coinbase', setter: 'eth_setCoinbase' },
|
||||
{ name: 'listening', getter: 'eth_listening', setter: 'eth_setListening' },
|
||||
{ name: 'mining', getter: 'eth_mining', setter: 'eth_setMining' },
|
||||
{ name: 'gasPrice', getter: 'eth_gasPrice' },
|
||||
{ name: 'account', getter: 'eth_account' },
|
||||
{ name: 'accounts', getter: 'eth_accounts' },
|
||||
{ name: 'peerCount', getter: 'eth_peerCount' },
|
||||
{ name: 'defaultBlock', getter: 'eth_defaultBlock', setter: 'eth_setDefaultBlock' },
|
||||
{ name: 'number', getter: 'eth_number'}
|
||||
];
|
||||
};
|
||||
|
||||
var dbMethods = function () {
|
||||
return [
|
||||
{ name: 'put', call: 'put' },
|
||||
{ name: 'get', call: 'get' },
|
||||
{ name: 'putString', call: 'putString' },
|
||||
{ name: 'getString', call: 'getString' }
|
||||
{ name: 'put', call: 'db_put' },
|
||||
{ name: 'get', call: 'db_get' },
|
||||
{ name: 'putString', call: 'db_putString' },
|
||||
{ name: 'getString', call: 'db_getString' }
|
||||
];
|
||||
};
|
||||
|
||||
var shhMethods = function () {
|
||||
return [
|
||||
{ name: 'post', call: 'post' },
|
||||
{ name: 'newIdentity', call: 'newIdentity' },
|
||||
{ name: 'haveIdentity', call: 'haveIdentity' },
|
||||
{ name: 'newGroup', call: 'newGroup' },
|
||||
{ name: 'addToGroup', call: 'addToGroup' }
|
||||
{ name: 'post', call: 'shh_post' },
|
||||
{ name: 'newIdentity', call: 'shh_newIdentity' },
|
||||
{ name: 'haveIdentity', call: 'shh_haveIdentity' },
|
||||
{ name: 'newGroup', call: 'shh_newGroup' },
|
||||
{ name: 'addToGroup', call: 'shh_addToGroup' }
|
||||
];
|
||||
};
|
||||
|
||||
var ethWatchMethods = function () {
|
||||
var newFilter = function (args) {
|
||||
return typeof args[0] === 'string' ? 'newFilterString' : 'newFilter';
|
||||
return typeof args[0] === 'string' ? 'eth_newFilterString' : 'eth_newFilter';
|
||||
};
|
||||
|
||||
return [
|
||||
{ name: 'newFilter', call: newFilter },
|
||||
{ name: 'uninstallFilter', call: 'uninstallFilter' },
|
||||
{ name: 'getMessages', call: 'getMessages' }
|
||||
{ name: 'uninstallFilter', call: 'eth_uninstallFilter' },
|
||||
{ name: 'getMessages', call: 'eth_getMessages' }
|
||||
];
|
||||
};
|
||||
|
||||
var shhWatchMethods = function () {
|
||||
return [
|
||||
{ name: 'newFilter', call: 'shhNewFilter' },
|
||||
{ name: 'uninstallFilter', call: 'shhUninstallFilter' },
|
||||
{ name: 'getMessage', call: 'shhGetMessages' }
|
||||
{ name: 'newFilter', call: 'shh_newFilter' },
|
||||
{ name: 'uninstallFilter', call: 'shh_uninstallFilter' },
|
||||
{ name: 'getMessage', call: 'shh_getMessages' }
|
||||
];
|
||||
};
|
||||
|
||||
@ -204,7 +200,7 @@
|
||||
Object.defineProperty(obj, property.name, proto);
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
var web3 = {
|
||||
_callbacks: {},
|
||||
_events: {},
|
||||
@ -246,7 +242,6 @@
|
||||
var hex = this.toHex(str);
|
||||
while(hex.length < pad*2)
|
||||
hex += "00";
|
||||
|
||||
return "0x" + hex;
|
||||
},
|
||||
|
||||
@ -302,11 +297,11 @@
|
||||
setupMethods(web3.shh, shhMethods());
|
||||
|
||||
var ethWatch = {
|
||||
changed: 'changed'
|
||||
changed: 'eth_changed'
|
||||
};
|
||||
setupMethods(ethWatch, ethWatchMethods());
|
||||
var shhWatch = {
|
||||
changed: 'shhChanged'
|
||||
changed: 'shh_changed'
|
||||
};
|
||||
setupMethods(shhWatch, shhWatchMethods());
|
||||
|
||||
@ -453,5 +448,5 @@
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = web3;
|
||||
|
||||
module.exports = web3;
|
||||
|
Loading…
Reference in New Issue
Block a user