Merge pull request #13 from nash-io/ts/update-nash-protocol-2

Ts/update nash protocol 2

Author: localhuman

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="5.0.35"></a>
+## [5.0.35](https://github.com/nash-io/api-client-typescript/compare/v5.0.33...v5.0.35) (2020-06-24)
+
+
+
+<a name="5.0.33"></a>
+## [5.0.33](https://github.com/nash-io/api-client-typescript/compare/v5.0.31...v5.0.33) (2020-06-24)
+
+
+
 <a name="5.0.31"></a>
 ## [5.0.31](https://github.com/nash-io/api-client-typescript/compare/v5.0.29-pages...v5.0.31) (2020-06-23)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neon-exchange/api-client-typescript",
-  "version": "5.0.31",
+  "version": "5.0.35",
   "description": "Official TypeScript client for interacting with the Nash exchange",
   "main": "build/main/index.js",
   "typings": "build/main/index.d.ts",
@@ -62,7 +62,7 @@
     "@absinthe/socket": "0.2.1",
     "@cityofzion/neon-js": "4.7.2",
     "@neon-exchange/nash-perf": "1.0.4",
-    "@neon-exchange/nash-protocol": "3.2.27",
+    "@neon-exchange/nash-protocol": "3.2.29",
     "@types/isomorphic-fetch": "0.0.35",
     "@types/node": "13.9.8",
     "@types/request": "2.48.1",

src/client/client.ts

@@ -221,6 +221,7 @@ import {
   createSignStatesParams,
   createSyncStatesParams,
   createTimestamp,
+  createTimestamp32,
   encryptSecretKey,
   getHKDFKeysFromPassword,
   getSecretKey,
@@ -775,7 +776,7 @@ export class Client {
     this.nashProtocolMarketData = mapMarketsForNashProtocol(this.marketData)
     this.assetData = await this.fetchAssetData()
 
-    this.currentOrderNonce = this.createTimestamp32()
+    this.currentOrderNonce = createTimestamp32()
     await this.updateTradedAssetNonces()
   }
 
@@ -854,7 +855,7 @@ export class Client {
     this.marketData = await this.fetchMarketData()
     this.assetData = await this.fetchAssetData()
     this.assetNonces = {}
-    this.currentOrderNonce = this.createTimestamp32()
+    this.currentOrderNonce = createTimestamp32()
     if (resp.data.signIn.twoFaRequired) {
       if (twoFaCode !== undefined) {
         this.account = await this.doTwoFactorLogin(twoFaCode)
@@ -2644,7 +2645,7 @@ export class Client {
             )
         } else {
           const sendAmount = parseFloat(amount) * 1e8
-          const timestamp = new BigNumber(this.createTimestamp32()).toString(16)
+          const timestamp = new BigNumber(createTimestamp32()).toString(16)
           transaction = new tx.InvocationTransaction({
             script: NeonJS.default.create.script({
               scriptHash: assetData.hash,
@@ -3358,7 +3359,7 @@ export class Client {
           txId: prefixWith0xIfNeeded(hash)
         }
       case 'neo':
-        const timestamp = new BigNumber(this.createTimestamp32()).toString(16)
+        const timestamp = new BigNumber(createTimestamp32()).toString(16)
         const balance = await NeonJS.api.neoscan.getBalance(
           this.opts.neoScan,
           childKey.address
@@ -3619,10 +3620,6 @@ export class Client {
     this.assetNonces = assetNonces
   }
 
-  private createTimestamp32(): number {
-    return Math.trunc(new Date().getTime() / 10) - 155000000000
-  }
-
   private getNoncesForTrade(
     marketName: string,
     direction: OrderBuyOrSell

yarn.lock

@@ -784,10 +784,10 @@
     node-fetch "2.6.0"
     semver "7.3.2"
 
-"@neon-exchange/nash-protocol@^3.2.27":
-  version "3.2.27"
-  resolved "https://registry.yarnpkg.com/@neon-exchange/nash-protocol/-/nash-protocol-3.2.27.tgz#6c561434e7eabf04df046ad1ecfcdda1de923015"
-  integrity sha512-clXfNWY5oAdJ0Id19DZ8CLE5IH6eI9J8xY21QM7GHJYXkqWnTtjl4Vg1vbLrgVjpMDCzcBB70Ss5iYIM+J0lzw==
+"@neon-exchange/nash-protocol@3.2.29":
+  version "3.2.29"
+  resolved "https://registry.yarnpkg.com/@neon-exchange/nash-protocol/-/nash-protocol-3.2.29.tgz#0408b5fbb77c747c3d8a3468e35408879d219873"
+  integrity sha512-8KHDrhSKlNU5TxD7VAvw+YqjIQcnIxX+lRVXb3pnViyYAr1ZWhbPW3snjdkIQWu3fRHKhT4EQeKDckxu/uuBBQ==
   dependencies:
     bignumber.js "8.1.1"
     bip32 "2.0.3"