Skip to content
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.

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

Support eth_signTypeData_v3 #14

Merged
merged 3 commits into from
Jan 12, 2021
Merged
Changes from all commits
Commits
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
39 changes: 1 addition & 38 deletions dist/AlphaWallet-min.js

Large diffs are not rendered by default.

77,904 changes: 39,874 additions & 38,030 deletions dist/AlphaWallet.js

Large diffs are not rendered by default.

21 changes: 7 additions & 14 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ const gulp = require('gulp'),
buffer = require('vinyl-buffer'),
del = require('del'),
minify = require('gulp-minify'),
runSequence = require('run-sequence'),
size = require('gulp-size'),
source = require('vinyl-source-stream'),
config = {
@@ -26,28 +25,26 @@ const gulp = require('gulp'),
}
};

gulp.task('clean', function (callback) {
runSequence('clean:dist', 'clean:stage', callback);
});

gulp.task('clean:stage', function () {
let stagingDir = `${config.staging.baseDir}/${config.fileTypes.all}`;
return del.sync(stagingDir);
return del(stagingDir);
});

gulp.task('clean:dist', function () {
let distributionDir = `${config.distribution.baseDir}/${config.fileTypes.all}`;
return del.sync(distributionDir);
return del(distributionDir);
});

gulp.task('clean', gulp.series('clean:dist', 'clean:stage'))

gulp.task('javascript', function () {
let sourceDir = `${config.source.baseDir}/${config.fileTypes.js}`,
stagingDir = `${config.staging.baseDir}`;
return gulp.src(sourceDir)
.pipe(gulp.dest(stagingDir));
});

gulp.task('bundle:javascript', ['javascript', ], function () {
gulp.task('bundle:javascript', gulp.series('javascript', function () {
let mainFile = `${config.staging.baseDir}/${config.fileTypes.main}`,
distributionDir = `${config.distribution.baseDir}`;
return browserify(mainFile)
@@ -62,10 +59,6 @@ gulp.task('bundle:javascript', ['javascript', ], function () {
}))
.pipe(size())
.pipe(gulp.dest(distributionDir));
});

gulp.task('build', function (callback) {
runSequence('clean:dist', 'clean:stage', ['bundle:javascript'],
callback);
});
}));

gulp.task('build', gulp.series('clean:dist', 'clean:stage', `bundle:javascript`))
12,031 changes: 10,532 additions & 1,499 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -35,17 +35,17 @@
"eslint": "^5.0.1",
"eslint-plugin-mocha": "^5.0.0",
"eslint-plugin-node": "^6.0.1",
"gulp": "^3.9.1",
"gulp-minify": "^2.1.0",
"gulp": "^4.0.2",
"gulp-minify": "^3.1.0",
"gulp-rename": "^1.2.2",
"gulp-size": "^3.0.0",
"run-sequence": "^2.2.1",
"undertaker": "^1.2.1",
"vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0"
},
"dependencies": {
"babel-core": "^6.26.0",
"web3": "0.20.6",
"web3-provider-engine": "https://github.com/cryptape/provider-engine#nervos"
"web3-provider-engine": "https://github.com/AlphaWallet/provider-engine#alphawallet"
}
}
16 changes: 16 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -122,5 +122,21 @@ ProviderEngine.prototype.isConnected = function () {
}).result
}

ProviderEngine.prototype.sendAsyncOriginal = ProviderEngine.prototype.sendAsync
ProviderEngine.prototype.sendAsync = function (payload, cb) {module.exports = AlphaWallet
switch (payload.method) {
case 'net_version':
var result = {
id: payload.id,
jsonrpc: payload.jsonrpc,
result: globalSyncOptions.networkVersion || null
};
cb(null, result);
break;
default:
this.sendAsyncOriginal(payload, cb)
}
};

module.exports = AlphaWallet