Skip to content

Commit

Permalink
2476, fix by google-doc
Browse files Browse the repository at this point in the history
  • Loading branch information
PseudoElement committed Jul 26, 2024
1 parent 97ac3fd commit 4e296b1
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 18 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rubic-sdk",
"version": "5.33.0-alpha.aggregation.1",
"version": "5.33.0-alpha.aggregation.4",
"description": "Simplify dApp creation",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down Expand Up @@ -83,7 +83,7 @@
"@solflare-wallet/utl-sdk": "^1.4.0",
"@viaprotocol/router-sdk": "^1.0.7",
"assert": "^2.0.0",
"axios": "^0.26.1",
"axios": "^1.7.2",
"bignumber.js": "9.1.0",
"bitcoin-address-validation": "2.2.1",
"browserify-zlib": "^0.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ export const rangoContractAddresses: Record<RangoSupportedBlockchain, UniversalC
providerGateway: '0x69460570c93f9DE5E2edbC3052bf10125f0Ca22d',
providerRouter: '0x69460570c93f9DE5E2edbC3052bf10125f0Ca22d',
rubicRouter: rubicProxyContractAddress[BLOCKCHAIN_NAME.ETHEREUM].router
},
[BLOCKCHAIN_NAME.FANTOM]: {
providerGateway: '0x69460570c93f9DE5E2edbC3052bf10125f0Ca22d',
providerRouter: '0x69460570c93f9DE5E2edbC3052bf10125f0Ca22d',
rubicRouter: rubicProxyContractAddress[BLOCKCHAIN_NAME.ETHEREUM].router
}
// [BLOCKCHAIN_NAME.FANTOM]: {
// providerGateway: '0x69460570c93f9DE5E2edbC3052bf10125f0Ca22d',
// providerRouter: '0x69460570c93f9DE5E2edbC3052bf10125f0Ca22d',
// rubicRouter: rubicProxyContractAddress[BLOCKCHAIN_NAME.ETHEREUM].router
// }
};
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const rangoApiBlockchainNames: Record<RangoSupportedBlockchain, string> =
[BLOCKCHAIN_NAME.METIS]: 'METIS',
[BLOCKCHAIN_NAME.ZK_SYNC]: 'ZKSYNC',
[BLOCKCHAIN_NAME.LINEA]: 'LINEA',
[BLOCKCHAIN_NAME.FANTOM]: 'FANTOM',
// [BLOCKCHAIN_NAME.FANTOM]: 'FANTOM',
[BLOCKCHAIN_NAME.BLAST]: 'BLAST',
[BLOCKCHAIN_NAME.SCROLL]: 'SCROLL'
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const rangoApiSymbols: Record<RangoSupportedBlockchain, string> = {
[BLOCKCHAIN_NAME.ZK_SYNC]: 'ETH',
[BLOCKCHAIN_NAME.LINEA]: 'ETH',
[BLOCKCHAIN_NAME.METIS]: 'METIS',
[BLOCKCHAIN_NAME.FANTOM]: 'FTM',
// [BLOCKCHAIN_NAME.FANTOM]: 'FTM',
[BLOCKCHAIN_NAME.BLAST]: 'ETH',
[BLOCKCHAIN_NAME.SCROLL]: 'ETH'
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export const rangoSupportedBlockchains = [
BLOCKCHAIN_NAME.BASE,
BLOCKCHAIN_NAME.LINEA,
BLOCKCHAIN_NAME.BLAST,
BLOCKCHAIN_NAME.SCROLL,
BLOCKCHAIN_NAME.FANTOM
BLOCKCHAIN_NAME.SCROLL
// BLOCKCHAIN_NAME.FANTOM
] as const;

export type RangoSupportedBlockchain = (typeof rangoSupportedBlockchains)[number];
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ export const lifiCrossChainSupportedBlockchains = [
BLOCKCHAIN_NAME.SCROLL,
BLOCKCHAIN_NAME.MANTLE,
BLOCKCHAIN_NAME.ROOTSTOCK,
BLOCKCHAIN_NAME.CELO,
BLOCKCHAIN_NAME.BLAST,
BLOCKCHAIN_NAME.AURORA
// BLOCKCHAIN_NAME.CELO,
BLOCKCHAIN_NAME.BLAST
// BLOCKCHAIN_NAME.AURORA
] as const;

export type LifiCrossChainSupportedBlockchain = (typeof lifiCrossChainSupportedBlockchains)[number];
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const orbiterContractAddresses: Record<OrbiterSupportedBlockchain, string
[BLOCKCHAIN_NAME.XLAYER]: '0x13e46b2a3f8512ed4682a8fb8b560589fe3c2172',
[BLOCKCHAIN_NAME.TAIKO]: '0x2598d7bc9d3b4b6124f3282e49eee68db270f516',
[BLOCKCHAIN_NAME.CORE]: '0x13e46b2a3f8512ed4682a8fb8b560589fe3c2172',
[BLOCKCHAIN_NAME.METIS]: '0xd9d74a29307cc6fc8bf424ee4217f1a587fbc8dc',
// [BLOCKCHAIN_NAME.METIS]: '0xd9d74a29307cc6fc8bf424ee4217f1a587fbc8dc',
[BLOCKCHAIN_NAME.ZK_LINK]: '0xb4ab2ff34fadc774aff45f1c4566cb5e16bd4867',
[BLOCKCHAIN_NAME.MERLIN]: '0x4b8a4641c140b3aa6be8d99786fafe47a65869db'
};
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const orbiterSupportedBlockchains = [
BLOCKCHAIN_NAME.XLAYER,
BLOCKCHAIN_NAME.TAIKO,
BLOCKCHAIN_NAME.CORE,
BLOCKCHAIN_NAME.METIS,
// BLOCKCHAIN_NAME.METIS,
BLOCKCHAIN_NAME.ZK_LINK,
BLOCKCHAIN_NAME.MERLIN
] as const;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const owlToSupportedBlockchains = [
BLOCKCHAIN_NAME.POLYGON,
BLOCKCHAIN_NAME.KROMA,
BLOCKCHAIN_NAME.MANTA_PACIFIC,
// BLOCKCHAIN_NAME.METIS,
BLOCKCHAIN_NAME.METIS,
BLOCKCHAIN_NAME.XLAYER,
BLOCKCHAIN_NAME.MANTLE,
BLOCKCHAIN_NAME.BLAST,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ export class OwlToBridgeTrade extends EvmCrossChainTrade {
}

protected get fromContractAddress(): string {
// @TODO Add owl-to contract addresses
return this.isProxyTrade
? rubicProxyContractAddress[this.fromBlockchain].gateway
: this.providerGateway;
Expand Down
14 changes: 14 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3761,6 +3761,15 @@ axios@^1.6.2:
form-data "^4.0.0"
proxy-from-env "^1.1.0"

axios@^1.7.2:
version "1.7.2"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621"
integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==
dependencies:
follow-redirects "^1.15.6"
form-data "^4.0.0"
proxy-from-env "^1.1.0"

babel-jest@^29.6.1:
version "29.6.1"
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.6.1.tgz#a7141ad1ed5ec50238f3cd36127636823111233a"
Expand Down Expand Up @@ -5978,6 +5987,11 @@ follow-redirects@^1.14.8, follow-redirects@^1.14.9:
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==

follow-redirects@^1.15.6:
version "1.15.6"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==

for-each@^0.3.3:
version "0.3.3"
resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
Expand Down

0 comments on commit 4e296b1

Please sign in to comment.