@solana/pay - npm Package Compare versions

Comparing version 0.2.1 to 0.2.2

lib/cjs/createTransfer.js

@@ -81,2 +81,3 @@ "use strict";
 function createSystemInstruction(recipient, amount, sender, connection) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
@@ -100,3 +101,3 @@ // Check that the sender and recipient accounts exist
         // Check that the amount provided doesn't have greater precision than SOL
-        if (amount.decimalPlaces() > constants_1.SOL_DECIMALS)
+        if ((_a = amount.decimalPlaces()) !== null && _a !== void 0 ? _a : 0 > constants_1.SOL_DECIMALS)
             throw new CreateTransferError('amount decimals invalid');
@@ -118,2 +119,3 @@ // Convert input decimal amount to integer lamports
 function createSPLTokenInstruction(recipient, amount, splToken, sender, connection) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
@@ -125,3 +127,3 @@ // Check that the token provided is an initialized mint
         // Check that the amount provided doesn't have greater precision than the mint
-        if (amount.decimalPlaces() > mint.decimals)
+        if ((_a = amount.decimalPlaces()) !== null && _a !== void 0 ? _a : 0 > mint.decimals)
             throw new CreateTransferError('amount decimals invalid');
@@ -128,0 +130,0 @@ // Convert input decimal amount to integer tokens according to the mint decimals

lib/cjs/encodeURL.js

