v9.12.6: fix evm build

DePayFi · Oct 28, 2022 · dc447c7 · dc447c7
1 parent 0e6f96e
commit dc447c7
Show file tree

Hide file tree

Showing 12 changed files with 117 additions and 149,418 deletions.
diff --git a/dist/esm/index.evm.js b/dist/esm/index.evm.js
diff --git a/dist/umd/index.evm.js b/dist/umd/index.evm.js
diff --git a/package.evm.json b/package.evm.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-tokens-evm",
   "moduleName": "Web3Tokens",
-  "version": "9.12.5",
+  "version": "9.12.6",
   "description": "JavaScript library providing basic functionalities to interact with web3 tokens.",
   "main": "dist/umd/index.evm.js",
   "module": "dist/esm/index.evm.js",
@@ -25,7 +25,8 @@
   "private": false,
   "dependencies": {},
   "peerDependencies": {
-    "@depay/web3-client-evm": "^10.1.19",
+    "@depay/web3-blockchains": "^6.2.3",
+    "@depay/web3-client-evm": "^10.1.20",
     "@depay/web3-constants": "^6.3.2",
     "ethers": "^5.7.1"
   },

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-tokens",
   "moduleName": "Web3Tokens",
-  "version": "9.12.5",
+  "version": "9.12.6",
   "description": "JavaScript library providing basic functionalities to interact with web3 tokens.",
   "main": "dist/umd/index.js",
   "module": "dist/esm/index.js",
@@ -34,7 +34,8 @@
   "dependencies": {},
   "peerDependencies": {
     "@depay/solana-web3.js": "^1.19.0",
-    "@depay/web3-client": "^10.1.19",
+    "@depay/web3-blockchains": "^6.2.3",
+    "@depay/web3-client": "^10.1.20",
     "@depay/web3-constants": "^6.3.2",
     "ethers": "^5.7.1"
   },
@@ -46,10 +47,10 @@
     "@babel/preset-env": "^7.12.7",
     "@depay/solana-web3.js": "^1.19.0",
     "@depay/web3-blockchains": "^6.2.3",
-    "@depay/web3-client": "^10.1.19",
-    "@depay/web3-client-evm": "^10.1.19",
+    "@depay/web3-client": "^10.1.20",
+    "@depay/web3-client-evm": "^10.1.20",
     "@depay/web3-constants": "^6.3.2",
-    "@depay/web3-mock": "^13.22.10",
+    "@depay/web3-mock": "^13.22.11",
     "@peculiar/webcrypto": "^1.4.0",
     "@rollup/plugin-commonjs": "^18.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",

