From cc5fd778c7aed6a4c81eabb1a6bbface2f7bad0c Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 7 Dec 2023 23:51:50 +0800 Subject: [PATCH] tweak --- bridge-history-api/conf/config.json | 4 +-- bridge-history-api/internal/config/config.go | 36 +++++++++---------- .../internal/controller/fetcher/l1_fetcher.go | 2 +- .../internal/controller/fetcher/l2_fetcher.go | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/bridge-history-api/conf/config.json b/bridge-history-api/conf/config.json index bc27421b96..e66581c87e 100644 --- a/bridge-history-api/conf/config.json +++ b/bridge-history-api/conf/config.json @@ -8,7 +8,7 @@ "MessengerAddr": "0x6774Bcbd5ceCeF1336b5300fb5186a12DDD8b367", "ETHGatewayAddr": "0x7F2b8C31F88B6006c382775eea88297Ec1e3E905", "WETHGatewayAddr": "0x7AC440cAe8EB6328de4fA621163a792c1EA9D4fE", - "StandardERC20Gateway": "0xD8A791fE2bE73eb6E6cF1eb0cb3F36adC9B3F8f9", + "StandardERC20GatewayAddr": "0xD8A791fE2bE73eb6E6cF1eb0cb3F36adC9B3F8f9", "CustomERC20GatewayAddr": "0xb2b10a289A229415a124EFDeF310C10cb004B6ff", "ERC721GatewayAddr": "0x6260aF48e8948617b8FA17F4e5CEa2d21D21554B", "ERC1155GatewayAddr": "0xb94f7F6ABcb811c5Ac709dE14E37590fcCd975B6", @@ -28,7 +28,7 @@ "MessengerAddr": "0x781e90f1c8Fc4611c9b7497C3B47F99Ef6969CbC", "ETHGatewayAddr": "0x6EA73e05AdC79974B931123675ea8F78FfdacDF0", "WETHGatewayAddr": "0x7003E7B7186f0E6601203b99F7B8DECBfA391cf9", - "StandardERC20Gateway": "0xE2b4795039517653c5Ae8C2A9BFdd783b48f447A", + "StandardERC20GatewayAddr": "0xE2b4795039517653c5Ae8C2A9BFdd783b48f447A", "CustomERC20GatewayAddr": "0x64CCBE37c9A82D85A1F2E74649b7A42923067988", "ERC721GatewayAddr": "0x7bC08E1c04fb41d75F1410363F0c5746Eae80582", "ERC1155GatewayAddr": "0x62597Cc19703aF10B58feF87B0d5D29eFE263bcc", diff --git a/bridge-history-api/internal/config/config.go b/bridge-history-api/internal/config/config.go index f54d5ac5b2..9feace3770 100644 --- a/bridge-history-api/internal/config/config.go +++ b/bridge-history-api/internal/config/config.go @@ -10,24 +10,24 @@ import ( // LayerConfig is the configuration of Layer1/Layer2 type LayerConfig struct { - Confirmation uint64 `json:"confirmation"` - Endpoint string `json:"endpoint"` - StartHeight uint64 `json:"startHeight"` - BlockTime int64 `json:"blockTime"` - FetchLimit uint64 `json:"fetchLimit"` - MessengerAddr string `json:"MessengerAddr"` - ETHGatewayAddr string `json:"ETHGatewayAddr"` - StandardERC20GatewayAddr string `json:"StandardERC20GatewayAddr"` - CustomERC20GatewayAddr string `json:"CustomERC20GatewayAddr"` - WETHGatewayAddr string `json:"WETHGatewayAddr"` - DAIGatewayAddr string `json:"DAIGatewayAddr"` - USDCGatewayAddr string `json:"USDCGatewayAddr"` - LIDOGatewayAddr string `json:"LIDOGatewayAddr"` - ERC721GatewayAddr string `json:"ERC721GatewayAddr"` - ERC1155GatewayAddr string `json:"ERC1155GatewayAddr"` - ScrollChainAddr string `json:"ScrollChainAddr"` - GatewayRouterAddr string `json:"GatewayRouterAddr"` - MessageQueueAddr string `json:"MessageQueueAddr"` + Confirmation uint64 `json:"confirmation"` + Endpoint string `json:"endpoint"` + StartHeight uint64 `json:"startHeight"` + BlockTime int64 `json:"blockTime"` + FetchLimit uint64 `json:"fetchLimit"` + MessengerAddr string `json:"MessengerAddr"` + ETHGatewayAddr string `json:"ETHGatewayAddr"` + StandardERC20GatewayAddr string `json:"StandardERC20GatewayAddr"` + CustomERC20GatewayAddr string `json:"CustomERC20GatewayAddr"` + WETHGatewayAddr string `json:"WETHGatewayAddr"` + DAIGatewayAddr string `json:"DAIGatewayAddr"` + USDCGatewayAddr string `json:"USDCGatewayAddr"` + LIDOGatewayAddr string `json:"LIDOGatewayAddr"` + ERC721GatewayAddr string `json:"ERC721GatewayAddr"` + ERC1155GatewayAddr string `json:"ERC1155GatewayAddr"` + ScrollChainAddr string `json:"ScrollChainAddr"` + GatewayRouterAddr string `json:"GatewayRouterAddr"` + MessageQueueAddr string `json:"MessageQueueAddr"` } // RedisConfig redis config diff --git a/bridge-history-api/internal/controller/fetcher/l1_fetcher.go b/bridge-history-api/internal/controller/fetcher/l1_fetcher.go index f5a45d7f7d..9cfe9bee3f 100644 --- a/bridge-history-api/internal/controller/fetcher/l1_fetcher.go +++ b/bridge-history-api/internal/controller/fetcher/l1_fetcher.go @@ -35,7 +35,7 @@ func NewL1MessageFetcher(ctx context.Context, cfg *config.LayerConfig, db *gorm. addressList := []common.Address{ common.HexToAddress(cfg.ETHGatewayAddr), - common.HexToAddress(cfg.StandardERC20Gateway), + common.HexToAddress(cfg.StandardERC20GatewayAddr), common.HexToAddress(cfg.CustomERC20GatewayAddr), common.HexToAddress(cfg.WETHGatewayAddr), common.HexToAddress(cfg.DAIGatewayAddr), diff --git a/bridge-history-api/internal/controller/fetcher/l2_fetcher.go b/bridge-history-api/internal/controller/fetcher/l2_fetcher.go index 6ef15268b0..766e0356b5 100644 --- a/bridge-history-api/internal/controller/fetcher/l2_fetcher.go +++ b/bridge-history-api/internal/controller/fetcher/l2_fetcher.go @@ -37,7 +37,7 @@ func NewL2MessageFetcher(ctx context.Context, cfg *config.LayerConfig, db *gorm. addressList := []common.Address{ common.HexToAddress(cfg.ETHGatewayAddr), - common.HexToAddress(cfg.StandardERC20Gateway), + common.HexToAddress(cfg.StandardERC20GatewayAddr), common.HexToAddress(cfg.CustomERC20GatewayAddr), common.HexToAddress(cfg.WETHGatewayAddr), common.HexToAddress(cfg.DAIGatewayAddr),