@ercworldio/blockchain-shared 1.0.5-dev.7-PROJ-1469.4 → 1.0.5-dev.7-PROJ-1469.6

package/build/chains/networks_dev.json

@@ -135,6 +135,16 @@
                 "source": "wallet"
             }
         ],
+        "quicknodeStreams": [
+            {
+                "network": "solana-devnet",
+                "dataset": "block",
+                "name": "solana-escrow-logs",
+                "listConfig": {
+                    "key": "escrow-address"
+                }
+            }
+        ],
         "quicknodeNotificationConfig": [
             {
                 "name": "escrow-sol-dev",

package/build/services/Redis.js

@@ -277,7 +277,7 @@ class Redis {
                 try {
                     const pref = `${this.prefix}-`;
                     const normalizedKey = expiredKey.startsWith(pref) ? expiredKey.slice(pref.length) : expiredKey;
-                    this.logger.info(`Redis: key expired: ${normalizedKey}`);
+                    // this.logger.info(`Redis: key expired: ${normalizedKey}`);
                     let value = null;
                     try {
                         value = yield this.get_object(expiredKey);
@@ -381,7 +381,7 @@ class Redis {
     get_object(_key_1) {
         return __awaiter(this, arguments, void 0, function* (_key, use_prefix = true) {
             const key = this.get_key(_key, use_prefix);
-            this.logger.info(`Redis: Getting object with key: ${key}`);
+            // this.logger.info(`Redis: Getting object with key: ${key}`);
             const raw = yield this._get(key);
             return raw ? JSON.parse(raw) : null;
         });

package/build/services/RedisPubSub.js

@@ -110,7 +110,7 @@ class RedisPubSub {
                 this.logger.info(`RedisPubSub: pSubscribe: Subscribed to pattern: ${pattern}`);
                 yield this.subscriber.pSubscribe(pattern, (eventKey) => __awaiter(this, void 0, void 0, function* () {
                     try {
-                        this.logger.info(`RedisPubSub: pSubscribe: Received subscriber event: ${event.eventName}. eventkey: ${eventKey}`);
+                        // this.logger.info(`RedisPubSub: pSubscribe: Received subscriber event: ${event.eventName}. eventkey: ${eventKey}`)
                         // Get the value before it expires (if possible) or use the key
                         const pref = `${this.prefix}-`;
                         if (eventKey.startsWith(pref))

package/build/services/solana/escrow/services/EscrowAdminUtility.d.ts

@@ -92,6 +92,15 @@ export declare class EscrowAdminUtility {
      * @returns string - signature
      */
     withdraw_batch(chain_id: ChainId, token_address: string, recipients: BatchReceiver[], signer?: Keypair): Promise<string>;
+    /** Per-request PDAs the folded batch path expects: receiver timelock override + commitment. */
+    private request_pdas;
+    /**
+     * Builds the Ed25519SigVerify instruction the program scans to enforce treasury multisig.
+     * Each request contributes its signers' approvals over that request's message (which binds
+     * the committed amount + token + chain + request id). Returns null when no request carries
+     * signatures, so plain batches send just the withdraw instruction.
+     */
+    private buildBatchTreasuryEd25519;
     /** @dev this might fail if the recipient does not have an ATA - take care of it in funding worker task */
     private batch_withdraw_spl;
     private batch_withdraw_sol;

package/build/services/solana/escrow/services/EscrowAdminUtility.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EscrowAdminUtility.d.ts","sourceRoot":"","sources":["../../../../../src/services/solana/escrow/services/EscrowAdminUtility.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAoB,SAAS,EAA0E,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAGjL,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAKzC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,qBAAa,kBAAkB;IACpB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC;gBAE3B,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,cAAc;IAWrE;;;OAGG;IACU,SAAS;IAYtB;;;;OAIG;IACU,QAAQ,CAAC,cAAc,EAAE,MAAM;IAgB5C;;;;OAIG;IACU,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAgBvC,YAAY;IA6BzB;;;OAGG;IACU,kBAAkB;IAY/B;;;OAGG;IACU,UAAU;IAiBvB;;;;;OAKG;IACU,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAkCtD,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAmBtE;;;;;OAKG;IACU,SAAS,CAAC,iBAAiB,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAmBlE;;;;;OAKG;IACU,YAAY,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAoBlE;;;;;OAKG;IACU,eAAe,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO;IAqBpE;;;;;;OAMG;IACU,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAUxF;;;;;;;OAOG;IACU,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAWnH;;;;;;;;OAQG;IACU,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO;IAUnH,0GAA0G;YAC5F,kBAAkB;YAuClB,kBAAkB;YA6ClB,YAAY;YAyBZ,YAAY;YAgCZ,WAAW;YAwBX,WAAW;IAuCnB,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAUlC,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;YAU9C,eAAe;IA0BhB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,GAAE,UAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1F,mBAAmB,CAC5B,SAAS,EAAE,oBAAoB,EAC/B,UAAU,GAAE,WAAW,GAAG,WAAyB,EACnD,SAAS,SAAS,GACnB,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;OAKG;IACH,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,kBAAkB;IAKnF;;;;;;OAMG;IACH,MAAM,CAAC,yBAAyB,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,kBAAkB;CAM/H;AAED,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"EscrowAdminUtility.d.ts","sourceRoot":"","sources":["../../../../../src/services/solana/escrow/services/EscrowAdminUtility.ts"],"names":[],"mappings":"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"}

package/build/services/solana/escrow/services/EscrowAdminUtility.js

@@ -56,6 +56,7 @@ const TransactionsService_1 = require("./TransactionsService");
 const Errors_1 = __importDefault(require("./Errors"));
 const TokenAccountService_1 = require("./TokenAccountService");
 const SolanaTokenProgramCache_1 = require("./SolanaTokenProgramCache");
+const TreasuryWithdrawalSignature_1 = require("./TreasuryWithdrawalSignature");
 class EscrowAdminUtility {
     constructor(program, provider) {
         this.program = program;
@@ -375,6 +376,43 @@ class EscrowAdminUtility {
             }
         });
     }
+    /** Per-request PDAs the folded batch path expects: receiver timelock override + commitment. */
+    request_pdas(receiver, request_id) {
+        const ridBuf = Buffer.alloc(8);
+        ridBuf.writeBigUInt64LE(BigInt(request_id));
+        const [receiverTimelock] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('receiver-timelock'), receiver.toBytes()], this.program.programId);
+        const [commitment] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('withdrawal'), ridBuf], this.program.programId);
+        return { receiverTimelock, commitment };
+    }
+    /**
+     * Builds the Ed25519SigVerify instruction the program scans to enforce treasury multisig.
+     * Each request contributes its signers' approvals over that request's message (which binds
+     * the committed amount + token + chain + request id). Returns null when no request carries
+     * signatures, so plain batches send just the withdraw instruction.
+     */
+    buildBatchTreasuryEd25519(chainId, tokenMint, recipients) {
+        var _a;
+        const entries = [];
+        for (const r of recipients) {
+            if (!((_a = r.signatures) === null || _a === void 0 ? void 0 : _a.length))
+                continue;
+            const message = (0, TreasuryWithdrawalSignature_1.buildWithdrawalApprovalMessage)({
+                recipient: new web3_js_1.PublicKey(r.receiver_pubkey),
+                tokenMint,
+                committedAmount: BigInt(r.amount_in_lamports),
+                chainId: BigInt(chainId),
+                requestId: BigInt(r.request_id),
+            });
+            for (const s of r.signatures) {
+                entries.push({
+                    publicKey: new web3_js_1.PublicKey(s.signer).toBytes(),
+                    signature: (0, TreasuryWithdrawalSignature_1.decodeEd25519Signature)(s.signature),
+                    message,
+                });
+            }
+        }
+        return entries.length ? (0, TreasuryWithdrawalSignature_1.buildTreasuryEd25519Instruction)(entries) : null;
+    }
     /** @dev this might fail if the recipient does not have an ATA - take care of it in funding worker task */
     batch_withdraw_spl(chainId, mint, recipients, signer) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -384,13 +422,17 @@ class EscrowAdminUtility {
             const amounts = recipients.map(r => new anchor.BN(r.amount_in_lamports));
             const net_amounts = recipients.map(r => new anchor.BN(r.net_amount_in_lamports));
             const request_ids = recipients.map(r => new anchor.BN(r.request_id));
-            const receivers = recipients.map(r => {
-                const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, new web3_js_1.PublicKey(r.receiver_pubkey));
-                return {
-                    isSigner: false,
-                    pubkey: ata,
-                    isWritable: true
-                };
+            // Per request: [recipient, recipient_token_account, receiver_timelock, commitment]
+            const receivers = recipients.flatMap(r => {
+                const wallet = new web3_js_1.PublicKey(r.receiver_pubkey);
+                const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, wallet);
+                const { receiverTimelock, commitment } = this.request_pdas(wallet, r.request_id);
+                return [
+                    { isSigner: false, pubkey: wallet, isWritable: true },
+                    { isSigner: false, pubkey: ata, isWritable: true },
+                    { isSigner: false, pubkey: receiverTimelock, isWritable: false },
+                    { isSigner: false, pubkey: commitment, isWritable: true },
+                ];
             });
             const ix = yield this.program.methods
                 .batchWithdrawTokens(new anchor.BN(chainId), request_ids, amounts, net_amounts)
@@ -404,7 +446,9 @@ class EscrowAdminUtility {
             })
                 .remainingAccounts(receivers)
                 .instruction();
-            const signature = yield this.sendTransaction([ix], signer);
+            // Prepend the treasury multisig proof when any request in the batch requires it.
+            const ed25519 = this.buildBatchTreasuryEd25519(chainId, mint, recipients);
+            const signature = yield this.sendTransaction(ed25519 ? [ed25519, ix] : [ix], signer);
             yield this.waitForConfirmation(signature, "confirmed");
             return signature;
         });
@@ -415,14 +459,17 @@ class EscrowAdminUtility {
             const vaultAuthority = EscrowService.findVaultAuthorityPda(this.program.programId);
             const amounts = recipients.map(r => new anchor.BN(r.amount_in_lamports));
             const net_amounts = recipients.map(r => new anchor.BN(r.net_amount_in_lamports));
-            const receivers = recipients.map(r => {
-                return {
-                    isSigner: false,
-                    pubkey: new web3_js_1.PublicKey(r.receiver_pubkey),
-                    isWritable: true
-                };
-            });
             const request_ids = recipients.map(r => new anchor.BN(r.request_id));
+            // Per request: [recipient, receiver_timelock, commitment]
+            const receivers = recipients.flatMap(r => {
+                const wallet = new web3_js_1.PublicKey(r.receiver_pubkey);
+                const { receiverTimelock, commitment } = this.request_pdas(wallet, r.request_id);
+                return [
+                    { isSigner: false, pubkey: wallet, isWritable: true },
+                    { isSigner: false, pubkey: receiverTimelock, isWritable: false },
+                    { isSigner: false, pubkey: commitment, isWritable: true },
+                ];
+            });
             const ix = yield this.program.methods
                 .batchWithdrawSol(new anchor.BN(chainId), request_ids, amounts, net_amounts)
                 .accountsPartial({
@@ -433,18 +480,9 @@ class EscrowAdminUtility {
             })
                 .remainingAccounts(receivers)
                 .instruction();
-            // let preimage = `global:batchWithdrawSol`;
-            // let ixBuffer = Buffer.from(sha256.hash(preimage)).slice(0, 8);
-            // const ixData = Buffer.concat([
-            //     new Uint8Array(ixBuffer),
-            //     new Uint8Array(ix.data)
-            // ])
-            // const transactionIx = new TransactionInstruction({
-            //     programId: this.program.programId,
-            //     data: ixData,
-            //     keys: ix.keys
-            // })
-            const signature = yield this.sendTransaction([ix], signer);
+            // Prepend the treasury multisig proof when any request in the batch requires it.
+            const ed25519 = this.buildBatchTreasuryEd25519(chainId, web3_js_1.SystemProgram.programId, recipients);
+            const signature = yield this.sendTransaction(ed25519 ? [ed25519, ix] : [ix], signer);
             return signature;
         });
     }

package/build/services/solana/escrow/services/TreasuryWithdrawalSignature.d.ts

@@ -0,0 +1,53 @@
+import { PublicKey, TransactionInstruction } from "@solana/web3.js";
+/**
+ * Treasury withdrawal approval message + Ed25519 assembly.
+ *
+ * Mirrors the escrow program's `build_withdrawal_message` and its Ed25519SigVerify layout so the
+ * batch-withdraw transaction the funding worker sends carries signatures the program accepts.
+ */
+/** One treasury manager/executive approval over a request's message. */
+export interface TreasurySignatureInput {
+    /** Base58 signer pubkey — a current treasury manager/executive on-chain. */
+    signer: string;
+    /** 64-byte Ed25519 signature (base64/hex/base58). */
+    signature: string;
+}
+/**
+ * Builds the UTF-8 approval message a treasury signer approves. MUST match the program's
+ * `build_withdrawal_message` byte for byte, or verification fails.
+ *
+ *   ERCWORLD Escrow Withdrawal Approval
+ *   Version: 1
+ *   Chain: <chainId>
+ *   Request: <requestId>
+ *   Recipient: <recipient base58>
+ *   Token: <mint base58>
+ *   Amount: <committed amount, raw base units>
+ *
+ * `Amount` is the committed (approved) amount — the net paid out is chosen later by the backend
+ * and bounded on-chain by TreasuryConfig.max_fee_delta. The title + Version line domain-separate
+ * the signature; bump Version in lockstep with the program on any format change.
+ */
+export declare function buildWithdrawalApprovalMessage(params: {
+    recipient: PublicKey;
+    tokenMint: PublicKey;
+    committedAmount: bigint;
+    chainId: bigint;
+    requestId: bigint;
+}): Buffer;
+/** Decode a 64-byte Ed25519 signature from base64, hex (0x-optional), or base58. */
+export declare function decodeEd25519Signature(s: string): Uint8Array;
+/** One fully-decoded signature entry: pubkey + signature over `message`. */
+export interface Ed25519Entry {
+    publicKey: Uint8Array;
+    signature: Uint8Array;
+    message: Uint8Array;
+}
+/**
+ * Builds a single Ed25519SigVerify instruction carrying `entries` self-contained signatures
+ * (each entry's pubkey, signature and message live in this instruction's own data). This is the
+ * compact layout the program scans in `verify_treasury_threshold`; one instruction for the whole
+ * batch keeps the transaction far smaller than one instruction per signature.
+ */
+export declare function buildTreasuryEd25519Instruction(entries: Ed25519Entry[]): TransactionInstruction;
+//# sourceMappingURL=TreasuryWithdrawalSignature.d.ts.map

package/build/services/solana/escrow/services/TreasuryWithdrawalSignature.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TreasuryWithdrawalSignature.d.ts","sourceRoot":"","sources":["../../../../../src/services/solana/escrow/services/TreasuryWithdrawalSignature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,SAAS,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAGpF;;;;;GAKG;AAEH,wEAAwE;AACxE,MAAM,WAAW,sBAAsB;IACnC,4EAA4E;IAC5E,MAAM,EAAE,MAAM,CAAC;IACf,qDAAqD;IACrD,SAAS,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE;IACnD,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAUT;AAED,oFAAoF;AACpF,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,MAAM,GAAG,UAAU,CAU5D;AAED,4EAA4E;AAC5E,MAAM,WAAW,YAAY;IACzB,SAAS,EAAE,UAAU,CAAC;IACtB,SAAS,EAAE,UAAU,CAAC;IACtB,OAAO,EAAE,UAAU,CAAC;CACvB;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,sBAAsB,CAmC/F"}

package/build/services/solana/escrow/services/TreasuryWithdrawalSignature.js

@@ -0,0 +1,89 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildWithdrawalApprovalMessage = buildWithdrawalApprovalMessage;
+exports.decodeEd25519Signature = decodeEd25519Signature;
+exports.buildTreasuryEd25519Instruction = buildTreasuryEd25519Instruction;
+const web3_js_1 = require("@solana/web3.js");
+const bs58_1 = __importDefault(require("bs58"));
+/**
+ * Builds the UTF-8 approval message a treasury signer approves. MUST match the program's
+ * `build_withdrawal_message` byte for byte, or verification fails.
+ *
+ *   ERCWORLD Escrow Withdrawal Approval
+ *   Version: 1
+ *   Chain: <chainId>
+ *   Request: <requestId>
+ *   Recipient: <recipient base58>
+ *   Token: <mint base58>
+ *   Amount: <committed amount, raw base units>
+ *
+ * `Amount` is the committed (approved) amount — the net paid out is chosen later by the backend
+ * and bounded on-chain by TreasuryConfig.max_fee_delta. The title + Version line domain-separate
+ * the signature; bump Version in lockstep with the program on any format change.
+ */
+function buildWithdrawalApprovalMessage(params) {
+    const text = "ERCWORLD Escrow Withdrawal Approval\n" +
+        "Version: 1\n" +
+        `Chain: ${params.chainId}\n` +
+        `Request: ${params.requestId}\n` +
+        `Recipient: ${params.recipient.toBase58()}\n` +
+        `Token: ${params.tokenMint.toBase58()}\n` +
+        `Amount: ${params.committedAmount}`;
+    return Buffer.from(text, "utf8");
+}
+/** Decode a 64-byte Ed25519 signature from base64, hex (0x-optional), or base58. */
+function decodeEd25519Signature(s) {
+    const b64 = Buffer.from(s, "base64");
+    if (b64.length === 64)
+        return b64;
+    const hex = s.startsWith("0x") ? s.slice(2) : s;
+    if (/^[0-9a-fA-F]{128}$/.test(hex))
+        return Buffer.from(hex, "hex");
+    try {
+        const b58 = bs58_1.default.decode(s);
+        if (b58.length === 64)
+            return b58;
+    }
+    catch ( /* fallthrough */_a) { /* fallthrough */ }
+    throw new Error("Invalid Ed25519 signature encoding (expected 64 bytes as base64/hex/base58)");
+}
+/**
+ * Builds a single Ed25519SigVerify instruction carrying `entries` self-contained signatures
+ * (each entry's pubkey, signature and message live in this instruction's own data). This is the
+ * compact layout the program scans in `verify_treasury_threshold`; one instruction for the whole
+ * batch keeps the transaction far smaller than one instruction per signature.
+ */
+function buildTreasuryEd25519Instruction(entries) {
+    const N = entries.length;
+    const OFFSETS_SIZE = 14;
+    const ENTRY_SIZE = 32 + 64; // pubkey + signature
+    const header = 2 + N * OFFSETS_SIZE;
+    const msgStart = header + N * ENTRY_SIZE;
+    const totalMsg = entries.reduce((s, e) => s + e.message.length, 0);
+    const data = Buffer.alloc(msgStart + totalMsg);
+    data[0] = N; // number of signatures
+    data[1] = 0; // padding
+    let msgCursor = msgStart;
+    for (let i = 0; i < N; i++) {
+        const base = 2 + i * OFFSETS_SIZE;
+        const pkOffset = header + i * ENTRY_SIZE;
+        const sigOffset = pkOffset + 32;
+        const msgOffset = msgCursor;
+        const msgLen = entries[i].message.length;
+        data.writeUInt16LE(sigOffset, base + 0); // signature_offset
+        data.writeUInt16LE(0xffff, base + 2); // signature_instruction_index (self)
+        data.writeUInt16LE(pkOffset, base + 4); // public_key_offset
+        data.writeUInt16LE(0xffff, base + 6); // public_key_instruction_index (self)
+        data.writeUInt16LE(msgOffset, base + 8); // message_data_offset
+        data.writeUInt16LE(msgLen, base + 10); // message_data_size
+        data.writeUInt16LE(0xffff, base + 12); // message_instruction_index (self)
+        data.set(entries[i].publicKey, pkOffset);
+        data.set(entries[i].signature, sigOffset);
+        data.set(entries[i].message, msgOffset);
+        msgCursor += msgLen;
+    }
+    return new web3_js_1.TransactionInstruction({ keys: [], programId: web3_js_1.Ed25519Program.programId, data });
+}

package/build/services/solana/escrow/types/types.d.ts

@@ -11,10 +11,26 @@ export interface EncodedWithdrawSignature {
     signer: string;
     message: string;
 }
+/** A treasury manager/executive approval collected off-chain for one withdrawal request. */
+export interface BatchTreasurySignature {
+    /** Base58 signer pubkey (must be a current treasury manager/executive on-chain). */
+    signer: string;
+    /** 64-byte Ed25519 signature, base64/hex/base58 — over the request's approval message. */
+    signature: string;
+}
 export interface BatchReceiver {
+    /** Approved (committed) amount — what the treasury signatures are bound to. */
     amount_in_lamports: number;
+    /** Amount actually paid out after the backend's fee deduction. */
     net_amount_in_lamports: number;
     receiver_pubkey: PublicKey;
     request_id: number;
+    /**
+     * Treasury approvals for this request. Required only when the token's amount band demands
+     * multisig (managers + executives > 0); leave empty/undefined otherwise. When present, the
+     * batch transaction prepends an Ed25519SigVerify instruction the program scans to enforce
+     * the threshold.
+     */
+    signatures?: BatchTreasurySignature[];
 }
 //# sourceMappingURL=types.d.ts.map

package/build/services/solana/escrow/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/services/solana/escrow/types/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE/E,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;AAC3G,MAAM,MAAM,4BAA4B,GAAG,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;AACpH,MAAM,WAAW,iBAAiB;IAC9B,SAAS,EAAE,UAAU,CAAC;IACtB,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE,UAAU,CAAC;CACvB;AAED,MAAM,WAAW,wBAAwB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,eAAe,EAAE,SAAS,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;CACtB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/services/solana/escrow/types/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE/E,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;AAC3G,MAAM,MAAM,4BAA4B,GAAG,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;AACpH,MAAM,WAAW,iBAAiB;IAC9B,SAAS,EAAE,UAAU,CAAC;IACtB,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE,UAAU,CAAC;CACvB;AAED,MAAM,WAAW,wBAAwB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,4FAA4F;AAC5F,MAAM,WAAW,sBAAsB;IACnC,oFAAoF;IACpF,MAAM,EAAE,MAAM,CAAC;IACf,0FAA0F;IAC1F,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC1B,+EAA+E;IAC/E,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kEAAkE;IAClE,sBAAsB,EAAE,MAAM,CAAC;IAC/B,eAAe,EAAE,SAAS,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,sBAAsB,EAAE,CAAC;CACzC"}

package/build/services/types/claim.d.ts

@@ -38,6 +38,7 @@ export interface MultisigSignatureEntry {
     v?: number;
     r?: string;
     s?: string;
+    signature?: string;
 }
 export interface ClaimJobSuccessResult extends ClaimJobs {
     tx_hash: string;

package/build/services/types/claim.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claim.d.ts","sourceRoot":"","sources":["../../../src/services/types/claim.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,UAAU,CAAC;AAEhD,MAAM,WAAW,mBAAmB;IAChC,UAAU,EAAE,cAAc,CAAC;IAC3B,YAAY,EAAE,WAAW,CAAC;CAC7B;AACD,MAAM,MAAM,aAAa,GACnB,SAAS,GACT,YAAY,GACZ,UAAU,GACV,UAAU,GACV,UAAU,GACV,MAAM,GACN,aAAa,CAAC;AAEpB,MAAM,MAAM,SAAS,GACf,QAAQ,GACR,YAAY,GACZ,WAAW,GACX,YAAY,GACZ,aAAa,GACb,kBAAkB,GAClB,QAAQ,CAAC;AAEf,MAAM,WAAW,sBAAsB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IAGd,UAAU,EAAE,cAAc,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,WAAW,CAAC;IAEzB,qBAAqB,CAAC,EAAE,WAAW,CAAC,GAAG,GAAG,WAAW,CAAC,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC;IAChF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAG1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kBAAkB,EAAE,sBAAsB,EAAE,CAAC;IAC7C,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,sBAAsB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,qBAAsB,SAAQ,SAAS;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,6BAA6B,EAAE,MAAM,CAAC;IACtC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,0BAA0B,EAAE,MAAM,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,IAAI,CAAC;CACrB"}
+{"version":3,"file":"claim.d.ts","sourceRoot":"","sources":["../../../src/services/types/claim.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,UAAU,CAAC;AAEhD,MAAM,WAAW,mBAAmB;IAChC,UAAU,EAAE,cAAc,CAAC;IAC3B,YAAY,EAAE,WAAW,CAAC;CAC7B;AACD,MAAM,MAAM,aAAa,GACnB,SAAS,GACT,YAAY,GACZ,UAAU,GACV,UAAU,GACV,UAAU,GACV,MAAM,GACN,aAAa,CAAC;AAEpB,MAAM,MAAM,SAAS,GACf,QAAQ,GACR,YAAY,GACZ,WAAW,GACX,YAAY,GACZ,aAAa,GACb,kBAAkB,GAClB,QAAQ,CAAC;AAEf,MAAM,WAAW,sBAAsB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IAGd,UAAU,EAAE,cAAc,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,WAAW,CAAC;IAEzB,qBAAqB,CAAC,EAAE,WAAW,CAAC,GAAG,GAAG,WAAW,CAAC,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC;IAChF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAG1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kBAAkB,EAAE,sBAAsB,EAAE,CAAC;IAC7C,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,sBAAsB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IAEtB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IAGX,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,qBAAsB,SAAQ,SAAS;IACpD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,6BAA6B,EAAE,MAAM,CAAC;IACtC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,0BAA0B,EAAE,MAAM,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,IAAI,CAAC;CACrB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ercworldio/blockchain-shared",
-  "version": "1.0.5-dev.7-PROJ-1469.4",
+  "version": "1.0.5-dev.7-PROJ-1469.6",
   "description": "Shared library for blockchain projects",
   "main": "build/index.js",
   "types": "build/index.d.ts",