Skip to content

Gdprice sdk v1 #597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sirpy merged 4 commits into from
May 22, 2025
Merged

Gdprice sdk v1 #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f1a25d
fix: g$ price for sdk v1
sirpy May 22, 2025
75fa472
add: latest sdk
sirpy May 22, 2025
2654770
Merge branch 'master' into gdprice-sdk-v1
sirpy May 22, 2025
7518da6
add: released sdks
sirpy May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@
"@babel/runtime": "^7.18.9",
"@gooddollar/good-design": "^0.4.17",
"@gooddollar/goodprotocol": "2.0.32",
"@gooddollar/web3sdk": "^0.1.49",
"@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",
Expand Down
2 changes: 1 addition & 1 deletion src/connectors/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/useWeb3.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down Expand Up @@ -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',
},
}}
>
Expand Down
10 changes: 5 additions & 5 deletions src/pages/gd/Portfolio/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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}` : ''}
</div>
<div className="part protocol">
<Title type="category" className="flex items-center key">
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -285,7 +285,7 @@ const Portfolio = memo(() => {
}
),
}
}, [account, mainnetChainId, fuseChainId])
}, [account, mainnetChainId, fuseChainId, gdPrice])

const showNotice = data?.list.find((stake) => stake.isDeprecated)

Expand Down
2 changes: 1 addition & 1 deletion src/pages/gd/Swap/SwapCelo/UniSwap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Comment thread
sirpy marked this conversation as resolved.

@sourcery-ai sourcery-ai Bot May 22, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue: Outdated comment about forno causing gas issues remains

Please update or remove the outdated comment referencing gas issues with forno, as it no longer reflects the current implementation.

],
}

Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4803,8 +4803,8 @@ __metadata:
"@fullhuman/postcss-purgecss": ^4.0.3
"@gooddollar/good-design": ^0.4.17
"@gooddollar/goodprotocol": 2.0.32
"@gooddollar/web3sdk": ^0.1.49
"@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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -5042,13 +5042,13 @@ __metadata:
react-native-web: "*"
viem: 2.*
wagmi: 2.*
checksum: 84e3c9de2510778669073f853b7f9314ebc63551b58c891074b9dee1b777b478beb6b70a4cd5659887325178de2fb9dd6a30806887959993004fb29ea01a6e63
checksum: 0f62555218850cea4e514a96df6f44d909013edfbdbcaaa8d99ebb6ae7a3dad2eb3468ad84187535a95688217db82e073d84eca83da924e48bef97212a060f83
languageName: node
linkType: hard

"@gooddollar/web3sdk@npm:^0.1.49":
version: 0.1.49
resolution: "@gooddollar/web3sdk@npm:0.1.49"
"@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
Expand All @@ -5071,7 +5071,7 @@ __metadata:
web3-utils: 1.8.2
peerDependencies:
react: ">=17"
checksum: a30a6cc19d1f207fb61aa271c95060361eb4bbd4f0135f9760e81256190c452a245a5d82fdba49befa05dc1517bb5b966058e04b215b800db5327c3d254fdd3d
checksum: be7e75778eb6bef1bd5ddfa7653082597009bfcc68968b31d2f1cbd0f4deb0604b778118f29c892b25422544fc2f82ff53ea608c0fe5e50694d2e4d8ae92379c
languageName: node
linkType: hard

Expand Down
Loading