Merge branch '1.0' into documentation/web3-module-options

web3 · Jan 27, 2019 · fcba5a9 · fcba5a9
2 parents 259ae55 + d816865
commit fcba5a9
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 3 deletions.
diff --git a/packages/web3-bzz/package-lock.json b/packages/web3-bzz/package-lock.json
diff --git a/packages/web3-bzz/package.json b/packages/web3-bzz/package.json
@@ -16,6 +16,7 @@
         "dtslint": "dtslint types --onlyTestTsNext"
     },
     "dependencies": {
+        "@types/node": "^10.12.18",
         "lodash": "^4.17.11",
         "swarm-js": "^0.1.39"
     },

diff --git a/packages/web3-core/package-lock.json b/packages/web3-core/package-lock.json
diff --git a/packages/web3-core/package.json b/packages/web3-core/package.json
@@ -16,6 +16,7 @@
         "dtslint": "dtslint types --onlyTestTsNext"
     },
     "dependencies": {
+        "@types/node": "^10.12.18",
         "lodash": "^4.17.11",
         "web3-utils": "1.0.0-beta.38"
     },

diff --git a/packages/web3-eth-accounts/types/index.d.ts b/packages/web3-eth-accounts/types/index.d.ts
@@ -30,7 +30,7 @@ export class Accounts extends AbstractWeb3Module {
 
     privateKeyToAccount(privateKey: string): Account;
 
-    signTransaction(tx: Transaction, privateKey: string, callback?: () => void): SignedTransaction;
+    signTransaction(tx: Transaction, privateKey: string, callback?: () => void): Promise<SignedTransaction>;
 
     recoverTransaction(signature: string): string;
 

diff --git a/packages/web3-eth-accounts/types/tests/accounts-tests.ts b/packages/web3-eth-accounts/types/tests/accounts-tests.ts
@@ -28,14 +28,14 @@ accounts.create('2435@#@#@±±±±!!!!678543213456764321§3456754321345678543213
 // $ExpectType Account
 accounts.privateKeyToAccount('0x348ce564d427a3311b6536bbcff9390d69395b06ed6c486954e971d960fe8709');
 
-// $ExpectType SignedTransaction
+// $ExpectType Promise<SignedTransaction>
 accounts.signTransaction({
     to: '0xF0109fC8DF283027b6285cc889F5aA624EaC1F55',
     value: '1000000000',
     gas: 2000000
 }, '0x4c0883a69102937d6231471b5dbb6204fe5129617082792ae468d01a3f362318');
 
-// $ExpectType SignedTransaction
+// $ExpectType Promise<SignedTransaction>
 accounts.signTransaction({
     to: '0xF0109fC8DF283027b6285cc889F5aA624EaC1F55',
     value: '1000000000',

diff --git a/packages/web3-providers/package-lock.json b/packages/web3-providers/package-lock.json
diff --git a/packages/web3-providers/package.json b/packages/web3-providers/package.json
@@ -16,6 +16,7 @@
     },
     "types": "types",
     "dependencies": {
+        "@types/node": "^10.12.18",
         "eventemitter3": "3.1.0",
         "lodash": "^4.17.11",
         "oboe": "2.1.4",

diff --git a/packages/web3-utils/package-lock.json b/packages/web3-utils/package-lock.json
diff --git a/packages/web3-utils/package.json b/packages/web3-utils/package.json
@@ -16,6 +16,7 @@
     },
     "types": "types",
     "dependencies": {
+        "@types/node": "^10.12.18",
         "bn.js": "4.11.8",
         "eth-lib": "0.2.8",
         "ethjs-unit": "^0.1.6",

diff --git a/packages/web3/package-lock.json b/packages/web3/package-lock.json
diff --git a/packages/web3/package.json b/packages/web3/package.json
@@ -56,6 +56,7 @@
     },
     "types": "types",
     "dependencies": {
+        "@types/node": "^10.12.18",
         "web3-bzz": "1.0.0-beta.38",
         "web3-core": "1.0.0-beta.38",
         "web3-core-helpers": "1.0.0-beta.38",