Add bundle

CHANGELOG.md

@@ -1,7 +1,12 @@
 # zkSync changelog
 
-### zksync.js 0.6.0 
-- Upgrade ethers to ^5.0.0 
+### zksync.js 0.6.1
+
+- Bundled version added.
+
+### zksync.js 0.6.0
+
+- Upgrade ethers to ^5.0.0
 
 ### zkSync
 

core/server/src/api_server/rpc_subscriptions.rs

@@ -243,6 +243,7 @@ pub fn start_ws_server(
                 |context: &RequestContext| Arc::new(Session::new(context.sender())),
             )
             .request_middleware(super::loggers::ws_rpc::request_middleware)
+            .max_connections(1000)
             .event_loop_executor(task_executor.executor())
             .start(&addr)
             .expect("Unable to start RPC ws server");

js/tests/simple-integration-test.ts

@@ -361,7 +361,7 @@ async function checkFailedTransactionResending(contract: Contract, depositWallet
     try {
         await testTransfer(syncWallet1, syncWallet2, "ETH", amount);
     } catch (e) {
-        assert(e.value.failReason == `Not enough balance`);
+        assert(e?.value?.failReason == `Not enough balance`);
         console.log('Transfer failed (expected)');
     }
 

js/zksync.js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zksync",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "license": "MIT",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -24,14 +24,17 @@
     "prettier": "1.18.2",
     "ts-node": "^8.3.0",
     "tslint": "^6.0.0-beta0",
-    "typescript": "^3.5.3"
+    "typescript": "^3.5.3",
+    "webpack": "^5.0.0-beta.26",
+    "webpack-cli": "^3.3.12"
   },
   "scripts": {
     "lint:ts": "tslint -c tslint.json {examples,test,src}/**/*.ts",
     "lint:ts-fix": "tslint -c tslint.json --fix {examples,test,src}/**/*.ts",
     "test": "mocha -r ts-node/register tests/**/*.test.ts",
     "fmt": "prettier --tab-width 4 --parser typescript --write \"{src,tests,examples}/*.ts\"",
     "build": "tsc",
-    "watch": "tsc --watch"
+    "watch": "tsc --watch",
+    "prepublish": "yarn build && webpack"
   }
 }

js/zksync.js/src/signer.ts

@@ -5,13 +5,15 @@ import {
 } from "./crypto";
 import {BigNumber, BigNumberish, ethers} from "ethers";
 import {
-    packAmountChecked,
-    packFeeChecked,
     getEthSignatureType,
     signMessagePersonalAPI,
-    getSignedBytesFromMessage
+    getSignedBytesFromMessage,
+    serializeAccountId,
+    serializeAddress,
+    serializeTokenId,
+    serializeAmountPacked,
+    serializeFeePacked, serializeNonce, serializeAmountFull
 } from "./utils";
