Skip to content
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.

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

feat: rfox for lpoors #8455

Merged
merged 25 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
632a9f8
fix: start rfox lpoors
NeOMakinG Jan 2, 2025
c128be9
fix: continue
NeOMakinG Jan 3, 2025
db92d98
fix: continue
NeOMakinG Jan 3, 2025
24e398f
fix: review feedbacks
NeOMakinG Jan 3, 2025
fcbd97e
Merge branch 'develop' into rfox-lpoors
NeOMakinG Jan 7, 2025
a76e5d1
fix: continue
NeOMakinG Jan 7, 2025
ab46a12
updated ipfs data structure checkpoint
kaladinlight Jan 9, 2025
62aa718
naming update
kaladinlight Jan 9, 2025
ae2c21c
parse staking contract
kaladinlight Jan 9, 2025
b01388e
reward transactions
kaladinlight Jan 9, 2025
c9022f0
clean up context
kaladinlight Jan 11, 2025
a1bf3ad
naming updates and starting cleanup of components
kaladinlight Jan 11, 2025
71c413b
hook cleanup
kaladinlight Jan 11, 2025
eb05103
stake sorted
kaladinlight Jan 14, 2025
08ed4cf
feature flag and more cleanup
kaladinlight Jan 14, 2025
81946a3
Merge branch 'develop' into rfox-lpoors
kaladinlight Jan 14, 2025
47732bd
regenerate assets
kaladinlight Jan 15, 2025
6b6067b
supported asset check and fallback
kaladinlight Jan 15, 2025
1ad7505
Merge branch 'develop' into rfox-lpoors
kaladinlight Jan 15, 2025
1f47d16
explicit proxy contract naming
kaladinlight Jan 15, 2025
1c2d78f
tx history migration for updated parser logic
kaladinlight Jan 15, 2025
c209e05
fix test
kaladinlight Jan 15, 2025
e66fba4
Merge branch 'develop' into rfox-lpoors
gomesalexandre Jan 15, 2025
460b851
Merge branch 'develop' into rfox-lpoors
gomesalexandre Jan 15, 2025
d53ae35
Merge branch 'develop' into rfox-lpoors
gomesalexandre Jan 16, 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
NeOMakinG marked this conversation as resolved.
Show resolved Hide resolved

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions packages/caip/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ export const baseAssetId: AssetId = 'eip155:8453/slip44:60'
export const solAssetId: AssetId = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501'
export const wrappedSolAssetId: AssetId =
'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/token:So11111111111111111111111111111111111111112'
export const foxEthLpArbitrumAssetId: AssetId =
'eip155:42161/erc20:0x5f6ce0ca13b87bd738519545d3e018e70e339c24'

export const foxatarAssetId: AssetId =
'eip155:137/erc721:0x2e727c425a11ce6b8819b3004db332c12d2af2a2'
Expand Down
3 changes: 3 additions & 0 deletions packages/contracts/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ export const TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET =
// RFOX on Arbitrum ERC1967Proxy contract address
// Uncomment me if you want to test RFOX with a shorter cooldown period
// export const RFOX_PROXY_CONTRACT: Address = '0x1094c4a99fce60e69ffe75849309408f1262d304'
// export const RFOX_LP_PROXY_CONTRACT: Address = '0x4843373F380aDf80C779cD4dEDC6452E414f7634'

export const RFOX_PROXY_CONTRACT: Address = '0xac2a4fd70bcd8bab0662960455c363735f0e2b56'
export const RFOX_LP_PROXY_CONTRACT: Address = '0x83B51B7605d2E277E03A7D6451B1efc0e5253A2F'
kaladinlight marked this conversation as resolved.
Show resolved Hide resolved
export const RFOX_REWARD_RATE = 1n * 10n ** 27n
export const RFOX_WAD = 1n * 10n ** 18n

