Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@pedromcunha
pedromcunha committed Nov 27, 2024
2 parents 4844f01 + 934d59c commit f51986a
Show file tree
Hide file tree
Showing 7 changed files with 80 additions and 40 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@radix-ui/react-toggle-group": "^1.0.1",
"@radix-ui/react-tooltip": "1.0.6",
"@rainbow-me/rainbowkit": "2.1.2",
"@reservoir0x/reservoir-kit-ui": "^2.7.40",
"@reservoir0x/reservoir-kit-ui": "^2.7.41",
"@sentry/nextjs": "^7.85.0",
"@tanstack/react-query": "5.20.2",
"@types/uuid": "^9.0.1",
Expand Down
10 changes: 10 additions & 0 deletions public/icons/game7-icon-dark.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions public/icons/game7-icon-light.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 26 additions & 1 deletion utils/chains.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ export default [
community: process.env.NEXT_PUBLIC_ZKSYNC_COMMUNITY,
oracleBidsEnabled: true,
checkPollingInterval: reservoirChains.zkSync.checkPollingInterval,
seaportV15: true,
},
{
...scroll,
Expand Down Expand Up @@ -617,6 +616,19 @@ export default [
oracleBidsEnabled: true,
checkPollingInterval: reservoirChains.flow.checkPollingInterval,
},
{
...customChains.hychain,
name: 'Hychain',
lightIconUrl: '/icons/hychain-icon-light.svg',
darkIconUrl: '/icons/hychain-icon-dark.svg',
reservoirBaseUrl: reservoirChains.hychain.baseApiUrl,
proxyApi: '/api/reservoir/hychain',
routePrefix: 'hychain',
apiKey: process.env.RESERVOIR_API_KEY,
coingeckoId: 'hytopia',
oracleBidsEnabled: true,
checkPollingInterval: reservoirChains.hychain.checkPollingInterval,
},
{
...customChains.zero,
name: 'Zero',
Expand All @@ -643,4 +655,17 @@ export default [
oracleBidsEnabled: true,
checkPollingInterval: reservoirChains.abstract.checkPollingInterval,
},
{
...customChains.game7,
name: 'game7',
lightIconUrl: '/icons/game7-icon-light.svg',
darkIconUrl: '/icons/game7-icon-dark.svg',
reservoirBaseUrl: reservoirChains.game7.baseApiUrl,
proxyApi: '/api/reservoir/game7',
routePrefix: 'game7',
apiKey: process.env.RESERVOIR_API_KEY,
coingeckoId: 'ethereum',
oracleBidsEnabled: true,
checkPollingInterval: reservoirChains.game7.checkPollingInterval,
},
] as ReservoirChain[]
18 changes: 18 additions & 0 deletions utils/paymentTokens.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1502,6 +1502,24 @@ export const chainPaymentTokensMap = {
},
],

// Hychain
2911: [
{
chainId: 2911,
address: zeroAddress,
symbol: 'TOPIA',
name: 'Hychain',
decimals: 18,
},
{
chainId: 2911,
address: '0x2b1499d631bffb29eed7749b12cba754273d6da7',
symbol: 'WTOPIA',
name: 'Wrapped TOPIA',
decimals: 18,
},
],

// Zero
543210: [
{
Expand Down
3 changes: 2 additions & 1 deletion utils/wrappedContracts.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ const wrappedContracts: Record<number, string> = {
646: '0x48a9b22b80f566e88f0f1dcc90ea15a8a3bae8a4', // flow previewnet
984122: '0xd5eace1274dbf70960714f513db207433615a263', // forma
8333: '0x48a9b22b80f566e88f0f1dcc90ea15a8a3bae8a4', // b3
2911: '0x2b1499d631bffb29eed7749b12cba754273d6da7', // hychain
33139: '0x48b62137edfa95a428d35c09e44256a739f6b557', // apechain
360: '0x4200000000000000000000000000000000000006', // shape
747: '0xd3bf53dac106a0290b0483ecbc89d40fcc961f3e', // flow
2911: '0x2b1499d631bffb29eed7749b12cba754273d6da7', // hychain
543210: '0xac98b49576b1c892ba6bfae08fe1bb0d80cf599c', // zero
2741: '0x3439153eb7af838ad19d56e1571fbd09333c2809', // abstract
2187: '0xfa3ed70386b9255fC04aA008A8ad1B0CDa816Fac', // game7
}

export default wrappedContracts
50 changes: 13 additions & 37 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1753,10 +1753,10 @@
dependencies:
"@react-hookz/deep-equal" "^1.0.3"

"@reservoir0x/reservoir-kit-ui@^2.7.40":
version "2.7.40"
resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.7.40.tgz#19d7a57f23e523fdd4de0b1bcdb92668718ee3f1"
integrity sha512-pBdhEoq1iFHXHAe5htsATWGFyAM9QSSPtr+dyaeN5tFoONiiDXOe0rux9AhvG5KTwNOq1gioKgxuvDvp2IHi6Q==
"@reservoir0x/reservoir-kit-ui@^2.7.41":
version "2.7.41"
resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.7.41.tgz#e281a18bdfaf9b3371b817c56965f67881b7b94f"
integrity sha512-dpb9uzhL4fbNOweBGAF71vcD8A5yrNOX6q9jru2qJ3a7U9TKe44qWbvAO5I9W++gFzInRa+hDc4+Lmelzk2XxQ==
dependencies:
"@fortawesome/fontawesome-svg-core" "^6.1.1"
"@fortawesome/free-solid-svg-icons" "^6.1.1"
Expand All @@ -1772,18 +1772,18 @@
"@radix-ui/react-toggle-group" "1.0.4"
"@radix-ui/react-tooltip" "1.0.6"
"@react-hookz/web" "^19.2.0"
"@reservoir0x/reservoir-sdk" "2.4.31"
"@reservoir0x/reservoir-sdk" "2.4.32"
"@stitches/react" "1.3.1-1"
dayjs "^1.11.4"
flatpickr "^4.6.13"
framer-motion "^6.4.2"
react-flatpickr "^3.10.13"
swr "2.0.1"

"@reservoir0x/[email protected].31":
version "2.4.31"
resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.4.31.tgz#84a19486180db0ba837172906cae1aba42ca0db6"
integrity sha512-qV9PdsComioXl5Qb4K/HMNti8Hap8Iu2QNhLBPQF/8+twU/S29jq0nIEBsI2crkDbaToPuhs2rClEIK2ai0kCA==
"@reservoir0x/[email protected].32":
version "2.4.32"
resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.4.32.tgz#fae0f8760af2046abfe1a3bfabd2113c4a8bb34b"
integrity sha512-LNIZ7s394LswdMbjjY4N/1ik4sxQymkhLAsiT9AZi+whKTNe5pAqbO+IugpS/ZlWQT7tRREtShWNybtxlpYSPw==
dependencies:
axios "^1.6.7"

Expand Down Expand Up @@ -6529,16 +6529,7 @@ strict-uri-encode@^2.0.0:
resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==

"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand Down Expand Up @@ -6635,14 +6626,7 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand Down Expand Up @@ -7235,7 +7219,8 @@ which@^2.0.1, which@^2.0.2:
dependencies:
isexe "^2.0.0"

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
name wrap-ansi-cjs
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand All @@ -7253,15 +7238,6 @@ wrap-ansi@^6.2.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
Expand Down

0 comments on commit f51986a

Please sign in to comment.