-import BN = require("bn.js");
 import {
     Address,
     EthSignerType,
@@ -20,9 +22,6 @@ import {
     Withdraw
 } from "./types";
 
-const MAX_NUMBER_OF_TOKENS = 128;
-const MAX_NUMBER_OF_ACCOUNTS = Math.pow(2, 24);
-
 export class Signer {
     readonly privateKey: Uint8Array;
 
@@ -151,72 +150,3 @@ export class Signer {
     }
 }
 
-function removeAddressPrefix(address: Address | PubKeyHash): string {
-    if (address.startsWith("0x")) return address.substr(2);
-
-    if (address.startsWith("sync:")) return address.substr(5);
-
-    throw new Error(
-        "ETH address must start with '0x' and PubKeyHash must start with 'sync:'"
-    );
-}
-
-// PubKeyHash or eth address
-export function serializeAddress(address: Address | PubKeyHash): Buffer {
-    const prefixlessAddress = removeAddressPrefix(address);
-
-    const addressBytes = Buffer.from(prefixlessAddress, "hex");
-    if (addressBytes.length != 20) {
-        throw new Error("Address must be 20 bytes long");
-    }
-
-    return addressBytes;
-}
-
-export function serializeAccountId(accountId: number): Buffer {
-    if (accountId < 0) {
-        throw new Error("Negative account id");
-    }
-    if (accountId >= MAX_NUMBER_OF_ACCOUNTS) {
-        throw new Error("AccountId is too big");
-    }
-    const buffer = Buffer.alloc(4);
-    buffer.writeUInt32BE(accountId, 0);
-    return buffer;
-}
-
-export function serializeTokenId(tokenId: number): Buffer {
-    if (tokenId < 0) {
-        throw new Error("Negative tokenId");
-    }
-    if (tokenId >= MAX_NUMBER_OF_TOKENS) {
-        throw new Error("TokenId is too big");
-    }
-    const buffer = Buffer.alloc(2);
-    buffer.writeUInt16BE(tokenId, 0);
-    return buffer;
-}
-
-export function serializeAmountPacked(amount: BigNumberish): Buffer {
-    const bnAmount = new BN(BigNumber.from(amount).toString());
-    return packAmountChecked(bnAmount);
-}
-
-export function serializeAmountFull(amount: BigNumberish): Buffer {
-    const bnAmount = new BN(BigNumber.from(amount).toString());
-    return bnAmount.toArrayLike(Buffer, "be", 16);
-}
-
-export function serializeFeePacked(fee: BigNumberish): Buffer {
-    const bnFee = new BN(BigNumber.from(fee).toString());
-    return packFeeChecked(bnFee);
-}
-
-export function serializeNonce(nonce: number): Buffer {
-    if (nonce < 0) {
-        throw new Error("Negative nonce");
-    }
-    const buff = Buffer.alloc(4);
-    buff.writeUInt32BE(nonce, 0);
-    return buff;
-}

js/zksync.js/src/transport.ts

@@ -1,6 +1,7 @@
 import Axios from "axios";
 import WebSocketAsPromised = require("websocket-as-promised");
-const W3CWebSocket = require("websocket").w3cwebsocket;
+import * as websocket from "websocket";
+const W3CWebSocket = websocket.w3cwebsocket;
 
 export abstract class AbstractJSONRPCTransport {
     abstract async request(method: string, params): Promise<any>;

js/zksync.js/src/utils.ts

@@ -6,9 +6,11 @@ import {
     TokenLike,
     Tokens,
     TokenSymbol,
-    EthSignerType
+    EthSignerType, Address
 } from "./types";
-import { serializeAccountId, serializeNonce } from "./signer";
+
+const MAX_NUMBER_OF_TOKENS = 128;
+const MAX_NUMBER_OF_ACCOUNTS = Math.pow(2, 24);
 
 export const IERC20_INTERFACE = new utils.Interface(
     require("../abi/IERC20.json").abi
@@ -44,7 +46,7 @@ export function floatToInteger(
     mantissaBits: number,
     expBaseNumber: number
 ): BN {
-    if (floatBytes.length * 8 != mantissaBits + expBits) {
+    if (floatBytes.length * 8 !== mantissaBits + expBits) {
         throw new Error("Float unpacking, incorrect input length");
     }
 
@@ -72,7 +74,7 @@ export function floatToInteger(
 }
 
 export function bitsIntoBytesInBEOrder(bits: boolean[]): Buffer {
-    if (bits.length % 8 != 0) {
+    if (bits.length % 8 !== 0) {
         throw new Error("wrong number of bits to pack");
     }
     const nBytes = bits.length / 8;
@@ -486,3 +488,73 @@ export async function getEthSignatureType(
         isSignedMsgPrefixed: true
     };
 }
+
+function removeAddressPrefix(address: Address | PubKeyHash): string {
+    if (address.startsWith("0x")) return address.substr(2);
+
+    if (address.startsWith("sync:")) return address.substr(5);
+
+    throw new Error(
+        "ETH address must start with '0x' and PubKeyHash must start with 'sync:'"
+    );
+}
+
+// PubKeyHash or eth address
+export function serializeAddress(address: Address | PubKeyHash): Buffer {
+    const prefixlessAddress = removeAddressPrefix(address);
+
+    const addressBytes = Buffer.from(prefixlessAddress, "hex");
+    if (addressBytes.length !== 20) {
+        throw new Error("Address must be 20 bytes long");
+    }
+
+    return addressBytes;
+}
+
+export function serializeAccountId(accountId: number): Buffer {
+    if (accountId < 0) {
+        throw new Error("Negative account id");
+    }
+    if (accountId >= MAX_NUMBER_OF_ACCOUNTS) {
+        throw new Error("AccountId is too big");
+    }
+    const buffer = Buffer.alloc(4);
+    buffer.writeUInt32BE(accountId, 0);
+    return buffer;
+}
+
+export function serializeTokenId(tokenId: number): Buffer {
+    if (tokenId < 0) {
+        throw new Error("Negative tokenId");
+    }
+    if (tokenId >= MAX_NUMBER_OF_TOKENS) {
+        throw new Error("TokenId is too big");
+    }
+    const buffer = Buffer.alloc(2);
+    buffer.writeUInt16BE(tokenId, 0);
+    return buffer;
+}
+
+export function serializeAmountPacked(amount: BigNumberish): Buffer {
+    const bnAmount = new BN(BigNumber.from(amount).toString());
+    return packAmountChecked(bnAmount);
+}
+
+export function serializeAmountFull(amount: BigNumberish): Buffer {
+    const bnAmount = new BN(BigNumber.from(amount).toString());
+    return bnAmount.toArrayLike(Buffer, "be", 16);
+}
+
+export function serializeFeePacked(fee: BigNumberish): Buffer {
+    const bnFee = new BN(BigNumber.from(fee).toString());
+    return packFeeChecked(bnFee);
+}
+
+export function serializeNonce(nonce: number): Buffer {
+    if (nonce < 0) {
+        throw new Error("Negative nonce");
+    }
+    const buff = Buffer.alloc(4);
+    buff.writeUInt32BE(nonce, 0);
+    return buff;
+}

js/zksync.js/tsconfig.json

@@ -1,9 +1,7 @@
 {
   "compilerOptions": {
-    "esModuleInterop": true,
     "module": "commonjs",
     "target": "es6",
-    "moduleResolution": "node",
 
     "outDir": "./build",
 

js/zksync.js/webpack.config.js

@@ -0,0 +1,11 @@
+
+module.exports = {
+  entry: './build/index.js',
+  mode: 'production',
+  experiments: {
+      asyncWebAssembly: true
+  },
+  resolve: {
+      alias: { util: false },
+  },
+};