diff --git a/rollup.globals.js b/rollup.globals.js
@@ -1,5 +1,6 @@
 export default {
   '@depay/web3-client': 'Web3Client',
+  '@depay/web3-blockchains': 'Web3Blockchains',
   '@depay/web3-client-evm': 'Web3Client',
   '@depay/web3-constants': 'Web3Constants',
   '@depay/solana-web3.js': 'SolanaWeb3js',

diff --git a/src/Token.evm.js b/src/Token.evm.js
@@ -1,14 +1,14 @@
-import allowanceOnEVM from './platforms/evm/allowance'
-import balanceOnEVM from './platforms/evm/balance'
+import allowanceOnEVM from './platforms/evm/allowance.evm'
+import balanceOnEVM from './platforms/evm/balance.evm'
 import BEP20 from './blockchains/bsc/BEP20'
-import decimalsOnEVM from './platforms/evm/decimals'
+import decimalsOnEVM from './platforms/evm/decimals.evm'
 import ERC20 from './blockchains/ethereum/ERC20'
 import ERC20onPolygon from './blockchains/polygon/ERC20'
-import nameOnEVM from './platforms/evm/name'
-import symbolOnEVM from './platforms/evm/symbol'
+import nameOnEVM from './platforms/evm/name.evm'
+import symbolOnEVM from './platforms/evm/symbol.evm'
 import { CONSTANTS } from '@depay/web3-constants'
 import { ethers } from 'ethers'
-import { request } from '@depay/web3-client'
+import { request } from '@depay/web3-client-evm'
 import { supported } from './blockchains.evm'
 
 class Token {

diff --git a/src/platforms/evm/allowance.evm.js b/src/platforms/evm/allowance.evm.js
@@ -0,0 +1,14 @@
+import { request } from '@depay/web3-client-evm'
+
+export default ({ blockchain, address, api, owner, spender })=>{
+  return request(
+    {
+      blockchain,
+      address,
+      api,
+      method: 'allowance',
+      params: [owner, spender],
+      cache: 5000, // 5 seconds
+    },
+  )
+}
diff --git a/src/platforms/evm/balance.evm.js b/src/platforms/evm/balance.evm.js
@@ -0,0 +1,26 @@
+import { CONSTANTS } from '@depay/web3-constants'
+import { request } from '@depay/web3-client-evm'
+
+export default async ({ blockchain, address, account, api })=>{
+  if (address == CONSTANTS[blockchain].NATIVE) {
+    return await request(
+      {
+        blockchain: blockchain,
+        address: account,
+        method: 'balance',
+        cache: 10000, // 10 seconds
+      },
+    )
+  } else {
+    return await request(
+      {
+        blockchain: blockchain,
+        address: address,
+        method: 'balanceOf',
+        api,
+        params: [account],
+        cache: 10000, // 10 seconds
+      },
+    )
+  }
+}
diff --git a/src/platforms/evm/decimals.evm.js b/src/platforms/evm/decimals.evm.js
@@ -0,0 +1,11 @@
+import { request } from '@depay/web3-client-evm'
+
+export default ({ blockchain, address, api })=>{
+  return request({
+    blockchain,
+    address,
+    api,
+    method: 'decimals',
+    cache: 86400000, // 1 day
+  })
+}
diff --git a/src/platforms/evm/name.evm.js b/src/platforms/evm/name.evm.js
@@ -0,0 +1,13 @@
+import { request } from '@depay/web3-client-evm'
+
+export default ({ blockchain, address, api })=>{
+  return request(
+    {
+      blockchain: blockchain,
+      address: address,
+      api,
+      method: 'name',
+      cache: 86400000, // 1 day
+    },
+  )
+}
diff --git a/src/platforms/evm/symbol.evm.js b/src/platforms/evm/symbol.evm.js
@@ -0,0 +1,13 @@
+import { request } from '@depay/web3-client-evm'
+
+export default ({ blockchain, address, api })=>{
+  return request(
+    {
+      blockchain,
+      address,
+      api,
+      method: 'symbol',
+      cache: 86400000, // 1 day
+    }
+  )
+}
diff --git a/yarn.lock b/yarn.lock
@@ -917,25 +917,25 @@
   resolved "https://registry.yarnpkg.com/@depay/web3-blockchains/-/web3-blockchains-6.2.3.tgz#8dbee9ec05e2d581dde0c1b7c4d1a64755e99cbf"
   integrity sha512-n917CoFqvlRBzUc7JBxm2H3y8WjEgFtgzwWgfg7OaStn0LqvVRxwc/h1vzPPW8hAANhbpDsLW2b9KKaks6LUBA==
 
-"@depay/web3-client-evm@^10.1.19":
-  version "10.1.19"
-  resolved "https://registry.yarnpkg.com/@depay/web3-client-evm/-/web3-client-evm-10.1.19.tgz#73020ff09d4042e25b7108f01d52c0daca7fef01"
-  integrity sha512-NJQ3xeFPqGKkbFLP2xW5C3FfFGNudT7Cs+fcEcuHbPN702f3SuigpOXKoRrcQL8iolgBnKJ6M3TRuoQQV65nNg==
+"@depay/web3-client-evm@^10.1.20":
+  version "10.1.20"
+  resolved "https://registry.yarnpkg.com/@depay/web3-client-evm/-/web3-client-evm-10.1.20.tgz#cc75cdefc82040cba7668f0b9aafaa3042f5d824"
+  integrity sha512-nVa9YqytpsBWvfTqAY8QWilM8Wbhi9xXZq2LY+WtQisj7CfPBLZBvivNehkZ+zro3r91UW8lCkgs0nXYPisbsA==
 
-"@depay/web3-client@^10.1.19":
-  version "10.1.19"
-  resolved "https://registry.yarnpkg.com/@depay/web3-client/-/web3-client-10.1.19.tgz#dcd5165705589a651bdb64b81c869da71eefd215"
-  integrity sha512-35Id2f9MMBC7DiSA1+owTW8WpY85VSurcXG+VROxNclgAdekFR4qbWLz9+WVDcg7LPFkNpI3GwFD/GcYAEmmJg==
+"@depay/web3-client@^10.1.20":
+  version "10.1.20"
+  resolved "https://registry.yarnpkg.com/@depay/web3-client/-/web3-client-10.1.20.tgz#940d573c41342bbb00dcf09a6e2ce61107afdd54"
+  integrity sha512-ljIwyhCnQ1Z02m8Zsrn/X559aQgnY+I8nq+Tmj7WwmXYL/qbosMUrly6EF5NLp7TUNjG5myfUsa3tGW0Qcm0rg==
 
 "@depay/web3-constants@^6.3.2":
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/@depay/web3-constants/-/web3-constants-6.3.2.tgz#13a6066f20baee3ea94b373eebc69bd2c4c9773b"
   integrity sha512-It2ygcxIrSXMB3ilHmgtq0EMfBGf42sgnaCFbF9Lz80gPjC7O2NifNv8h3gRd/8Fy3XwzCLkjDqbVIgn7kV9tQ==
 
-"@depay/web3-mock@^13.22.10":
-  version "13.22.10"
-  resolved "https://registry.yarnpkg.com/@depay/web3-mock/-/web3-mock-13.22.10.tgz#f99ec9b4f214b9812eca13594e9cf799b0511e5c"
-  integrity sha512-Uf3gW//WXrr6H8Tzua1jQCLFqIDd8aSEv8CdyB6TwM7pxviR+ufMvJ8VXoqzGDSNmNVvXJoNuKvxC3qNtdpzmA==
+"@depay/web3-mock@^13.22.11":
+  version "13.22.11"
+  resolved "https://registry.yarnpkg.com/@depay/web3-mock/-/web3-mock-13.22.11.tgz#36f13c444448284061c73b078fb8f7b388bfeaec"
+  integrity sha512-I5cGu9G6f75fmEJtwQEMRj9zrbLLquOAM31ldTwRrOYpYYLIS2K4DLqZINAdGn+jW8z0dOvSscgMVI/OJ4l2RQ==
   dependencies:
     "@depay/web3-blockchains" "^6.2.3"
     "@depay/web3-constants" "^6.3.2"