Skip to content

Commit

Permalink
Merge branch 'develop' into fox-wif-hat-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
NeOMakinG authored Jan 17, 2025
2 parents a79f134 + fda8993 commit 15b66cf
Show file tree
Hide file tree
Showing 83 changed files with 1,687 additions and 995 deletions.
1 change: 1 addition & 0 deletions .env.base
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ REACT_APP_FEATURE_THORCHAIN_LP_WITHDRAW=true
REACT_APP_FEATURE_ACCOUNT_MANAGEMENT=true
REACT_APP_FEATURE_ACCOUNT_MANAGEMENT_LEDGER=true
REACT_APP_FEATURE_RFOX=true
REACT_APP_FEATURE_RFOX_LP=false
REACT_APP_FEATURE_ARBITRUM_BRIDGE=true
REACT_APP_FEATURE_CUSTOM_TOKEN_IMPORT=true
REACT_APP_FEATURE_ARBITRUM_BRIDGE_CLAIMS=true
Expand Down
3 changes: 3 additions & 0 deletions .env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ REACT_APP_FEATURE_FOX_PAGE_FOX_WIF_HAT_SECTION=true

# Swapper feature flags

# feature flags
REACT_APP_FEATURE_RFOX_LP=true

# logging
REACT_APP_REDUX_WINDOW=false

Expand Down
4 changes: 3 additions & 1 deletion .env.develop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# Swapper chain-specific flags. Use me if you're working on a swapper which brings first time swapper support for a chain,
# meaning we don't want to enable the selection for said chain in prod just yet
# Or alternatively, if we know that a given chain is very unstable and we may want to disable it in swapper altogether.

REACT_APP_FEATURE_SWAPPER_SOLANA=true
REACT_APP_FEATURE_FOX_PAGE_FOX_WIF_HAT_SECTION=true

# Swapper feature flags

# feature flags
REACT_APP_FEATURE_RFOX_LP=true