@@ -29,6 +29,7 @@ "use strict";
 function encodeTransferRequestURL({ recipient, amount, splToken, reference, label, message, memo, }) {
+    var _a;
     const pathname = recipient.toBase58();
     const url = new URL(constants_1.SOLANA_PROTOCOL + pathname);
     if (amount) {
-        url.searchParams.append('amount', amount.toFixed(amount.decimalPlaces()));
+        url.searchParams.append('amount', amount.toFixed((_a = amount.decimalPlaces()) !== null && _a !== void 0 ? _a : 0));
     }
@@ -35,0 +36,0 @@ if (splToken) {

lib/cjs/validateTransfer.js

@@ -45,3 +45,3 @@ "use strict";
             throw new ValidateTransferError('not found');
-        const message = response.transaction.message;
+        const { message, signatures } = response.transaction;
         const meta = response.meta;
@@ -55,17 +55,20 @@ if (!meta)
         }
+        // Deserialize the transaction and make a copy of the instructions we're going to mutate it.
+        const transaction = web3_js_1.Transaction.populate(message, signatures);
+        const instructions = transaction.instructions.slice();
+        // Transfer instruction must be the last instruction
+        const instruction = instructions.pop();
+        if (!instruction)
+            throw new ValidateTransferError('missing transfer instruction');
         const [preAmount, postAmount] = splToken
-            ? yield validateSPLTokenTransfer(message, meta, recipient, splToken, reference)
-            : yield validateSystemTransfer(message, meta, recipient, reference);
+            ? yield validateSPLTokenTransfer(instruction, message, meta, recipient, splToken, reference)
+            : yield validateSystemTransfer(instruction, message, meta, recipient, reference);
         if (postAmount.minus(preAmount).lt(amount))
             throw new ValidateTransferError('amount not transferred');
-        if (memo) {
-            // Check that the second instruction is a memo instruction with the expected memo.
-            const transaction = web3_js_1.Transaction.populate(message);
-            const instruction = transaction.instructions[1];
+        if (memo !== undefined) {
+            // Memo instruction must be the second to last instruction
+            const instruction = instructions.pop();
             if (!instruction)
                 throw new ValidateTransferError('missing memo instruction');
-            if (!instruction.programId.equals(constants_1.MEMO_PROGRAM_ID))
-                throw new ValidateTransferError('invalid memo program');
-            if (!instruction.data.equals(Buffer.from(memo, 'utf8')))
-                throw new ValidateTransferError('invalid memo');
+            validateMemo(instruction, memo);
         }
@@ -76,8 +79,18 @@ return response;
 exports.validateTransfer = validateTransfer;
-function validateSystemTransfer(message, meta, recipient, references) {
+function validateMemo(instruction, memo) {
+    // Check that the instruction is a memo instruction with no keys and the expected memo data.
+    if (!instruction.programId.equals(constants_1.MEMO_PROGRAM_ID))
+        throw new ValidateTransferError('invalid memo program');
+    if (instruction.keys.length)
+        throw new ValidateTransferError('invalid memo keys');
+    if (!instruction.data.equals(Buffer.from(memo, 'utf8')))
+        throw new ValidateTransferError('invalid memo');
+}
+function validateSystemTransfer(instruction, message, meta, recipient, references) {
     return __awaiter(this, void 0, void 0, function* () {
+        const accountIndex = message.accountKeys.findIndex((pubkey) => pubkey.equals(recipient));
+        if (accountIndex === -1)
+            throw new ValidateTransferError('recipient not found');
         if (references) {
-            // Check that the first instruction is a system transfer instruction.
-            const transaction = web3_js_1.Transaction.populate(message);
-            const instruction = transaction.instructions[0];
+            // Check that the instruction is a system transfer instruction.
             web3_js_1.SystemInstruction.decodeTransfer(instruction);
@@ -94,5 +107,2 @@ // Check that the expected reference keys exactly match the extra keys provided to the instruction.
         }
-        const accountIndex = message.accountKeys.findIndex((pubkey) => pubkey.equals(recipient));
-        if (accountIndex === -1)
-            throw new ValidateTransferError('recipient not found');
         return [
@@ -104,13 +114,16 @@ new bignumber_js_1.default(meta.preBalances[accountIndex] || 0).div(web3_js_1.LAMPORTS_PER_SOL),
 }
-function validateSPLTokenTransfer(message, meta, recipient, splToken, references) {
+function validateSPLTokenTransfer(instruction, message, meta, recipient, splToken, references) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
+        const recipientATA = yield (0, spl_token_1.getAssociatedTokenAddress)(splToken, recipient);
+        const accountIndex = message.accountKeys.findIndex((pubkey) => pubkey.equals(recipientATA));
+        if (accountIndex === -1)
+            throw new ValidateTransferError('recipient not found');
         if (references) {
             // Check that the first instruction is an SPL token transfer instruction.
-            const transaction = web3_js_1.Transaction.populate(message);
-            const instruction = (0, spl_token_1.decodeInstruction)(transaction.instructions[0]);
-            if (!(0, spl_token_1.isTransferCheckedInstruction)(instruction) && !(0, spl_token_1.isTransferInstruction)(instruction))
+            const decodedInstruction = (0, spl_token_1.decodeInstruction)(instruction);
+            if (!(0, spl_token_1.isTransferCheckedInstruction)(decodedInstruction) && !(0, spl_token_1.isTransferInstruction)(decodedInstruction))
                 throw new ValidateTransferError('invalid transfer');
             // Check that the expected reference keys exactly match the extra keys provided to the instruction.
-            const extraKeys = instruction.keys.multiSigners;
+            const extraKeys = decodedInstruction.keys.multiSigners;
             const length = extraKeys.length;
@@ -124,6 +137,2 @@ if (length !== references.length)
         }
-        const recipientATA = yield (0, spl_token_1.getAssociatedTokenAddress)(splToken, recipient);
-        const accountIndex = message.accountKeys.findIndex((pubkey) => pubkey.equals(recipientATA));
-        if (accountIndex === -1)
-            throw new ValidateTransferError('recipient not found');
         const preBalance = (_a = meta.preTokenBalances) === null || _a === void 0 ? void 0 : _a.find((x) => x.accountIndex === accountIndex);
@@ -130,0 +139,0 @@ const postBalance = (_b = meta.postTokenBalances) === null || _b === void 0 ? void 0 : _b.find((x) => x.accountIndex === accountIndex);

package.json

 {
     "name": "@solana/pay",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "author": "Solana Maintainers <[e-mail]>",
@@ -40,5 +40,5 @@ "repository": "https://github.com/solana-labs/solana-pay",
         "@solana/qr-code-styling": "^1.6.0-beta.0",
-        "@solana/spl-token": "^0.2.0",
+        "@solana/spl-token": "^0.3.4",
         "@solana/web3.js": "^1.36.0",
-        "bignumber.js": "^9.0.2",
+        "bignumber.js": "^9.1.0",
         "cross-fetch": "^3.1.5",
@@ -45,0 +45,0 @@ "js-base64": "^3.7.2",

README.md

@@ -38,2 +38,3 @@ # Solana Pay
 - [Create a transaction request](https://docs.solanapay.com/core/transaction-request/merchant-integration)
+- [Test a transaction request URL](https://glow.app/test/solana-pay)
 
@@ -40,0 +41,0 @@ ### Transfer Requests

src/createTransfer.ts

@@ -119,3 +119,3 @@ import { createTransferCheckedInstruction, getAccount, getAssociatedTokenAddress, getMint } from '@solana/spl-token';
     // Check that the amount provided doesn't have greater precision than SOL
-    if (amount.decimalPlaces() > SOL_DECIMALS) throw new CreateTransferError('amount decimals invalid');
+    if (amount.decimalPlaces() ?? 0 > SOL_DECIMALS) throw new CreateTransferError('amount decimals invalid');
 
@@ -149,3 +149,3 @@ // Convert input decimal amount to integer lamports
     // Check that the amount provided doesn't have greater precision than the mint
-    if (amount.decimalPlaces() > mint.decimals) throw new CreateTransferError('amount decimals invalid');
+    if (amount.decimalPlaces() ?? 0 > mint.decimals) throw new CreateTransferError('amount decimals invalid');
 
@@ -152,0 +152,0 @@ // Convert input decimal amount to integer tokens according to the mint decimals

src/encodeURL.ts

@@ -76,3 +76,3 @@ import { SOLANA_PROTOCOL } from './constants';
     if (amount) {
-        url.searchParams.append('amount', amount.toFixed(amount.decimalPlaces()));
+        url.searchParams.append('amount', amount.toFixed(amount.decimalPlaces() ?? 0));
     }
@@ -79,0 +79,0 @@

src/validateTransfer.ts

@@ -15,2 +15,3 @@ import {
     Transaction,
+    TransactionInstruction,
     TransactionResponse,
@@ -65,3 +66,3 @@ TransactionSignature,
 
-    const message = response.transaction.message;
+    const { message, signatures } = response.transaction;
     const meta = response.meta;
@@ -75,14 +76,26 @@ if (!meta) throw new ValidateTransferError('missing meta');
 
+    // Deserialize the transaction and make a copy of the instructions we're going to mutate it.
+    const transaction = Transaction.populate(message, signatures);
+    const instructions = transaction.instructions.slice();
+
+    // Transfer instruction must be the last instruction
+    const instruction = instructions.pop();
+    if (!instruction) throw new ValidateTransferError('missing transfer instruction');
     const [preAmount, postAmount] = splToken
-        ? await validateSPLTokenTransfer(message, meta, recipient, splToken, reference)
-        : await validateSystemTransfer(message, meta, recipient, reference);
+        ? await validateSPLTokenTransfer(
+              instruction,
+              message,
+              meta,
+              recipient,
+              splToken,
+              reference
+          )
+        : await validateSystemTransfer(instruction, message, meta, recipient, reference);
     if (postAmount.minus(preAmount).lt(amount)) throw new ValidateTransferError('amount not transferred');
 
-    if (memo) {
-        // Check that the second instruction is a memo instruction with the expected memo.
-        const transaction = Transaction.populate(message);
-        const instruction = transaction.instructions[1];
+    if (memo !== undefined) {
+        // Memo instruction must be the second to last instruction
+        const instruction = instructions.pop();
         if (!instruction) throw new ValidateTransferError('missing memo instruction');
-        if (!instruction.programId.equals(MEMO_PROGRAM_ID)) throw new ValidateTransferError('invalid memo program');
-        if (!instruction.data.equals(Buffer.from(memo, 'utf8'))) throw new ValidateTransferError('invalid memo');
+        validateMemo(instruction, memo);
     }
@@ -93,3 +106,11 @@
 
+function validateMemo(instruction: TransactionInstruction, memo: string): void {
+    // Check that the instruction is a memo instruction with no keys and the expected memo data.
+    if (!instruction.programId.equals(MEMO_PROGRAM_ID)) throw new ValidateTransferError('invalid memo program');
+    if (instruction.keys.length) throw new ValidateTransferError('invalid memo keys');
+    if (!instruction.data.equals(Buffer.from(memo, 'utf8'))) throw new ValidateTransferError('invalid memo');
+}
+
 async function validateSystemTransfer(
+    instruction: TransactionInstruction,
     message: Message,
@@ -100,6 +121,7 @@ meta: ConfirmedTransactionMeta,
 ): Promise<[BigNumber, BigNumber]> {
+    const accountIndex = message.accountKeys.findIndex((pubkey) => pubkey.equals(recipient));
+    if (accountIndex === -1) throw new ValidateTransferError('recipient not found');
+
     if (references) {
-        // Check that the first instruction is a system transfer instruction.
-        const transaction = Transaction.populate(message);
-        const instruction = transaction.instructions[0];
+        // Check that the instruction is a system transfer instruction.
         SystemInstruction.decodeTransfer(instruction);
@@ -117,5 +139,2 @@
 
-    const accountIndex = message.accountKeys.findIndex((pubkey) => pubkey.equals(recipient));
-    if (accountIndex === -1) throw new ValidateTransferError('recipient not found');
-
     return [
@@ -128,2 +147,3 @@ new BigNumber(meta.preBalances[accountIndex] || 0).div(LAMPORTS_PER_SOL),
 async function validateSPLTokenTransfer(
+    instruction: TransactionInstruction,
     message: Message,
@@ -135,11 +155,14 @@ meta: ConfirmedTransactionMeta,
 ): Promise<[BigNumber, BigNumber]> {
+    const recipientATA = await getAssociatedTokenAddress(splToken, recipient);
+    const accountIndex = message.accountKeys.findIndex((pubkey) => pubkey.equals(recipientATA));
+    if (accountIndex === -1) throw new ValidateTransferError('recipient not found');
+
     if (references) {
         // Check that the first instruction is an SPL token transfer instruction.
-        const transaction = Transaction.populate(message);
-        const instruction = decodeInstruction(transaction.instructions[0]);
-        if (!isTransferCheckedInstruction(instruction) && !isTransferInstruction(instruction))
+        const decodedInstruction = decodeInstruction(instruction);
+        if (!isTransferCheckedInstruction(decodedInstruction) && !isTransferInstruction(decodedInstruction))
             throw new ValidateTransferError('invalid transfer');
 
         // Check that the expected reference keys exactly match the extra keys provided to the instruction.
-        const extraKeys = instruction.keys.multiSigners;
+        const extraKeys = decodedInstruction.keys.multiSigners;
         const length = extraKeys.length;
@@ -153,6 +176,2 @@ if (length !== references.length) throw new ValidateTransferError('invalid references');
 
-    const recipientATA = await getAssociatedTokenAddress(splToken, recipient);
-    const accountIndex = message.accountKeys.findIndex((pubkey) => pubkey.equals(recipientATA));
-    if (accountIndex === -1) throw new ValidateTransferError('recipient not found');
-
     const preBalance = meta.preTokenBalances?.find((x) => x.accountIndex === accountIndex);
@@ -159,0 +178,0 @@ const postBalance = meta.postTokenBalances?.find((x) => x.accountIndex === accountIndex);

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

157071

increased by1.73%

Lines of code

2204

increased by1.9%

Number of lines in readme file

56

increased by1.82%

Dependency changes

• + Added@solana/codecs@2.0.0-rc.1(transitive)

• + Added@solana/codecs-core@2.0.0-rc.1(transitive)

• + Added@solana/codecs-data-structures@2.0.0-rc.1(transitive)

• + Added@solana/codecs-numbers@2.0.0-rc.1(transitive)

• + Added@solana/codecs-strings@2.0.0-rc.1(transitive)

• + Added@solana/errors@2.0.0-rc.1(transitive)

• + Added@solana/options@2.0.0-rc.1(transitive)

• + Added@solana/spl-token@0.3.11(transitive)

• + Added@solana/spl-token-metadata@0.1.5(transitive)

• + Added@solana/spl-type-length-value@0.1.0(transitive)

• + Addedchalk@5.3.0(transitive)

• + Addedcommander@12.1.0(transitive)

• + Addedfastestsmallesttextencoderdecoder@1.0.22(transitive)

• + Addedtypescript@5.6.2(transitive)

• - Removed@hapi/hoek@9.3.0(transitive)

• - Removed@hapi/topo@5.1.0(transitive)

• - Removed@sideway/address@4.1.5(transitive)

• - Removed@sideway/formula@3.0.1(transitive)

• - Removed@sideway/pinpoint@2.0.0(transitive)

• - Removed@solana/spl-token@0.2.0(transitive)

• - Removedarg@5.0.2(transitive)

• - Removedasynckit@0.4.0(transitive)

• - Removedaxios@0.27.2(transitive)

• - Removedbluebird@3.7.2(transitive)

• - Removedcheck-more-types@2.24.0(transitive)

• - Removedcombined-stream@1.0.8(transitive)

• - Removedcross-spawn@7.0.3(transitive)

• - Removeddebug@4.3.4(transitive)

• - Removeddelayed-stream@1.0.0(transitive)

• - Removedexeca@5.1.1(transitive)

• - Removedfollow-redirects@1.15.9(transitive)

• - Removedform-data@4.0.0(transitive)

• - Removedget-stream@6.0.1(transitive)

• - Removedhuman-signals@2.1.0(transitive)

• - Removedis-stream@2.0.1(transitive)

• - Removedisexe@2.0.0(transitive)

• - Removedjoi@17.13.3(transitive)

• - Removedlazy-ass@1.6.0(transitive)

• - Removedlodash@4.17.21(transitive)

• - Removedmerge-stream@2.0.0(transitive)

• - Removedmime-db@1.52.0(transitive)

• - Removedmime-types@2.1.35(transitive)

• - Removedmimic-fn@2.1.0(transitive)

• - Removedminimist@1.2.8(transitive)

• - Removedms@2.1.2(transitive)

• - Removednpm-run-path@4.0.1(transitive)

• - Removedonetime@5.1.2(transitive)

• - Removedpath-key@3.1.1(transitive)

• - Removedps-tree@1.2.0(transitive)

• - Removedrxjs@7.8.1(transitive)

• - Removedshebang-command@2.0.0(transitive)

• - Removedshebang-regex@3.0.0(transitive)

• - Removedsignal-exit@3.0.7(transitive)

• - Removedstart-server-and-test@1.15.5(transitive)

• - Removedstrip-final-newline@2.0.0(transitive)

• - Removedwait-on@7.0.1(transitive)

• - Removedwhich@2.0.2(transitive)

• Updated@solana/spl-token@^0.3.4

• Updatedbignumber.js@^9.1.0