@voidifydao/sdk 1.0.0 → 2.0.1

package/dist/voidify/withdraw.js

@@ -49,6 +49,57 @@ export async function withdrawIx(ctx, proof, root, nullifierHash, recipient, rel
         .instruction();
     return [withdrawComputeBudgetIx(), ix];
 }
+function scoreRelayer(stake, feeBps) {
+    const fee = feeBps / 10000;
+    return stake * Math.max(0, 1 - 25 * fee * fee);
+}
+function pickRandomRelayer(list) {
+    if (list.length === 0)
+        return null;
+    if (list.length === 1)
+        return list[0];
+    const weights = list.map((r) => scoreRelayer(Number(r.stakeAmount ?? 0n), r.feeBps));
+    const total = weights.reduce((sum, weight) => sum + weight, 0);
+    if (total === 0)
+        return list[Math.floor(Math.random() * list.length)];
+    let rnd = Math.random() * total;
+    for (let i = 0; i < list.length; i++) {
+        rnd -= weights[i];
+        if (rnd <= 0)
+            return list[i];
+    }
+    return list[list.length - 1];
+}
+function findRelayerByName(relayers, name) {
+    return relayers.find((r) => r.name === name) ?? null;
+}
+async function isRelayerHealthy(url) {
+    try {
+        const res = await fetch(url.replace(/\/$/, "") + "/health", {
+            method: "GET",
+            signal: AbortSignal.timeout(5000),
+        });
+        return res.ok;
+    }
+    catch {
+        return false;
+    }
+}
+async function pickAutoRelayer(relayers) {
+    const active = relayers.filter((r) => r.isActive);
+    const healthChecks = await Promise.all(active.map(async (relayer) => ({
+        relayer,
+        isHealthy: await isRelayerHealthy(relayer.url),
+    })));
+    const healthy = healthChecks
+        .filter((item) => item.isHealthy)
+        .map((item) => item.relayer);
+    const selected = pickRandomRelayer(healthy);
+    if (!selected) {
+        throw new Error("Failed to auto-select relayer: no healthy relayer found");
+    }
+    return selected;
+}
 export async function validateNote(ctx, note_str) {
     const note = await Note.deserialize(note_str);
     const voidifyProgram = new VoidifyProgram(ctx.connection, ctx.programId);
@@ -69,10 +120,10 @@ export async function validateNote(ctx, note_str) {
     }
     return { note };
 }
-export async function prepareWithdraw(ctx, note_str, recipient, relayer) {
+export async function prepareWithdraw(ctx, note_str, recipient, relayerName, options, sendRpc = false) {
     const note = await Note.deserialize(note_str);
-    const recipientPubkey = new PublicKey(recipient);
-    const relayerPubkey = new PublicKey(relayer);
+    const recipientPubkey = recipient ? new PublicKey(recipient) : ctx.publicKey;
+    const recipientAddress = recipientPubkey.toBase58();
     const voidifyProgram = new VoidifyProgram(ctx.connection, ctx.programId);
     const nullifierBytes = bigIntToBytes(BigInt(note.nullifierHash));
     const nullifierPda = voidifyProgram.nullifier(nullifierBytes);
@@ -83,7 +134,7 @@ export async function prepareWithdraw(ctx, note_str, recipient, relayer) {
     const client = new SubstreamCliClient(ctx);
     await client.init();
     const depositModule = client.module("deposit");
-    await depositModule.sync(note.amountRaw);
+    await depositModule.sync(note.amountRaw, options?.depositSync);
     const deposits = await depositModule.list(note.amountRaw);
     const commitments = [...deposits]
         .sort((a, b) => a.index - b.index)
@@ -95,11 +146,17 @@ export async function prepareWithdraw(ctx, note_str, recipient, relayer) {
         throw new Error("Invalid note: deposit not found in the pool. Verify the note is correct and the deposit transaction has been confirmed.");
     }
     const relayerModule = client.module("relayer");
-    await relayerModule.sync();
-    const relayerInfo = await relayerModule.get(relayer);
+    await relayerModule.sync(options?.relayerSync);
+    const relayers = await relayerModule.list();
+    const relayerInfo = relayerName
+        ? findRelayerByName(relayers, relayerName)
+        : await pickAutoRelayer(relayers);
     if (!relayerInfo) {
-        throw new Error("Failed to get relayer info");
+        throw new Error(relayerName
+            ? `Failed to get relayer info for name: ${relayerName}`
+            : "Failed to get relayer info");
     }
+    const relayerPubkey = new PublicKey(relayerInfo.relayerPubkey);
     const treasuryConfig = await voidifyProgram.program.account.treasuryConfig.fetch(voidifyProgram.treasuryConfig());
     const fee = (note.amountRaw * BigInt(relayerInfo.feeBps)) / BigInt(10000);
     const treasury = (note.amountRaw * BigInt(treasuryConfig.treasuryBps)) / BigInt(10000);
@@ -108,10 +165,11 @@ export async function prepareWithdraw(ctx, note_str, recipient, relayer) {
         proof: await proofToBytes(proof),
         root: Array.from(bigIntToBytes(BigInt(root))),
         nullifierHash: Array.from(bigIntToBytes(BigInt(note.nullifierHash))),
-        recipient,
+        recipient: recipientAddress,
         amount: note.amountRaw.toString(),
         fee: fee.toString(),
         treasury: treasury.toString(),
+        ...(sendRpc ? { rpcUrl: ctx.rpcUrl } : {}),
     });
     return { withdrawData, relayerUrl: relayerInfo.url };
 }
@@ -147,8 +205,8 @@ export async function submitWithdrawToRelayer(artifact) {
     }
     return result.signature;
 }
