Merge branch '1.x' into patch-1

web3 · Aug 10, 2020 · b15678f · b15678f
2 parents 80a33d1 + dbf659a
commit b15678f
Show file tree

Hide file tree

Showing 10 changed files with 635 additions and 767 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,16 +19,20 @@ jobs:
             - uses: actions/setup-node@v1
               with:
                   node-version: 12
+
             - uses: actions/checkout@v2
+
             - uses: actions/cache@v2
               id: cache-deps
               with:
                   path: |
                       node_modules
                       */*/node_modules
-                  key: 2-${{ runner.os }}-node12-${{ hashFiles('**/package-lock.json') }}
-            - run: bash ./scripts/install.sh
+                  key: ${{ runner.os }}-node12-${{ hashFiles('**/package-lock.json') }}
+
+            - run: npm ci
               if: steps.cache-deps.outputs.cache-hit != 'true'
+
             - run: bash ./scripts/ci.sh
     unit:
         runs-on: ubuntu-latest
@@ -41,16 +45,20 @@ jobs:
             - uses: actions/setup-node@v1
               with:
                   node-version: ${{ matrix.node }}
+
             - uses: actions/checkout@v2
+
             - uses: actions/cache@v2
               id: cache-deps
               with:
                   path: |
                       node_modules
                       */*/node_modules
-                  key: 2-${{ runner.os }}-node${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
-            - run: bash ./scripts/install.sh
+                  key: ${{ runner.os }}-node${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
+
+            - run: npm ci
               if: steps.cache-deps.outputs.cache-hit != 'true'
+
             - run: bash ./scripts/ci.sh
     e2e:
         runs-on: ubuntu-latest
@@ -59,11 +67,11 @@ jobs:
             matrix:
                 testCmd:
                     [
-                        "unit_and_e2e_clients",
-                        "e2e_ganache",
-                        "e2e_mosaic",
-                        "e2e_browsers",
-                        "e2e_gnosis_dex",
+                        'unit_and_e2e_clients',
+                        'e2e_browsers',
+                        'e2e_ganache',
+                        'e2e_mosaic',
+                        'e2e_gnosis_dex',
                     ]
         env:
             TEST: ${{ matrix.testCmd }}
@@ -72,16 +80,21 @@ jobs:
               with:
                   node-version: 12
             - uses: actions/checkout@v2
+
             - uses: actions/cache@v2
               id: cache-deps
+              if: env.TEST == 'unit_and_e2e_clients' || env.TEST == 'e2e_browsers'
               with:
                   path: |
                       node_modules
                       */*/node_modules
-                  key: 2-${{ runner.os }}-node12-${{ hashFiles('**/package-lock.json') }}
-            - run: bash ./scripts/install.sh
-              if: steps.cache-deps.outputs.cache-hit != 'true'
+                  key: ${{ runner.os }}-node12-${{ hashFiles('**/package-lock.json') }}
+
+            - run: npm ci
+              if: (env.TEST == 'unit_and_e2e_clients' || env.TEST == 'e2e_browsers') && steps.cache-deps.outputs.cache-hit != 'true'
+
             - run: bash ./scripts/ci.sh
+
             - name: Send coverage reports to Coveralls
               if: env.TEST == 'unit_and_e2e_clients'
               uses: coverallsapp/github-action@master

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -274,9 +274,11 @@ Released with 1.0.0-beta.37 code base.
 
 ### Changed
 
+- Improve RequestManager send method (#3649)
 - `npm run build` now uses TSC to compile (.js allowed) and the build folder is now located under `lib` (#3652)
 - Modernized web3-core to use newer es syntax (#3652)
 - Bumped `web3-providers-ipc` `oboe` version to 2.1.5 (#3661)
+- Bump lodash from 4.17.15 to 4.17.19
 
 ### Fixed
 

diff --git a/docs/web3-shh.rst b/docs/web3-shh.rst
@@ -759,25 +759,25 @@ Example
 
 .. code-block:: javascript
 
-    var identities = [];
+    var identities = {};
     var subscription = null;
 
     Promise.all([
-        web3.shh.newSymKey().then((id) => {identities.push(id);}),
-        web3.shh.newKeyPair().then((id) => {identities.push(id);})
+        web3.shh.newSymKey().then((id) => {identities.symKey = id;}),
+        web3.shh.newKeyPair().then((id) => {identities.keyPair = id;})
 
     ]).then(() => {
 
         // will receive also its own message send, below
-        subscription = shh.subscribe("messages", {
-            symKeyID: identities[0],
+        subscription = web3.shh.subscribe("messages", {
+            symKeyID: identities.symKey,
             topics: ['0xffaadd11']
         }).on('data', console.log);
 
     }).then(() => {
        web3.shh.post({
-            symKeyID: identities[0], // encrypts using the sym key ID
-            sig: identities[1], // signs the message using the keyPair ID
+            symKeyID: identities.symKey, // encrypts using the sym key ID
+            sig: identities.keyPair, // signs the message using the keyPair ID
             ttl: 10,
             topic: '0xffaadd11',
             payload: '0xffffffdddddd1122',