Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:hop-protocol/hop into mainnet
Browse files Browse the repository at this point in the history
  • Loading branch information
shanefontaine committed Jul 31, 2023
2 parents 26fd7ae + 75f9a4b commit 8561173
Show file tree
Hide file tree
Showing 34 changed files with 401 additions and 105 deletions.
4 changes: 2 additions & 2 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"author": "",
"license": "MIT",
"dependencies": {
"@hop-protocol/core": "0.0.1-beta.172",
"@hop-protocol/sdk": "0.0.1-beta.522",
"@hop-protocol/core": "0.0.1-beta.175",
"@hop-protocol/sdk": "0.0.1-beta.524",
"cors": "^2.8.5",
"express": "^4.18.1",
"express-rate-limit": "^6.7.0",
Expand Down
71 changes: 66 additions & 5 deletions packages/core/build/addresses/mainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,31 +173,57 @@
"optimism": "0x881296Edcb252080bd476c464cEB521d08df7631",
"arbitrum": "0x881296Edcb252080bd476c464cEB521d08df7631",
"gnosis": "0x881296Edcb252080bd476c464cEB521d08df7631",
"polygon": "0x881296Edcb252080bd476c464cEB521d08df7631"
"polygon": "0x881296Edcb252080bd476c464cEB521d08df7631",
"nova": "0x881296Edcb252080bd476c464cEB521d08df7631",
"base": "0x881296Edcb252080bd476c464cEB521d08df7631"
},
"optimism": {
"ethereum": "0x881296Edcb252080bd476c464cEB521d08df7631",
"arbitrum": "0x881296Edcb252080bd476c464cEB521d08df7631",
"gnosis": "0x881296Edcb252080bd476c464cEB521d08df7631",
"polygon": "0x881296Edcb252080bd476c464cEB521d08df7631"
"polygon": "0x881296Edcb252080bd476c464cEB521d08df7631",
"nova": "0x881296Edcb252080bd476c464cEB521d08df7631",
"base": "0x881296Edcb252080bd476c464cEB521d08df7631"
},
"arbitrum": {
"ethereum": "0x881296Edcb252080bd476c464cEB521d08df7631",
"optimism": "0x881296Edcb252080bd476c464cEB521d08df7631",
"gnosis": "0x881296Edcb252080bd476c464cEB521d08df7631",
"polygon": "0x881296Edcb252080bd476c464cEB521d08df7631"
"polygon": "0x881296Edcb252080bd476c464cEB521d08df7631",
"nova": "0x881296Edcb252080bd476c464cEB521d08df7631",
"base": "0x881296Edcb252080bd476c464cEB521d08df7631"
},
"gnosis": {
"ethereum": "0x881296Edcb252080bd476c464cEB521d08df7631",
"arbitrum": "0x881296Edcb252080bd476c464cEB521d08df7631",
"optimism": "0x881296Edcb252080bd476c464cEB521d08df7631",
"polygon": "0x881296Edcb252080bd476c464cEB521d08df7631"
"polygon": "0x881296Edcb252080bd476c464cEB521d08df7631",
"nova": "0x881296Edcb252080bd476c464cEB521d08df7631",
"base": "0x881296Edcb252080bd476c464cEB521d08df7631"
},
"polygon": {
"ethereum": "0x881296Edcb252080bd476c464cEB521d08df7631",
"arbitrum": "0x881296Edcb252080bd476c464cEB521d08df7631",
"gnosis": "0x881296Edcb252080bd476c464cEB521d08df7631",
"optimism": "0x881296Edcb252080bd476c464cEB521d08df7631"
"optimism": "0x881296Edcb252080bd476c464cEB521d08df7631",
"nova": "0x881296Edcb252080bd476c464cEB521d08df7631",
"base": "0x881296Edcb252080bd476c464cEB521d08df7631"
},
"nova": {
"ethereum": "0x881296Edcb252080bd476c464cEB521d08df7631",
"arbitrum": "0x881296Edcb252080bd476c464cEB521d08df7631",
"gnosis": "0x881296Edcb252080bd476c464cEB521d08df7631",
"optimism": "0x881296Edcb252080bd476c464cEB521d08df7631",
"polygon": "0x881296Edcb252080bd476c464cEB521d08df7631",
"base": "0x881296Edcb252080bd476c464cEB521d08df7631"
},
"base": {
"ethereum": "0x881296Edcb252080bd476c464cEB521d08df7631",
"arbitrum": "0x881296Edcb252080bd476c464cEB521d08df7631",
"gnosis": "0x881296Edcb252080bd476c464cEB521d08df7631",
"optimism": "0x881296Edcb252080bd476c464cEB521d08df7631",
"polygon": "0x881296Edcb252080bd476c464cEB521d08df7631",
"nova": "0x881296Edcb252080bd476c464cEB521d08df7631"
}
},
"SNX": {
Expand Down Expand Up @@ -313,6 +339,9 @@
"gnosis": [
"0xC61bA16e864eFbd06a9fe30Aab39D18B8F63710a",
"0x712F0cf37Bdb8299D0666727F73a5cAbA7c1c24c"
],
"base": [
"0x12e59C59D282D2C00f3166915BED6DC2F5e2B5C7"
]
},
"SNX": {
Expand All @@ -334,6 +363,14 @@
"optimism": [
"0x266e2dc3C4c59E42AA07afeE5B09E964cFFe6778"
]
},
"MAGIC": {
"arbitrum": [
"0x4e9840f3C1ff368a10731D15c11516b9Fe7E1898"
],
"nova": [
"0xeB35Dac45077319042D62a735aa0f9eDD1F01Fa6"
]
}
},
"bridges": {
Expand Down Expand Up @@ -701,6 +738,30 @@
"l2SaddleSwap": "0x0000000000000000000000000000000000000000",
"l2SaddleLpToken": "0x0000000000000000000000000000000000000000",
"bridgeDeployedBlockNumber": 26088165
},
"nova": {
"l1CanonicalBridge": "0x0000000000000000000000000000000000000000",
"l1MessengerWrapper": "0xEbC49b236ff1920C788eF3c0687A3A1B6fCB35f1",
"l2CanonicalBridge": "0x0000000000000000000000000000000000000000",
"l2CanonicalToken": "0xc5102fE9359FD9a28f877a67E36B0F050d81a3CC",
"l2Bridge": "0x02D47f76523d2f059b617E4346de67482792eB83",
"l2HopBridgeToken": "0xc5102fE9359FD9a28f877a67E36B0F050d81a3CC",
"l2AmmWrapper": "0x0000000000000000000000000000000000000000",
"l2SaddleSwap": "0x0000000000000000000000000000000000000000",
"l2SaddleLpToken": "0x0000000000000000000000000000000000000000",
"bridgeDeployedBlockNumber": 15937602
},
"base": {
"l1CanonicalBridge": "0x0000000000000000000000000000000000000000",
"l1MessengerWrapper": "0x86eD3B8AD6b721fD3a2Fa73c227987Fb9AD3D1Ae",
"l2CanonicalBridge": "0x0000000000000000000000000000000000000000",
"l2CanonicalToken": "0xc5102fE9359FD9a28f877a67E36B0F050d81a3CC",
"l2Bridge": "0xe22D2beDb3Eca35E6397e0C6D62857094aA26F52",
"l2HopBridgeToken": "0xc5102fE9359FD9a28f877a67E36B0F050d81a3CC",
"l2AmmWrapper": "0x0000000000000000000000000000000000000000",
"l2SaddleSwap": "0x0000000000000000000000000000000000000000",
"l2SaddleLpToken": "0x0000000000000000000000000000000000000000",
"bridgeDeployedBlockNumber": 1859764
}
},
"SNX": {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hop-protocol/core",
"version": "0.0.1-beta.172",
"version": "0.0.1-beta.175",
"description": "Hop Protocol networks config",
"main": "index.js",
"types": "index.d.ts",
Expand Down
67 changes: 61 additions & 6 deletions packages/core/src/addresses/mainnet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -175,31 +175,57 @@ export const addresses: Addresses = {
optimism: '0x881296Edcb252080bd476c464cEB521d08df7631',
arbitrum: '0x881296Edcb252080bd476c464cEB521d08df7631',
gnosis: '0x881296Edcb252080bd476c464cEB521d08df7631',
polygon: '0x881296Edcb252080bd476c464cEB521d08df7631'
polygon: '0x881296Edcb252080bd476c464cEB521d08df7631',
nova: '0x881296Edcb252080bd476c464cEB521d08df7631',
base: '0x881296Edcb252080bd476c464cEB521d08df7631'
},
optimism: {
ethereum: '0x881296Edcb252080bd476c464cEB521d08df7631',
arbitrum: '0x881296Edcb252080bd476c464cEB521d08df7631',
gnosis: '0x881296Edcb252080bd476c464cEB521d08df7631',
polygon: '0x881296Edcb252080bd476c464cEB521d08df7631'
polygon: '0x881296Edcb252080bd476c464cEB521d08df7631',
nova: '0x881296Edcb252080bd476c464cEB521d08df7631',
base: '0x881296Edcb252080bd476c464cEB521d08df7631'
},
arbitrum: {
ethereum: '0x881296Edcb252080bd476c464cEB521d08df7631',
optimism: '0x881296Edcb252080bd476c464cEB521d08df7631',
gnosis: '0x881296Edcb252080bd476c464cEB521d08df7631',
polygon: '0x881296Edcb252080bd476c464cEB521d08df7631'
polygon: '0x881296Edcb252080bd476c464cEB521d08df7631',
nova: '0x881296Edcb252080bd476c464cEB521d08df7631',
base: '0x881296Edcb252080bd476c464cEB521d08df7631'
},
gnosis: {
ethereum: '0x881296Edcb252080bd476c464cEB521d08df7631',
arbitrum: '0x881296Edcb252080bd476c464cEB521d08df7631',
optimism: '0x881296Edcb252080bd476c464cEB521d08df7631',
polygon: '0x881296Edcb252080bd476c464cEB521d08df7631'
polygon: '0x881296Edcb252080bd476c464cEB521d08df7631',
nova: '0x881296Edcb252080bd476c464cEB521d08df7631',
base: '0x881296Edcb252080bd476c464cEB521d08df7631'
},
polygon: {
ethereum: '0x881296Edcb252080bd476c464cEB521d08df7631',
arbitrum: '0x881296Edcb252080bd476c464cEB521d08df7631',
gnosis: '0x881296Edcb252080bd476c464cEB521d08df7631',
optimism: '0x881296Edcb252080bd476c464cEB521d08df7631'
optimism: '0x881296Edcb252080bd476c464cEB521d08df7631',
nova: '0x881296Edcb252080bd476c464cEB521d08df7631',
base: '0x881296Edcb252080bd476c464cEB521d08df7631'
},
nova: {
ethereum: '0x881296Edcb252080bd476c464cEB521d08df7631',
arbitrum: '0x881296Edcb252080bd476c464cEB521d08df7631',
gnosis: '0x881296Edcb252080bd476c464cEB521d08df7631',
optimism: '0x881296Edcb252080bd476c464cEB521d08df7631',
polygon: '0x881296Edcb252080bd476c464cEB521d08df7631',
base: '0x881296Edcb252080bd476c464cEB521d08df7631'
},
base: {
ethereum: '0x881296Edcb252080bd476c464cEB521d08df7631',
arbitrum: '0x881296Edcb252080bd476c464cEB521d08df7631',
gnosis: '0x881296Edcb252080bd476c464cEB521d08df7631',
optimism: '0x881296Edcb252080bd476c464cEB521d08df7631',
polygon: '0x881296Edcb252080bd476c464cEB521d08df7631',
nova: '0x881296Edcb252080bd476c464cEB521d08df7631'
}
},
SNX: {
Expand Down Expand Up @@ -297,7 +323,8 @@ export const addresses: Addresses = {
gnosis: [
'0xC61bA16e864eFbd06a9fe30Aab39D18B8F63710a',
'0x712F0cf37Bdb8299D0666727F73a5cAbA7c1c24c'
]
],
base: ['0x12e59C59D282D2C00f3166915BED6DC2F5e2B5C7']
},
SNX: {
optimism: [
Expand All @@ -314,6 +341,10 @@ export const addresses: Addresses = {
rETH: {
arbitrum: ['0x3D4cAD734B464Ed6EdCF6254C2A3e5fA5D449b32'],
optimism: ['0x266e2dc3C4c59E42AA07afeE5B09E964cFFe6778']
},
MAGIC: {
arbitrum: ['0x4e9840f3C1ff368a10731D15c11516b9Fe7E1898'],
nova: ['0xeB35Dac45077319042D62a735aa0f9eDD1F01Fa6']
}
},
bridges: {
Expand Down Expand Up @@ -681,6 +712,30 @@ export const addresses: Addresses = {
l2SaddleSwap: '0x0000000000000000000000000000000000000000',
l2SaddleLpToken: '0x0000000000000000000000000000000000000000',
bridgeDeployedBlockNumber: 26088165
},
nova: {
l1CanonicalBridge: '0x0000000000000000000000000000000000000000',
l1MessengerWrapper: '0xEbC49b236ff1920C788eF3c0687A3A1B6fCB35f1',
l2CanonicalBridge: '0x0000000000000000000000000000000000000000',
l2CanonicalToken: '0xc5102fE9359FD9a28f877a67E36B0F050d81a3CC',
l2Bridge: '0x02D47f76523d2f059b617E4346de67482792eB83',
l2HopBridgeToken: '0xc5102fE9359FD9a28f877a67E36B0F050d81a3CC',
l2AmmWrapper: '0x0000000000000000000000000000000000000000',
l2SaddleSwap: '0x0000000000000000000000000000000000000000',
l2SaddleLpToken: '0x0000000000000000000000000000000000000000',
bridgeDeployedBlockNumber: 15937602
},
base: {
l1CanonicalBridge: '0x0000000000000000000000000000000000000000',
l1MessengerWrapper: '0x86eD3B8AD6b721fD3a2Fa73c227987Fb9AD3D1Ae',
l2CanonicalBridge: '0x0000000000000000000000000000000000000000',
l2CanonicalToken: '0xc5102fE9359FD9a28f877a67E36B0F050d81a3CC',
l2Bridge: '0xe22D2beDb3Eca35E6397e0C6D62857094aA26F52',
l2HopBridgeToken: '0xc5102fE9359FD9a28f877a67E36B0F050d81a3CC',
l2AmmWrapper: '0x0000000000000000000000000000000000000000',
l2SaddleSwap: '0x0000000000000000000000000000000000000000',
l2SaddleLpToken: '0x0000000000000000000000000000000000000000',
bridgeDeployedBlockNumber: 1859764
}
},
SNX: {
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/config/mainnet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ export const config : Config = {
polygon: 50,
gnosis: 50,
optimism: 50,
arbitrum: 50
arbitrum: 50,
nova: 50,
base: 50
},
SNX: {
ethereum: 20
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/config/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export enum AssetSymbol {
rETH = 'rETH',
UNI = 'UNI',
MAGIC = 'MAGIC',
FRAX = 'FRAX',
}

export type Bps = {
Expand Down
3 changes: 3 additions & 0 deletions packages/core/src/metadata/assets/tokens/FRAX.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default `
data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI0LjMuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IgoJIHZpZXdCb3g9IjAgMCAyODMuNDYgMjgzLjQ2IiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAyODMuNDYgMjgzLjQ2OyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+Cgkuc3Qwe2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+CjxnPgoJPGc+CgkJPHBhdGggY2xhc3M9InN0MCIgZD0iTTE0MS43MywyODMuNDZjLTE5LjEzLDAtMzcuNjktMy43NS01NS4xNy0xMS4xNGMtMTYuODgtNy4xNC0zMi4wMy0xNy4zNi00NS4wNS0zMC4zNwoJCQljLTEzLjAxLTEzLjAxLTIzLjIzLTI4LjE3LTMwLjM3LTQ1LjA1QzMuNzUsMTc5LjQyLDAsMTYwLjg2LDAsMTQxLjczczMuNzUtMzcuNjksMTEuMTQtNTUuMTdjNy4xNC0xNi44OCwxNy4zNi0zMi4wMywzMC4zNy00NS4wNQoJCQlDNTQuNTMsMjguNSw2OS42OCwxOC4yOCw4Ni41NiwxMS4xNEMxMDQuMDQsMy43NSwxMjIuNiwwLDE0MS43MywwczM3LjY5LDMuNzUsNTUuMTcsMTEuMTRjMTYuODgsNy4xNCwzMi4wMywxNy4zNiw0NS4wNSwzMC4zNwoJCQljMTMuMDEsMTMuMDEsMjMuMjMsMjguMTcsMzAuMzcsNDUuMDVjNy4zOSwxNy40OCwxMS4xNCwzNi4wNCwxMS4xNCw1NS4xN3MtMy43NSwzNy42OS0xMS4xNCw1NS4xNwoJCQljLTcuMTQsMTYuODgtMTcuMzYsMzIuMDMtMzAuMzcsNDUuMDVjLTEzLjAxLDEzLjAxLTI4LjE3LDIzLjIzLTQ1LjA1LDMwLjM3QzE3OS40MiwyNzkuNzIsMTYwLjg2LDI4My40NiwxNDEuNzMsMjgzLjQ2eiIvPgoJPC9nPgoJPGc+CgkJPGNpcmNsZSBjeD0iMTQxLjczIiBjeT0iMTQxLjczIiByPSIxMzQuMjIiLz4KCTwvZz4KCTxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik0yMTIuNDMsMTQxLjczYzAtMTQuMzgtNC4zMi0yNy43Ni0xMS43Mi0zOC45NGwyMS45NS0yMS45NUwyMDIuOTIsNjEuMWwtMjEuODksMjEuODkKCQljLTExLjI0LTcuNTUtMjQuNzYtMTEuOTYtMzkuMjktMTEuOTZjLTE0LjM4LDAtMjcuNzYsNC4zMi0zOC45NCwxMS43Mkw4MC44NCw2MC44TDYxLjEsODAuNTRsMjEuODksMjEuODkKCQljLTcuNTUsMTEuMjQtMTEuOTYsMjQuNzYtMTEuOTYsMzkuMjljMCwxNC4zOCw0LjMyLDI3Ljc2LDExLjcyLDM4Ljk0TDYwLjgsMjAyLjYybDE5Ljc0LDE5Ljc0bDIxLjg5LTIxLjg5CgkJYzExLjI0LDcuNTUsMjQuNzYsMTEuOTYsMzkuMjksMTEuOTZjMTQuMzgsMCwyNy43Ni00LjMyLDM4Ljk0LTExLjcybDIxLjk2LDIxLjk2bDE5Ljc0LTE5Ljc0bC0yMS44OS0yMS44OQoJCUMyMDguMDIsMTY5Ljc4LDIxMi40MywxNTYuMjYsMjEyLjQzLDE0MS43M3ogTTk4Ljk2LDE0MS43M2MwLTIzLjU5LDE5LjE5LTQyLjc4LDQyLjc4LTQyLjc4czQyLjc4LDE5LjE5LDQyLjc4LDQyLjc4CgkJcy0xOS4xOSw0Mi43OC00Mi43OCw0Mi43OFM5OC45NiwxNjUuMzIsOTguOTYsMTQxLjczeiIvPgo8L2c+Cjwvc3ZnPgo=
`.trim()
1 change: 1 addition & 0 deletions packages/core/src/metadata/assets/tokens/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export { default as ETHImage } from './ETH'
export { default as FraxImage } from './FRAX'
export { default as MATICImage } from './MATIC'
export { default as MAGICImage } from './MAGIC'
export { default as XDAIImage } from './XDAI'
Expand Down
33 changes: 22 additions & 11 deletions packages/core/src/metadata/chains.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,76 +19,87 @@ export const chains: Chains = {
slug: 'ethereum',
image: ethereumImage,
nativeTokenSymbol: 'ETH',
isLayer1: true
isLayer1: true,
primaryColor: '#868dac'
},
gnosis: {
name: 'Gnosis',
slug: 'gnosis',
image: gnosisImage,
nativeTokenSymbol: 'XDAI',
isLayer1: false
isLayer1: false,
primaryColor: '#46a4a1'
},
polygon: {
name: 'Polygon',
slug: 'polygon',
image: polygonImage,
nativeTokenSymbol: 'MATIC',
isLayer1: false
isLayer1: false,
primaryColor: '#8b57e1'
},
arbitrum: {
name: 'Arbitrum One',
slug: 'arbitrum',
image: arbitrumImage,
nativeTokenSymbol: 'ETH',
isLayer1: false
isLayer1: false,
primaryColor: '#289fef'
},
optimism: {
name: 'Optimism',
slug: 'optimism',
image: optimismImage,
nativeTokenSymbol: 'ETH',
isLayer1: false
isLayer1: false,
primaryColor: '#e64b5d'
},
nova: {
name: 'Arbitrum Nova',
slug: 'nova',
image: novaImage,
nativeTokenSymbol: 'ETH',
isLayer1: false
isLayer1: false,
primaryColor: '#ec772c'
},
zksync: {
name: 'zkSync',
slug: 'zksync',
image: zksyncImage,
nativeTokenSymbol: 'ETH',
isLayer1: false
isLayer1: false,
primaryColor: '#8889f4'
},
linea: {
name: 'Linea',
slug: 'linea',
image: lineaImage,
nativeTokenSymbol: 'ETH',
isLayer1: false
isLayer1: false,
primaryColor: '#121212'
},
scrollzk: {
name: 'Scroll zkEVM',
slug: 'scrollzk',
image: scrollzkImage,
nativeTokenSymbol: 'ETH',
isLayer1: false
isLayer1: false,
primaryColor: '#e5d1b8'
},
base: {
name: 'Base',
slug: 'base',
image: baseImage,
nativeTokenSymbol: 'ETH',
isLayer1: false
isLayer1: false,
primaryColor: '#0052ff'
},
polygonzk: {
name: 'Polygon zkEVM',
slug: 'polygonzk',
image: polygonzkImage,
nativeTokenSymbol: 'ETH',
isLayer1: false
isLayer1: false,
primaryColor: '#8b57e1'
}
}
Loading

0 comments on commit 8561173

Please sign in to comment.