handle negative amountOut error

src/cli/index.ts

@@ -277,7 +277,7 @@ export class RainSolverCli {
     /** Resets the DataFetcher (sushi router cached pool data) by the given interval */
     async maybeResetDataFetcher() {
         const now = Date.now();
-        if (this.nextDatafetcherReset <= now) {
+        if (this.nextDatafetcherReset <= now || this.state.router.sushi?.signalReset) {
             this.nextDatafetcherReset = now + this.appOptions.poolUpdateInterval * 60 * 1000;
             // reset only if the data fetcher is initialized successfully
             const res = await this.state.router.sushi?.reset();

src/router/sushi/error.ts

@@ -7,6 +7,7 @@ export enum SushiRouterErrorType {
     FetchFailed,
     WasmEncodedError,
     UndefinedTradeDestinationAddress,
+    NegativeOutput,
 }
 
 /**

src/router/sushi/index.ts

@@ -101,6 +101,7 @@ export class SushiRouter extends RainSolverRouterBase {
 
     /** The sushi router data fetcher instance for interacting */
     dataFetcher: RainDataFetcher;
+    signalReset = false;
 
     constructor(
         chainId: number,
@@ -235,6 +236,15 @@ export class SushiRouter extends RainSolverRouterBase {
                     ),
                 );
             } else {
+                if (route.amountOutBI < 0n) {
+                    this.signalReset = true;
+                    return Result.err(
+                        new SushiRouterError(
+                            `Sushi router returned negative output for route: amountOut ${route.amountOutBI.toString()}, amountIn: ${amountIn.toString()}, pair: ${toToken.symbol}/${fromToken.symbol}`,
+                            SushiRouterErrorType.NegativeOutput,
+                        ),
+                    );
+                }
                 const price = calculatePrice18(
                     amountIn,
                     route.amountOutBI,
@@ -278,6 +288,7 @@ export class SushiRouter extends RainSolverRouterBase {
                 this.client as any,
                 this.liquidityProviders,
             );
+            this.signalReset = false;
             return true;
         } catch {}
         return false;

src/rpc/helpers.ts

@@ -112,10 +112,9 @@ export function probablyPicksFrom(ranges: number[], weights: number[]): number {
     // we now match the selection rates against
     // picked random int to get picked index
     for (let i = 0; i < ranges.length; i++) {
-        const weightsSlice = weights.slice(0, i);
         const offset = ranges
             .slice(0, i)
-            .reduce((a, b, j) => a + Math.max(b, Math.ceil(10_000 * weightsSlice[j])), 0);
+            .reduce((a, b, j) => a + Math.max(b, Math.ceil(10_000 * weights[j])), 0);
         const lowerBound = offset + 1;
         const upperBound = offset + ranges[i];
         if (lowerBound <= pick && pick <= upperBound) {