Merge pull request #6 from satoshipay/bugfix/compat-latest-stellar-sdk

Make compatible with latest Stellar SDK versions

package.json

@@ -16,7 +16,7 @@
     "posttest": "npm run lint"
   },
   "peerDependencies": {
-    "stellar-sdk": "^2.0.1"
+    "stellar-sdk": ">= 5.0.0"
   },
   "dependencies": {
     "axios": "^0.19.0",
@@ -28,12 +28,12 @@
     "husky": "^1.3.1",
     "lint-staged": "^8.1.4",
     "prettier": "^1.16.4",
-    "stellar-sdk": "^2.0.1",
+    "stellar-sdk": "^5.0.3",
     "tap-xunit": "^2.3.0",
     "ts-node": "^8.0.2",
     "tslint": "^5.12.1",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "^3.3.3"
+    "typescript": "^3.9.5"
   },
   "ava": {
     "compileEnhancements": false,

src/authentication.ts

@@ -1,5 +1,5 @@
 import axios, { AxiosResponse } from "axios"
-import { Keypair, Network, Operation, Transaction } from "stellar-sdk"
+import { Keypair, Networks, Operation, Transaction } from "stellar-sdk"
 import { debug } from "./logger"
 
 function assertChallengeOK(
@@ -80,7 +80,8 @@ function getNonceOperation(challenge: Transaction): Buffer {
 export async function fetchChallenge(
   endpointURL: string,
   serviceSigningKey: string | null,
-  localPublicKey: string
+  localPublicKey: string,
+  network: Networks
 ): Promise<Transaction> {
   debug(`Fetching web auth challenge from ${endpointURL}...`)
   let response: AxiosResponse<any>
@@ -95,7 +96,7 @@ export async function fetchChallenge(
   }
 
   debug("Fetched web auth challenge:", response.data)
-  const transaction = new Transaction(response.data.transaction)
+  const transaction = new Transaction(response.data.transaction, network)
   assertChallengeOK(transaction, serviceSigningKey, localPublicKey)
 
   return transaction
@@ -145,15 +146,15 @@ export async function authenticate(
   endpointURL: string,
   serviceSigningKey: string,
   keypair: Keypair,
-  network: Network
+  network: Networks
 ) {
   const transaction = await fetchChallenge(
     endpointURL,
     serviceSigningKey,
-    keypair.publicKey()
+    keypair.publicKey(),
+    network
   )
 
-  Network.use(network)
   transaction.sign(keypair)
 
   const token = await postResponse(endpointURL, transaction)