Skip to content

Commit c8604f3

Browse files
jourdanDunkleyjourdanDunkley
committed
fixed merge conflicts
2 parents f018c95 + ebafc97 commit c8604f3

69 files changed

Lines changed: 15621 additions & 1336 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ops/prod/base.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ locals {
2222
memory_size = 512
2323
}*/
2424

25-
module "base_mainnet_liquidator_ecs" {
25+
/*module "base_mainnet_liquidator_ecs" {
2626
source = "../modules/bot"
2727
2828
cluster_name = var.liquidator_cluster_name
@@ -46,7 +46,8 @@ module "base_mainnet_liquidator_ecs" {
4646
security_group_ids = ["sg-0a3996557af867ad0"]
4747
region = var.region
4848
liquidator_container_name = "${var.liquidator_container_name}-base"
49-
}
49+
}*/
50+
5051
module "base_mainnet_pyth_rpc_0" {
5152
source = "../modules/lambda"
5253
ecr_repository_name = local.pyth_updater_ecr_repository_name

‎ops/prod/fraxtal.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ locals {
55
}
66

77

8-
module "fraxtal_mainnet_liquidator_ecs" {
8+
/*module "fraxtal_mainnet_liquidator_ecs" {
99
source = "../modules/bot"
1010
1111
cluster_name = var.liquidator_cluster_name
@@ -29,4 +29,4 @@ module "fraxtal_mainnet_liquidator_ecs" {
2929
security_group_ids = ["sg-0a3996557af867ad0"]
3030
region = var.region
3131
liquidator_container_name = "${var.liquidator_container_name}-fraxtal"
32-
}
32+
}*/

‎ops/prod/lisk.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ locals {
55
}
66

77

8-
module "lisk_mainnet_liquidator_ecs" {
8+
/*module "lisk_mainnet_liquidator_ecs" {
99
source = "../modules/bot"
1010
1111
cluster_name = var.liquidator_cluster_name
@@ -29,4 +29,4 @@ module "lisk_mainnet_liquidator_ecs" {
2929
security_group_ids = ["sg-0a3996557af867ad0"]
3030
region = var.region
3131
liquidator_container_name = "${var.liquidator_container_name}-lisk"
32-
}
32+
}*/

‎ops/prod/mode.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ locals {
2020
memory_size = 512
2121
} */
2222

23-
module "mode_mainnet_liquidator_ecs" {
23+
/*module "mode_mainnet_liquidator_ecs" {
2424
source = "../modules/bot"
2525
2626
cluster_name = var.liquidator_cluster_name
@@ -44,7 +44,8 @@ module "mode_mainnet_liquidator_ecs" {
4444
security_group_ids = ["sg-0a3996557af867ad0"]
4545
region = var.region
4646
liquidator_container_name = var.liquidator_container_name
47-
}
47+
}*/
48+
4849
module "mode_mainnet_pyth_rpc_0" {
4950
source = "../modules/lambda"
5051
ecr_repository_name = local.pyth_updater_ecr_repository_name

‎ops/prod/optimism.tf‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ locals {
1919
timeout = 700
2020
memory_size = 512
2121
}*/
22-
module "optimism_mainnet_liquidator_ecs" {
22+
23+
/*module "optimism_mainnet_liquidator_ecs" {
2324
source = "../modules/bot"
2425
2526
cluster_name = var.liquidator_cluster_name
@@ -43,7 +44,8 @@ module "optimism_mainnet_liquidator_ecs" {
4344
security_group_ids = ["sg-0a3996557af867ad0"]
4445
region = var.region
4546
liquidator_container_name = "${var.liquidator_container_name}-optimism"
46-
}
47+
}*/
48+
4749
module "optimism_mainnet_pyth_rpc_0" {
4850
source = "../modules/lambda"
4951
ecr_repository_name = local.pyth_updater_ecr_repository_name

‎ops/prod/outputs.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# value = module.mode_mainnet_liquidation_rpc_0.lambda_cron_service_name
44
# }
55
# Add ECS outputs if needed
6-
output "base_mainnet_liquidator_ecs_service" {
6+
/*output "base_mainnet_liquidator_ecs_service" {
77
value = module.base_mainnet_liquidator_ecs.task_definition_arn
8-
}
8+
}*/
99

10-
output "optimism_mainnet_liquidator_ecs_service" {
10+
/*output "optimism_mainnet_liquidator_ecs_service" {
1111
value = module.optimism_mainnet_liquidator_ecs.task_definition_arn
12-
}
12+
}*/
1313
output "ecs_cluster_id" {
1414
value = aws_ecs_cluster.my_cluster1.id
1515
}

‎packages/bots/pyth-updater/src/config/superseed.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { PythAssetConfig } from '../types';
2+
3+
import { pythConfig as commonPythConfig } from './common';
4+
5+
export const pythConfig: PythAssetConfig[] = [
6+
...commonPythConfig,
7+
{
8+
// price feed for oUSDT
9+
priceId: '0x2dc7f272d3010abe4de48755a50fcf5bd9eefd3b4af01d8f39f6c80ae51544fe',
10+
configRefreshRateInSeconds: 3600,
11+
validTimePeriodSeconds: 86400, // 24 hrs
12+
deviationThresholdBps: 100, // 1%
13+
},
14+
];

‎packages/chains/src/base/params.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const specificParams: ChainParams = {
1616
rpcUrls: {
1717
default: {
1818
http: [
19+
"https://rpc.ankr.com/base/5f29692f7dd10adfd399569824ee3168c7b0c055ceea0ba9075d7f926bd49fd7",
1920
"https://mainnet.base.org",
2021
"https://base.llamarpc.com",
2122
"https://base-rpc.publicnode.com",

‎packages/chains/src/metalL2/addresses.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { assets } from "./assets";
55

66
const chainAddresses: ChainAddresses = {
77
PAIR_INIT_HASH: "", // TODO is this used anywhere?
8-
STABLE_TOKEN: zeroAddress,
8+
STABLE_TOKEN: "0x51e85d70944256710cb141847f1a04f568c1db0e",
99
UNISWAP_V2_ROUTER: zeroAddress,
1010
UNISWAP_V2_FACTORY: zeroAddress,
1111
UNISWAP_V3: {
@@ -16,7 +16,7 @@ const chainAddresses: ChainAddresses = {
1616
UNISWAP_V3_ROUTER: zeroAddress, // universal router, need to check if this works
1717
W_BTC_TOKEN: zeroAddress, // underlying(assets, assetSymbols.WBTC),
1818
W_TOKEN: underlying(assets, assetSymbols.WETH),
19-
W_TOKEN_USD_CHAINLINK_PRICE_FEED: zeroAddress
19+
W_TOKEN_USD_CHAINLINK_PRICE_FEED: "0x5b0cf2b36a65a6BB085D501B971e4c102B9Cd473"
2020
};
2121

2222
export default chainAddresses;

‎packages/chains/src/metalL2/assets.ts‎

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
1-
import { assetSymbols, OracleTypes, SupportedAsset, SupportedChains } from "@ionicprotocol/types";
2-
import { parseEther } from "viem";
1+
import {
2+
assetSymbols,
3+
ChainlinkFeedBaseCurrency,
4+
ChainlinkSpecificParams,
5+
OracleTypes,
6+
SupportedAsset,
7+
SupportedChains
8+
} from "@ionicprotocol/types";
9+
import { parseEther, parseUnits } from "viem";
310

411
import { wrappedAssetDocs } from "../common";
512

613
export const WETH = "0x4200000000000000000000000000000000000006";
14+
export const MTL = "0xBCFc435d8F276585f6431Fc1b9EE9A850B5C00A9";
15+
export const USDC = "0x51e85d70944256710cb141847f1a04f568c1db0e";
716

817
export const assets: SupportedAsset[] = [
918
{
@@ -16,6 +25,36 @@ export const assets: SupportedAsset[] = [
1625
initialBorrowCap: parseEther("100").toString(),
1726
initialSupplyCap: parseEther("100").toString(),
1827
initialCf: "0.5"
28+
},
29+
{
30+
symbol: assetSymbols.MTL,
31+
underlying: MTL,
32+
name: "Metal",
33+
decimals: 8,
34+
oracle: OracleTypes.ChainlinkPriceOracleV2,
35+
oracleSpecificParams: {
36+
aggregator: "0x5d6f129900b1516A59e59C122C9ba3446E090DB0",
37+
feedBaseCurrency: ChainlinkFeedBaseCurrency.USD
38+
} as ChainlinkSpecificParams,
39+
extraDocs: wrappedAssetDocs(SupportedChains.superseed),
40+
initialBorrowCap: parseUnits("20000", 8).toString(),
41+
initialSupplyCap: parseUnits("20000", 8).toString(),
42+
initialCf: "0.5"
43+
},
44+
{
45+
symbol: assetSymbols.USDC,
46+
underlying: USDC,
47+
name: "Bridged USDC (Metal Mainnet)",
48+
decimals: 6,
49+
oracle: OracleTypes.ChainlinkPriceOracleV2,
50+
oracleSpecificParams: {
51+
aggregator: "0x374E48C630F815ffa51d3b5e740482f37a40Ef64",
52+
feedBaseCurrency: ChainlinkFeedBaseCurrency.USD
53+
} as ChainlinkSpecificParams,
54+
extraDocs: wrappedAssetDocs(SupportedChains.superseed),
55+
initialBorrowCap: parseUnits("30000", 6).toString(),
56+
initialSupplyCap: parseUnits("30000", 6).toString(),
57+
initialCf: "0.5"
1958
}
2059
];
2160

0 commit comments

Comments
 (0)