v6.0.0: svm package and minor updates

0xNe0x1 · 0xNe0x1 · commit 66f4f0ebbfe3 · 2025-03-16T10:23:44.000+01:00
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -12,7 +12,7 @@ jobs:
         with:
           node-version: '16.x'
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         env:
           cache-name: cache-node-modules
         with:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -12,7 +12,7 @@ jobs:
         with:
           node-version: '16.x'
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         env:
           cache-name: cache-node-modules
         with:
diff --git a/.github/workflows/publish-svm.yml b/.github/workflows/publish-svm.yml
@@ -1,4 +1,4 @@
-name: Publish SOLANA
+name: Publish SVM
 
 on:
   release:
@@ -15,7 +15,7 @@ jobs:
           node-version: '16.x'
           registry-url: 'https://registry.npmjs.org'
 
-      - run: mv package.solana.json package.json
+      - run: mv package.svm.json package.json
           
       - run: yarn install
 
diff --git a/README.md b/README.md
@@ -44,16 +44,16 @@ This library supports the following blockchains:
 
 In case you want to use and package only specific platforms, use the platform-specific package:
 
-### EVM platform specific packaging
+### EVM (Ethereum Virtual Machien) platform specific packaging
 
 ```javascript
 import { TokenImage } from '@depay/react-token-image-evm'
 ```
 
-### Solana platform specific packaging
+### SVM (Solana Virtual Machine) platform specific packaging
 
 ```javascript
-import { TokenImage } from '@depay/react-token-image-solana'
+import { TokenImage } from '@depay/react-token-image-svm'
 ```
 
 
diff --git a/dist/esm/index.evm.js b/dist/esm/index.evm.js
@@ -5,7 +5,7 @@ import Blockchains from '@depay/web3-blockchains';
 
 let supported = ['ethereum', 'bsc', 'polygon', 'fantom', 'arbitrum', 'avalanche', 'gnosis', 'optimism', 'base', 'worldchain'];
 supported.evm = ['ethereum', 'bsc', 'polygon', 'fantom', 'arbitrum', 'avalanche', 'gnosis', 'optimism', 'base', 'worldchain'];
-supported.solana = [];
+supported.svm = [];
 
 const _jsxFileName = "/Users/sebastian/Work/DePay/react-token-image/src/index.js"; function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
diff --git a/dist/esm/index.js b/dist/esm/index.js
@@ -6,7 +6,7 @@ import Blockchains from '@depay/web3-blockchains';
 
 let supported = ['ethereum', 'bsc', 'polygon', 'solana', 'fantom', 'arbitrum', 'avalanche', 'gnosis', 'optimism', 'base', 'worldchain'];
 supported.evm = ['ethereum', 'bsc', 'polygon', 'fantom', 'arbitrum', 'avalanche', 'gnosis', 'optimism', 'base', 'worldchain'];
-supported.solana = ['solana'];
+supported.svm = ['solana'];
 
 const _jsxFileName = "/Users/sebastian/Work/DePay/react-token-image/src/index.js"; function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
diff --git a/dist/esm/index.svm.js b/dist/esm/index.svm.js
@@ -1,12 +1,12 @@
 import { PublicKey, Buffer } from '@depay/solana-web3.js';
-import { request } from '@depay/web3-client-solana';
-import Token from '@depay/web3-tokens-solana';
+import { request } from '@depay/web3-client-svm';
+import Token from '@depay/web3-tokens-svm';
 import React, { useState, useEffect } from 'react';
 import Blockchains from '@depay/web3-blockchains';
 
 let supported = ['solana'];
 supported.evm = [];
-supported.solana = ['solana'];
+supported.svm = ['solana'];
 
 const _jsxFileName = "/Users/sebastian/Work/DePay/react-token-image/src/index.js"; function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
diff --git a/dist/umd/index.evm.js b/dist/umd/index.evm.js
@@ -12,7 +12,7 @@
 
   let supported = ['ethereum', 'bsc', 'polygon', 'fantom', 'arbitrum', 'avalanche', 'gnosis', 'optimism', 'base', 'worldchain'];
   supported.evm = ['ethereum', 'bsc', 'polygon', 'fantom', 'arbitrum', 'avalanche', 'gnosis', 'optimism', 'base', 'worldchain'];