-export async function withdraw(ctx, note_str, recipient, relayer, _dryRun) {
-    const artifact = await prepareWithdraw(ctx, note_str, recipient, relayer);
+export async function withdraw(ctx, note_str, recipient, relayerName, options, sendRpc = false) {
+    const artifact = await prepareWithdraw(ctx, note_str, recipient, relayerName, options, sendRpc);
     return submitWithdrawToRelayer(artifact);
 }
 export async function directWithdraw(ctx, note_str, recipient) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voidifydao/sdk",
-  "version": "1.0.0",
+  "version": "2.0.1",
   "description": "Voidify client SDK and CLI for interacting with the Anchor voidify program suite (browser + Node).",
   "type": "module",
   "main": "dist/index.js",
@@ -44,6 +44,7 @@
     "express": "^5.2.1",
     "ffjavascript": "^0.3.1",
     "fixed-merkle-tree": "^0.7.3",
+    "p-retry": "^8.0.0",
     "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
     "snarkjs": "^0.7.6",
@@ -70,10 +71,10 @@
     "voidify",
     "cli"
   ],
+  "author": "",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/VoidifyCommunity/voidify-sdk.git"
-  },
-  "author": "",
-  "license": "MIT"
+  }
 }

package/dist/idl/voidify-staking/idl.d.ts

@@ -1,93 +0,0 @@
-/**
- * Program IDL in camelCase format in order to be used in JS/TS.
- *
- * Note that this is only a type helper and is not the actual IDL. The original
- * IDL can be found at `target/idl/voidify_staking.json`.
- */
-export type VoidifyStaking = {
-    "address": "";
-    "metadata": {
-        "name": "voidifyStaking";
-        "version": "1.0.1";
-        "spec": "0.1.0";
-    };
-    "instructions": [
-        {
-            "name": "notifyRewardAmount";
-            "discriminator": [
-                228,
-                154,
-                113,
-                244,
-                155,
-                76,
-                153,
-                136
-            ];
-            "accounts": [
-                {
-                    "name": "caller";
-                    "signer": true;
-                },
-                {
-                    "name": "stakingState";
-                    "writable": true;
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const";
-                                "value": [
-                                    115,
-                                    116,
-                                    97,
-                                    107,
-                                    105,
-                                    110,
-                                    103,
-                                    95,
-                                    115,
-                                    116,
-                                    97,
-                                    116,
-                                    101
-                                ];
-                            }
-                        ];
-                    };
-                },
-                {
-                    "name": "rewardVault";
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const";
-                                "value": [
-                                    114,
-                                    101,
-                                    119,
-                                    97,
-                                    114,
-                                    100,
-                                    95,
-                                    118,
-                                    97,
-                                    117,
-                                    108,
-                                    116
-                                ];
-                            }
-                        ];
-                    };
-                },
-                {
-                    "name": "tokenProgram";
-                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
-                }
-            ];
-            "args": [];
-        }
-    ];
-    "accounts": [];
-    "events": [];
-    "types": [];
-};

package/dist/idl/voidify-staking/idl.js

@@ -1 +0,0 @@
-export {};

package/dist/idl/voidify-staking/idl.json

