Skip to content

feat(cc): dont exit deals when finishing CC #1112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 20, 2025
Merged

feat(cc): dont exit deals when finishing CC #1112

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50a5ba2
remove code that exists deals before CC end
ValeryAntopol Mar 11, 2025
5051391
Merge branch 'main' into feat/dont-exit-deals-on-cc-end
ValeryAntopol Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 0 additions & 51 deletions packages/cli/package/src/lib/chain/commitment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,8 +540,6 @@ export async function collateralWithdraw(
[FINISH_COMMITMENT_FLAG_NAME]?: boolean;
},
) {
const { ZeroAddress } = await import("ethers");

const [invalidCommitments, commitments] = splitErrorsAndResults(
await getCommitmentsGroupedByStatus(flags),
(c) => {
Expand Down Expand Up @@ -618,55 +616,6 @@ export async function collateralWithdraw(
};
});

const unitsWithDeals = units.filter((unit) => {
return unit.unitInfo.deal !== ZeroAddress;
});

const onChainWorkerIds = new Set<string>();

for (const { unitInfo } of unitsWithDeals) {
onChainWorkerIds.add(unitInfo.onchainWorkerId);
}

const moveResourcesFromDealTxs = Array.from(onChainWorkerIds).map(
(onchainWorkerId) => {
return populateTx(
contracts.diamond.moveResourcesFromDealV2,
onchainWorkerId,
);
},
);

const [firstMoveResourcesFromDealTx, ...restMoveResourcesFromDealTxs] =
moveResourcesFromDealTxs;

const dealsString = Array.from(
new Set(
unitsWithDeals.map(({ unitInfo }) => {
return unitInfo.deal;
}),
),
).join("\n");

if (firstMoveResourcesFromDealTx !== undefined) {
try {
await signBatch({
title: `Moving resources from the following deals:\n${dealsString}`,
populatedTxs: [
firstMoveResourcesFromDealTx,
...restMoveResourcesFromDealTxs,
],
});
} catch (e) {
commandObj.warn(
`Wasn't able to move resources from deals for ${stringifyBasicCommitmentInfo(commitment)}. Most likely the reason is you must wait until the provider exits from all the following deals:\n${dealsString}`,
);

dbg(stringifyUnknown(e));
continue;
}
}

await sign({
title: `withdraw collateral from: ${ccId}`,
method: contracts.diamond.withdrawCollateral,
Expand Down
Loading