-  supported.solana = [];
+  supported.svm = [];
 
   const _jsxFileName = "/Users/sebastian/Work/DePay/react-token-image/src/index.js"; function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
diff --git a/dist/umd/index.js b/dist/umd/index.js
@@ -12,7 +12,7 @@
 
   let supported = ['ethereum', 'bsc', 'polygon', 'solana', 'fantom', 'arbitrum', 'avalanche', 'gnosis', 'optimism', 'base', 'worldchain'];
   supported.evm = ['ethereum', 'bsc', 'polygon', 'fantom', 'arbitrum', 'avalanche', 'gnosis', 'optimism', 'base', 'worldchain'];
-  supported.solana = ['solana'];
+  supported.svm = ['solana'];
 
   const _jsxFileName = "/Users/sebastian/Work/DePay/react-token-image/src/index.js"; function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
diff --git a/dist/umd/index.svm.js b/dist/umd/index.svm.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@depay/solana-web3.js'), require('@depay/web3-client-solana'), require('@depay/web3-tokens-solana'), require('react'), require('@depay/web3-blockchains')) :
-  typeof define === 'function' && define.amd ? define(['exports', '@depay/solana-web3.js', '@depay/web3-client-solana', '@depay/web3-tokens-solana', 'react', '@depay/web3-blockchains'], factory) :
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@depay/solana-web3.js'), require('@depay/web3-client-svm'), require('@depay/web3-tokens-svm'), require('react'), require('@depay/web3-blockchains')) :
+  typeof define === 'function' && define.amd ? define(['exports', '@depay/solana-web3.js', '@depay/web3-client-svm', '@depay/web3-tokens-svm', 'react', '@depay/web3-blockchains'], factory) :
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.ReactTokenImage = {}, global.SolanaWeb3js, global.Web3Client, global.Web3Tokens, global.React, global.Web3Blockchains));
-}(this, (function (exports, solanaWeb3_js, web3ClientSolana, Token, React, Blockchains) { 'use strict';
+}(this, (function (exports, solanaWeb3_js, web3ClientSvm, Token, React, Blockchains) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -12,7 +12,7 @@
 
   let supported = ['solana'];
   supported.evm = [];
-  supported.solana = ['solana'];
+  supported.svm = ['solana'];
 
   const _jsxFileName = "/Users/sebastian/Work/DePay/react-token-image/src/index.js"; function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
@@ -86,7 +86,7 @@
 
           let tokenMetaDataPublicKey = (await solanaWeb3_js.PublicKey.findProgramAddress(seed, metaDataPublicKey))[0];
 
-          let metaData = await web3ClientSolana.request({
+          let metaData = await web3ClientSvm.request({
             blockchain, 
             address: tokenMetaDataPublicKey.toString(),
             api: Token__default['default'].solana.METADATA_LAYOUT,
@@ -188,12 +188,12 @@
         setSource(`https://integrate.depay.com/tokens/${blockchain}/${address}/image`, 'depay');
       } else if (source == 'depay' && supported.evm.includes(blockchain)) {
         if(id) {
-          web3ClientSolana.request({ blockchain, address, api: uriAPI, method: 'uri', params: [id] }).then((uri)=>{
+          web3ClientSvm.request({ blockchain, address, api: uriAPI, method: 'uri', params: [id] }).then((uri)=>{
             uri = uri.match('0x{id}') ? uri.replace('0x{id}', id) : uri;
             uriToImage(uri);
           }).catch(setUnknown);
         } else {
-          web3ClientSolana.request({ blockchain, address, api: tokenURIAPI, method: 'tokenURI', params: [1] }).then(uriToImage).catch(setUnknown);
+          web3ClientSvm.request({ blockchain, address, api: tokenURIAPI, method: 'tokenURI', params: [1] }).then(uriToImage).catch(setUnknown);
         }
       } else {
         setUnknown();
diff --git a/package.evm.json b/package.evm.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/react-token-image-evm",
   "moduleName": "ReactTokenImage",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "description": "React component to display token images with fallbacks and unknown state.",
   "main": "./dist/umd/index.evm.js",
   "module": "./dist/esm/index.evm.js",
@@ -24,9 +24,9 @@
   "homepage": "https://depay.com",
   "private": false,
   "peerDependencies": {
-    "@depay/web3-blockchains": "^9.6.0",
-    "@depay/web3-client-evm": "^10.19.0",
-    "@depay/web3-tokens-evm": "^10.4.0",
+    "@depay/web3-blockchains": "^9.7.9",
+    "@depay/web3-client-evm": "^11.0.1",
+    "@depay/web3-tokens-evm": "^11.0.0",
     "ethers": "^5.7.1",
     "react": "^18",
     "react-dom": "^18"
diff --git a/package.json b/package.json
@@ -1,15 +1,15 @@
 {
   "name": "@depay/react-token-image",
   "moduleName": "ReactTokenImage",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "description": "React component to display token images with fallbacks and unknown state.",
   "main": "./dist/umd/index.js",
   "module": "./dist/esm/index.js",
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "rm -rf dist && rollup -c rollup.module.config.js && rollup -c rollup.module.evm.config.js && rollup -c rollup.module.solana.config.js",
+    "build": "rm -rf dist && rollup -c rollup.module.config.js && rollup -c rollup.module.evm.config.js && rollup -c rollup.module.svm.config.js",
     "build:evm": "rollup -c rollup.module.evm.config.js",
     "lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\"",
     "lint:fix": "eslint \"src/**/*.{js,jsx,ts,tsx}\" --fix",
@@ -35,10 +35,10 @@
   "homepage": "https://depay.com",
   "private": false,
   "peerDependencies": {
-    "@depay/solana-web3.js": "^1.26.0",
-    "@depay/web3-blockchains": "^9.6.0",
-    "@depay/web3-client": "^10.19.0",
-    "@depay/web3-tokens": "^10.4.0",
+    "@depay/solana-web3.js": "^1.98.0",
+    "@depay/web3-blockchains": "^9.7.9",
+    "@depay/web3-client": "^11.0.1",
+    "@depay/web3-tokens": "^11.0.0",
     "ethers": "^5.7.1",
     "react": "^18",
     "react-dom": "^18"
@@ -50,10 +50,10 @@
     "@babel/core": "^7.12.9",
     "@babel/preset-env": "^7.12.7",
     "@babel/preset-react": "^7.12.7",
-    "@depay/solana-web3.js": "^1.26.0",
-    "@depay/web3-blockchains": "^9.6.0",
-    "@depay/web3-client": "^10.19.0",
-    "@depay/web3-tokens": "^10.4.0",
+    "@depay/solana-web3.js": "^1.98.0",
+    "@depay/web3-blockchains": "^9.7.9",
+    "@depay/web3-client": "^11.0.1",
+    "@depay/web3-tokens": "^11.0.0",
     "@rollup/plugin-commonjs": "^18.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",
     "@rollup/plugin-replace": "^2.4.2",
diff --git a/package.svm.json b/package.svm.json
@@ -1,7 +1,7 @@
 {
-  "name": "@depay/react-token-image-solana",
+  "name": "@depay/react-token-image-svm",
   "moduleName": "ReactTokenImage",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "description": "React component to display token images with fallbacks and unknown state.",
   "main": "./dist/umd/index.solana.js",
   "module": "./dist/esm/index.solana.js",
@@ -24,10 +24,10 @@
   "homepage": "https://depay.com",
   "private": false,
   "peerDependencies": {
-    "@depay/solana-web3.js": "^1.26.0",
-    "@depay/web3-blockchains": "^9.6.0",
-    "@depay/web3-client-solana": "^10.19.0",
-    "@depay/web3-tokens-solana": "^10.4.0",
+    "@depay/solana-web3.js": "^1.98.0",
+    "@depay/web3-blockchains": "^9.7.9",
+    "@depay/web3-client-svm": "^11.0.1",
+    "@depay/web3-tokens-svm": "^11.0.0",
     "ethers": "^5.7.1",
     "react": "^18",
     "react-dom": "^18"
diff --git a/rollup.globals.js b/rollup.globals.js
@@ -3,11 +3,11 @@ export default {
   '@depay/web3-blockchains': 'Web3Blockchains',
   '@depay/web3-client': 'Web3Client',
   '@depay/web3-client-evm': 'Web3Client',
-  '@depay/web3-client-solana': 'Web3Client',
+  '@depay/web3-client-svm': 'Web3Client',
   '@depay/web3-constants': 'Web3Constants',
   '@depay/web3-tokens': 'Web3Tokens',
   '@depay/web3-tokens-evm': 'Web3Tokens',
-  '@depay/web3-tokens-solana': 'Web3Tokens',
+  '@depay/web3-tokens-svm': 'Web3Tokens',
   'react': 'React',
   'react-dom': 'ReactDOM',
   'ethers': 'ethers',
diff --git a/rollup.module.svm.config.js b/rollup.module.svm.config.js
@@ -1,7 +1,7 @@
 import commonjs from '@rollup/plugin-commonjs'
 import globals from './rollup.globals.js'
 import jscc from 'rollup-plugin-jscc'
-import pkg from './package.solana.json'
+import pkg from './package.svm.json'
 import replace from '@rollup/plugin-replace'
 import resolve from '@rollup/plugin-node-resolve'
 import sucrase from '@rollup/plugin-sucrase'
@@ -13,21 +13,21 @@ export default {
     {
       format: 'es',
       globals: globals,
-      file: 'dist/esm/index.solana.js'
+      file: 'dist/esm/index.svm.js'
     },
     {
       format: 'umd',
       name: pkg.moduleName,
       globals: globals,
-      file: 'dist/umd/index.solana.js'
+      file: 'dist/umd/index.svm.js'
     },
   ],
   external: [
     ...Object.keys(pkg.dependencies || {}),
     ...Object.keys(pkg.peerDependencies || {}),
   ],
   plugins: [
-    jscc({ values: { _SOLANA: 1 }}),
+    jscc({ values: { _SVM: 1 }}),
     sucrase({
       exclude: ['node_modules/**'],
       transforms: ['jsx']
diff --git a/src/blockchains.js b/src/blockchains.js
@@ -2,19 +2,19 @@
 
 let supported = ['ethereum', 'bsc', 'polygon', 'fantom', 'arbitrum', 'avalanche', 'gnosis', 'optimism', 'base', 'worldchain']
 supported.evm = ['ethereum', 'bsc', 'polygon', 'fantom', 'arbitrum', 'avalanche', 'gnosis', 'optimism', 'base', 'worldchain']
-supported.solana = []
+supported.svm = []
 
-/*#elif _SOLANA
+/*#elif _SVM
 
 let supported = ['solana']
 supported.evm = []
-supported.solana = ['solana']
+supported.svm = ['solana']
 
 //#else */
 
 let supported = ['ethereum', 'bsc', 'polygon', 'solana', 'fantom', 'arbitrum', 'avalanche', 'gnosis', 'optimism', 'base', 'worldchain']
 supported.evm = ['ethereum', 'bsc', 'polygon', 'fantom', 'arbitrum', 'avalanche', 'gnosis', 'optimism', 'base', 'worldchain']
-supported.solana = ['solana']
+supported.svm = ['solana']
 
 //#endif
 
diff --git a/src/index.js b/src/index.js
@@ -3,11 +3,11 @@
 import { request } from '@depay/web3-client-evm'
 import Token from '@depay/web3-tokens-evm'
 
-/*#elif _SOLANA
+/*#elif _SVM
 
 import { Buffer, PublicKey } from '@depay/solana-web3.js'
-import { request } from '@depay/web3-client-solana'
-import Token from '@depay/web3-tokens-solana'
+import { request } from '@depay/web3-client-svm'
+import Token from '@depay/web3-tokens-svm'
 
 //#else */
 
diff --git a/yarn.lock b/yarn.lock
@@ -960,27 +960,27 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@depay/solana-web3.js@^1.26.0":
-  version "1.26.0"
-  resolved "https://registry.yarnpkg.com/@depay/solana-web3.js/-/solana-web3.js-1.26.0.tgz#6234cd46779924a930d6b6021b66a25c18b38365"
-  integrity sha512-aAhDxfNGraE8VBwM5g/BhHnNCENlLSKDJ3yIh2EZd4mfmKM/4utv0cNUhTEytUAvvFoaMcOXXQ5U5sE1IMXFrQ==
+"@depay/solana-web3.js@^1.98.0":
+  version "1.98.0"
+  resolved "https://registry.yarnpkg.com/@depay/solana-web3.js/-/solana-web3.js-1.98.0.tgz#56eb0ecde34fd4a146377cd6369683acdc4a6957"
+  integrity sha512-4Gi+tjyWNS94D2NyNGtMMnyCf1d5M/Hbsw7WZis21RF0GyFFEu8wsbQHq+4KL6IaaUma0e0mGz8HLwCAGJd47A==
   dependencies:
     bs58 "^5.0.0"
 
-"@depay/web3-blockchains@^9.6.0":
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/@depay/web3-blockchains/-/web3-blockchains-9.6.0.tgz#51bcd4cd6bcc9542b61f7792eabdccbe6385b476"
-  integrity sha512-+REyl5vva1e6t4yvSJKJE2IgidTNDPB7imn4xxAqqeVOFJryLBwaPddyh5C9pnX9GMpLhR6s6Su4AgrdLSZ/JQ==
+"@depay/web3-blockchains@^9.7.9":
+  version "9.7.9"
+  resolved "https://registry.yarnpkg.com/@depay/web3-blockchains/-/web3-blockchains-9.7.9.tgz#3b1024684adfef9fcab7596ffd12a5a8cc4548fc"
+  integrity sha512-nYv04ClJn6aOUrusApIyBtIk3/wHxY2OnQC5mFQ7giJqr0/ZE3FbdDmKHPYYkysedNQdERq/lR+p+AFWVzfEQQ==
 
-"@depay/web3-client@^10.19.0":
-  version "10.19.0"
-  resolved "https://registry.yarnpkg.com/@depay/web3-client/-/web3-client-10.19.0.tgz#11fbef413d99b9d21890475a89fc19f6e5ddb06d"
-  integrity sha512-5K/C225cO6uPW+rBj6DRjZrIZEUNi5HcsUeMiZipy7vfYZNTnAMqFU3AbTgYTatIvCXSJ6T+fTp1cEmnoXalhA==
+"@depay/web3-client@^11.0.1":
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/@depay/web3-client/-/web3-client-11.0.1.tgz#fdb7f2eca85f52bd7c8a5814c2a7d48461d5808a"
+  integrity sha512-moynGSJuZ+T44wOjIIbPWQVDs7TxKgJowxlGVNi0fWusL+EgCRuia+Tdf3MJRZyIkyHj03MzWahhu8JGgvDqzw==
 
-"@depay/web3-tokens@^10.4.0":
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/@depay/web3-tokens/-/web3-tokens-10.4.0.tgz#6e4a937eaef90d09be87243ad4e1302b858026b0"
-  integrity sha512-yQm+s1tVPssjP2qUOhy65bzVqvD0GYLacdOxG1Zmx8HltcORyehqNJdekraCgw99bbeTkMsxeC3KNuwdb0d/xw==
+"@depay/web3-tokens@^11.0.0":
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/@depay/web3-tokens/-/web3-tokens-11.0.0.tgz#fc5d22b324efa16f3f339ee0ea2e8dd739932478"
+  integrity sha512-Whav1+c8xiMb3ayGpu6/vI/F4nd4WBWTLpavvi6509gQSuUqx0OnRZX8XBddSw8c9bpxvcJLxxIgSrMHyW0hGg==
 
 "@eslint/eslintrc@^0.4.3":
   version "0.4.3"
