@triadxyz/triad-protocol 3.1.5-beta → 3.1.7-beta

package/dist/utils/merkle.js

@@ -0,0 +1,112 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createClaimData = exports.generateMerkleTree = exports.MerkleTree = void 0;
+const sha3_1 = require("@noble/hashes/sha3");
+const web3_js_1 = require("@solana/web3.js");
+class MerkleTree {
+    constructor(claimData) {
+        this.claimData = claimData;
+        this.leaves = this.generateLeaves(claimData);
+        this.tree = this.buildTree(this.leaves);
+    }
+    generateLeaves(claimData) {
+        return claimData.map((data) => {
+            const userBytes = data.user.toBytes();
+            const amountBytes = Buffer.alloc(8);
+            const amountLamports = BigInt(Math.floor(data.amount * Math.pow(10, 6)));
+            amountBytes.writeBigUInt64LE(amountLamports, 0);
+            const leafData = Buffer.concat([userBytes, amountBytes]);
+            return Buffer.from((0, sha3_1.keccak_256)(leafData));
+        });
+    }
+    buildTree(leaves) {
+        if (leaves.length === 0) {
+            throw new Error('Cannot build tree with no leaves');
+        }
+        let currentLevel = [...leaves];
+        const tree = [currentLevel];
+        while (currentLevel.length > 1) {
+            const nextLevel = [];
+            for (let i = 0; i < currentLevel.length; i += 2) {
+                const left = currentLevel[i];
+                const right = i + 1 < currentLevel.length ? currentLevel[i + 1] : left;
+                const combined = left.compare(right) <= 0
+                    ? Buffer.concat([left, right])
+                    : Buffer.concat([right, left]);
+                nextLevel.push(Buffer.from((0, sha3_1.keccak_256)(combined)));
+            }
+            currentLevel = nextLevel;
+            tree.push(currentLevel);
+        }
+        return tree;
+    }
+    getRoot() {
+        if (this.tree.length === 0) {
+            throw new Error('Tree not built');
+        }
+        const root = this.tree[this.tree.length - 1][0];
+        return Array.from(root);
+    }
+    getProof(userPubkey, amount) {
+        const targetLeaf = this.generateLeaves([{ user: userPubkey, amount }])[0];
+        const leafIndex = this.leaves.findIndex((leaf) => leaf.equals(targetLeaf));
+        if (leafIndex === -1) {
+            throw new Error('User not found in merkle tree');
+        }
+        const proof = [];
+        let currentIndex = leafIndex;
+        for (let level = 0; level < this.tree.length - 1; level++) {
+            const isRightNode = currentIndex % 2 === 1;
+            const siblingIndex = isRightNode ? currentIndex - 1 : currentIndex + 1;
+            if (siblingIndex < this.tree[level].length) {
+                proof.push(this.tree[level][siblingIndex]);
+            }
+            currentIndex = Math.floor(currentIndex / 2);
+        }
+        return proof.map((hash) => Array.from(hash));
+    }
+    getAllProofs() {
+        return this.claimData.map((data) => ({
+            user: data.user,
+            amount: data.amount,
+            proof: this.getProof(data.user, data.amount)
+        }));
+    }
+    verifyProof(userPubkey, amount, proof) {
+        const leafData = Buffer.concat([
+            userPubkey.toBytes(),
+            (() => {
+                const amountBytes = Buffer.alloc(8);
+                const amountLamports = BigInt(Math.floor(amount * Math.pow(10, 6)));
+                amountBytes.writeBigUInt64LE(amountLamports, 0);
+                return amountBytes;
+            })()
+        ]);
+        let currentHash = Buffer.from((0, sha3_1.keccak_256)(leafData));
+        for (const proofElement of proof) {
+            const proofBuffer = Buffer.from(proofElement);
+            const combined = currentHash.compare(proofBuffer) <= 0
+                ? Buffer.concat([currentHash, proofBuffer])
+                : Buffer.concat([proofBuffer, currentHash]);
+            currentHash = Buffer.from((0, sha3_1.keccak_256)(combined));
+        }
+        const root = Buffer.from(this.getRoot());
+        return currentHash.equals(root);
+    }
+}
+exports.MerkleTree = MerkleTree;
+function generateMerkleTree(claimData) {
+    const tree = new MerkleTree(claimData);
+    return {
+        merkleRoot: tree.getRoot(),
+        proofs: tree.getAllProofs()
+    };
+}
+exports.generateMerkleTree = generateMerkleTree;
+function createClaimData(data) {
+    return data.map((item) => ({
+        user: new web3_js_1.PublicKey(item.user),
+        amount: item.amount
+    }));
+}
+exports.createClaimData = createClaimData;

package/dist/utils/sendVersionedTransaction.d.ts

@@ -1,6 +1,6 @@
-import { TransactionInstruction, AddressLookupTableAccount } from '@solana/web3.js';
+import { TransactionInstruction, VersionedTransaction, AddressLookupTableAccount } from '@solana/web3.js';
 import { Program } from '@coral-xyz/anchor';
 import { RpcOptions } from '../types';
 import { TriadProtocol } from '../types/triad_protocol';
-declare const sendVersionedTransaction: (program: Program<TriadProtocol>, ixs: TransactionInstruction[], options?: RpcOptions, addressLookupTableAccounts?: AddressLookupTableAccount[]) => Promise<string>;
+declare const sendVersionedTransaction: (program: Program<TriadProtocol>, ixs: TransactionInstruction[], options?: RpcOptions, addressLookupTableAccounts?: AddressLookupTableAccount[]) => Promise<VersionedTransaction | string>;
 export default sendVersionedTransaction;

package/dist/utils/sendVersionedTransaction.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const web3_js_1 = require("@solana/web3.js");
 const getPriorityFee_1 = __importDefault(require("./getPriorityFee"));
 const sendVersionedTransaction = (program, ixs, options, addressLookupTableAccounts) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     if (options === null || options === void 0 ? void 0 : options.microLamports) {
         ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
             microLamports: options.microLamports
@@ -27,6 +28,13 @@ const sendVersionedTransaction = (program, ixs, options, addressLookupTableAccou
         }));
     }
     const { blockhash } = yield program.provider.connection.getLatestBlockhash();
+    if (program.provider.publicKey.toBase58() !== ((_a = options === null || options === void 0 ? void 0 : options.payer) === null || _a === void 0 ? void 0 : _a.toBase58())) {
+        return new web3_js_1.VersionedTransaction(new web3_js_1.TransactionMessage({
+            instructions: ixs,
+            recentBlockhash: blockhash,
+            payerKey: options === null || options === void 0 ? void 0 : options.payer
+        }).compileToV0Message(addressLookupTableAccounts));
+    }
     return program.provider.sendAndConfirm(new web3_js_1.VersionedTransaction(new web3_js_1.TransactionMessage({
         instructions: ixs,
         recentBlockhash: blockhash,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "3.1.5-beta",
+  "version": "3.1.7-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",