Merge branch 'ccip-develop' into will/test

smartcontractkit · Apr 2, 2024 · 127e239 · 127e239
2 parents ddfc3ac + 99a5cef
commit 127e239
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.changeset/many-pigs-brake.md b/.changeset/many-pigs-brake.md
@@ -0,0 +1,5 @@
+---
+"ccip": patch
+---
+
+fix rebalancing algorithm determinism
diff --git a/core/services/ocr2/plugins/rebalancer/liquidityrebalancer/targetbalance.go b/core/services/ocr2/plugins/rebalancer/liquidityrebalancer/targetbalance.go
@@ -112,6 +112,7 @@ func (r *MinLiquidityRebalancer) findNetworksRequiringFunding(graphNow, graphLat
 		res = append(res, net)
 	}
 
+	sort.Slice(res, func(i, j int) bool { return liqDiffsLater[res[i]].Cmp(liqDiffsLater[res[j]]) > 0 })
 	return res, liqDiffsNow, liqDiffsLater, nil
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		res = append(res, net)
     	}
+    	sort.Slice(res, func(i, j int) bool { return liqDiffsLater[res[i]].Cmp(liqDiffsLater[res[j]]) > 0 })
     	return res, liqDiffsNow, liqDiffsLater, nil
     }
@@ Expand Down @@