@exodus/solana-api 1.2.3 → 1.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -13,9 +13,13 @@
     "access": "restricted"
   },
   "dependencies": {
-    "@exodus/solana-lib": "^1.2.3",
-    "@exodus/solana-web3.js": "^0.87.1-exodus4",
-    "lodash": "^4.17.11"
+    "@exodus/asset-json-rpc": "^1.0.0",
+    "@exodus/solana-lib": "^1.2.4",
+    "lodash": "^4.17.11",
+    "wretch": "^1.5.2"
   },
-  "gitHead": "5be453e5b6c47cf82b8c80a83e8a4bebbb487a2e"
+  "devDependencies": {
+    "node-fetch": "~1.6.3"
+  },
+  "gitHead": "f5a2d444a2789ca118671566f32805dba061ce5a"
 }

package/src/index.js

@@ -1,10 +1,10 @@
 // @flow
-import { Connection, PublicKey } from '@exodus/solana-web3.js'
+import createApi from '@exodus/asset-json-rpc'
 import { tokens, SYSTEM_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@exodus/solana-lib'
 import assert from 'assert'
 import lodash from 'lodash'
 
-// Doc: https://solana-labs.github.io/solana-web3.js/
+// Doc: https://docs.solana.com/apps/jsonrpc-api
 
 const RPC_URL = 'https://api.mainnet-beta.solana.com' // https://solana-api.projectserum.com
 
@@ -16,45 +16,59 @@ class Api {
 
   setServer(rpcUrl) {
     this.rpcUrl = rpcUrl || RPC_URL
-    this.connection = new Connection(this.rpcUrl)
+    this.api = createApi(this.rpcUrl)
   }
 
   async getRecentBlockHash(): string {
-    const { blockhash } = await this.connection.getRecentBlockhash()
+    const {
+      value: { blockhash },
+    } = await this.api.post({
+      method: 'getRecentBlockhash',
+    })
     return blockhash
   }
 
   // Transaction structure: https://docs.solana.com/apps/jsonrpc-api#transaction-structure
   async getTransactionById(id: string) {
-    const { result } = await this.connection._rpcRequest('getConfirmedTransaction', [
-      id,
-      'jsonParsed',
-    ])
+    const result = await this.api.post({
+      method: 'getConfirmedTransaction',
+      params: [id, 'jsonParsed'],
+    })
     return result
   }
 
   async getFee(): number {
     const {
-      feeCalculator: { lamportsPerSignature },
-    } = await this.connection.getRecentBlockhash()
+      value: {
+        feeCalculator: { lamportsPerSignature },
+      },
+    } = await this.api.post({
+      method: 'getRecentBlockhash',
+    })
     return lamportsPerSignature
   }
 
   async getBalance(address: string): number {
-    return this.connection.getBalance(new PublicKey(address))
+    const res = await this.api.post({
+      method: 'getBalance',
+      params: [address],
+    })
+    return res.value || 0
   }
 
   async getBlockTime(slot: number) {
     // might result in error if executed on a validator with partial ledger (https://github.com/solana-labs/solana/issues/12413)
-    return this.connection.getBlockTime(slot)
+    return this.api.post({
+      method: 'getBlockTime',
+      params: [slot],
+    })
   }
 
   async getConfirmedSignaturesForAddress(address: string, { until, before, limit } = {}): any {
     until = until || undefined
-    return this.connection.getConfirmedSignaturesForAddress2(new PublicKey(address), {
-      until,
-      before,
-      limit,
+    return this.api.post({
+      method: 'getConfirmedSignaturesForAddress2',
+      params: [address, { until, before, limit }],
     })
   }
 
@@ -191,13 +205,10 @@ class Api {
   }
 
   async getTokenAccountsByOwner(address: string, tokenTicker: ?string): Array {
-    const {
-      result: { value: accountsList },
-    } = await this.connection._rpcRequest('getTokenAccountsByOwner', [
-      address,
-      { programId: TOKEN_PROGRAM_ID.toBase58() },
-      { encoding: 'jsonParsed' },
-    ])
+    const { value: accountsList } = await this.api.post({
+      method: 'getTokenAccountsByOwner',
+      params: [address, { programId: TOKEN_PROGRAM_ID.toBase58() }, { encoding: 'jsonParsed' }],
+    })
 
     const tokenAccounts = []
     for (let entry of accountsList) {
@@ -225,11 +236,22 @@ class Api {
 
   async getAddressType(address: string) {
     // solana, token or null (unknown), meaning address has never been initialized
-    const account = await this.connection.getAccountInfo(new PublicKey(address))
-    if (account === null) return null
-    return account.owner.equals(SYSTEM_PROGRAM_ID)
+    const { value } = await this.api.post({
+      method: 'getAccountInfo',
+      params: [address, { encoding: 'base64' }],
+    })
+    if (value === null) return null
+
+    const account = {
+      executable: value.executable,
+      owner: value.owner,
+      lamports: value.lamports,
+      data: value.data,
+    }
+
+    return account.owner === SYSTEM_PROGRAM_ID.toBase58()
       ? 'solana'
-      : account.owner.equals(TOKEN_PROGRAM_ID)
+      : account.owner === TOKEN_PROGRAM_ID.toBase58()
       ? 'token'
       : null
   }
@@ -250,7 +272,11 @@ class Api {
   broadcastTransaction = async (signedTx: string): string => {
     console.log('Solana broadcasting TX:', signedTx) // base64
 
-    const { message, ...result } = await this.connection.sendEncodedTransaction(signedTx)
+    const { message, ...result } = await this.api.post({
+      method: 'sendTransaction',
+      params: [signedTx, { encoding: 'base64' }],
+    })
+
     if (message) throw new Error(message)
 
     console.log(`tx ${result} sent!`)