v10.12.1: return undefined if account has no data

DePayFi · May 6, 2023 · 7d4c3c0 · 7d4c3c0
1 parent 568c182
commit 7d4c3c0
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 3 deletions.
diff --git a/dist/esm/index.js b/dist/esm/index.js
@@ -779,6 +779,7 @@ var requestEVM = async ({ blockchain, address, api, method, params, block, timeo
 
 const accountInfo = async ({ address, api, method, params, provider, block }) => {
   const info = await provider.getAccountInfo(new PublicKey(address));
+  if(!info || !info.data) { return }
   return api.decode(info.data)
 };
 

diff --git a/dist/esm/index.solana.js b/dist/esm/index.solana.js
@@ -474,6 +474,7 @@ let estimate = async function ({ blockchain, from, to, value, method, api, param
 
 const accountInfo = async ({ address, api, method, params, provider, block }) => {
   const info = await provider.getAccountInfo(new PublicKey(address));
+  if(!info || !info.data) { return }
   return api.decode(info.data)
 };
 

diff --git a/dist/umd/index.js b/dist/umd/index.js
@@ -785,6 +785,7 @@
 
   const accountInfo = async ({ address, api, method, params, provider, block }) => {
     const info = await provider.getAccountInfo(new solanaWeb3_js.PublicKey(address));
+    if(!info || !info.data) { return }
     return api.decode(info.data)
   };
 

diff --git a/dist/umd/index.solana.js b/dist/umd/index.solana.js
@@ -480,6 +480,7 @@
 
   const accountInfo = async ({ address, api, method, params, provider, block }) => {
     const info = await provider.getAccountInfo(new solanaWeb3_js.PublicKey(address));
+    if(!info || !info.data) { return }
     return api.decode(info.data)
   };
 

diff --git a/package.evm.json b/package.evm.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-client-evm",
   "moduleName": "Web3Client",
-  "version": "10.12.0",
+  "version": "10.12.1",
   "description": "A web3 client to fetch blockchain data just like you are used to with HTTP clients.",
   "main": "dist/umd/index.evm.js",
   "module": "dist/esm/index.evm.js",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-client",
   "moduleName": "Web3Client",
-  "version": "10.12.0",
+  "version": "10.12.1",
   "description": "A web3 client to fetch blockchain data just like you are used to with HTTP clients.",
   "main": "dist/umd/index.js",
   "module": "dist/esm/index.js",

diff --git a/package.solana.json b/package.solana.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-client-solana",
   "moduleName": "Web3Client",
-  "version": "10.12.0",
+  "version": "10.12.1",
   "description": "A web3 client to fetch blockchain data just like you are used to with HTTP clients.",
   "main": "dist/umd/index.solana.js",
   "module": "dist/esm/index.solana.js",

diff --git a/src/platforms/solana/request.js b/src/platforms/solana/request.js
@@ -4,6 +4,7 @@ import { PublicKey, ACCOUNT_LAYOUT } from '@depay/solana-web3.js'
 
 const accountInfo = async ({ address, api, method, params, provider, block }) => {
   const info = await provider.getAccountInfo(new PublicKey(address))
+  if(!info || !info.data) { return }
   return api.decode(info.data)
 }
 

diff --git a/tests/units/platforms/solana/request/getAccountInfo.solana.spec.js b/tests/units/platforms/solana/request/getAccountInfo.solana.spec.js
@@ -122,6 +122,20 @@ describe('request getAccountInfo', () => {
           request('solana://2wmVCSfPxGPjrnMMn7rchp4uaeoTqN39mXFC2zhPdri9', { api })
         ).rejects.toEqual(Error('failed to get info about account 2wmVCSfPxGPjrnMMn7rchp4uaeoTqN39mXFC2zhPdri9: SOMETHING WENT WRONG'))
       })
+
+      it('returns nothing if account does not exist', async ()=>{
+        mock({
+          provider,
+          blockchain,
+          request: {
+            method: 'getAccountInfo',
+            to: 'EHugM4AienbEwyWKVMseUac2VGR876k48JqyQ2ZuzqeE',
+            return: null
+          }
+        })
+        let data = await request('solana://EHugM4AienbEwyWKVMseUac2VGR876k48JqyQ2ZuzqeE')
+        expect(data).toEqual(undefined)
+      })
     })
   })
 })
diff --git a/tests/units/platforms/solana/request/getAccountInfo.spec.js b/tests/units/platforms/solana/request/getAccountInfo.spec.js
@@ -122,6 +122,20 @@ describe('request getAccountInfo', () => {
           request('solana://2wmVCSfPxGPjrnMMn7rchp4uaeoTqN39mXFC2zhPdri9', { api })
         ).rejects.toEqual(Error('failed to get info about account 2wmVCSfPxGPjrnMMn7rchp4uaeoTqN39mXFC2zhPdri9: SOMETHING WENT WRONG'))
       })
+
+      it('returns nothing if account does not exist', async ()=>{
+        mock({
+          provider,
+          blockchain,
+          request: {
+            method: 'getAccountInfo',
+            to: 'EHugM4AienbEwyWKVMseUac2VGR876k48JqyQ2ZuzqeE',
+            return: null
+          }
+        })
+        let data = await request('solana://EHugM4AienbEwyWKVMseUac2VGR876k48JqyQ2ZuzqeE')
+        expect(data).toEqual(undefined)
+      })
     })
   })
 })