Upgrade new bridge-core version and fix issues related to the changes

Author: DNK90

cmd/bridge/cleaner.go

@@ -32,7 +32,7 @@ var (
 )
 
 type cleanerStore struct {
-	stores.ListenHandlerStore
+	stores.BridgeStore
 	bridgeCoreStore.MainStore
 }
 
@@ -48,7 +48,7 @@ func start(cfg *bridgeCore.Config) error {
 	if err != nil {
 		return err
 	}
-	listenHandlerStore := stores.NewListenHandlerStore(db)
+	listenHandlerStore := stores.NewBridgeStore(db)
 	bridgeStore := bridgeCoreStore.NewMainStore(db)
 	store := &cleanerStore{listenHandlerStore, bridgeStore}
 	u := bridgeCoreUtils.NewUtils()

cmd/bridge/main.go

@@ -141,8 +141,6 @@ func prepare(ctx *cli.Context) *bridgeCore.Config {
 		if err := json.Unmarshal(plan, &cfg); err != nil {
 			panic(err)
 		}
-		cfg.Listeners[RoninNetwork].TaskInterval *= time.Second // convert to nanosecond
-		cfg.Listeners[RoninNetwork].TransactionCheckPeriod *= time.Second
 	}
 
 	checkEnv(cfg)
@@ -154,13 +152,6 @@ func prepare(ctx *cli.Context) *bridgeCore.Config {
 }
 
 func checkEnv(cfg *bridgeCore.Config) {
-	setRpcUrlFromEnv(cfg, os.Getenv(roninRpc), RoninNetwork)
-	setKeyFromEnv(cfg, true, os.Getenv(roninValidatorKey), RoninNetwork)
-	setKeyFromEnv(cfg, false, os.Getenv(roninRelayKey), RoninNetwork)
-	setRpcUrlFromEnv(cfg, os.Getenv(ethereumRpc), EthereumNetwork)
-	setKeyFromEnv(cfg, true, os.Getenv(ethereumValidatorKey), EthereumNetwork)
-	setKeyFromEnv(cfg, false, os.Getenv(ethereumRelayerKey), EthereumNetwork)
-
 	if cfg.DB == nil {
 		cfg.DB = &bridgeCoreStore.Database{}
 	}
@@ -206,42 +197,55 @@ func checkEnv(cfg *bridgeCore.Config) {
 		cfg.NumberOfWorkers, _ = strconv.Atoi(os.Getenv(numberOfWorkers))
 	}
 
-	if os.Getenv(roninTaskInterval) != "" {
-		taskInterval, _ := strconv.Atoi(os.Getenv(roninTaskInterval))
-		if taskInterval > 0 {
-			cfg.Listeners[RoninNetwork].TaskInterval = time.Duration(int64(taskInterval)) * time.Second
-			log.Info("setting TaskInterval", "value", cfg.Listeners[RoninNetwork].TaskInterval)
+	if cfg.Listeners[RoninNetwork] != nil {
+
+		if os.Getenv(roninTaskInterval) != "" {
+			taskInterval, _ := strconv.Atoi(os.Getenv(roninTaskInterval))
+			if taskInterval > 0 {
+				cfg.Listeners[RoninNetwork].TaskInterval = time.Duration(int64(taskInterval)) * time.Second
+				log.Info("setting TaskInterval", "value", cfg.Listeners[RoninNetwork].TaskInterval)
+			}
 		}
-	}
 
-	if os.Getenv(roninTransactionCheckPeriod) != "" {
-		txPeriod, _ := strconv.Atoi(os.Getenv(roninTransactionCheckPeriod))
-		if txPeriod > 0 {
-			cfg.Listeners[RoninNetwork].TransactionCheckPeriod = time.Duration(int64(txPeriod)) * time.Second
-			log.Info("setting transactionCheckPeriod", "value", cfg.Listeners[RoninNetwork].TransactionCheckPeriod)
+		if os.Getenv(roninTransactionCheckPeriod) != "" {
+			txPeriod, _ := strconv.Atoi(os.Getenv(roninTransactionCheckPeriod))
+			if txPeriod > 0 {
+				cfg.Listeners[RoninNetwork].TransactionCheckPeriod = time.Duration(int64(txPeriod)) * time.Second
+				log.Info("setting transactionCheckPeriod", "value", cfg.Listeners[RoninNetwork].TransactionCheckPeriod)
+			}
 		}
-	}
 
-	if os.Getenv(roninMaxProcessingTasks) != "" {
-		tasks, _ := strconv.Atoi(os.Getenv(roninMaxProcessingTasks))
-		if tasks > 0 {
-			cfg.Listeners[RoninNetwork].MaxProcessingTasks = tasks
-			log.Info("setting MaxProcessingTasks", "value", tasks)
+		if os.Getenv(roninMaxProcessingTasks) != "" {
+			tasks, _ := strconv.Atoi(os.Getenv(roninMaxProcessingTasks))
+			if tasks > 0 {
+				cfg.Listeners[RoninNetwork].MaxProcessingTasks = tasks
+				log.Info("setting MaxProcessingTasks", "value", tasks)
+			}
 		}
-	}
 
-	if os.Getenv(ethereumGetLogsBatchSize) != "" {
-		batchSize, _ := strconv.Atoi(os.Getenv(ethereumGetLogsBatchSize))
-		if batchSize > 0 {
-			cfg.Listeners[EthereumNetwork].GetLogsBatchSize = batchSize
+		if os.Getenv(roninMaxTasksQuery) != "" {
+			limit, _ := strconv.Atoi(os.Getenv(roninMaxTasksQuery))
+			if limit > 0 {
+				cfg.Listeners[RoninNetwork].MaxTasksQuery = limit
+			}
 		}
+
+		setRpcUrlFromEnv(cfg, os.Getenv(roninRpc), RoninNetwork)
+		setKeyFromEnv(cfg, true, os.Getenv(roninValidatorKey), RoninNetwork)
+		setKeyFromEnv(cfg, false, os.Getenv(roninRelayKey), RoninNetwork)
 	}
 
-	if os.Getenv(roninMaxTasksQuery) != "" {
-		limit, _ := strconv.Atoi(os.Getenv(roninMaxTasksQuery))
-		if limit > 0 {
-			cfg.Listeners[RoninNetwork].MaxTasksQuery = limit
+	if cfg.Listeners[EthereumNetwork] != nil {
+		if os.Getenv(ethereumGetLogsBatchSize) != "" {
+			batchSize, _ := strconv.Atoi(os.Getenv(ethereumGetLogsBatchSize))
+			if batchSize > 0 {
+				cfg.Listeners[EthereumNetwork].GetLogsBatchSize = batchSize
+			}
 		}
+
+		setRpcUrlFromEnv(cfg, os.Getenv(ethereumRpc), EthereumNetwork)
+		setKeyFromEnv(cfg, true, os.Getenv(ethereumValidatorKey), EthereumNetwork)
+		setKeyFromEnv(cfg, false, os.Getenv(ethereumRelayerKey), EthereumNetwork)
 	}
 
 	// clean key

config/config.mainnet.json

@@ -24,7 +24,7 @@
           "to": "0x0CF8fF40a508bdBc39fBe1Bb679dCBa64E65C7Df",
           "type": 1,
           "handler": {
-            "abi": "contracts/ronin/RoninGatewayV2.abi",
+            "contract": "RoninGateway",
             "name": "MainchainWithdrew"
           },
           "callbacks": {
@@ -35,7 +35,7 @@
           "to": "0x0CF8fF40a508bdBc39fBe1Bb679dCBa64E65C7Df",
           "type": 1,
           "handler": {
-            "abi": "contracts/ronin/RoninGatewayV2.abi",
+            "contract": "RoninGateway",
             "name": "WithdrawalRequested"
           },
           "callbacks": {
@@ -46,7 +46,7 @@
           "to": "0x0CF8fF40a508bdBc39fBe1Bb679dCBa64E65C7Df",
           "type": 1,
           "handler": {
-            "abi": "contracts/ronin/RoninGatewayV2.abi",
+            "contract": "RoninGateway",
             "name": "WithdrawalSignaturesRequested"
           },
           "callbacks": {
@@ -77,7 +77,7 @@
           "to": "0x64192819Ac13Ef72bF6b5AE239AC672B43a9AF08",
           "type": 1,
           "handler": {
-            "abi": "contracts/ethereum/MainchainGatewayV2.abi",
+            "contract": "EthereumGateway",
             "name": "DepositRequested"
           },
           "callbacks": {
@@ -88,7 +88,7 @@
           "to": "0x64192819Ac13Ef72bF6b5AE239AC672B43a9AF08",
           "type": 1,
           "handler": {
-            "abi": "contracts/ethereum/MainchainGatewayV2.abi",
+            "contract": "EthereumGateway",
             "name": "Withdrew"
           },
           "callbacks": {

config/config.testnet.json

@@ -24,7 +24,7 @@
           "to": "0xA8D61A5427a778be28Bd9bb5990956b33385c738",
           "type": 1,
           "handler": {
-            "abi": "contracts/ronin/RoninGatewayV2.abi",
+            "contract": "RoninGateway",
             "name": "MainchainWithdrew"
           },
           "callbacks": {
@@ -35,7 +35,7 @@
           "to": "0xA8D61A5427a778be28Bd9bb5990956b33385c738",
           "type": 1,
           "handler": {
-            "abi": "contracts/ronin/RoninGatewayV2.abi",
+            "contract": "RoninGateway",
             "name": "WithdrawalRequested"
           },
           "callbacks": {
@@ -46,7 +46,7 @@
           "to": "0xA8D61A5427a778be28Bd9bb5990956b33385c738",
           "type": 1,
           "handler": {
-            "abi": "contracts/ronin/RoninGatewayV2.abi",
+            "contract": "RoninGateway",
             "name": "WithdrawalSignaturesRequested"
           },
           "callbacks": {
@@ -76,7 +76,7 @@
           "to": "0x4E4D9B21B157CCD52b978C3a3BCd1dc5eBAE7167",
           "type": 1,
           "handler": {
-            "abi": "contracts/ethereum/MainchainGatewayV2.abi",
+            "contract": "EthereumGateway",
             "name": "DepositRequested"
           },
           "callbacks": {
@@ -87,7 +87,7 @@
           "to": "0x4E4D9B21B157CCD52b978C3a3BCd1dc5eBAE7167",
           "type": 1,
           "handler": {
-            "abi": "contracts/ethereum/MainchainGatewayV2.abi",
+            "contract": "EthereumGateway",
             "name": "Withdrew"
           },
           "callbacks": {

config/eth.ropsten.json

@@ -35,7 +35,7 @@
           "to": "0x3b6371EB912bFd5C0E249A16000ffbC6B881555A",
           "type": 1,
           "handler": {
-            "abi": "contracts/ethereum/MainchainGatewayV2.abi",
+            "contract": "EthereumGateway",
             "name": "DepositRequested"
           },
           "callbacks": {
@@ -46,7 +46,7 @@
           "to": "0x3b6371EB912bFd5C0E249A16000ffbC6B881555A",
           "type": 1,
           "handler": {
-            "abi": "contracts/ethereum/MainchainGatewayV2.abi",
+            "contract": "EthereumGateway",
             "name": "Withdrew"
           },
           "callbacks": {

config/ronin.testnet.json

@@ -19,7 +19,7 @@
           "to": "0x03d1F13c7391F6B5A651143a31034cf728A93694",
           "type": 1,
           "handler": {
-            "abi": "contracts/ronin/RoninGatewayV2.abi",
+            "contract": "RoninGateway",
             "name": "MainchainWithdrew"
           },
           "callbacks": {
@@ -30,7 +30,7 @@
           "to": "0x03d1F13c7391F6B5A651143a31034cf728A93694",
           "type": 1,
           "handler": {
-            "abi": "contracts/ronin/RoninGatewayV2.abi",
+            "contract": "RoninGateway",
             "name": "WithdrawalRequested"
           },
           "callbacks": {
@@ -41,7 +41,7 @@
           "to": "0x03d1F13c7391F6B5A651143a31034cf728A93694",
           "type": 1,
           "handler": {
-            "abi": "contracts/ronin/RoninGatewayV2.abi",
+            "contract": "RoninGateway",
             "name": "WithdrawalSignaturesRequested"
           },
           "callbacks": {

go.mod

@@ -18,32 +18,32 @@ require (
 
 require (
 	github.com/deckarep/golang-set v1.8.0 // indirect
-	golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
+	golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
 )
 
 require (
 	github.com/StackExchange/wmi v1.2.1 // indirect
-	github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
+	github.com/VictoriaMetrics/fastcache v1.10.0 // indirect
 	github.com/axieinfinity/bridge-contracts v0.0.0-20220731110242-d273b578b657 // indirect
-	github.com/axieinfinity/bridge-core v0.0.0-20220802075849-77abb76e9167 // indirect
+	github.com/axieinfinity/bridge-core v0.0.0-20220803111811-2dd817d8512e // indirect
 	github.com/axieinfinity/bridge-migrations v0.0.0-20220803051308-adab1cd1bcca // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/btcsuite/btcd v0.20.1-beta // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/edsrzf/mmap-go v1.0.0 // indirect
-	github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
+	github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
 	github.com/go-gormigrate/gormigrate/v2 v2.0.2 // indirect
-	github.com/go-ole/go-ole v1.2.5 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-stack/stack v1.8.1 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/uuid v1.2.0 // indirect
-	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
 	github.com/holiman/uint256 v1.2.0 // indirect
-	github.com/huin/goupnp v1.0.2 // indirect
+	github.com/huin/goupnp v1.0.3 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.12.1 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
@@ -52,39 +52,41 @@ require (
 	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
 	github.com/jackc/pgtype v1.11.0 // indirect
 	github.com/jackc/pgx/v4 v4.16.1 // indirect
-	github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 // indirect
+	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/karalabe/usb v0.0.0-20211005121534-4c5740d64559 // indirect
+	github.com/karalabe/usb v0.0.2 // indirect
 	github.com/kelseyhightower/envconfig v1.4.0 // indirect
-	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/mattn/go-sqlite3 v1.14.12 // indirect
+	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/mattn/go-sqlite3 v1.14.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/mitchellh/pointerstructure v1.2.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
-	github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 // indirect
+	github.com/peterh/liner v1.2.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.12.2 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
-	github.com/prometheus/tsdb v0.7.1 // indirect
-	github.com/rjeczalik/notify v0.9.1 // indirect
+	github.com/prometheus/tsdb v0.10.0 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/rjeczalik/notify v0.9.2 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
-	github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
+	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
-	github.com/tklauser/go-sysconf v0.3.5 // indirect
-	github.com/tklauser/numcpus v0.2.2 // indirect
-	github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	github.com/tklauser/go-sysconf v0.3.10 // indirect
+	github.com/tklauser/numcpus v0.5.0 // indirect
+	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
+	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
-	gorm.io/driver/postgres v1.3.7 // indirect
-	gorm.io/driver/sqlite v1.3.2 // indirect
+	gorm.io/driver/postgres v1.3.8 // indirect
+	gorm.io/driver/sqlite v1.3.6 // indirect
 )