Skip to content

Commit 6ea1b57

Browse files
xieqiancaosissilq0-githubnaturexie
authored
Add z nea rn m pool (#623)
* Feat zNEARnM_USDC pool * Update zNEARnM icon * Fix some bugs * remove accounts api * fix: stable pool display ui * fix: update stable ui --------- Co-authored-by: lq0-github <[email protected]> Co-authored-by: naturexie <[email protected]>
1 parent 12a9e7c commit 6ea1b57

File tree

13 files changed

+52
-11
lines changed

13 files changed

+52
-11
lines changed

‎src/components/farm/FarmsDetail.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ function StakeContainer(props: {
568568
}
569569
useEffect(() => {
570570
getPoolFee();
571-
get_ve_seed_share();
571+
// get_ve_seed_share();
572572
}, []);
573573
async function get_ve_seed_share() {
574574
const result = await getVeSeedShare();

‎src/components/farm/FarmsHome.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ export default function FarmsHome(props: any) {
221221
get_user_unWithDraw_rewards();
222222
get_user_seeds_and_unClaimedRewards();
223223
getLoveTokenBalance();
224-
get_ve_seed_share();
224+
// get_ve_seed_share();
225225
}, [isSignedIn]);
226226
useEffect(() => {
227227
if (count > 0) {

‎src/components/stableswap/StableTokenList.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export function FlexibleStableToken({
5252
icon={token.icon}
5353
className="h-9 w-9 mr-2 xs:w-7 xs:h-7 md:w-7 md-h-7"
5454
/>
55-
<div className="text-white text-base" title={token.id}>
55+
<div className="text-white text-base break-all" title={token.id}>
5656
{toRealSymbol(token.symbol)}
5757
</div>
5858
</div>

‎src/components/stableswap/StableTokenListUSN.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export default function StableTokenListUSN(props: {
8383
className="h-9 w-9 xs:h-7 md:h-7 xs:w-7 md:w-7 mr-2"
8484
/>
8585
)}
86-
<div className="text-white text-base" title={tokens[0].id}>
86+
<div className="text-white text-base break-all" title={tokens[0].id}>
8787
{tokens[0].id == '16.contract.portalbridge.near'
8888
? 'USDC.w'
8989
: toRealSymbol(tokens[0].symbol)}

‎src/components/stableswap/TokenReserves.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ function TokenChart({
8888
'USDC.w': '#2B6EB7',
8989
FRAX: '#OE1519',
9090
sFRAX: '#4A6D7C',
91+
'zNEARnM-USDC': '#74FA9D',
9192
};
9293

9394
const noBorderTokens = ['LINEAR', 'USDt'];

‎src/pages/Orderly/components/UserBoard/index.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -3968,7 +3968,6 @@ export function AssetManagerModal(
39683968
buttonLoading
39693969
}
39703970
>
3971-
{/* TODOXXX */}
39723971
<ButtonTextWrapper
39733972
loading={buttonLoading}
39743973
Text={() => (
@@ -4324,7 +4323,6 @@ function ConfirmOrderModal(
43244323
} = props;
43254324
const [loading, setLoading] = useState<boolean>(false);
43264325
const [warningIsOpen, setWarningIsOpen] = useState(false);
4327-
// TODOXXX
43284326
const isMobile = useClientMobile();
43294327
const intl = useIntl();
43304328
return (

‎src/pages/pools/LiquidityPage/LiquidityPage.tsx

+6-2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ import {
6767
FRAX_USDC_POOL_ID,
6868
USDCW_POOL_ID,
6969
Frax_SFrax_POOL_ID,
70+
ZNEARnM_USDC_POOL_ID,
7071
} from '../../../services/near';
7172
import { WatchListStartFull } from '../../../components/icon/WatchListStar';
7273
import _, { orderBy, sortBy, filter } from 'lodash';
@@ -2356,6 +2357,7 @@ function TokenChart({
23562357
'USDC.w': '#2B6EB7',
23572358
FRAX: '#OE1519',
23582359
sFRAX: '#4A6D7C',
2360+
'zNEARnM-USDC': '#74FA9D',
23592361
};
23602362

23612363
const colorLight = {
@@ -2378,8 +2380,8 @@ function TokenChart({
23782380
'USD Coin': 'rgba(0, 163, 255, 1)',
23792381
FRAX: '#OE1519',
23802382
sFRAX: '#4A6D7C',
2383+
'zNEARnM-USDC': '#74FA9D',
23812384
};
2382-
23832385
const innerRadius = 30;
23842386
const outerRadius = 40;
23852387
const width = 80;
@@ -2588,7 +2590,8 @@ function StablePoolCard({
25882590
poolData.pool.id == USDT_USDC_POOL_ID ||
25892591
poolData.pool.id == FRAX_USDC_POOL_ID ||
25902592
poolData.pool.id == USDCW_POOL_ID ||
2591-
poolData.pool.id == Frax_SFrax_POOL_ID;
2593+
poolData.pool.id == Frax_SFrax_POOL_ID ||
2594+
poolData.pool.id == ZNEARnM_USDC_POOL_ID;
25922595

25932596
const atRiskTokens = curRowTokens.filter((token) =>
25942597
riskTokens.some((riskToken) => riskToken.id === token.id)
@@ -2986,6 +2989,7 @@ function StablePoolList({
29862989
FRAX_USDC_POOL_ID,
29872990
Frax_SFrax_POOL_ID,
29882991
USDCW_POOL_ID,
2992+
ZNEARnM_USDC_POOL_ID,
29892993
];
29902994

29912995
const sortingFunc = (p1: PoolData, p2: PoolData) => {

‎src/pages/pools/poolsComponents/StablePoolList.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
FRAX_USDC_POOL_ID,
1111
USDCW_POOL_ID,
1212
Frax_SFrax_POOL_ID,
13+
ZNEARnM_USDC_POOL_ID,
1314
} from 'src/services/near';
1415
import _, { find } from 'lodash';
1516
import { FormattedMessage } from 'react-intl';
@@ -107,6 +108,7 @@ function StablePoolList({
107108
FRAX_USDC_POOL_ID,
108109
Frax_SFrax_POOL_ID,
109110
USDCW_POOL_ID,
111+
ZNEARnM_USDC_POOL_ID,
110112
];
111113
const sortingFunc = (p1: PoolData, p2: PoolData) => {
112114
const v1 = Number(p1?.poolTVL?.toString() || 0);
@@ -384,7 +386,8 @@ function StablePoolCard({
384386
poolData.pool.id == USDT_USDC_POOL_ID ||
385387
poolData.pool.id == FRAX_USDC_POOL_ID ||
386388
poolData.pool.id == USDCW_POOL_ID ||
387-
poolData.pool.id == Frax_SFrax_POOL_ID;
389+
poolData.pool.id == Frax_SFrax_POOL_ID ||
390+
poolData.pool.id == ZNEARnM_USDC_POOL_ID;
388391

389392
const atRiskTokens = curRowTokens.filter((token) =>
390393
riskTokens.some((riskToken) => riskToken.id === token.id)
@@ -850,6 +853,7 @@ function TokenChart({
850853
'USDC.w': '#2B6EB7',
851854
FRAX: '#OE1519',
852855
sFRAX: '#4A6D7C',
856+
'zNEARnM-USDC': '#74FA9D',
853857
};
854858

855859
const colorLight = {
@@ -871,6 +875,7 @@ function TokenChart({
871875
USDt: '#0E8585',
872876
FRAX: '#OE1519',
873877
sFRAX: '#4A6D7C',
878+
'zNEARnM-USDC': '#74FA9D',
874879
};
875880

876881
const innerRadius = 30;

‎src/services/config.ts

+22
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,11 @@ export default function getConfig(
277277
'853d955acef822db058eb8505911ed77f175b99e.factory.bridge.near',
278278
'a663b02cf0a4b149d2ad41910cb81e23e1c41c32.factory.bridge.near',
279279
],
280+
ZNEARnM_USDC_POOL_ID: 5442,
281+
ZNEARnM_USDC_TOKEN_IDS: [
282+
'v1.guild-covenant.near',
283+
'17208628f84f5d6ad33f0da3bbbeb27ffcb398eac501a31bd6ad2011e36133a1',
284+
],
280285
};
281286
case 'pub-testnet':
282287
return {
@@ -627,6 +632,11 @@ export default function getConfig(
627632
'853d955acef822db058eb8505911ed77f175b99e.factory.bridge.near',
628633
'a663b02cf0a4b149d2ad41910cb81e23e1c41c32.factory.bridge.near',
629634
],
635+
ZNEARnM_USDC_POOL_ID: 5442,
636+
ZNEARnM_USDC_TOKEN_IDS: [
637+
'v1.guild-covenant.near',
638+
'17208628f84f5d6ad33f0da3bbbeb27ffcb398eac501a31bd6ad2011e36133a1',
639+
],
630640
};
631641
}
632642
}
@@ -698,6 +708,7 @@ export function getExtraStablePoolConfig(
698708
'4514',
699709
'5219',
700710
'5029',
711+
'5442',
701712
],
702713
USDTT_USDCC_USDT_USDC_POOL_INDEX: {
703714
'usdt.tether-token.near': 0,
@@ -721,6 +732,10 @@ export function getExtraStablePoolConfig(
721732
'853d955acef822db058eb8505911ed77f175b99e.factory.bridge.near': 0,
722733
'a663b02cf0a4b149d2ad41910cb81e23e1c41c32.factory.bridge.near': 1,
723734
},
735+
ZNEARnM_USDC_POOL_INDEX: {
736+
'v1.guild-covenant.near': 0,
737+
'17208628f84f5d6ad33f0da3bbbeb27ffcb398eac501a31bd6ad2011e36133a1': 1,
738+
},
724739
};
725740
case 'development':
726741
case 'pub-testnet':
@@ -778,6 +793,7 @@ export function getExtraStablePoolConfig(
778793
},
779794
USDT_USDC_POOL_INDEX: {},
780795
FRAX_USDC_POOL_INDEX: {},
796+
ZNEARnM_USDC_POOL_INDEX: {},
781797
};
782798
case 'testnet':
783799
return {
@@ -833,6 +849,7 @@ export function getExtraStablePoolConfig(
833849
},
834850
USDT_USDC_POOL_INDEX: {},
835851
FRAX_USDC_POOL_INDEX: {},
852+
ZNEARnM_USDC_POOL_INDEX: {},
836853
};
837854
default:
838855
return {
@@ -896,6 +913,7 @@ export function getExtraStablePoolConfig(
896913
'4514',
897914
'5219',
898915
'5029',
916+
'5442',
899917
],
900918
USDTT_USDCC_USDT_USDC_POOL_INDEX: {
901919
'usdt.tether-token.near': 0,
@@ -919,6 +937,10 @@ export function getExtraStablePoolConfig(
919937
'853d955acef822db058eb8505911ed77f175b99e.factory.bridge.near': 0,
920938
'a663b02cf0a4b149d2ad41910cb81e23e1c41c32.factory.bridge.near': 1,
921939
},
940+
ZNEARnM_USDC_POOL_INDEX: {
941+
'v1.guild-covenant.near': 0,
942+
'17208628f84f5d6ad33f0da3bbbeb27ffcb398eac501a31bd6ad2011e36133a1': 1,
943+
},
922944
};
923945
}
924946
}

‎src/services/farm.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,7 @@ export const getBoostSeedsFromServer = async (): Promise<{
11001100
export const getVeSeedShare = async (): Promise<any> => {
11011101
// REF_VE_CONTRACT_ID
11021102
return await fetch(
1103-
config.sodakiApiUrl + `/seed/v2.ref-finance.near@79/accounts`,
1103+
config.sodakiApiUrl + `/seedv2/v2.ref-finance.near@79/accounts`,
11041104
{
11051105
method: 'GET',
11061106
}

‎src/services/ft-contract.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ const SOL_NATIVE_ID = '22.contract.portalbridge.near';
2929
const BABY_BLACKDRAGON_ID = 'babyblackdragon.tkn.near';
3030
const INTEL_ID = 'intel.tkn.near';
3131
const PORTALBRIDGE_ID = '16.contract.portalbridge.near';
32+
const zNEARnM_ID = 'v1.guild-covenant.near';
3233

3334
export const REF_META_DATA = {
3435
decimals: 18,
@@ -214,7 +215,8 @@ export const ftGetTokenMetadata = async (
214215
metadata.id === SOL_NATIVE_ID ||
215216
metadata.id === BABY_BLACKDRAGON_ID ||
216217
metadata.id === INTEL_ID ||
217-
metadata.id === PORTALBRIDGE_ID
218+
metadata.id === PORTALBRIDGE_ID ||
219+
metadata.id === zNEARnM_ID
218220
) {
219221
metadata.icon = metadataDefaults[id];
220222
if (metadata.id === SOL_ID) {

‎src/services/near.ts

+8
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ export const USDCW_TOKEN_IDS = config.USDCW_TOKEN_IDS;
3737
export const USDT_USDC_TOKEN_IDS = config.USDT_USDC_TOKEN_IDS;
3838
export const FRAX_USDC_TOKEN_IDS = config.FRAX_USDC_TOKEN_IDS;
3939
export const Frax_SFrax_TOKEN_IDS = config.Frax_SFrax_TOKEN_IDS;
40+
export const ZNEARnM_USDC_TOKEN_IDS = config.ZNEARnM_USDC_TOKEN_IDS;
4041

4142
export const STABLE_POOL_ID = config.STABLE_POOL_ID;
4243

@@ -55,6 +56,7 @@ export const FRAX_USDC_POOL_ID = config.FRAX_USDC_POOL_ID;
5556

5657
export const USDCW_POOL_ID = config.USDCW_POOL_ID;
5758
export const Frax_SFrax_POOL_ID = config.Frax_SFrax_POOL_ID;
59+
export const ZNEARnM_USDC_POOL_ID = config.ZNEARnM_USDC_POOL_ID;
5860

5961
export const {
6062
BTCIDS,
@@ -83,6 +85,7 @@ export const {
8385
FRAX_USDC_POOL_INDEX,
8486
USDCW_TOKEN_INDEX,
8587
Frax_SFrax_POOL_INDEX,
88+
ZNEARnM_USDC_POOL_INDEX,
8689
} = getExtraStablePoolConfig();
8790

8891
export const extraStableTokenIds = BTCIDS.concat(LINEARIDS)
@@ -107,6 +110,7 @@ export const AllStableTokenIds = new Array(
107110
.concat(FRAX_USDC_TOKEN_IDS)
108111
.concat(USDCW_TOKEN_IDS)
109112
.concat(Frax_SFrax_TOKEN_IDS)
113+
.concat(ZNEARnM_USDC_TOKEN_IDS)
110114
)
111115
);
112116

@@ -132,6 +136,7 @@ export const ALL_STABLE_POOL_IDS = [
132136
USDT_USDC_POOL_ID,
133137
FRAX_USDC_POOL_ID,
134138
Frax_SFrax_POOL_ID,
139+
ZNEARnM_USDC_POOL_ID,
135140
]
136141
.filter((_) => _)
137142
.map((id) => id.toString());
@@ -179,6 +184,8 @@ export const getStableTokenIndex = (stable_pool_id: string | number) => {
179184
return USDCW_TOKEN_INDEX;
180185
case Frax_SFrax_POOL_ID.toString():
181186
return Frax_SFrax_POOL_INDEX;
187+
case ZNEARnM_USDC_POOL_ID.toString():
188+
return ZNEARnM_USDC_POOL_INDEX;
182189
}
183190
};
184191

@@ -210,6 +217,7 @@ export const USD_CLASS_STABLE_POOL_IDS = [
210217
FRAX_USDC_POOL_ID?.toString(),
211218
USDCW_POOL_ID?.toString(),
212219
Frax_SFrax_POOL_ID?.toString(),
220+
ZNEARnM_USDC_POOL_ID?.toString(),
213221
];
214222

215223
export const BTC_CLASS_STABLE_TOKEN_IDS = BTCIDS;

‎src/utils/metadata.ts

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ const icons: { [tokenId: string]: string } = {
6969
'intel.tkn.near': 'https://img.ref.finance/images/intel.jpeg',
7070
'16.contract.portalbridge.near':
7171
'https://img.ref.finance/images/portalbridge.svg',
72+
'v1.guild-covenant.near': 'https://img.ref.finance/images/zNEARnM-USDC.svg',
7273
};
7374

7475
export default icons;

0 commit comments

Comments
 (0)