Expand Down
21 changes: 19 additions & 2 deletions scripts/generateAssetData/arbitrum/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { arbitrumChainId } from '@shapeshiftoss/caip'
import { arbitrumChainId, foxEthLpArbitrumAssetId } from '@shapeshiftoss/caip'
import type { Asset } from '@shapeshiftoss/types'
import { arbitrum, unfreeze } from '@shapeshiftoss/utils'
import partition from 'lodash/partition'
Expand All @@ -7,6 +7,23 @@ import { getPortalTokens } from 'lib/portals/utils'

import * as coingecko from '../coingecko'

const foxEthLpArbitrumAsset: Readonly<Asset> = Object.freeze({
assetId: foxEthLpArbitrumAssetId,
chainId: arbitrumChainId,
name: 'UniswapV2 FOX/ETH Pool',
precision: 18,
symbol: 'WETH/FOX',
color: '#FFFFFF',
icons: [
'/fox-token-logo.png',
'https://rawcdn.githack.com/trustwallet/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png',
],
explorer: arbitrum.explorer,
explorerAddressLink: arbitrum.explorerAddressLink,
explorerTxLink: arbitrum.explorerTxLink,
relatedAssetKey: 'eip155:1/erc20:0x470e8de2ebaef52014a47cb5e6af86884947f08c',
}) as Readonly<Asset>

