Skip to content

bug: support customized spore script for transfer&melt method #175

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
Hanssen0 merged 1 commit into from
Mar 20, 2025
Merged

bug: support customized spore script for transfer&melt method #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changeset/curly-berries-watch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@ckb-ccc/spore": patch
---

bug: add scriptInfo parameter in transfer/melt spore method
13 changes: 9 additions & 4 deletions packages/spore/src/cluster/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,17 +145,22 @@ export async function transferSporeCluster(params: {
id: ccc.HexLike;
to: ccc.ScriptLike;
tx?: ccc.TransactionLike;
scripts?: SporeScriptInfoLike[];
scriptInfoHash?: ccc.HexLike;
}): Promise<{
tx: ccc.Transaction;
}> {
const { signer, id, to, scriptInfoHash } = params;
const { signer, id, to, scripts, scriptInfoHash } = params;

// prepare transaction
const tx = ccc.Transaction.from(params.tx ?? {});

// build cluster cell
const { cell: cluster, scriptInfo } = await assertCluster(signer.client, id);
const { cell: cluster, scriptInfo: clusterScriptInfo } = await assertCluster(
signer.client,
id,
scripts,
);

tx.addInput(cluster);
tx.addOutput(
Expand All @@ -167,10 +172,10 @@ export async function transferSporeCluster(params: {
);

// complete cellDeps
await tx.addCellDepInfos(signer.client, scriptInfo.cellDeps);
await tx.addCellDepInfos(signer.client, clusterScriptInfo.cellDeps);

// generate cobuild action
const actions = scriptInfo.cobuild
const actions = clusterScriptInfo.cobuild
? [
assembleTransferClusterAction(
cluster.cellOutput,
Expand Down
26 changes: 18 additions & 8 deletions packages/spore/src/spore/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,17 +164,22 @@ export async function transferSpore(params: {
id: ccc.HexLike;
to: ccc.ScriptLike;
tx?: ccc.TransactionLike;
scripts?: SporeScriptInfoLike[];
scriptInfoHash?: ccc.HexLike;
}): Promise<{
tx: ccc.Transaction;
}> {
const { signer, id, to, scriptInfoHash } = params;
const { signer, id, to, scripts, scriptInfoHash } = params;

// prepare transaction
const tx = ccc.Transaction.from(params.tx ?? {});

const { cell: sporeCell, scriptInfo } = await assertSpore(signer.client, id);
await tx.addCellDepInfos(signer.client, scriptInfo.cellDeps);
const { cell: sporeCell, scriptInfo: sporeScriptInfo } = await assertSpore(
signer.client,
id,
scripts,
);
await tx.addCellDepInfos(signer.client, sporeScriptInfo.cellDeps);
tx.addInput(sporeCell);
tx.addOutput(
{
Expand All @@ -184,7 +189,7 @@ export async function transferSpore(params: {
sporeCell.outputData,
);

const actions = scriptInfo.cobuild
const actions = sporeScriptInfo.cobuild
? [
assembleTransferSporeAction(
sporeCell.cellOutput,
Expand Down Expand Up @@ -213,21 +218,26 @@ export async function meltSpore(params: {
signer: ccc.Signer;
id: ccc.HexLike;
tx?: ccc.TransactionLike;
scripts?: SporeScriptInfoLike[];
scriptInfoHash?: ccc.HexLike;
}): Promise<{
tx: ccc.Transaction;
}> {
const { signer, id, scriptInfoHash } = params;
const { signer, id, scripts, scriptInfoHash } = params;

// prepare transaction
const tx = ccc.Transaction.from(params.tx ?? {});

// build spore cell
const { cell: sporeCell, scriptInfo } = await assertSpore(signer.client, id);
await tx.addCellDepInfos(signer.client, scriptInfo.cellDeps);
const { cell: sporeCell, scriptInfo: sporeScriptInfo } = await assertSpore(
signer.client,
id,
scripts,
);
await tx.addCellDepInfos(signer.client, sporeScriptInfo.cellDeps);
tx.addInput(sporeCell);

const actions = scriptInfo.cobuild
const actions = sporeScriptInfo.cobuild
? [assembleMeltSporeAction(sporeCell.cellOutput, scriptInfoHash)]
: [];

Expand Down