# mixpanel
REACT_APP_MIXPANEL_TOKEN=1c1369f6ea23a6404bac41b42817cc4b

Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"eip155:100/slip44:60":"xdai","eip155:100/erc20:0x8c88ea1fd60462ef7004b9e288afcb4680a3c50c":"0xmonero","eip155:100/erc20:0x4291f029b9e7acb02d49428458cf6fceac545f81":"1hive-water","eip155:100/erc20:0xd0dd6cef72143e22cced4867eb0d5f2328715533":"aave-v3-dai","eip155:100/erc20:0xedbc7449a9b594ca4e053d9737ec5dc4cbccbfb2":"aave-v3-eure","eip155:100/erc20:0xa1fa064a85266e2ca82dee5c5ccec84df445760e":"aave-v3-gno","eip155:100/erc20:0x7a5c3860a77a8dc1b225bd46d0fb2ac1c6d191bc":"aave-v3-sdai","eip155:100/erc20:0xc6b7aca6de8a6044e0e32d0c841a89244a10d284":"aave-v3-usdc","eip155:100/erc20:0xa818f1b57c201e092c4a2017a91815034326efd1":"aave-v3-weth","eip155:100/erc20:0x3a97704a1b25f08aa230ae53b352e2e72ef52843":"agave-token","eip155:100/erc20:0x4b1e2c2762667331bc91648052f646d1b0d35984":"ageur","eip155:100/erc20:0x0000206329b97db379d5e1bf586bbdb969c63274":"angle-usd","eip155:100/erc20:0x1509706a6c66ca549ff0cb464de88231ddbe213b":"aura-finance","eip155:100/erc20:0xce11e14225575945b8e6dc0d4f2dd4c570f79d9f":"autonolas","eip155:100/erc20:0xebee37aaf2905b7bda7e3b928043862e982e8f32":"backed-alphabet-class-a","eip155:100/erc20:0xbbcb0356bb9e6b3faa5cbf9e5f36185d53403ac9":"backed-coinbase-global","eip155:100/erc20:0x1e2c4fb7ede391d116e6b41cd0608260e8801d59":"backed-cspx-core-s-p-500","eip155:100/erc20:0x0f76d32cdccdcbd602a55af23eaf58fd1ee17245":"backed-erna-bond","eip155:100/erc20:0x3f95aa88ddbb7d9d484aa3d482bf0a80009c52c9":"backed-ernx-bond","eip155:100/erc20:0x7212088a11b4d8f6fc90fbb3dfe793b45dd72323":"backed-gamestop-corp","eip155:100/erc20:0x2f123cf3f37ce3328cc9b5b8415f9ec5109b45e7":"backed-govies-0-6-months-euro","eip155:100/erc20:0x20c64dee8fda5269a78f2d5bdba861ca1d83df7a":"backed-high-high-yield-corp-bond","eip155:100/erc20:0xca30c93b02514f86d5c86a6e375e3a330b435fb5":"backed-ib01-treasury-bond-0-1yr","eip155:100/erc20:0x52d134c6db5889fad3542a09eaf7aa90c0fdf9e4":"backed-ibta-treasury-bond-1-3yr","eip155:100/erc20:0x374a457967ba24fd3ae66294cab08244185574b0":"backed-microsoft","eip155:100/erc20:0xac28c9178acc8ba4a11a29e013a3a2627086e422":"backed-microstrategy","eip155:100/erc20:0x2f11eeee0bf21e7661a22dbbbb9068f4ad191b86":"backed-niu-technologies","eip155:100/erc20:0x14a5f2872396802c3cc8942a39ab3e4118ee5038":"backed-tesla","eip155:100/erc20:0xade6057fcafa57d6d51ffa341c64ce4814995995":"backed-zpr1-1-3-month-t-bill","eip155:100/erc20:0xdfc20ae04ed70bd9c7d720f449eedae19f659d65":"badger-dao","eip155:100/erc20:0x7ef541e2a22058048904fe5744f9c7e4c57af717":"balancer","eip155:100/erc20:0x2086f52651837600180de173b09470f54ef74910":"balancer-stable-usd","eip155:100/erc20:0xa34c5e0abe843e10461e2c9586ea03e55dbcc495":"bndva-backed-nvidia","eip155:100/erc20:0xdd96b45877d0e8361a4ddb732da741e97f3191ff":"bridged-busd","eip155:100/erc20:0x2a22f9c3b484c3629090feed35f17ff8f88f76f0":"bridged-usdc-gnosis","eip155:100/erc20:0x6c76971f98945ae98dd7d4dfca8711ebea946ea6":"bridged-wrapped-steth-gnosis","eip155:100/erc20:0x83ff60e2f93f8edd0637ef669c69d5fb4f64ca8e":"bright-token","eip155:100/erc20:0xfecb3f7c54e2caae9dc6ac9060a822d47e053760":"brla-digital-brla","eip155:100/erc20:0xe2e73a1c69ecf83f464efce6a5be353a37ca09b2":"chainlink","eip155:100/erc20:0x8b8407c6184f1f0fd1082e83d6a3b8349caced12":"circuits-of-value","eip155:100/erc20:0x58b9cb810a68a7f3e1e4f8cb45d1b9b3c79705e8":"connext","eip155:100/erc20:0x177127622c4a00f3d409b75571e12cb3c8973d3c":"cow-protocol","eip155:100/erc20:0xabef652195f98a91e490f047a5006b71c85f058d":"crvusd","eip155:100/erc20:0xb0c5f3100a4d9d9532a4cfd68c55f1ae8da987eb":"daohaus","eip155:100/erc20:0x97edc0e345fbbbd8460847fcfa3bc2a13bf8641f":"daosquare","eip155:100/erc20:0xd3d47d5578e55c880505dc40648f7f9307c3e7a8":"defipulse-index","eip155:100/erc20:0xfbdd194376de19a88118e84e279b977f165d01b8":"dehive","eip155:100/erc20:0x524b969793a64a602342d89bc2789d43a016b13a":"donut","eip155:100/erc20:0xb90d6bec20993be5d72a5ab353343f7a0281f158":"dxdao","eip155:100/erc20:0xeeeeeb57642040be42185f49c52f7e9b38f8eeee":"elk-finance","eip155:100/erc20:0x6a8cb6714b1ee5b471a7d2ec4302cb4f5ff25ec2":"energy-web-token","eip155:100/erc20:0x48b1b0d077b4919b65b4e4114806dd803901e1d9":"etherisc","eip155:100/erc20:0xec3f3e6d7907acda3a7431abd230196cda3fbb19":"ethichub","eip155:100/erc20:0xd589f00fa2eb83367f732ab3cda92ee0940389cf":"fuse-network-token","eip155:100/erc20:0x4f4f9b8d5b4d0dc10506e5551b0513b61fd59e75":"giveth","eip155:100/erc20:0x1a8805194d0ef2f73045a00c70da399d9e74221c":"gnobby","eip155:100/erc20:0x9c58bacc331c9aa871afd802db6379a98e80cedb":"gnosis","eip155:100/erc20:0xddafbb505ad214d7b80b1f830fccc89b60fb7a83":"gnosis-xdai-bridged-usdc-gnosis","eip155:100/erc20:0x4ecaba5870353805a9f068101a40e0f32ed605c6":"gnosis-xdai-bridged-usdt-gnosis","eip155:100/erc20:0x8e5bbbb09ed1ebde8674cda39a0c169401db4252":"gnosis-xdai-bridged-wbtc-gnosis-chain","eip155:100/erc20:0x6a023ccd1ff6f2045c3309768ead9e68f978f6e1":"gnosis-xdai-bridged-weth-gnosis-chain","eip155:100/erc20:0xca5d8f8a8d49439357d3cf46ca2e720702f132b8":"gyroscope-gyd","eip155:100/erc20:0x3a3e9715018d80916740e8ac300713fdf6614d19":"hivewater","eip155:100/erc20:0x71850b7e9ee3f13ab46d67167341e4bdc905eef9":"honey","eip155:100/erc20:0xc5102fe9359fd9a28f877a67e36b0f050d81a3cc":"hop-protocol","eip155:100/erc20:0xd057604a14982fe8d88c5fc25aac3267ea142a08":"hopr","eip155:100/erc20:0x9fb1d52596c44603198fb0aee434fac3a679f702":"jarvis-synthetic-euro","eip155:100/erc20:0x2d5563da42b06fbbf9c67b7dc073cf6a7842239e":"jarvis-synthetic-swiss-franc","eip155:100/erc20:0x417602f4fbdd471a431ae29fb5fe0a681964c11b":"jpyc","eip155:100/erc20:0x431d5dff03120afa4bdf332c61a6e1766ef37bdb":"jpy-coin","eip155:100/erc20:0x37b60f4e9a31a64ccc0024dce7d0fd07eaa0f7b3":"kleros","eip155:100/erc20:0x3f56e0c36d275367b8c502090edf38289b3dea0d":"mimatic","eip155:100/erc20:0x63e62989d9eb2d37dfdb1f93a22f063635b07d51":"minerva-wallet","eip155:100/erc20:0xcb444e90d8198415266c6a2724b7900fb12fc56e":"monerium-eur-money","eip155:100/erc20:0x5cb9073902f2035222b9749f8fb0c9bfe5527108":"monerium-gbp-emoney","eip155:100/erc20:0xfa57aa7beed63d03aaf85ffd1753f5f6242588fb":"mt-pelerin-shares","eip155:100/erc20:0x44fa8e6f47987339850636f88629646662444217":"omnibridge-bridged-dai-gnosis-chain","eip155:100/erc20:0xb5d592f85ab2d955c25720ebe6ff8d4d1e1be300":"particle-2","eip155:100/erc20:0x7ecf26cd9a36990b8ea477853663092333f59979":"perpetual-protocol","eip155:100/erc20:0x18e9262e68cc6c6004db93105cc7c001bb103e49":"raid-token","eip155:100/erc20:0x0aa1e96d2a46ec6beb2923de1e61addf5f5f1dce":"realtoken-ecosystem-governance","eip155:100/erc20:0x4d18815d14fe5c3304e87b3fa18318baa5c23820":"safe","eip155:100/erc20:0xaf204776c7245bf4147c2612bf6e5972ee483701":"savings-xdai","eip155:100/erc20:0x21a42669643f45bc0e086b8fc2ed70c23d67509d":"shapeshift-fox-token","eip155:100/erc20:0x1d1498166ddceee616a6d99868e1e0677300056f":"space-token-bsc","eip155:100/erc20:0x004626a008b1acdc4c74ab51644093b155e59a23":"staked-ageur","eip155:100/erc20:0xf490c80aae5f2616d3e3bda2483e30c4cb21d1a0":"stakewise-staked-gno-2","eip155:100/erc20:0x256eb8a51f382650b2a1e946b8811953640ee47d":"streamr","eip155:100/erc20:0x532801ed6f82fffd2dab70a19fc2d7b2772c4f4b":"swapr","eip155:100/erc20:0xdbf3ea6f5bee45c02255b2c26a16f300502f68da":"swarm-bzz","eip155:100/erc20:0x84e2c67cbefae6b5148fca7d02b341b12ff4b5bb":"swash","eip155:100/erc20:0xaad66432d27737ecf6ed183160adc5ef36ab99f2":"tellor","eip155:100/erc20:0x364b5975385b4de226cf450df82d7ed69902ac5a":"torg","eip155:100/erc20:0x4537e328bf7e4efa29d05caea260d7fe26af9d74":"uniswap","eip155:100/erc20:0xd4fdec44db9d44b8f2b6d529620f9c0c7066a2c1":"wrapped-xhopr","eip155:100/erc20:0xe91d153e0b41518a2ce8dd3d7944fa863463a97d":"xdai","eip155:100/erc20:0x38fb649ad3d6ba1113be5f57b927053e97fc5bf7":"xdai-native-comb","eip155:100/erc20:0xb7d311e2eb55f2f68a9440da38e7989210b9a05e":"xdai-stake","eip155:100/erc20:0xbf65bfcb5da067446cee6a706ba3fe2fb1a9fdfd":"yearn-finance"}
{"eip155:100/slip44:60":"xdai","eip155:100/erc20:0x8c88ea1fd60462ef7004b9e288afcb4680a3c50c":"0xmonero","eip155:100/erc20:0x4291f029b9e7acb02d49428458cf6fceac545f81":"1hive-water","eip155:100/erc20:0xd0dd6cef72143e22cced4867eb0d5f2328715533":"aave-v3-dai","eip155:100/erc20:0xedbc7449a9b594ca4e053d9737ec5dc4cbccbfb2":"aave-v3-eure","eip155:100/erc20:0xa1fa064a85266e2ca82dee5c5ccec84df445760e":"aave-v3-gno","eip155:100/erc20:0x7a5c3860a77a8dc1b225bd46d0fb2ac1c6d191bc":"aave-v3-sdai","eip155:100/erc20:0xc6b7aca6de8a6044e0e32d0c841a89244a10d284":"aave-v3-usdc","eip155:100/erc20:0xa818f1b57c201e092c4a2017a91815034326efd1":"aave-v3-weth","eip155:100/erc20:0x3a97704a1b25f08aa230ae53b352e2e72ef52843":"agave-token","eip155:100/erc20:0x4b1e2c2762667331bc91648052f646d1b0d35984":"ageur","eip155:100/erc20:0x0000206329b97db379d5e1bf586bbdb969c63274":"angle-usd","eip155:100/erc20:0x1509706a6c66ca549ff0cb464de88231ddbe213b":"aura-finance","eip155:100/erc20:0xce11e14225575945b8e6dc0d4f2dd4c570f79d9f":"autonolas","eip155:100/erc20:0xebee37aaf2905b7bda7e3b928043862e982e8f32":"backed-alphabet-class-a","eip155:100/erc20:0xbbcb0356bb9e6b3faa5cbf9e5f36185d53403ac9":"backed-coinbase-global","eip155:100/erc20:0x1e2c4fb7ede391d116e6b41cd0608260e8801d59":"backed-cspx-core-s-p-500","eip155:100/erc20:0x0f76d32cdccdcbd602a55af23eaf58fd1ee17245":"backed-erna-bond","eip155:100/erc20:0x3f95aa88ddbb7d9d484aa3d482bf0a80009c52c9":"backed-ernx-bond","eip155:100/erc20:0x7212088a11b4d8f6fc90fbb3dfe793b45dd72323":"backed-gamestop-corp","eip155:100/erc20:0x2f123cf3f37ce3328cc9b5b8415f9ec5109b45e7":"backed-govies-0-6-months-euro","eip155:100/erc20:0x20c64dee8fda5269a78f2d5bdba861ca1d83df7a":"backed-high-high-yield-corp-bond","eip155:100/erc20:0xca30c93b02514f86d5c86a6e375e3a330b435fb5":"backed-ib01-treasury-bond-0-1yr","eip155:100/erc20:0x52d134c6db5889fad3542a09eaf7aa90c0fdf9e4":"backed-ibta-treasury-bond-1-3yr","eip155:100/erc20:0x374a457967ba24fd3ae66294cab08244185574b0":"backed-microsoft","eip155:100/erc20:0xac28c9178acc8ba4a11a29e013a3a2627086e422":"backed-microstrategy","eip155:100/erc20:0x2f11eeee0bf21e7661a22dbbbb9068f4ad191b86":"backed-niu-technologies","eip155:100/erc20:0xd8b95b1987741849ca7e71e976aeb535fd2e55a2":"backed-swiss-domestic-government-bond-0-3","eip155:100/erc20:0x14a5f2872396802c3cc8942a39ab3e4118ee5038":"backed-tesla","eip155:100/erc20:0xade6057fcafa57d6d51ffa341c64ce4814995995":"backed-zpr1-1-3-month-t-bill","eip155:100/erc20:0xdfc20ae04ed70bd9c7d720f449eedae19f659d65":"badger-dao","eip155:100/erc20:0x7ef541e2a22058048904fe5744f9c7e4c57af717":"balancer","eip155:100/erc20:0x2086f52651837600180de173b09470f54ef74910":"balancer-stable-usd","eip155:100/erc20:0xa34c5e0abe843e10461e2c9586ea03e55dbcc495":"bndva-backed-nvidia","eip155:100/erc20:0xdd96b45877d0e8361a4ddb732da741e97f3191ff":"bridged-busd","eip155:100/erc20:0x2a22f9c3b484c3629090feed35f17ff8f88f76f0":"bridged-usdc-gnosis","eip155:100/erc20:0x6c76971f98945ae98dd7d4dfca8711ebea946ea6":"bridged-wrapped-steth-gnosis","eip155:100/erc20:0x83ff60e2f93f8edd0637ef669c69d5fb4f64ca8e":"bright-token","eip155:100/erc20:0xfecb3f7c54e2caae9dc6ac9060a822d47e053760":"brla-digital-brla","eip155:100/erc20:0xe2e73a1c69ecf83f464efce6a5be353a37ca09b2":"chainlink","eip155:100/erc20:0x8b8407c6184f1f0fd1082e83d6a3b8349caced12":"circuits-of-value","eip155:100/erc20:0x58b9cb810a68a7f3e1e4f8cb45d1b9b3c79705e8":"connext","eip155:100/erc20:0x177127622c4a00f3d409b75571e12cb3c8973d3c":"cow-protocol","eip155:100/erc20:0xabef652195f98a91e490f047a5006b71c85f058d":"crvusd","eip155:100/erc20:0xb0c5f3100a4d9d9532a4cfd68c55f1ae8da987eb":"daohaus","eip155:100/erc20:0x97edc0e345fbbbd8460847fcfa3bc2a13bf8641f":"daosquare","eip155:100/erc20:0xd3d47d5578e55c880505dc40648f7f9307c3e7a8":"defipulse-index","eip155:100/erc20:0xfbdd194376de19a88118e84e279b977f165d01b8":"dehive","eip155:100/erc20:0x524b969793a64a602342d89bc2789d43a016b13a":"donut","eip155:100/erc20:0xb90d6bec20993be5d72a5ab353343f7a0281f158":"dxdao","eip155:100/erc20:0xeeeeeb57642040be42185f49c52f7e9b38f8eeee":"elk-finance","eip155:100/erc20:0x6a8cb6714b1ee5b471a7d2ec4302cb4f5ff25ec2":"energy-web-token","eip155:100/erc20:0x48b1b0d077b4919b65b4e4114806dd803901e1d9":"etherisc","eip155:100/erc20:0xec3f3e6d7907acda3a7431abd230196cda3fbb19":"ethichub","eip155:100/erc20:0xd589f00fa2eb83367f732ab3cda92ee0940389cf":"fuse-network-token","eip155:100/erc20:0x4f4f9b8d5b4d0dc10506e5551b0513b61fd59e75":"giveth","eip155:100/erc20:0x1a8805194d0ef2f73045a00c70da399d9e74221c":"gnobby","eip155:100/erc20:0x9c58bacc331c9aa871afd802db6379a98e80cedb":"gnosis","eip155:100/erc20:0xddafbb505ad214d7b80b1f830fccc89b60fb7a83":"gnosis-xdai-bridged-usdc-gnosis","eip155:100/erc20:0x4ecaba5870353805a9f068101a40e0f32ed605c6":"gnosis-xdai-bridged-usdt-gnosis","eip155:100/erc20:0x8e5bbbb09ed1ebde8674cda39a0c169401db4252":"gnosis-xdai-bridged-wbtc-gnosis-chain","eip155:100/erc20:0x6a023ccd1ff6f2045c3309768ead9e68f978f6e1":"gnosis-xdai-bridged-weth-gnosis-chain","eip155:100/erc20:0xca5d8f8a8d49439357d3cf46ca2e720702f132b8":"gyroscope-gyd","eip155:100/erc20:0x3a3e9715018d80916740e8ac300713fdf6614d19":"hivewater","eip155:100/erc20:0x71850b7e9ee3f13ab46d67167341e4bdc905eef9":"honey","eip155:100/erc20:0xc5102fe9359fd9a28f877a67e36b0f050d81a3cc":"hop-protocol","eip155:100/erc20:0xd057604a14982fe8d88c5fc25aac3267ea142a08":"hopr","eip155:100/erc20:0x9fb1d52596c44603198fb0aee434fac3a679f702":"jarvis-synthetic-euro","eip155:100/erc20:0x2d5563da42b06fbbf9c67b7dc073cf6a7842239e":"jarvis-synthetic-swiss-franc","eip155:100/erc20:0x417602f4fbdd471a431ae29fb5fe0a681964c11b":"jpyc","eip155:100/erc20:0x431d5dff03120afa4bdf332c61a6e1766ef37bdb":"jpy-coin","eip155:100/erc20:0x37b60f4e9a31a64ccc0024dce7d0fd07eaa0f7b3":"kleros","eip155:100/erc20:0x3f56e0c36d275367b8c502090edf38289b3dea0d":"mimatic","eip155:100/erc20:0x63e62989d9eb2d37dfdb1f93a22f063635b07d51":"minerva-wallet","eip155:100/erc20:0xcb444e90d8198415266c6a2724b7900fb12fc56e":"monerium-eur-money","eip155:100/erc20:0x5cb9073902f2035222b9749f8fb0c9bfe5527108":"monerium-gbp-emoney","eip155:100/erc20:0xfa57aa7beed63d03aaf85ffd1753f5f6242588fb":"mt-pelerin-shares","eip155:100/erc20:0x44fa8e6f47987339850636f88629646662444217":"omnibridge-bridged-dai-gnosis-chain","eip155:100/erc20:0xb5d592f85ab2d955c25720ebe6ff8d4d1e1be300":"particle-2","eip155:100/erc20:0x7ecf26cd9a36990b8ea477853663092333f59979":"perpetual-protocol","eip155:100/erc20:0x18e9262e68cc6c6004db93105cc7c001bb103e49":"raid-token","eip155:100/erc20:0x0aa1e96d2a46ec6beb2923de1e61addf5f5f1dce":"realtoken-ecosystem-governance","eip155:100/erc20:0x4d18815d14fe5c3304e87b3fa18318baa5c23820":"safe","eip155:100/erc20:0xaf204776c7245bf4147c2612bf6e5972ee483701":"savings-xdai","eip155:100/erc20:0x21a42669643f45bc0e086b8fc2ed70c23d67509d":"shapeshift-fox-token","eip155:100/erc20:0x1d1498166ddceee616a6d99868e1e0677300056f":"space-token-bsc","eip155:100/erc20:0x004626a008b1acdc4c74ab51644093b155e59a23":"staked-ageur","eip155:100/erc20:0xf490c80aae5f2616d3e3bda2483e30c4cb21d1a0":"stakewise-staked-gno-2","eip155:100/erc20:0x256eb8a51f382650b2a1e946b8811953640ee47d":"streamr","eip155:100/erc20:0x532801ed6f82fffd2dab70a19fc2d7b2772c4f4b":"swapr","eip155:100/erc20:0xdbf3ea6f5bee45c02255b2c26a16f300502f68da":"swarm-bzz","eip155:100/erc20:0x84e2c67cbefae6b5148fca7d02b341b12ff4b5bb":"swash","eip155:100/erc20:0xaad66432d27737ecf6ed183160adc5ef36ab99f2":"tellor","eip155:100/erc20:0x364b5975385b4de226cf450df82d7ed69902ac5a":"torg","eip155:100/erc20:0x4537e328bf7e4efa29d05caea260d7fe26af9d74":"uniswap","eip155:100/erc20:0xd4fdec44db9d44b8f2b6d529620f9c0c7066a2c1":"wrapped-xhopr","eip155:100/erc20:0xe91d153e0b41518a2ce8dd3d7944fa863463a97d":"xdai","eip155:100/erc20:0x38fb649ad3d6ba1113be5f57b927053e97fc5bf7":"xdai-native-comb","eip155:100/erc20:0xb7d311e2eb55f2f68a9440da38e7989210b9a05e":"xdai-stake","eip155:100/erc20:0xbf65bfcb5da067446cee6a706ba3fe2fb1a9fdfd":"yearn-finance"}

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 uniV2EthFoxArbitrumAssetId: AssetId =
'eip155:42161/erc20:0x5f6ce0ca13b87bd738519545d3e018e70e339c24'

