Merge pull request #21 from nash-io/ts/tfi

tfi updates

Author: localhuman

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 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.1.1"></a>
+## [5.1.1](https://github.com/nash-io/api-client-typescript/compare/v5.0.35...v5.1.1) (2020-07-09)
+
+
+
 <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)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neon-exchange/api-client-typescript",
-  "version": "5.0.35",
+  "version": "5.1.1",
   "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.29",
+    "@neon-exchange/nash-protocol": "3.3.3",
     "@types/isomorphic-fetch": "0.0.35",
     "@types/node": "13.9.8",
     "@types/request": "2.48.1",

src/client/client.ts

@@ -113,10 +113,6 @@ import {
   GET_ASSETS_NONCES_QUERY,
   AssetsNoncesData
 } from '../queries/nonces'
-import {
-  GET_ORDERS_FOR_MOVEMENT_QUERY,
-  OrdersForMovementData
-} from '../queries/movement/getOrdersForMovementQuery'
 
 import {
   checkMandatoryParams,
@@ -212,7 +208,6 @@ import {
   createCancelOrderParams,
   createGetAssetsNoncesParams,
   createGetMovementParams,
-  createGetOrdersForMovementParams,
   createListMovementsParams,
   createPlaceLimitOrderParams,
   createPlaceMarketOrderParams,
@@ -1617,36 +1612,6 @@ export class Client {
     return result.data.listMovements
   }
 
-  /**
-   * List all orders for a given movement
-   *
-   * @returns
-   *
-   * Example
-   * ```
-   * const getOrdersForMovementData = await nash.getOrdersForMovement(unit)
-   * console.log(getOrdersForMovementData)
-   * ```
-   */
-  public async getOrdersForMovement(
-    asset: string
-  ): Promise<OrdersForMovementData> {
-    checkMandatoryParams({ asset, Type: 'string' })
-    const getOrdersForMovementParams = createGetOrdersForMovementParams(asset)
-    const signedPayload = await this.signPayload(getOrdersForMovementParams)
-    const result = await this.gql.query<{
-      getOrdersForMovement: OrdersForMovementData
-    }>({
-      query: GET_ORDERS_FOR_MOVEMENT_QUERY,
-      variables: {
-        payload: signedPayload.payload,
-        signature: signedPayload.signature
-      }
-    })
-
-    return result.data.getOrdersForMovement
-  }
-
   /**
    * List all current asset nonces
    *
@@ -3121,37 +3086,7 @@ export class Client {
       }
     }
 
-    while (true) {
-      try {
-        await prepareAMovement()
-        break
-      } catch (e) {
-        if (!e.message.startsWith('GraphQL error: ')) {
-          throw e
-        }
-        const blockchainError = e.message.slice(
-          'GraphQL error: '.length
-        ) as BlockchainError
-        switch (blockchainError) {
-          case BlockchainError.MISSING_SIGNATURES:
-          case BlockchainError.BLOCKCHAIN_BALANCE_OUT_OF_SYNC:
-            // console.log('sync states and retry in 15 seconds')
-            await this.getSignAndSyncStates(true)
-            await sleep(15000)
-            break
-          case BlockchainError.WAITING_FOR_BALANCE_SYNC:
-            // console.log('waiting for balance sync, retrying in 15 seconds')
-            await sleep(15000)
-            break
-          case BlockchainError.MOVEMENT_ALREADY_IN_PROGRESS:
-            // console.log('movement in progress, retrying in 15 seconds')
-            await sleep(15000)
-            break
-          default:
-            throw e
-        }
-      }
-    }
+    await prepareAMovement()
 
     let signedAddMovementPayload: PayloadSignature
     let addMovementResult: GQLResp<{
@@ -3175,7 +3110,10 @@ export class Client {
             })
           ),
           digests: preparedMovement.transactionElements.map(
-            ({ digest: digest }) => ({ digest })
+            ({ blockchain: txBlockchain, digest: digest }) => ({
+              blockchain: txBlockchain,
+              digest
+            })
           ),
           timestamp: new Date().getTime()
         },
@@ -3212,18 +3150,6 @@ export class Client {
             await sleep(15000)
             await prepareAMovement()
             break
-          case BlockchainError.MOVEMENT_ALREADY_IN_PROGRESS:
-          case BlockchainError.WAITING_FOR_BALANCE_SYNC:
-            // console.log('waiting for balance sync, retrying in 15 seconds')
-            await sleep(15000)
-            break
-          case BlockchainError.MISSING_SIGNATURES:
-          case BlockchainError.BLOCKCHAIN_BALANCE_OUT_OF_SYNC:
-            // console.log('sync states and retry in 15 seconds')
-            await this.getSignAndSyncStates(true)
-            await prepareAMovement()
-            await sleep(15000)
-            break
           default:
             throw e
         }

src/client/processSchema.ts

@@ -43,7 +43,6 @@ import { UPDATED_TICKERS } from '../subscriptions/updatedTickers'
 import { UPDATED_CANDLES } from '../subscriptions/updatedCandles'
 import { DH_FIIL_POOL } from '../mutations/dhFillPool'
 import { GET_ASSETS_NONCES_QUERY } from '../queries/nonces/getAssetsNonces'
-import { GET_ORDERS_FOR_MOVEMENT_QUERY } from '../queries/movement/getOrdersForMovementQuery'
 import { SYNC_STATES_MUTATION } from '../mutations/stateSyncing/syncStatesMutation'
 import { SIGN_STATES_MUTATION } from '../mutations/stateSyncing/signStatesMutation'
 import { COMPLETE_PAYLOAD_SIGNATURE } from '../mutations/mpc/completeSignature'
@@ -85,7 +84,6 @@ const queries = {
   UPDATED_CANDLES,
   DH_FIIL_POOL,
   GET_ASSETS_NONCES_QUERY,
-  GET_ORDERS_FOR_MOVEMENT_QUERY,
   SYNC_STATES_MUTATION,
   SIGN_STATES_MUTATION,
   COMPLETE_PAYLOAD_SIGNATURE,

src/mutations/movements/prepareMovement.ts

@@ -5,7 +5,7 @@ import {
 } from '@neon-exchange/nash-protocol'
 
 import { ClientSignedState } from '../stateSyncing/fragments'
-import { CurrencyAmount, Signature } from '../../types'
+import { CurrencyAmount, Signature, Blockchain } from '../../types'
 
 export const PREPARE_MOVEMENT_MUTATION = gql`
   mutation prepareMovement(
@@ -19,6 +19,7 @@ export const PREPARE_MOVEMENT_MUTATION = gql`
       }
       nonce
       transactionElements {
+        blockchain
         digest
       }
       fees {
@@ -30,6 +31,7 @@ export const PREPARE_MOVEMENT_MUTATION = gql`
 `
 
 export interface TransactionElement {
+  blockchain: Blockchain
   digest: string
 }
 

src/queries/movement/getOrdersForMovementQuery.ts

@@ -784,10 +784,10 @@
     node-fetch "2.6.0"
     semver "7.3.2"
 
-"@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==
+"@neon-exchange/nash-protocol@3.3.3":
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/@neon-exchange/nash-protocol/-/nash-protocol-3.3.3.tgz#29417e09b1bd6e18f8f8b51a4bf29c4d68fae6d9"
+  integrity sha512-eVBH6OeOD81aBW4QsJ39AC+P2hh4HBv1bV8LJ9AG3Ty1fsnmEumL1umuhtg66rjmJdg/VIdv0yyoeew/kRq7oQ==
   dependencies:
     bignumber.js "8.1.1"
     bip32 "2.0.3"