Feature/exact version dependencies (web3#1130)

* Specify the "--exact" flag when running `lerna publish` to pin dependencies to exact released versions on all the web3-* packages. * Fixed package versioning. Fixed the `gulp version` task so that it updates all the necessary files, including `.versions` Changed the `release` npm script to update all versions (via lerna), *then* rebuild the dist files, then do the full `lerna publish` step. * Simplified the `npm run release` script, removed version update of meteor files. * Discovered a more global way of ensuring that lerna always publishes with exact versions. * Fixed blocking test in eth.sendTransaction.js
nachomazzara · Jun 4, 2020 · ec44807 · ec44807
1 parent d2226c8
commit ec44807
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 54 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -2,7 +2,7 @@
 
 'use strict';
 
-var version = require('./lerna.json');
+var lernaJSON = require('./lerna.json');
 var path = require('path');
 
 var del = require('del');
@@ -24,74 +24,74 @@ var packages = [{
  fileName: 'web3',
  expose: 'Web3',
  src: './packages/web3/src/index.js',
- ignore: ['xmlhttprequest','websocket']
-},{
+ ignore: ['xmlhttprequest', 'websocket']
+}, {
  fileName: 'web3-utils',
  expose: 'Web3Utils',
  src: './packages/web3-utils/src/index.js'
-},{
+}, {
  fileName: 'web3-eth',
  expose: 'Web3Eth',
  src: './packages/web3-eth/src/index.js'
-},{
+}, {
  fileName: 'web3-eth-accounts',
  expose: 'Web3EthAccounts',
  src: './packages/web3-eth-accounts/src/index.js'
-},{
+}, {
  fileName: 'web3-eth-contract',
  expose: 'Web3EthContract',
  src: './packages/web3-eth-contract/src/index.js'
-},{
+}, {
  fileName: 'web3-eth-personal',
  expose: 'Web3EthPersonal',
  src: './packages/web3-eth-personal/src/index.js'
-},{
+}, {
  fileName: 'web3-eth-iban',
  expose: 'Web3EthIban',
  src: './packages/web3-eth-iban/src/index.js'
-},{
+}, {
  fileName: 'web3-eth-abi',
  expose: 'Web3EthAbi',
  src: './packages/web3-eth-abi/src/index.js'
-},{
+}, {
  fileName: 'web3-net',
  expose: 'Web3Net',
  src: './packages/web3-net/src/index.js'
-},{
+}, {
  fileName: 'web3-shh',
  expose: 'Web3Shh',
  src: './packages/web3-shh/src/index.js'
-},{
+}, {
  fileName: 'web3-bzz',
  expose: 'Web3Bzz',
  src: './packages/web3-bzz/src/index.js'
-},{
+}, {
  fileName: 'web3-providers-ipc',
  expose: 'Web3IpcProvider',
  src: './packages/web3-providers-ipc/src/index.js'
-},{
+}, {
  fileName: 'web3-providers-http',
  expose: 'Web3HttpProvider',
  src: './packages/web3-providers-http/src/index.js',
  ignore: ['xmlhttprequest']
-},{
+}, {
  fileName: 'web3-providers-ws',
  expose: 'Web3WsProvider',
  src: './packages/web3-providers-ws/src/index.js',
  ignore: ['websocket']
-},{
+}, {
  fileName: 'web3-core-subscriptions',
  expose: 'Web3Subscriptions',
  src: './packages/web3-core-subscriptions/src/index.js'
-},{
+}, {
  fileName: 'web3-core-requestmanager',
  expose: 'Web3RequestManager',
  src: './packages/web3-core-requestmanager/src/index.js'
-},{
+}, {
  fileName: 'web3-core-promievent',
  expose: 'Web3PromiEvent',
  src: './packages/web3-core-promievent/src/index.js'
-},{
+}, {
  fileName: 'web3-core-method',
  expose: 'Web3Method',
  src: './packages/web3-core-method/src/index.js'
@@ -107,88 +107,93 @@ var browserifyOptions = {
 };
 
 var ugliyOptions = {
- compress:{
- dead_code : true, // jshint ignore:line
- drop_debugger : true, // jshint ignore:line
- global_defs : { // jshint ignore:line
+ compress: {
+ dead_code: true, // jshint ignore:line
+ drop_debugger: true, // jshint ignore:line
+ global_defs: { // jshint ignore:line
  "DEBUG": false // matters for some libraries
  }
  }
 };
 
-gulp.task('version', function(){
- if(!version.version) return;
-
- gulp.src(['./package.json'])
- .pipe(replace(/\"version\"\: \"([\.0-9\-a-z]*)\"/, '"version": "'+ version.version + '"'))
- .pipe(gulp.dest('./'));
- gulp.src(['./bower.json'])
- .pipe(replace(/\"version\"\: \"([\.0-9\-a-z]*)\"/, '"version": "'+ version.version + '"'))
- .pipe(gulp.dest('./'));
- gulp.src(['./package.js'])
- .pipe(replace(/version\: \'([\.0-9\-a-z]*)\'/, "version: '"+ version.version + "'"))
- .pipe(gulp.dest('./'));
+gulp.task('version', function () {
+ if (!lernaJSON.version) {
+ throw new Error("version property is missing from lerna.json");
+ }
+
+ var version = lernaJSON.version;
+ var jsonPattern = /"version": "[.0-9\-a-z]*"/;
+ var jsPattern = /version: '[.0-9\-a-z]*'/;
+ var glob = [
+ './package.json',
+ './bower.json',
+ './package.js'
+ ];
+
+ gulp.src(glob, {base: './'})
+ .pipe(replace(jsonPattern, '"version": "' + version + '"'))
+ .pipe(replace(jsPattern, "version: '" + version + "'"))
+ .pipe(gulp.dest('./'));
 });
 
-gulp.task('bower', ['version'], function(cb){
- bower.commands.install().on('end', function (installed){
+gulp.task('bower', ['version'], function (cb) {
+ bower.commands.install().on('end', function (installed) {
  console.log(installed);
  cb();
  });
 });
 
-gulp.task('lint', [], function(){
+gulp.task('lint', [], function () {
  return gulp.src(['./*.js', './lib/*.js'])
  .pipe(jshint())
  .pipe(jshint.reporter('default'));
 });
 
-gulp.task('clean', ['lint'], function(cb) {
- del([ DEST ]).then(cb.bind(null, null));
+gulp.task('clean', ['lint'], function (cb) {
+ del([DEST]).then(cb.bind(null, null));
 });
 
-packages.forEach(function(pckg, i){
- var prevPckg = (!i) ? 'clean' : packages[i-1].fileName;
+packages.forEach(function (pckg, i) {
+ var prevPckg = (!i) ? 'clean' : packages[i - 1].fileName;
 
  gulp.task(pckg.fileName, [prevPckg], function () {
  browserifyOptions.standalone = pckg.expose;
 
  var pipe = browserify(browserifyOptions)
- .require(pckg.src, {expose: pckg.expose})
- .require('bn.js', {expose: 'BN'}) // expose it to dapp developers
+ .require(pckg.src, { expose: pckg.expose })
+ .require('bn.js', { expose: 'BN' }) // expose it to dapp developers
  .add(pckg.src);
 
- if(pckg.ignore) {
+ if (pckg.ignore) {
  pckg.ignore.forEach(function (ignore) {
  pipe.ignore(ignore);
  });
  }
 
  return pipe.bundle()
- .pipe(exorcist(path.join( DEST, pckg.fileName + '.js.map')))
+ .pipe(exorcist(path.join(DEST, pckg.fileName + '.js.map')))
  .pipe(source(pckg.fileName + '.js'))
  .pipe(streamify(babel({
  compact: false,
  presets: ['env']
  })))
- .pipe(gulp.dest( DEST ))
+ .pipe(gulp.dest(DEST))
  .pipe(streamify(babel({
  compact: true,
  presets: ['env']
  })))
  .pipe(streamify(uglify(ugliyOptions)))
  .on('error', function (err) { console.error(err); })
  .pipe(rename(pckg.fileName + '.min.js'))
- .pipe(gulp.dest( DEST ));
+ .pipe(gulp.dest(DEST));
  });
 });
 
-
-gulp.task('watch', function() {
+gulp.task('watch', function () {
  gulp.watch(['./packages/web3/src/*.js'], ['lint', 'build']);
 });
 
-gulp.task('all', ['version', 'lint', 'clean', packages[packages.length-1].fileName]);
+gulp.task('all', ['version', 'lint', 'clean', packages[packages.length - 1].fileName]);
 
 gulp.task('default', ['version', 'lint', 'clean', packages[0].fileName]);
 
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,15 @@
 {
  "version": "1.0.0-beta.26",
  "lerna": "2.0.0",
+ "command": {
+ "init": {
+ "exact": true
+ },
+ "publish": {
+ "exact": true,
+ "skipGit": true
+ }
+ },
  "packages": [
  "packages/*"
  ]

diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
  "postinstall": "lerna bootstrap",
  "build": "gulp",
  "build-all": "gulp all",
- "release": "lerna bootstrap; gulp; lerna publish --skip-git; gulp version;",
+ "release": "lerna bootstrap; lerna publish; gulp version; gulp",
  "watch": "gulp watch",
  "docs": "cd docs; make html;",
  "lint": "jshint *.js packages",

diff --git a/test/eth.sendTransaction.js b/test/eth.sendTransaction.js
@@ -242,12 +242,12 @@ describe(method, function () {
  assert.deepEqual(payload.params, test.formattedArgs2 || []);
  });
  }
- 
+
  provider.injectResult(null);
  provider.injectValidation(function (payload) {
  assert.equal(payload.method, 'eth_getTransactionReceipt');
  });
- 
+
 
  // if notification its sendTransaction, which needs two more results, subscription and receipt
  if(test.notification) {
@@ -327,6 +327,26 @@ describe(method, function () {
  }
 
 
+ provider.injectResult(null);
+ provider.injectValidation(function (payload) {
+ assert.equal(payload.method, 'eth_getTransactionReceipt');
+ });
+
+
+ // if notification its sendTransaction, which needs two more results, subscription and receipt
+ if(test.notification) {
+ // inject receipt
+ provider.injectResult({
+ "blockHash": "0x6fd9e2a26ab",
+ "blockNumber": "0x15df",
+ "transactionHash": "0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b",
+ "transactionIndex": "0x1",
+ "contractAddress": "0x407d73d8a49eeb85d32cf465507dd71d507100c1",
+ "cumulativeGasUsed": "0x7f110",
+ "gasUsed": "0x7f110"
+ });
+ }
+
  var args = clone(test.args);
 
  if(test.error) {