From 3a8244b7fd84fc4d95d8d16135b9f2b250dcadf9 Mon Sep 17 00:00:00 2001 From: Evgeny Vlasenko Date: Mon, 6 May 2024 18:49:21 +0400 Subject: [PATCH] feat: fantom --- server/cloudbuild.yaml | 1 + server/package-lock.json | 9 ++++----- server/package.json | 2 +- web/.env | 1 + web/index.html | 1 + web/package-lock.json | 18 ++++++++---------- web/package.json | 4 ++-- web/src/lib/account/Account.js | 7 +++++-- .../Add/CryptoAddStepSelectBlockchain.vue | 1 + 9 files changed, 24 insertions(+), 20 deletions(-) diff --git a/server/cloudbuild.yaml b/server/cloudbuild.yaml index 00cb5e92c..918d9637a 100644 --- a/server/cloudbuild.yaml +++ b/server/cloudbuild.yaml @@ -46,6 +46,7 @@ steps: && if [[ "${_VITE_API_ADA_URL}" ]]; then export VITE_API_ADA_URL=${_VITE_API_ADA_URL}; fi \ && if [[ "${_VITE_API_TON_URL}" ]]; then export VITE_API_TON_URL=${_VITE_API_TON_URL}; fi \ && if [[ "${_VITE_API_OP_URL}" ]]; then export VITE_API_OP_URL=${_VITE_API_OP_URL}; fi \ + && if [[ "${_VITE_API_FTM_URL}" ]]; then export VITE_API_FTM_URL=${_VITE_API_FTM_URL}; fi \ && npm run build - name: 'gcr.io/cloud-builders/docker' diff --git a/server/package-lock.json b/server/package-lock.json index 9122c4cbb..f400b2651 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -9,7 +9,7 @@ "version": "6.3.1", "license": "MIT", "dependencies": { - "@coinspace/crypto-db": "^1.9.3", + "@coinspace/crypto-db": "^1.10.0", "@ensdomains/address-encoder": "^0.2.9", "@sentry/integrations": "^6.17.3", "@sentry/node": "^6.17.3", @@ -162,10 +162,9 @@ ] }, "node_modules/@coinspace/crypto-db": { - "version": "1.9.3", - "resolved": "https://npm.pkg.github.com/download/@CoinSpace/crypto-db/1.9.3/13a930fd7626562ac96385634039e48488d399e3", - "integrity": "sha512-HRwaBECv1VFQMCFZTHTG38DZz8/3zWD+B4KVbthZWUBr7UrZJwNL74R9k7h5OmqMWDacctmQxi+2ByBcT+PAjA==", - "license": "MIT" + "version": "1.10.0", + "resolved": "https://npm.pkg.github.com/download/@CoinSpace/crypto-db/1.10.0/b3d4ba6faa492137538022e9fe690527baa2afa6", + "integrity": "sha512-SAEAtKwAP8kj8Fs7oWMDdSPoMpmFMrori4Oe362xpnLEzGrRki/guHLWm1fjVX5aZ7xY9sMb4AxWcyLyn5sxpQ==" }, "node_modules/@ensdomains/address-encoder": { "version": "0.2.22", diff --git a/server/package.json b/server/package.json index fc2b63b7b..50419e014 100644 --- a/server/package.json +++ b/server/package.json @@ -22,7 +22,7 @@ "lint:api": "spectral lint ./lib/v*/*.yaml" }, "dependencies": { - "@coinspace/crypto-db": "^1.9.3", + "@coinspace/crypto-db": "^1.10.0", "@ensdomains/address-encoder": "^0.2.9", "@sentry/integrations": "^6.17.3", "@sentry/node": "^6.17.3", diff --git a/web/.env b/web/.env index 29c8dbd9b..f6026aa30 100644 --- a/web/.env +++ b/web/.env @@ -33,3 +33,4 @@ VITE_API_TRX_URL=https://trx.coin.space/ VITE_API_ADA_URL=https://ada.coin.space/ VITE_API_TON_URL=https://ton.coin.space/ VITE_API_OP_URL=https://op.coin.space/ +VITE_API_FTM_URL=https://ftm.coin.space/ diff --git a/web/index.html b/web/index.html index cbd56c8dc..54948d246 100644 --- a/web/index.html +++ b/web/index.html @@ -30,6 +30,7 @@ %VITE_API_ARB_URL% %VITE_API_TON_URL% %VITE_API_OP_URL% + %VITE_API_FTM_URL% https://api.coingecko.com/ https://api.moonpay.com https://*.sentry.io; diff --git a/web/package-lock.json b/web/package-lock.json index 4b7be7a8f..44278f118 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -9,12 +9,12 @@ "version": "6.3.1", "license": "MIT", "dependencies": { - "@coinspace/crypto-db": "^1.9.3", + "@coinspace/crypto-db": "^1.10.0", "@coinspace/cs-bitcoin-wallet": "^1.1.2", "@coinspace/cs-cardano-wallet": "^2.0.0", "@coinspace/cs-common": "^1.1.2", "@coinspace/cs-eos-wallet": "^2.0.2", - "@coinspace/cs-evm-wallet": "^1.2.0", + "@coinspace/cs-evm-wallet": "^1.3.0", "@coinspace/cs-monero-wallet": "^2.0.2", "@coinspace/cs-ripple-wallet": "^2.2.0", "@coinspace/cs-solana-wallet": "^2.0.4", @@ -280,10 +280,9 @@ } }, "node_modules/@coinspace/crypto-db": { - "version": "1.9.3", - "resolved": "https://npm.pkg.github.com/download/@CoinSpace/crypto-db/1.9.3/13a930fd7626562ac96385634039e48488d399e3", - "integrity": "sha512-HRwaBECv1VFQMCFZTHTG38DZz8/3zWD+B4KVbthZWUBr7UrZJwNL74R9k7h5OmqMWDacctmQxi+2ByBcT+PAjA==", - "license": "MIT" + "version": "1.10.0", + "resolved": "https://npm.pkg.github.com/download/@CoinSpace/crypto-db/1.10.0/b3d4ba6faa492137538022e9fe690527baa2afa6", + "integrity": "sha512-SAEAtKwAP8kj8Fs7oWMDdSPoMpmFMrori4Oe362xpnLEzGrRki/guHLWm1fjVX5aZ7xY9sMb4AxWcyLyn5sxpQ==" }, "node_modules/@coinspace/cs-bitcoin-wallet": { "version": "1.1.2", @@ -344,10 +343,9 @@ } }, "node_modules/@coinspace/cs-evm-wallet": { - "version": "1.2.0", - "resolved": "https://npm.pkg.github.com/download/@coinspace/cs-evm-wallet/1.2.0/4efd32646ebd98c1c9713d8622b3e012dfe16c82", - "integrity": "sha512-v4gOg/wOJwev8gVQZTpFzBeMuz7DyETwIQO5T4SPRZvHCT8jH08qOZ1oVCA8pwdvHKCiaK6Ik/Cw6gEwozHEBw==", - "license": "MIT", + "version": "1.3.0", + "resolved": "https://npm.pkg.github.com/download/@coinspace/cs-evm-wallet/1.3.0/60a63c8981176a425ecee2521970e14b0d907d65", + "integrity": "sha512-wlC4cCPbNF8dHeaURSoIUVBKnQiTutuZ4oKHHxJi7DNcBfYtmGRWSCgwRCHbW4pjj/IQJ5QCppQx2MgNr6HN1A==", "dependencies": { "@noble/hashes": "^1.3.1", "@scure/bip32": "^1.3.0", diff --git a/web/package.json b/web/package.json index 9030fa24c..194022d3c 100644 --- a/web/package.json +++ b/web/package.json @@ -26,12 +26,12 @@ "lint:style": "stylelint '**/*.{vue,scss}'" }, "dependencies": { - "@coinspace/crypto-db": "^1.9.3", + "@coinspace/crypto-db": "^1.10.0", "@coinspace/cs-bitcoin-wallet": "^1.1.2", "@coinspace/cs-cardano-wallet": "^2.0.0", "@coinspace/cs-common": "^1.1.2", "@coinspace/cs-eos-wallet": "^2.0.2", - "@coinspace/cs-evm-wallet": "^1.2.0", + "@coinspace/cs-evm-wallet": "^1.3.0", "@coinspace/cs-monero-wallet": "^2.0.2", "@coinspace/cs-ripple-wallet": "^2.2.0", "@coinspace/cs-solana-wallet": "^2.0.4", diff --git a/web/src/lib/account/Account.js b/web/src/lib/account/Account.js index ecf11c240..d4c29468c 100644 --- a/web/src/lib/account/Account.js +++ b/web/src/lib/account/Account.js @@ -39,6 +39,7 @@ const EVM_FAMILY = [ 'binance-smart-chain', 'arbitrum', 'optimism', + 'fantom', ]; async function loadWalletModule(platform) { @@ -380,6 +381,10 @@ export default class Account extends EventEmitter { return import.meta.env.VITE_API_AVAX_URL; case 'arbitrum': return import.meta.env.VITE_API_ARB_URL; + case 'optimism': + return import.meta.env.VITE_API_OP_URL; + case 'fantom': + return import.meta.env.VITE_API_FTM_URL; // Ripple-like case 'ripple': return import.meta.env.VITE_API_XRP_URL; @@ -398,8 +403,6 @@ export default class Account extends EventEmitter { return import.meta.env.VITE_API_ADA_URL; case 'toncoin': return import.meta.env.VITE_API_TON_URL; - case 'optimism': - return import.meta.env.VITE_API_OP_URL; default: throw new errors.InternalWalletError(`Unsupported platform "${platform}"`); } diff --git a/web/src/views/Crypto/Add/CryptoAddStepSelectBlockchain.vue b/web/src/views/Crypto/Add/CryptoAddStepSelectBlockchain.vue index cda7cf59f..c4197ce2b 100644 --- a/web/src/views/Crypto/Add/CryptoAddStepSelectBlockchain.vue +++ b/web/src/views/Crypto/Add/CryptoAddStepSelectBlockchain.vue @@ -20,6 +20,7 @@ export default { 'polygon@polygon', 'solana@solana', 'tron@tron', + 'fantom@fantom', ], }; },