feat: v0 - reallocation check

src/bot/runner.ts

@@ -6,6 +6,7 @@ import { ALERTING_DELAY } from '../constants/alertingDelay';
 import { BaseTree } from '../providers/tree';
 import { BotError, MerklReport, Resolver, Result, Step, StepResult } from '../types/bot';
 import { gtStrings } from '../utils/addString';
+import { wasReallocated } from '../utils/leafDiff';
 import { fetchCampaigns, fetchLeaves } from '../utils/merklAPI';
 import { DisputeContext } from './context';
 import { approveDisputeStake, createSigner, disputeTree } from './dispute';
@@ -116,11 +117,16 @@ export const checkOverDistribution: Step = async ({}, report) => {
     //  -> test unsuccessful => throw
     // if not we throw
     if (negativeDiffs.length > 0) {
-      return Result.Error({
-        code: BotError.NegativeDiff,
-        reason: negativeDiffs.join('\n'),
-        report: { ...report, diffCampaigns, diffRecipients },
-      });
+      const allReallocated = (await Promise.all(negativeDiffs.map(async (leaf) => await wasReallocated(chainId, leaf)))).reduce(
+        (a, b) => a && b
+      );
+      if (!allReallocated) {
+        return Result.Error({
+          code: BotError.NegativeDiff,
+          reason: negativeDiffs.join('\n'),
+          report: { ...report, diffCampaigns, diffRecipients },
+        });
+      }
     }
 
     const overDistributed = [];

src/providers/tree/BaseTree.ts

@@ -1,4 +1,4 @@
-import { BASE_9, type Campaign, type CampaignParameters, Erc20__factory, Int256, type MerklChainId } from '@angleprotocol/sdk';
+import { type Campaign, type CampaignParameters, type MerklChainId, BASE_9, Erc20__factory, Int256 } from '@angleprotocol/sdk';
 import { BigNumber, utils } from 'ethers';
 import keccak256 from 'keccak256';
 import MerkleTree from 'merkletreejs';

src/utils/leafDiff.ts

@@ -0,0 +1,18 @@
+import { DistributionCreator__factory, Distributor__factory, registry } from '@angleprotocol/sdk';
+import { BigNumber, ethers } from 'ethers';
+
+import { httpProvider } from '../providers';
+import { ExpandedLeaf } from '../providers/tree';
+
+export const wasReallocated = async (chainId: number, leaf: ExpandedLeaf) => {
+  const provider = httpProvider(chainId);
+  const distributionCreatorAddress = registry(chainId).Merkl.DistributionCreator;
+  const distributorAddress = registry(chainId).Merkl.Distributor;
+  const creator = DistributionCreator__factory.connect(distributionCreatorAddress, provider);
+  const distributor = Distributor__factory.connect(distributorAddress, provider);
+
+  const to = await creator.campaignReallocation(leaf.campaignId, leaf.recipient);
+  const claimed = await distributor.claimed(leaf.campaignId, leaf.recipient);
+
+  return to !== ethers.constants.AddressZero && claimed.amount.eq(BigNumber.from('0'));
+};