@@ -1,87 +0,0 @@
-{
-    "address": "3K12np4CKy8WbQim78trY6Pdii8wHQiWpQ4dMdsCKXYo",
-    "metadata": {
-        "name": "voidify_staking",
-        "version": "1.0.1",
-        "spec": "0.1.0"
-    },
-    "instructions": [
-        {
-            "name": "",
-            "discriminator": [
-                228,
-                154,
-                113,
-                244,
-                155,
-                76,
-                153,
-                136
-            ],
-            "accounts": [
-                {
-                    "name": "caller",
-                    "signer": true
-                },
-                {
-                    "name": "staking_state",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    115,
-                                    116,
-                                    97,
-                                    107,
-                                    105,
-                                    110,
-                                    103,
-                                    95,
-                                    115,
-                                    116,
-                                    97,
-                                    116,
-                                    101
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "reward_vault",
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [
-                                    114,
-                                    101,
-                                    119,
-                                    97,
-                                    114,
-                                    100,
-                                    95,
-                                    118,
-                                    97,
-                                    117,
-                                    108,
-                                    116
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "token_program",
-                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
-                }
-            ],
-            "args": []
-        }
-    ],
-    "accounts": [],
-    "events": [],
-    "types": []
-}

package/dist/staking/commands.d.ts

@@ -1,3 +0,0 @@
-import { PublicKey, TransactionInstruction } from "@solana/web3.js";
-import { Context } from "../context.js";
-export declare function notifyRewardAmountIx(ctx: Context, caller?: PublicKey): Promise<TransactionInstruction[]>;

package/dist/staking/commands.js

@@ -1,13 +0,0 @@
-import { VoidifyStakingProgram } from "./program.js";
-export async function notifyRewardAmountIx(ctx, caller) {
-    const staking = new VoidifyStakingProgram(ctx.connection, ctx.stakingProgramId);
-    const ix = await staking.program.methods
-        .notifyRewardAmount()
-        .accountsPartial({
-        caller: caller ?? ctx.publicKey,
-        stakingState: staking.stakingState(),
-        rewardVault: staking.rewardVault(),
-    })
-        .instruction();
-    return [ix];
-}

package/dist/staking/index.d.ts

@@ -1,2 +0,0 @@
-export { VoidifyStakingProgram } from "./program.js";
-export * from "./commands.js";

package/dist/staking/index.js

@@ -1,2 +0,0 @@
-export { VoidifyStakingProgram } from "./program.js";
-export * from "./commands.js";

package/dist/staking/program.d.ts

@@ -1,18 +0,0 @@
-import { Program } from "@coral-xyz/anchor";
-import { Connection, PublicKey } from "@solana/web3.js";
-import type { VoidifyStaking } from "../idl/voidify-staking/idl.js";
-export declare class VoidifyStakingProgram {
-    private connection;
-    private _program;
-    private _programId;
-    static readonly SEEDS: {
-        readonly STAKING_STATE: Buffer<ArrayBufferLike>;
-        readonly REWARD_VAULT: Buffer<ArrayBufferLike>;
-    };
-    constructor(connection: Connection, programId: PublicKey);
-    get program(): Program<VoidifyStaking>;
-    get programId(): PublicKey;
-    get rpcConnection(): Connection;
-    stakingState(): PublicKey;
-    rewardVault(): PublicKey;
-}

package/dist/staking/program.js

@@ -1,40 +0,0 @@
-import { Program } from "@coral-xyz/anchor";
-import { PublicKey } from "@solana/web3.js";
-import idl from "../idl/voidify-staking/idl.json" with { type: "json" };
-import { getConstSeed } from "../utils/idl-seed.js";
-export class VoidifyStakingProgram {
-    connection;
-    _program = null;
-    _programId;
-    static SEEDS = {
-        STAKING_STATE: getConstSeed(idl, "staking_state"),
-        REWARD_VAULT: getConstSeed(idl, "reward_vault"),
-    };
-    constructor(connection, programId) {
-        this.connection = connection;
-        this._programId = programId;
-    }
-    get program() {
-        if (!this._program) {
-            idl["address"] = this._programId.toBase58();
-            this._program = new Program(idl, {
-                connection: this.connection,
-            });
-        }
-        return this._program;
-    }
-    get programId() {
-        return this._programId;
-    }
-    get rpcConnection() {
-        return this.connection;
-    }
-    stakingState() {
-        const [pda] = PublicKey.findProgramAddressSync([VoidifyStakingProgram.SEEDS.STAKING_STATE], this._programId);
-        return pda;
-    }
-    rewardVault() {
-        const [pda] = PublicKey.findProgramAddressSync([VoidifyStakingProgram.SEEDS.REWARD_VAULT], this._programId);
-        return pda;
-    }
-}

package/dist/types/errors.d.ts

@@ -1 +0,0 @@
-export declare function mapOnChainError(errorMsg: string): string;

package/dist/types/errors.js

@@ -1,16 +0,0 @@
-export function mapOnChainError(errorMsg) {
-    if (errorMsg.includes("UnknownRoot") || errorMsg.includes("6005")) {
-        return "Merkle root not in history, please confirm deposit is confirmed";
-    }
-    if (errorMsg.includes("Unauthorized") || errorMsg.includes("6006")) {
-        return "Unauthorized to perform this operation";
-    }
-    if (errorMsg.includes("InvalidProof") || errorMsg.includes("6000")) {
-        return "Zero-knowledge proof is invalid, please check deposit note";
-    }
-    if (errorMsg.includes("AccountAlreadyInUse") ||
-        errorMsg.includes("custom program error: 0x0")) {
-        return "This deposit note has already been used";
-    }
-    return errorMsg;
-}