export const foxatarAssetId: AssetId =
'eip155:137/erc721:0x2e727c425a11ce6b8819b3004db332c12d2af2a2'
Expand Down
6 changes: 5 additions & 1 deletion packages/contracts/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ 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_PROXY_CONTRACT: Address = '0xac2a4fd70bcd8bab0662960455c363735f0e2b56'
// export const RFOX_UNI_V2_ETH_FOX_PROXY_CONTRACT: Address = '0x4843373F380aDf80C779cD4dEDC6452E414f7634'

export const RFOX_PROXY_CONTRACT: Address = '0xaC2a4fD70BCD8Bab0662960455c363735f0e2b56'
export const RFOX_UNI_V2_ETH_FOX_PROXY_CONTRACT: Address =
'0x83B51B7605d2E277E03A7D6451B1efc0e5253A2F'
export const RFOX_REWARD_RATE = 1n * 10n ** 27n
export const RFOX_WAD = 1n * 10n ** 18n

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { thorchainAssetId, thorchainChainId } from '@shapeshiftoss/caip'
import { RFOX_PROXY_CONTRACT } from '@shapeshiftoss/contracts'
import { describe, expect, it, vi } from 'vitest'

import type { Fee } from '../../../../types'
Expand Down Expand Up @@ -639,6 +640,7 @@ describe('parseTx', () => {
epoch: 0,
ipfsHash: 'QmYUiUq9UWK5NPF1h2BGdatw95psNtW8seGQpXZYoQYK1s',
stakingAddress: '0x32DBc9Cf9E8FbCebE1e0a2ecF05Ed86Ca3096Cb6',
stakingContract: RFOX_PROXY_CONTRACT,
},
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { RFOX_PROXY_CONTRACT } from '@shapeshiftoss/contracts'

import type { BaseTxMetadata, StandardTx } from '../../../types'
import type { SubParser, Tx, TxSpecific } from '../../parser'

Expand All @@ -6,6 +8,7 @@ export interface TxMetadata extends BaseTxMetadata {
type: 'thorchain'
epoch: number
stakingAddress: string
stakingContract: string
ipfsHash: string
}

Expand All @@ -18,12 +21,12 @@ export class Parser implements SubParser<Tx> {
if (!tx.memo?.startsWith('rFOX reward')) return

const match = tx.memo.match(
/Staking Address: (?<stakingAddress>\w+)\) - Epoch #(?<epoch>\d+) \(IPFS Hash: (?<ipfsHash>\w+)\)/,
/rFOX reward \(?(?:Staking Contract: (?<stakingContract>\w+), )?Staking Address: (?<stakingAddress>\w+)\) - Epoch #(?<epoch>\d+) \(IPFS Hash: (?<ipfsHash>\w+)\)/,
)

if (!match?.groups) return

const { epoch, stakingAddress, ipfsHash } = match.groups
const { epoch, stakingAddress, stakingContract, ipfsHash } = match.groups

if (!epoch || !stakingAddress || !ipfsHash) return

Expand All @@ -34,6 +37,7 @@ export class Parser implements SubParser<Tx> {
method: 'reward',
epoch: parseInt(match.groups.epoch, 10),
stakingAddress: match.groups.stakingAddress,
stakingContract: stakingContract || RFOX_PROXY_CONTRACT,
ipfsHash: match.groups.ipfsHash,
},
})
Expand Down
Loading

0 comments on commit 15b66cf

Please sign in to comment.