Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions sdk/multisig/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"build": "yarn build:js && yarn build:types",
"generate": "yarn solita",
"ts": "tsc --noEmit",
"test:types": "tsc --noEmit -p tsconfig.test-d.json",
"prepare:canary": "yarn build && npm version --prerelease --preid=canary"
},
"dependencies": {
Expand Down
11 changes: 9 additions & 2 deletions sdk/multisig/src/instructions/spendingLimitUse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
TOKEN_PROGRAM_ID,
ASSOCIATED_TOKEN_PROGRAM_ID,
} from "@solana/spl-token";
import BN from "bn.js";
import { createSpendingLimitUseInstruction, PROGRAM_ID } from "../generated";
import { getVaultPda } from "../pda";

Expand All @@ -30,7 +31,7 @@ export function spendingLimitUse({
/** Provide if `spendingLimit` is for an SPL token, omit if it's for SOL. */
mint?: PublicKey;
vaultIndex: number;
amount: number;
amount: number | bigint;
decimals: number;
destination: PublicKey;
tokenProgram?: PublicKey;
Expand Down Expand Up @@ -72,7 +73,13 @@ export function spendingLimitUse({
destinationTokenAccount,
tokenProgram: mint ? tokenProgram : undefined,
},
{ args: { amount, decimals, memo: memo ?? null } },
{
args: {
amount: new BN(amount.toString()),
decimals,
memo: memo ?? null,
},
},
programId
);
}
2 changes: 1 addition & 1 deletion sdk/multisig/src/rpc/spendingLimitUse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export async function spendingLimitUse({
/** Provide if `spendingLimit` is for an SPL token, omit if it's for SOL. */
mint?: PublicKey;
vaultIndex: number;
amount: number;
amount: number | bigint;
decimals: number;
destination: PublicKey;
tokenProgram?: PublicKey;
Expand Down
2 changes: 1 addition & 1 deletion sdk/multisig/src/transactions/spendingLimitUse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function spendingLimitUse({
/** Provide if `spendingLimit` is for an SPL token, omit if it's for SOL. */
mint?: PublicKey;
vaultIndex: number;
amount: number;
amount: number | bigint;
decimals: number;
destination: PublicKey;
tokenProgram?: PublicKey;
Expand Down
49 changes: 49 additions & 0 deletions sdk/multisig/test-d/spendingLimitUse.test-d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import { PublicKey } from "@solana/web3.js";
import { instructions, rpc, transactions } from "../src";

type Equal<Left, Right> = (<Type>() => Type extends Left ? 1 : 2) extends <
Type
>() => Type extends Right ? 1 : 2
? true
: false;
type Expect<Type extends true> = Type;

type InstructionAmount = Parameters<
typeof instructions.spendingLimitUse
>[0]["amount"];
type TransactionAmount = Parameters<
typeof transactions.spendingLimitUse
>[0]["amount"];
type RpcAmount = Parameters<typeof rpc.spendingLimitUse>[0]["amount"];

type _InstructionAmount = Expect<Equal<InstructionAmount, number | bigint>>;
type _TransactionAmount = Expect<Equal<TransactionAmount, number | bigint>>;
type _RpcAmount = Expect<Equal<RpcAmount, number | bigint>>;

const key = PublicKey.default;
const amount = 18_446_744_073_709_551_615n;

instructions.spendingLimitUse({
multisigPda: key,
member: key,
spendingLimit: key,
vaultIndex: 0,
amount,
decimals: 0,
destination: key,
});

transactions.spendingLimitUse({
blockhash: key.toBase58(),
feePayer: key,
multisigPda: key,
member: key,
spendingLimit: key,
vaultIndex: 0,
amount,
decimals: 0,
destination: key,
});

const rpcAmount: RpcAmount = amount;
void rpcAmount;
10 changes: 10 additions & 0 deletions sdk/multisig/tsconfig.test-d.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"declaration": false,
"declarationMap": false,
"noEmit": true,
"rootDir": "."
},
"include": ["src/**/*", "test-d/**/*"]
}
4 changes: 2 additions & 2 deletions tests/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// The order of imports is the order the test suite will run in.
import "./suites/program-config-init"
import "./suites/program-config-init";
import "./suites/account-migrations";
import "./suites/examples/batch-sol-transfer";
import "./suites/examples/create-mint";
Expand All @@ -13,6 +13,7 @@ import "./suites/instructions/configTransactionExecute";
import "./suites/instructions/multisigCreate";
import "./suites/instructions/multisigCreateV2";
import "./suites/instructions/multisigSetRentCollector";
import "./suites/instructions/spendingLimitUse";
import "./suites/instructions/transactionBufferClose";
import "./suites/instructions/transactionBufferCreate";
import "./suites/instructions/transactionBufferExtend";
Expand All @@ -24,4 +25,3 @@ import "./suites/multisig-sdk";
// // Uncomment to enable the heapTest instruction testing
// //import "./suites/instructions/heapTest";
// import "./suites/examples/custom-heap";

22 changes: 22 additions & 0 deletions tests/suites/instructions/spendingLimitUse.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import * as multisig from "@sqds/multisig";
import { PublicKey } from "@solana/web3.js";
import assert from "assert";

describe("Instructions / spending_limit_use", () => {
it("serializes bigint amounts across the full u64 range", () => {
const amount = 18_446_744_073_709_551_615n;

const instruction = multisig.instructions.spendingLimitUse({
multisigPda: PublicKey.default,
member: PublicKey.default,
spendingLimit: PublicKey.default,
vaultIndex: 0,
amount,
decimals: 0,
destination: PublicKey.default,
});

const serializedAmount = instruction.data.subarray(8, 16);
assert.strictEqual(serializedAmount.readBigUInt64LE(), amount);
});
});