export const getAssets = async (): Promise<Asset[]> => {
const results = await Promise.allSettled([
coingecko.getAssets(arbitrumChainId),
Expand All @@ -26,7 +43,7 @@ export const getAssets = async (): Promise<Asset[]> => {
portalsPools
.concat(assets)
.concat(portalsAssets)
.concat([unfreeze(arbitrum)]),
.concat([unfreeze(arbitrum), unfreeze(foxEthLpArbitrumAsset)]),
'assetId',
)

Expand Down
26 changes: 23 additions & 3 deletions scripts/generateAssetData/color-map.json
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@
"eip155:1/erc20:0x1234567461d3f8db7496581774bd869c83d51c93": "#BEC1B9",
"eip155:1/erc20:0x1236ea13c7339287cd00ab196aaa8217006b04dc": "#C8518C",
"eip155:1/erc20:0x12392f67bdf24fae0af363c24ac620a2f67dad86": "#1C5CFB",
"eip155:1/erc20:0x123fb3dfa7d082291d822ceedaabe3aa0c3f7758": "#243CF5",
"eip155:1/erc20:0x124386504d774979e1e9d2d19c6188391d7af8e3": "#B7936D",
"eip155:1/erc20:0x1250b98cbde9f99f4c42dcdacee193221f17eb50": "#058DAC",
"eip155:1/erc20:0x1258d60b224c0c5cd888d37bbf31aa5fcfb7e870": "#090E08",
Expand Down Expand Up @@ -686,7 +687,6 @@
"eip155:1/erc20:0x1d1498166ddceee616a6d99868e1e0677300056f": "#EC466A",
"eip155:1/erc20:0x1d2b8fa9b730fa7eb0fbf0f3c527b2381beed2b2": "#C5C4C6",
"eip155:1/erc20:0x1d4fb9bfa1967be6ca74819e28b98c2aa5ae8b59": "#EFDAB0",
"eip155:1/erc20:0x1d6405138a335ce5fd7364086334efb3e4f28b59": "#0C0F0C",
"eip155:1/erc20:0x1d7ca62f6af49ec66f6680b8606e634e55ef22c1": "#272025",
"eip155:1/erc20:0x1d96fd43ee07aa79f8fd003cbdf404fb5ce41ad2": "#CDD6D8",
"eip155:1/erc20:0x1da4858ad385cc377165a298cc2ce3fce0c5fd31": "#5CE4E4",
Expand Down Expand Up @@ -785,6 +785,7 @@
"eip155:1/erc20:0x2196b84eace74867b73fb003aff93c11fce1d47a": "#9453AB",
"eip155:1/erc20:0x21b8bfbbefc9e2b9a994871ecd742a5132b98aed": "#0464F4",
"eip155:1/erc20:0x21bfbda47a0b4b5b1248c767ee49f7caa9b23697": "#A850A1",
"eip155:1/erc20:0x21cd589a989615a9e901328d3c089bbca16d00b2": "#232323",
"eip155:1/erc20:0x21e5c85a5b1f38bddde68307af77e38f747cd530": "#251F1D",
"eip155:1/erc20:0x21f15966e07a10554c364b988e91dab01d32794a": "#282828",
"eip155:1/erc20:0x220b71671b649c03714da9c621285943f3cbcdc6": "#1CBCCC",
Expand Down Expand Up @@ -901,6 +902,7 @@
"eip155:1/erc20:0x26f3f26f46cbee59d1f8860865e13aa39e36a8c0": "#DCDCDC",
"eip155:1/erc20:0x27054b13b1b798b345b591a4d22e6562d47ea75a": "#2B73FC",
"eip155:1/erc20:0x270b7748cdf8243bfe68face7230ef0fce695389": "#DAC190",
"eip155:1/erc20:0x270ca21eb1a37cfe0e9a0e7582d8f897e013cdff": "#81513A",
"eip155:1/erc20:0x27206f5a9afd0c51da95f20972885545d3b33647": "#579993",
"eip155:1/erc20:0x272f97b7a56a387ae942350bbc7df5700f8a4576": "#060606",
"eip155:1/erc20:0x2730d6fdc86c95a74253beffaa8306b40fedecbb": "#DD1786",
Expand Down Expand Up @@ -1114,6 +1116,7 @@
"eip155:1/erc20:0x31e4efe290973ebe91b3a875a7994f650942d28f": "#0A0A0A",
"eip155:1/erc20:0x31ea0de8119307aa264bb4b38727aab4e36b074f": "#DCD4BC",
"eip155:1/erc20:0x31ea904a7eca45122890deb8da3473a2081bc9d1": "#24D474",
"eip155:1/erc20:0x31ef6148cae611421c5d5c58649faf6b412f6422": "#B92C1D",
"eip155:1/erc20:0x31f69de127c8a0ff10819c0955490a4ae46fcc2a": "#2C3C4C",
"eip155:1/erc20:0x31fdd1c6607f47c14a2821f599211c67ac20fa96": "#DA823D",
"eip155:1/erc20:0x320623b8e4ff03373931769a31fc52a4e78b5d70": "#050505",
Expand Down Expand Up @@ -2599,6 +2602,7 @@
"eip155:1/erc20:0x7137e8a3b069c3f787c4ffbb901b91e4ba47d082": "#D9C8C4",
"eip155:1/erc20:0x7138eb0d563f3f6722500936a11dcae99d738a2c": "#E8EAF0",
"eip155:1/erc20:0x7163436b8efffb469f6bb81cc908b1661d4795e6": "#EDD00F",
"eip155:1/erc20:0x716457d3ee671231e3a9fd320940e88ac247a733": "#DC4F2E",
"eip155:1/erc20:0x716bb5e0839451068885250442a5b8377f582933": "#DD4C95",
"eip155:1/erc20:0x716bf454066a84f39a2f78b5707e79a9d64f1225": "#E0AFC5",
"eip155:1/erc20:0x718dab2c7bbd2d9503dc1ce1dbc215abc41a3545": "#C0B8BC",
Expand Down Expand Up @@ -2816,7 +2820,6 @@
"eip155:1/erc20:0x7aa2f174fbc4d0a17b34adfb9b3e1dc029b46d76": "#32358F",
"eip155:1/erc20:0x7ab7d54f8cb054141142f04ba0b3d41ac4c4d61c": "#1C1C1C",
"eip155:1/erc20:0x7abc8a5768e6be61a6c693a6e4eacb5b60602c4d": "#53FB6B",
"eip155:1/erc20:0x7acc3f723419fa0c1f789618f798e75c5189c24f": "#D7AC79",
"eip155:1/erc20:0x7acdf2012aac69d70b86677fe91eb66e08961880": "#C37787",
"eip155:1/erc20:0x7ad16874759348f04b6b6119463d66c07ae54899": "#108A60",
"eip155:1/erc20:0x7ae0d42f23c33338de15bfa89c7405c068d9dc0a": "#DC7714",
Expand Down Expand Up @@ -4127,6 +4130,7 @@
"eip155:1/erc20:0xb82fa9f31612989525992fcfbb09ab22eff5c85a": "#2EC6C9",
"eip155:1/erc20:0xb840d10d840ef47c233fec1fd040f5b145a6dfa5": "#1C1C1C",
"eip155:1/erc20:0xb8647e90c0645152fccf4d9abb6b59eb4aa99052": "#055CD4",
"eip155:1/erc20:0xb868cca38a8e6348d8d299c9b3c80e63d45abe4c": "#140F0E",
"eip155:1/erc20:0xb870679a7fa65b924026f496de7f27c1dd0e5c5f": "#EFEFF0",
"eip155:1/erc20:0xb87b96868644d99cc70a8565ba7311482edebf6e": "#6A8C48",
"eip155:1/erc20:0xb893a8049f250b57efa8c62d51527a22404d7c9a": "#DEBAA7",
Expand Down Expand Up @@ -4816,6 +4820,7 @@
"eip155:1/erc20:0xd69f306549e9d96f183b1aeca30b8f4353c2ecc3": "#7F78EE",
"eip155:1/erc20:0xd6a5ab46ead26f49b03bbb1f9eb1ad5c1767974a": "#EBC93E",
"eip155:1/erc20:0xd6b117076222d95a05032a99f10738103c60d64d": "#de5dd5",
"eip155:1/erc20:0xd6b48ccf41a62eb3891e58d0f006b19b01d50cca": "#040404",
"eip155:1/erc20:0xd6c67b93a7b248df608a653d82a100556144c5da": "#049199",
"eip155:1/erc20:0xd6c7bb8531295e88d364ea67d5d1acc7d3f87454": "#04F464",
"eip155:1/erc20:0xd6caf5bd23cf057f5fccce295dcc50c01c198707": "#AB0984",
Expand Down Expand Up @@ -6511,6 +6516,7 @@
"eip155:137/erc20:0x564906ec1df8399f00e4ad32c0ecac0404a27a1c": "#7018F8",
"eip155:137/erc20:0x56633733fc8baf9f730ad2b6b9956ae22c6d4148": "#DDDCDC",
"eip155:137/erc20:0x57211299bc356319ba5ca36873eb06896173f8bc": "#EDC1A1",
"eip155:137/erc20:0x5742fe477b2afed92c25d092418bac06cd076cea": "#B6425C",
"eip155:137/erc20:0x5786b267d35f9d011c4750e0b0ba584e1fdbead1": "#D166AF",
"eip155:137/erc20:0x57999936fc9a9ec0751a8d146cce11901be8bed0": "#FC5C04",
"eip155:137/erc20:0x57f5e098cad7a3d1eed53991d4d66c45c9af7812": "#151515",
Expand Down Expand Up @@ -8239,6 +8245,7 @@
"eip155:43114/erc20:0x3ab1c9adb065f3fca0059652cd7a52b05c98f9a9": "#6E809F",
"eip155:43114/erc20:0x3bd2b1c7ed8d396dbb98ded3aebb41350a5b2339": "#FCD2D2",
"eip155:43114/erc20:0x3c780f5cbf94de3efcec964af928d08c4508eebe": "#242424",
"eip155:43114/erc20:0x3cc96f3cb4f45b5b5cdbce61faee8ae80d805c65": "#100D28",
"eip155:43114/erc20:0x3d8f74620857dd8ed6d0da02ceb13fd0ed8ba678": "#4B2DF9",
"eip155:43114/erc20:0x3e5e33b714193f88fcbdbc3dcbf31f453d26e3a6": "#2474CC",
"eip155:43114/erc20:0x3eefb18003d033661f84e48360ebecd181a84709": "#AADDFC",
Expand Down Expand Up @@ -8579,6 +8586,7 @@
"eip155:43114/erc20:0xe50fa9b3c56ffb159cb0fca61f5c9d750e8128c8": "#C5B9CB",
"eip155:43114/erc20:0xe533b81297b820d2eb2cd837263926596328e8d2": "#0C8ACC",
"eip155:43114/erc20:0xe5caef4af8780e59df925470b050fb23c43ca68c": "#DCDDDD",
"eip155:43114/erc20:0xe7d69acbc00d0ec5d9c02162310ee21daa77f69c": "#CF6D45",
"eip155:43114/erc20:0xe8385cecb013561b69beb63ff59f4d10734881f3": "#D0D160",
"eip155:43114/erc20:0xe8876189a80b2079d8c0a7867e46c50361d972c1": "#95BFA5",
"eip155:43114/erc20:0xe896cdeaac9615145c0ca09c8cd5c25bced6384c": "#D24243",
Expand Down Expand Up @@ -8646,6 +8654,7 @@
"eip155:56/bep20:0x0173295183685f27c84db046b5f0bea3e683c24b": "#E9D2B5",
"eip155:56/bep20:0x01832e3346fd3a0d38ca589d836bd78d1de7030c": "#EAF4F8",
"eip155:56/bep20:0x01bd7acb6ff3b6dd5aefa05cf085f2104f3fc53f": "#F6C6D0",
"eip155:56/bep20:0x01ca78a2b5f1a9152d8a3a625bd7df5765eee1d8": "#1D1B1F",
"eip155:56/bep20:0x01da6501d1083464f9a2c9a8cacf89f2dc160a97": "#040404",
"eip155:56/bep20:0x01e04c6e0b2c93bb4f8ee4b71072b861f9352660": "#69697E",
"eip155:56/bep20:0x01e0d17a533e5930a349c2bb71304f04f20ab12b": "#9042BC",
Expand Down Expand Up @@ -10354,6 +10363,7 @@
"eip155:56/bep20:0x8e17ed70334c87ece574c9d537bc153d8609e2a3": "#3464F4",
"eip155:56/bep20:0x8e2d8f40818fbaba663db6a24fb9b527fc7100be": "#272523",
"eip155:56/bep20:0x8e5cb7626dd949dff56fe2c130b75a8b6f1a05f8": "#121E35",
"eip155:56/bep20:0x8e6df9b20338722feadabc2a2b3483047d3a2c7d": "#1A7BF4",
"eip155:56/bep20:0x8e984e03ab35795c60242c902ece2450242c90e9": "#ECD504",
"eip155:56/bep20:0x8ea2f890cb86dfb0e376137451c6fd982afefc15": "#050505",
"eip155:56/bep20:0x8ea5219a16c2dbf1d6335a6aa0c6bd45c50347c5": "#040404",
Expand Down Expand Up @@ -11317,6 +11327,7 @@
"eip155:56/bep20:0xde301d6a2569aefcfe271b9d98f318baee1d30a4": "#CE45E7",
"eip155:56/bep20:0xde314a065aaaf11e794706f8585c77e3bb7a2741": "#660434",
"eip155:56/bep20:0xde3dbbe30cfa9f437b293294d1fd64b26045c71a": "#802C50",
"eip155:56/bep20:0xde4addcc213f6750faabdad59c00a2eb57352737": "#203720",
"eip155:56/bep20:0xde51d1599339809cafb8194189ce67d5bdca9e9e": "#111110",
"eip155:56/bep20:0xde5bdcbd4d7dfa86e527fef9971bd6ca6a76eefb": "#0F1DF3",
"eip155:56/bep20:0xde5ed76e7c05ec5e4572cfc88d1acea165109e44": "#040708",
Expand Down Expand Up @@ -11530,6 +11541,7 @@
"eip155:56/bep20:0xf1e083a825db31c844b8b6be0b16a43fd523ca9c": "#4C6BE9",
"eip155:56/bep20:0xf1e5bbd997501a8439619266a09a54b2b499eaa3": "#15132F",
"eip155:56/bep20:0xf1f0fa0287c47804636ffef14e2c241f2587903e": "#C4A45C",
"eip155:56/bep20:0xf2102011194920ea2506479051b386d1c0e5cc96": "#CD2934",
"eip155:56/bep20:0xf21768ccbc73ea5b6fd3c687208a7c2def2d966e": "#A036D8",
"eip155:56/bep20:0xf218184af829cf2b0019f8e6f0b2423498a36983": "#BEBEBE",
"eip155:56/bep20:0xf224ade71c20f9823e34e0792f72437596b4e28c": "#CF2C16",
Expand Down Expand Up @@ -11837,6 +11849,7 @@
"eip155:8453/erc20:0x1c555eee8018fee4fbca4bb657c5f175601e3ed7": "#2A3B40",
"eip155:8453/erc20:0x1c7a460413dd4e964f96d8dfc56e7223ce88cd85": "#040404",
"eip155:8453/erc20:0x1c9f5e5b5c172955660c11ec0df65b68ecb5fb69": "#244A82",
"eip155:8453/erc20:0x1cbb39da9e815483ed44ec918d6f8dfb828f3a06": "#949293",
"eip155:8453/erc20:0x1ccb4b14a11e0f2994a7ecbbd4cc69632f4c7c76": "#7881A9",
"eip155:8453/erc20:0x1cd38856ee0fdfd65c757e530e3b1de3061008d3": "#FC9C10",
"eip155:8453/erc20:0x1d008f50fb828ef9debbbeae1b71fffe929bf317": "#7463DA",
Expand Down Expand Up @@ -11891,6 +11904,7 @@
"eip155:8453/erc20:0x26f1bb40ea88b46ceb21557dc0ffac7b7c0ad40f": "#394228",
"eip155:8453/erc20:0x26fb8f2f3b26c750ee34005c1930deb232940cfe": "#0B57FA",
"eip155:8453/erc20:0x27d2decb4bfc9c76f0309b8e88dec3a601fe25a8": "#F9DCC8",
"eip155:8453/erc20:0x27d7959cf26135d8019d0f1e4a2280a8a355c4f5": "#CA7553",
"eip155:8453/erc20:0x27e3bc3a66e24cad043ac3d93a12a8070e3897ba": "#1D8BDF",
"eip155:8453/erc20:0x2816a491dd0b7a88d84cbded842a618e59016888": "#CCDAFC",
"eip155:8453/erc20:0x284c60490212db0dc0b8f93503d35744f8053381": "#E8E8E8",
Expand Down Expand Up @@ -12322,7 +12336,9 @@
"eip155:8453/erc20:0x8319767a7b602f88e376368dca1b92d38869b9b4": "#D08969",
"eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913": "#2E7ACD",
"eip155:8453/erc20:0x835e336782a1d04db6eb44c44024650d18a138c2": "#C3722C",
"eip155:8453/erc20:0x83abfc4beec2ecf12995005d751a42df691c09c1": "#C3C3C3",
"eip155:8453/erc20:0x844c03892863b0e3e00e805e41b34527044d5c72": "#6B8BE3",
"eip155:8453/erc20:0x84993768ba82ebc6101a5440ea41be41310ea12f": "#F1B89B",
"eip155:8453/erc20:0x84c6a31db4e9a23334039f5183e6d6840257a322": "#060606",
"eip155:8453/erc20:0x84f074917fb9d464c1264c47296be53424bbc93f": "#E44006",
"eip155:8453/erc20:0x85483696cc9970ad9edd786b2c5ef735f38d156f": "#118EE5",
Expand All @@ -12347,6 +12363,7 @@
"eip155:8453/erc20:0x8a24d7260cd02d3dfd8eefb66bc17ad4b17d494c": "#E1C6B3",
"eip155:8453/erc20:0x8a638ea79f71f3b91bdc96bbdf9fb27c93013d60": "#0453FB",
"eip155:8453/erc20:0x8a9430e92153c026092544444cbb38077e6688d1": "#D4B46C",
"eip155:8453/erc20:0x8aaf9fa1ee649eade46201394a9b8e06312f0f17": "#EEDBC1",
"eip155:8453/erc20:0x8ad5b9007556749de59e088c88801a3aaa87134b": "#2E5798",
"eip155:8453/erc20:0x8b52f46a52d86c131222ee14167da6a847bdb84a": "#21C7D9",
"eip155:8453/erc20:0x8b67f2e56139ca052a7ec49cbcd1aa9c83f2752a": "#0A0908",
Expand Down Expand Up @@ -12531,6 +12548,7 @@
"eip155:8453/erc20:0xb7890cee6cf4792cdcc13489d36d9d42726ab863": "#2474CC",
"eip155:8453/erc20:0xb79dd08ea68a908a97220c76d19a6aa9cbde4376": "#BFC5D3",
"eip155:8453/erc20:0xb8051464c8c92209c92f3a4cd9c73746c4c3cfb3": "#8B93B3",
"eip155:8453/erc20:0xb89d354ad1b0d95a48b3de4607f75a8cd710c1ba": "#040404",
"eip155:8453/erc20:0xb8a9a92dfe1303728394dd0f8362a09962dec24f": "#24A39C",
"eip155:8453/erc20:0xb8d98a102b0079b69ffbc760c8d857a31653e56e": "#E4E9E9",
"eip155:8453/erc20:0xb8e0b7d0df89673e4f6f82a66ef642a1cd46e010": "#14140A",
Expand Down Expand Up @@ -12583,6 +12601,7 @@
"eip155:8453/erc20:0xbf1aea8670d2528e08334083616dd9c5f3b087ae": "#F0C5C5",
"eip155:8453/erc20:0xbf3a2340221b9ead8fe0b6a1b2990e6e00dea092": "#9D54E8",
"eip155:8453/erc20:0xbf4db8b7a679f89ef38125d5f84dd1446af2ea3b": "#09AECA",
"eip155:8453/erc20:0xbf93166be905cb8e3c16bda16a4ef3c3e46e1c1d": "#6035C4",
"eip155:8453/erc20:0xbfd5206962267c7b4b4a8b3d76ac2e1b2a5c4d5e": "#783333",
"eip155:8453/erc20:0xbfefd7a0eda8a0feb06d0f52cf431afd0f9b2dd0": "#4C474C",
"eip155:8453/erc20:0xc0041ef357b183448b235a8ea73ce4e4ec8c265f": "#19D16D",
Expand All @@ -12606,7 +12625,6 @@
"eip155:8453/erc20:0xc2eeca228ebac45c339cc5e522dd3a10638155f1": "#524FD5",
"eip155:8453/erc20:0xc2fe011c3885277c7f0e7ffd45ff90cadc8ecd12": "#9A7A7A",
"eip155:8453/erc20:0xc36f19bccd51e3f1163eff07b5edf9d2850acec4": "#0D16F7",
"eip155:8453/erc20:0xc38380a706bfcd29874bf7bc436382017c90c255": "#EBEBE3",
"eip155:8453/erc20:0xc41ba5737baf6bd0ccd5daf7eee39874e4ad45ff": "#54DC24",
"eip155:8453/erc20:0xc438b0c0e80a8fa1b36898d1b36a3fc2ec371c54": "#635254",
"eip155:8453/erc20:0xc43f3ae305a92043bd9b62ebd2fe14f7547ee485": "#0C243C",
Expand All @@ -12633,6 +12651,7 @@
"eip155:8453/erc20:0xc9b6ef062fab19d3f1eabc36b1f2e852af1acd18": "#04C9F2",
"eip155:8453/erc20:0xc9e0dc5b3a89c1d55760cbee2b5973957fb9ca11": "#CCCCCC",
"eip155:8453/erc20:0xca4569949699d56e1834efe9f58747ca0f151b01": "#E0C46D",
"eip155:8453/erc20:0xca4c2e10037ac1af9f501ecb11a710776c87d2d5": "#080405",
"eip155:8453/erc20:0xca5c7a459becaac1f2b5ee28bb8a29875b1a37a6": "#DADBD4",
"eip155:8453/erc20:0xca5d8f8a8d49439357d3cf46ca2e720702f132b8": "#272E36",
"eip155:8453/erc20:0xca72827a3d211cfd8f6b00ac98824872b72cab49": "#0C301C",
Expand Down Expand Up @@ -12731,6 +12750,7 @@
"eip155:8453/erc20:0xdfd579dd6aeb232e95a15d964a135a61925b5c93": "#0A0C0D",
"eip155:8453/erc20:0xe0023e73aab4fe9a22f059a9d27e857e027ee3dc": "#6D8111",
"eip155:8453/erc20:0xe095780ba2a64a4efa7a74830f0b71656f0b0ad4": "#D3CBC0",
"eip155:8453/erc20:0xe12acf5bb21654195a498c2fbd49fff801a3a02d": "#0A0A07",
"eip155:8453/erc20:0xe13e40e8fdb815fbc4a1e2133ab5588c33bac45d": "#FBB732",
"eip155:8453/erc20:0xe161be4a74ab8fa8706a2d03e67c02318d0a0ad6": "#B9D5CE",
"eip155:8453/erc20:0xe18c07d858fb1bbf8c06fd78c13b86afd3d04e28": "#43A8F7",
Expand Down
4 changes: 3 additions & 1 deletion src/assets/translations/en/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -2646,13 +2646,15 @@
"confirmAndBridge": "Confirm & Bridge",
"myStakedBalance": "My Staked Balance",
"myStakedBalanceHelper": "The amount of FOX you have staked",
"pendingRewardsBalance": "Current Estimated Rewards Balance",
"pendingRewardsBalance": "Pending Rewards Balance",
kaladinlight marked this conversation as resolved.
Show resolved Hide resolved
"pendingRewardsBalanceHelper": "This is only an estimate of your pending rewards based on epoch to date revenues. All accounting is done at epoch end and cannot be calculated exactly before the end of the month",
"lifetimeRewards": "Lifetime Rewards",
"lifetimeRewardsHelper": "Lifetime rewards is the cumulative rewards from staking your FOX",
"timeInPool": "Time in Pool",
"timeInPoolHelper": "Time in pool is the longest living deposit into rFOX",
"myPosition": "My Position",
"positionDetails": "Position details",
"mySymbolPosition": "My %{symbol} Position",
"faq": {
"title": "FAQ",
"what": {
Expand Down
6 changes: 5 additions & 1 deletion src/components/AssetSearch/components/AssetRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ const focus = {
shadow: 'outline-inset',
}

const assetIconPairProps = {
showFirst: true,
}

export const AssetRow: FC<ListChildComponentProps<AssetData>> = memo(
({ data: { handleClick, disableUnsupported, assets, hideZeroBalanceAmounts }, index, style }) => {
const color = useColorModeValue('text.subtle', 'whiteAlpha.500')
Expand Down Expand Up @@ -53,7 +57,7 @@ export const AssetRow: FC<ListChildComponentProps<AssetData>> = memo(
_focus={focus}
>
<Flex gap={4} alignItems='center'>
<AssetIcon assetId={asset.assetId} size='sm' />
<AssetIcon assetId={asset.assetId} size='sm' pairProps={assetIconPairProps} />
<Box textAlign='left'>
<Text
lineHeight={1}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/asset-service/service/encodedAssetData.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export const ChangeAddressRoutes: React.FC<ChangeAddressRouteProps> = ({ headerC
stakingAssetAccountAddress: confirmedQuote
? fromAccountId(confirmedQuote.stakingAssetAccountId).account
: undefined,
stakingAssetId: confirmedQuote?.stakingAssetId,
})

const handleTxConfirmed = useCallback(async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
buildAndBroadcast,
createBuildCustomTxInput,
} from 'lib/utils/evm'
import { getRfoxProxyContract } from 'pages/RFOX/helpers'
import {
selectAccountNumberByAccountId,
selectAssetById,
Expand Down Expand Up @@ -153,7 +154,7 @@ export const ChangeAddressConfirm: React.FC<
adapter,
data: callData,
value: '0',
to: RFOX_PROXY_CONTRACT,
to: getRfoxProxyContract(confirmedQuote.stakingAssetId),
wallet,
})

Expand Down
Loading
Loading