From 2f1a25da110e05b134099334e02bf385f0c2df39 Mon Sep 17 00:00:00 2001 From: sirpy Date: Thu, 22 May 2025 12:28:36 +0300 Subject: [PATCH 1/3] fix: g$ price for sdk v1 --- src/connectors/index.ts | 2 +- src/hooks/useWeb3.tsx | 4 ++-- src/pages/gd/Portfolio/index.tsx | 10 +++++----- src/pages/gd/Swap/SwapCelo/UniSwap.tsx | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/connectors/index.ts b/src/connectors/index.ts index 20f0aa71a..52fc4d8f4 100644 --- a/src/connectors/index.ts +++ b/src/connectors/index.ts @@ -31,7 +31,7 @@ export const connectOptions = { id: '0xa4ec', token: 'CELO', label: 'Celo', - rpcUrl: sample(process.env.REACT_APP_CELO_RPC?.split(',')) ?? 'https://rpc.ankr.com/celo', + rpcUrl: sample(process.env.REACT_APP_CELO_RPC?.split(',')) ?? 'https://forno.celo.org', }, { id: '0x1', diff --git a/src/hooks/useWeb3.tsx b/src/hooks/useWeb3.tsx index a42266d43..cdc9ef669 100644 --- a/src/hooks/useWeb3.tsx +++ b/src/hooks/useWeb3.tsx @@ -35,7 +35,7 @@ export function useNetwork(): NetworkSettings { process.env.REACT_APP_MAINNET_RPC || (ethers.getDefaultProvider('mainnet') as any).providerConfigs[0].provider.connection.url, FUSE_RPC: fuseRpcList || 'https://rpc.fuse.io', - CELO_RPC: celoRpcList || 'https://rpc.ankr.com/celo', + CELO_RPC: celoRpcList || 'https://forno.celo.org', KOVAN_RPC: undefined, ROPSTEN_RPC: undefined, }, @@ -98,7 +98,7 @@ export function Web3ContextProvider({ children }: { children: ReactNode | ReactN readOnlyUrls: { 1: sample(process.env.REACT_APP_MAINNET_RPC?.split(',')) ?? 'https://eth.llamarpc.com', 122: sample(process.env.REACT_APP_FUSE_RPC?.split(',')) || 'https://rpc.fuse.io', - 42220: sample(process.env.REACT_APP_CELO_RPC?.split(',')) || 'https://rpc.ankr.com/celo', + 42220: sample(process.env.REACT_APP_CELO_RPC?.split(',')) || 'https://forno.celo.org', }, }} > diff --git a/src/pages/gd/Portfolio/index.tsx b/src/pages/gd/Portfolio/index.tsx index 00b89f2b9..ce291d528 100644 --- a/src/pages/gd/Portfolio/index.tsx +++ b/src/pages/gd/Portfolio/index.tsx @@ -1,6 +1,6 @@ import React, { memo, useCallback, useState } from 'react' import { DAO_NETWORK, getMyList, LIQUIDITY_PROTOCOL, MyStake, useEnvWeb3 } from '@gooddollar/web3sdk' -import { SupportedChains } from '@gooddollar/web3sdk-v2' +import { SupportedChains, useG$Price } from '@gooddollar/web3sdk-v2' import { t } from '@lingui/macro' import { useLingui } from '@lingui/react' import { Currency, CurrencyAmount } from '@uniswap/sdk-core' @@ -81,7 +81,7 @@ const MobileCell = ({ network={stake.protocol} /> {stake.tokens.A.symbol} - {stake.tokens.A.address !== stake.tokens.B.address ?? `/ ${stake.tokens.B.symbol}`} + {stake.tokens.A.address !== stake.tokens.B.address ? `/ ${stake.tokens.B.symbol}` : ''}
@@ -195,7 +195,7 @@ const MobileTable = ({ stakes, cells, onUpdate }: { stakes?: MyStake[]; cells: a const Portfolio = memo(() => { const { i18n } = useLingui() const { account, chainId } = useActiveWeb3React() - + const gdPrice = useG$Price() const [mainnetWeb3, mainnetChainId] = useEnvWeb3(DAO_NETWORK.MAINNET) const [fuseWeb3, fuseChainId] = useEnvWeb3(DAO_NETWORK.FUSE) const { width } = useWindowSize() @@ -240,7 +240,7 @@ const Portfolio = memo(() => { const [data, , , update] = usePromise(async () => { const list = account && mainnetWeb3 && fuseWeb3 && !disableTestnetMain.includes(chainId) - ? await getMyList(mainnetWeb3, fuseWeb3, account) + ? await getMyList(mainnetWeb3, fuseWeb3, account, gdPrice) : [] return { list, @@ -285,7 +285,7 @@ const Portfolio = memo(() => { } ), } - }, [account, mainnetChainId, fuseChainId]) + }, [account, mainnetChainId, fuseChainId, gdPrice]) const showNotice = data?.list.find((stake) => stake.isDeprecated) diff --git a/src/pages/gd/Swap/SwapCelo/UniSwap.tsx b/src/pages/gd/Swap/SwapCelo/UniSwap.tsx index e40475b32..210f92ba3 100644 --- a/src/pages/gd/Swap/SwapCelo/UniSwap.tsx +++ b/src/pages/gd/Swap/SwapCelo/UniSwap.tsx @@ -34,7 +34,7 @@ const jsonRpcUrlMap = { 122: ['https://rpc.fuse.io', 'https://fuse-pokt.nodies.app', 'https://fuse.liquify.com'], 42220: [ // 'https://forno.celo.org', // forno is causing gas issues with uniswap - 'https://rpc.ankr.com/celo', + 'https://forno.celo.org', ], } From 75fa4727f0a5102f744d9b76c3063890a17b1921 Mon Sep 17 00:00:00 2001 From: sirpy <hadar@gooddollar.org> Date: Thu, 22 May 2025 12:41:38 +0300 Subject: [PATCH 2/3] add: latest sdk --- package.json | 6 +++--- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 64a838890..3ff5cbcb7 100755 --- a/package.json +++ b/package.json @@ -205,10 +205,10 @@ }, "dependencies": { "@babel/runtime": "^7.18.9", - "@gooddollar/good-design": "^0.4.16", + "@gooddollar/good-design": "^0.4.17", "@gooddollar/goodprotocol": "2.0.32", - "@gooddollar/web3sdk": "^0.1.48", - "@gooddollar/web3sdk-v2": "^0.4.11", + "@gooddollar/web3sdk": "file:.yalc/@gooddollar/web3sdk", + "@gooddollar/web3sdk-v2": "^0.4.12", "@headlessui/react": "1.5.0", "@lingui/format-json": "^4.0.0", "@lingui/macro": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index cbe94a2cb..215c15193 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4706,9 +4706,9 @@ __metadata: languageName: node linkType: hard -"@gooddollar/good-design@npm:^0.4.16": - version: 0.4.16 - resolution: "@gooddollar/good-design@npm:0.4.16" +"@gooddollar/good-design@npm:^0.4.17": + version: 0.4.17 + resolution: "@gooddollar/good-design@npm:0.4.17" dependencies: "@babel/core": ^7.18.10 "@babel/runtime": ^7.18.9 @@ -4752,7 +4752,7 @@ __metadata: react-use-promise: ^0.5.0 react-use-wizard: ^2.3.0 require-from-string: ^2.0.2 - checksum: e23da2060e9bfd52c0c4777e05fe0c2c1fbfef346fd57fbb15bc12941b1d0042cf7fadbcad1f18a4ad4bdfc9b09385cb16f22964acc3d709dea70ab26a0c739f + checksum: 0d0e20a03beff5f04faa99088dd2a2772a92de391a51ac7e501af43205674f45ec25161750a711bad33a50a484a631b9a1c762d3612ed8be857bf703e9b0ec6c languageName: node linkType: hard @@ -4801,10 +4801,10 @@ __metadata: "@ethersproject/experimental": ^5.0.1 "@fontsource/dm-sans": ^4.2.2 "@fullhuman/postcss-purgecss": ^4.0.3 - "@gooddollar/good-design": ^0.4.16 + "@gooddollar/good-design": ^0.4.17 "@gooddollar/goodprotocol": 2.0.32 - "@gooddollar/web3sdk": ^0.1.48 - "@gooddollar/web3sdk-v2": ^0.4.11 + "@gooddollar/web3sdk": "file:.yalc/@gooddollar/web3sdk" + "@gooddollar/web3sdk-v2": ^0.4.12 "@headlessui/react": 1.5.0 "@hot-loader/react-dom": ^17.0.1 "@lingui/cli": ^4.0.0 @@ -4987,9 +4987,9 @@ __metadata: languageName: unknown linkType: soft -"@gooddollar/web3sdk-v2@npm:^0.4.11": - version: 0.4.11 - resolution: "@gooddollar/web3sdk-v2@npm:0.4.11" +"@gooddollar/web3sdk-v2@npm:^0.4.12": + version: 0.4.12 + resolution: "@gooddollar/web3sdk-v2@npm:0.4.12" dependencies: "@amplitude/analytics-browser": ^1.6.4 "@amplitude/analytics-react-native": ^0.7.0 @@ -5042,13 +5042,13 @@ __metadata: react-native-web: "*" viem: 2.* wagmi: 2.* - checksum: 2fef3539f209f41200f431baeae5fba1c5492e6428c2fac71233589cb55dabee31c563653cf436046295c2f447818c7288a88a145d71ba556bb91461405187ee + checksum: 84e3c9de2510778669073f853b7f9314ebc63551b58c891074b9dee1b777b478beb6b70a4cd5659887325178de2fb9dd6a30806887959993004fb29ea01a6e63 languageName: node linkType: hard -"@gooddollar/web3sdk@npm:^0.1.48": +"@gooddollar/web3sdk@file:.yalc/@gooddollar/web3sdk::locator=%40gooddollar%2Fprotocol-ui%40workspace%3A.": version: 0.1.48 - resolution: "@gooddollar/web3sdk@npm:0.1.48" + resolution: "@gooddollar/web3sdk@file:.yalc/@gooddollar/web3sdk#.yalc/@gooddollar/web3sdk::hash=fb25d1&locator=%40gooddollar%2Fprotocol-ui%40workspace%3A." dependencies: "@apollo/client": ^3.2.0 "@gooddollar/goodprotocol": ^2.0.32 @@ -5071,7 +5071,7 @@ __metadata: web3-utils: 1.8.2 peerDependencies: react: ">=17" - checksum: cebf9d0d0603daf1f5e7af000ce23563f01fed2f471cf6846a03a47950f256616217c967452796b4f6cf723d39b0052d35f0c11278e9addbd99e6641a0f43d34 + checksum: c563cd9853733c14249404b621c6861aa307cd7d42d0e1a670544725462cbd1fe4fa45fbc0af814547830404fdea4682e2de7c8614c34193fce3847b51fe2225 languageName: node linkType: hard From 7518da6c7adbff86ec34548335ed628f2ec37fed Mon Sep 17 00:00:00 2001 From: sirpy <hadar@gooddollar.org> Date: Thu, 22 May 2025 22:27:18 +0300 Subject: [PATCH 3/3] add: released sdks --- package.json | 4 ++-- yarn.lock | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 9c6e5a28c..a96f9d971 100755 --- a/package.json +++ b/package.json @@ -207,8 +207,8 @@ "@babel/runtime": "^7.18.9", "@gooddollar/good-design": "^0.4.17", "@gooddollar/goodprotocol": "2.0.32", - "@gooddollar/web3sdk": "file:.yalc/@gooddollar/web3sdk", - "@gooddollar/web3sdk-v2": "^0.4.12", + "@gooddollar/web3sdk": "^0.1.50", + "@gooddollar/web3sdk-v2": "^0.4.13", "@headlessui/react": "1.5.0", "@lingui/format-json": "^4.0.0", "@lingui/macro": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 215c15193..da0743a08 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4803,8 +4803,8 @@ __metadata: "@fullhuman/postcss-purgecss": ^4.0.3 "@gooddollar/good-design": ^0.4.17 "@gooddollar/goodprotocol": 2.0.32 - "@gooddollar/web3sdk": "file:.yalc/@gooddollar/web3sdk" - "@gooddollar/web3sdk-v2": ^0.4.12 + "@gooddollar/web3sdk": ^0.1.50 + "@gooddollar/web3sdk-v2": ^0.4.13 "@headlessui/react": 1.5.0 "@hot-loader/react-dom": ^17.0.1 "@lingui/cli": ^4.0.0 @@ -4987,9 +4987,9 @@ __metadata: languageName: unknown linkType: soft -"@gooddollar/web3sdk-v2@npm:^0.4.12": - version: 0.4.12 - resolution: "@gooddollar/web3sdk-v2@npm:0.4.12" +"@gooddollar/web3sdk-v2@npm:^0.4.13": + version: 0.4.13 + resolution: "@gooddollar/web3sdk-v2@npm:0.4.13" dependencies: "@amplitude/analytics-browser": ^1.6.4 "@amplitude/analytics-react-native": ^0.7.0 @@ -5042,13 +5042,13 @@ __metadata: react-native-web: "*" viem: 2.* wagmi: 2.* - checksum: 84e3c9de2510778669073f853b7f9314ebc63551b58c891074b9dee1b777b478beb6b70a4cd5659887325178de2fb9dd6a30806887959993004fb29ea01a6e63 + checksum: 0f62555218850cea4e514a96df6f44d909013edfbdbcaaa8d99ebb6ae7a3dad2eb3468ad84187535a95688217db82e073d84eca83da924e48bef97212a060f83 languageName: node linkType: hard -"@gooddollar/web3sdk@file:.yalc/@gooddollar/web3sdk::locator=%40gooddollar%2Fprotocol-ui%40workspace%3A.": - version: 0.1.48 - resolution: "@gooddollar/web3sdk@file:.yalc/@gooddollar/web3sdk#.yalc/@gooddollar/web3sdk::hash=fb25d1&locator=%40gooddollar%2Fprotocol-ui%40workspace%3A." +"@gooddollar/web3sdk@npm:^0.1.50": + version: 0.1.50 + resolution: "@gooddollar/web3sdk@npm:0.1.50" dependencies: "@apollo/client": ^3.2.0 "@gooddollar/goodprotocol": ^2.0.32 @@ -5071,7 +5071,7 @@ __metadata: web3-utils: 1.8.2 peerDependencies: react: ">=17" - checksum: c563cd9853733c14249404b621c6861aa307cd7d42d0e1a670544725462cbd1fe4fa45fbc0af814547830404fdea4682e2de7c8614c34193fce3847b51fe2225 + checksum: be7e75778eb6bef1bd5ddfa7653082597009bfcc68968b31d2f1cbd0f4deb0604b778118f29c892b25422544fc2f82ff53ea608c0fe5e50694d2e4d8ae92379c languageName: node linkType: hard