fix: adding multiple dcs

Author: harsh-98

ds/dc_wrapper/wrapper.go

@@ -181,31 +181,39 @@ func (dcw *DataCompressorWrapper) LoadMultipleDC(multiDCs interface{}) {
 		log.Fatalf("Converting address provider() details for dc to map failed %v", multiDCs)
 	}
 
-	var blockNums []int64
-	for k := range dcMap {
-		blockNum, err := strconv.ParseInt(k, 10, 64)
-		if err != nil {
-			log.Fatal(err)
+	blockNums := []int64{}
+	{
+		blockMap := map[int64]struct{}{}
+		for k := range dcMap {
+			splits := strings.Split(k, "_")
+			blockNum, err := strconv.ParseInt(splits[0], 10, 64)
+			if err != nil {
+				log.Fatal(err)
+			}
+			blockMap[blockNum] = struct{}{}
+		}
+		for blockNum := range blockMap {
+			blockNums = append(blockNums, blockNum)
 		}
-		blockNums = append(blockNums, blockNum)
+		sort.Slice(blockNums, func(i, j int) bool { return blockNums[i] < blockNums[j] })
 	}
-	sort.Slice(blockNums, func(i, j int) bool { return blockNums[i] < blockNums[j] })
 	for _, blockNum := range blockNums {
-		k := fmt.Sprintf("%d", blockNum)
-		dcAddr := dcMap[k].(string)
-		//
-		if strings.Contains(dcAddr, "_") {
-			addrs := strings.Split(dcAddr, "_")
-			if addrs[1] == "300" {
-				version, err := strconv.ParseInt(addrs[1], 10, 64)
-				log.CheckFatal(err)
-				dcw.addDataCompressorv300(core.NewVersion(int16(version)), addrs[0], blockNum)
-			} else {
-				dcw.AddCompressorType(common.HexToAddress(addrs[0]), CompressorType(addrs[1]), blockNum)
+		for _, suffix := range []CompressorType{CompressorType(""), CompressorType("300"), MARKET_COMPRESSOR, POOL_COMPRESSOR, CREDIT_ACCOUNT_COMPRESSOR} {
+			key := fmt.Sprintf("%d", blockNum)
+			if suffix != "" {
+				key = fmt.Sprintf("%d_%s", blockNum, suffix)
+			}
+			if dcAddr, ok := dcMap[key].(string); ok {
+				if suffix == "" {
+					dcw.addDataCompressorv1v2(blockNum, dcAddr)
+				} else if suffix == "300" {
+					dcw.addDataCompressorv300(core.NewVersion(300), dcAddr, blockNum)
+				} else {
+					dcw.AddCompressorType(common.HexToAddress(dcAddr), suffix, blockNum)
+				}
 			}
-		} else {
-			dcw.addDataCompressorv1v2(blockNum, dcAddr)
 		}
+		//
 	}
 }
 

migrations/000056_v310.up.sql

@@ -30,7 +30,7 @@ CREATE TABLE relations (
 );
 
 -- UPDATE
-update pools p set price_oracle=sa.address from  sync_adapters sa where type='PriceOracle' and p._version=sa.version;
+update pools p set price_oracle=sa.address from  sync_adapters sa where type='PriceOracle' and (case when p._version=1 then 2 else p._version end)=sa.version;
 
 update token_oracle set disabled_at=19752044 where version=2; -- don't disable for v1
 update token_oracle set disabled_at=13856183 where feed='0xc170DC3C2e8809AC6197D56b86bF421c8a7f8c67'; -- all for v1

models/address_provider/on_log.go

@@ -124,7 +124,7 @@ func (mdl *AddressProvider) OnLog(txLog types.Log) {
 	switch txLog.Topics[0] {
 	case core.Topic("AddressSet(bytes32,address)"):
 		mdl.v2LogParse(txLog)
-	case core.Topic("SetAddress(bytes32,address,uint256)"): // can be used for version 310 address provider too. set PriceOracle acl contractregister are not emitted thought
+	case core.Topic("SetAddress(bytes32,address,uint256)"):
 		contract := strings.Trim(string(txLog.Topics[1][:]), "\x00")
 		address := common.BytesToAddress(txLog.Topics[2][:])
 		mdl.v3LogParse(txLog, contract, address.Hex(), getRealVersion(txLog.Topics[3]))
@@ -166,10 +166,10 @@ func (mdl *AddressProvider) v310LogParse(txLog types.Log, contract string, addre
 			"POOL_COMPRESSOR":           dc_wrapper.POOL_COMPRESSOR,
 		}
 		cType := m[contract]
-		newValue := fmt.Sprintf("%s_%s", txLog.Address.Hex(), cType)
+		newValue := address
 		//
 		dcObj, fn := mdl.updateDetailsField_dc()
-		dcObj[fmt.Sprintf("%d", blockNum)] = newValue
+		dcObj[fmt.Sprintf("%d_%s", blockNum, cType)] = newValue
 		fn(dcObj)
 		mdl.Repo.GetDCWrapper().AddCompressorType(common.HexToAddress(address), cType, int64(txLog.BlockNumber))
 	}
@@ -188,10 +188,10 @@ func (mdl *AddressProvider) v3LogParse(txLog types.Log, contract string, address
 			log.Infof("Don't add %s version %d", address, realversion)
 			return
 		}
-		dcObj[fmt.Sprintf("%d", blockNum)] = fmt.Sprintf("%s_%d", address, realversion)
+		dcObj[fmt.Sprintf("%d_300", blockNum)] = address
 		fn(dcObj)
 		// v3
-		mdl.Repo.GetDCWrapper().AddDataCompressorv300(core.NewVersion(realversion), address, blockNum)
+		mdl.Repo.GetDCWrapper().AddDataCompressorv300(core.NewVersion(300), address, blockNum)
 	case "PRICE_ORACLE":
 		if realversion < 300 { // don't except v2,v2.10 or v1 priceOracle , why are already know from v1 addressProvider
 			return