lint

packages/common/package.json

@@ -20,6 +20,7 @@
     "build": "rm -rf dist; tsc -p tsconfig.json",
     "pack": "npm pack",
     "lint": "eslint --fix .",
+    "lint-config": "eslint --print-config",
     "prepublishOnly": "npm run lint && npm run build"
   },
   "gitHead": "a37306eba0e762af096db642fa22f07194014cfd",

packages/common/solana/instructions.ts

@@ -1,16 +1,16 @@
-import { Connection, PublicKey, SystemProgram, TransactionInstruction } from "@solana/web3.js";
-import BN from "bn.js";
 import {
+  NATIVE_MINT,
   createAssociatedTokenAccountInstruction,
   createSyncNativeInstruction,
   getAssociatedTokenAddress,
-  NATIVE_MINT,
 } from "@solana/spl-token";
+import { Connection, PublicKey, SystemProgram, TransactionInstruction } from "@solana/web3.js";
+import BN from "bn.js";
 
 export const prepareWrappedAccount = async (
   connection: Connection,
   senderAddress: PublicKey,
-  amount: BN
+  amount: BN,
 ): Promise<TransactionInstruction[]> => {
   const tokenAccount = await getAssociatedTokenAddress(NATIVE_MINT, senderAddress, true);
 

packages/common/solana/types.ts

@@ -1,5 +1,5 @@
 import { SignerWalletAdapter } from "@solana/wallet-adapter-base";
-import { AccountInfo, PublicKey, Keypair, TransactionSignature, TransactionInstruction } from "@solana/web3.js";
+import { AccountInfo, Keypair, PublicKey, TransactionInstruction, TransactionSignature } from "@solana/web3.js";
 
 export { WalletAdapterNetwork as Cluster } from "@solana/wallet-adapter-base";
 

packages/common/solana/utils.ts

@@ -26,7 +26,7 @@ export async function getProgramAccounts(
   connection: Connection,
   wallet: PublicKey,
   offset: number,
-  programId: PublicKey
+  programId: PublicKey,
 ): Promise<Account[]> {
   return connection?.getProgramAccounts(programId, {
     filters: [
@@ -85,7 +85,7 @@ export async function signAndExecuteTransaction(
   connection: Connection,
   invoker: Keypair | SignerWalletAdapter,
   tx: Transaction,
-  hash: BlockhashWithExpiryBlockHeight
+  hash: BlockhashWithExpiryBlockHeight,
 ): Promise<string> {
   const signedTx = await signTransaction(invoker, tx);
   const rawTx = signedTx.serialize();
@@ -123,7 +123,7 @@ export async function ataBatchExist(connection: Connection, paramsBatch: AtaPara
     paramsBatch.map(async ({ mint, owner }) => {
       const pubkey = await ata(mint, owner);
       return pubkey;
-    })
+    }),
   );
   const response = await connection.getMultipleAccountsInfo(tokenAccounts);
   return response.map((accInfo) => !!accInfo);
@@ -139,15 +139,15 @@ export async function ataBatchExist(connection: Connection, paramsBatch: AtaPara
 export async function generateCreateAtaBatchTx(
   connection: Connection,
   payer: PublicKey,
-  paramsBatch: AtaParams[]
+  paramsBatch: AtaParams[],
 ): Promise<{
   tx: Transaction;
   hash: BlockhashWithExpiryBlockHeight;
 }> {
   const ixs: TransactionInstruction[] = await Promise.all(
     paramsBatch.map(async ({ mint, owner }) => {
       return createAssociatedTokenAccountInstruction(payer, await ata(mint, owner), owner, mint);
-    })
+    }),
   );
   const hash = await connection.getLatestBlockhash();
   const tx = new Transaction({
@@ -168,7 +168,7 @@ export async function generateCreateAtaBatchTx(
 export async function createAtaBatch(
   connection: Connection,
   invoker: Keypair | SignerWalletAdapter,
-  paramsBatch: AtaParams[]
+  paramsBatch: AtaParams[],
 ): Promise<string> {
   const { tx, hash } = await generateCreateAtaBatchTx(connection, invoker.publicKey!, paramsBatch);
   const signature = await signAndExecuteTransaction(connection, invoker, tx, hash);
@@ -187,7 +187,7 @@ export async function checkOrCreateAtaBatch(
   connection: Connection,
   owners: PublicKey[],
   mint: PublicKey,
-  invoker: SignerWalletAdapter | Keypair
+  invoker: SignerWalletAdapter | Keypair,
 ): Promise<TransactionInstruction[]> {
   const ixs: TransactionInstruction[] = [];
   // TODO: optimize fetching and maps/arrays

packages/common/utils.ts

@@ -36,7 +36,7 @@ export const getNumberFromBN = (value: BN, decimals: number): number =>
  */
 export async function handleContractError<T>(
   func: () => Promise<T>,
-  callback?: (err: Error) => string | null
+  callback?: (err: Error) => string | null,
 ): Promise<T> {
   try {
     return await func();

packages/distributor/solana/client.ts

@@ -69,7 +69,7 @@ export default class SolanaDistributorClient {
 
   public async create(
     data: ICreateDistributorData,
-    { invoker, isNative = false }: ICreateSolanaExt
+    { invoker, isNative = false }: ICreateSolanaExt,
   ): Promise<ICreateDistributorResult> {
     if (!invoker.publicKey) {
       throw new Error("Invoker's PublicKey is not available, check passed wallet adapter!");
@@ -116,8 +116,8 @@ export default class SolanaDistributorClient {
         tokenVault,
         invoker.publicKey,
         BigInt(data.maxTotalClaim.toString()),
-        mintAccount.decimals
-      )
+        mintAccount.decimals,
+      ),
     );
 
     const commitment = typeof this.commitment == "string" ? this.commitment : this.commitment.commitment;

packages/distributor/solana/generated/accounts/ClaimStatus.ts

@@ -104,7 +104,7 @@ export class ClaimStatus {
   static async fetch(
     c: Connection,
     address: PublicKey,
-    programId: PublicKey = PROGRAM_ID
+    programId: PublicKey = PROGRAM_ID,
   ): Promise<ClaimStatus | null> {
     const info = await c.getAccountInfo(address);
 
@@ -121,7 +121,7 @@ export class ClaimStatus {
   static async fetchMultiple(
     c: Connection,
     addresses: PublicKey[],
-    programId: PublicKey = PROGRAM_ID
+    programId: PublicKey = PROGRAM_ID,
   ): Promise<Array<ClaimStatus | null>> {
     const infos = await c.getMultipleAccountsInfo(addresses);
 

packages/distributor/solana/generated/accounts/MerkleDistributor.ts

@@ -203,7 +203,7 @@ export class MerkleDistributor {
   static async fetch(
     c: Connection,
     address: PublicKey,
-    programId: PublicKey = PROGRAM_ID
+    programId: PublicKey = PROGRAM_ID,
   ): Promise<MerkleDistributor | null> {
     const info = await c.getAccountInfo(address);
 
@@ -220,7 +220,7 @@ export class MerkleDistributor {
   static async fetchMultiple(
     c: Connection,
     addresses: PublicKey[],
-    programId: PublicKey = PROGRAM_ID
+    programId: PublicKey = PROGRAM_ID,
   ): Promise<Array<MerkleDistributor | null>> {
     const infos = await c.getMultipleAccountsInfo(addresses);
 

packages/distributor/solana/generated/errors/index.ts

@@ -16,7 +16,7 @@ const errorRe = /Program (\w+) failed: custom program error: (\w+)/;
 
 export function fromTxError(
   err: unknown,
-  programId: PublicKey = PROGRAM_ID
+  programId: PublicKey = PROGRAM_ID,
 ): custom.CustomError | anchor.AnchorError | null {
   if (typeof err !== "object" || err === null || !hasOwnProperty(err, "logs") || !Array.isArray(err.logs)) {
     return null;

packages/distributor/solana/generated/instructions/newClaim.ts

@@ -38,7 +38,7 @@ export const layout = borsh.struct([
 export function newClaim(
   args: NewClaimArgs,
   accounts: NewClaimAccounts,
-  programId: PublicKey = PROGRAM_ID
+  programId: PublicKey = PROGRAM_ID,
 ): TransactionInstruction {
   const keys: Array<AccountMeta> = [
     { pubkey: accounts.distributor, isSigner: false, isWritable: true },
@@ -58,7 +58,7 @@ export function newClaim(
       amountLocked: args.amountLocked,
       proof: args.proof,
     },
-    buffer
+    buffer,
   );
   const data = Buffer.concat([identifier, buffer]).slice(0, 8 + len);
   const ix = new TransactionInstruction({ keys, programId, data });

packages/distributor/solana/generated/instructions/newDistributor.ts

@@ -73,7 +73,7 @@ export const layout = borsh.struct([
 export function newDistributor(
   args: NewDistributorArgs,
   accounts: NewDistributorAccounts,
-  programId: PublicKey = PROGRAM_ID
+  programId: PublicKey = PROGRAM_ID,
 ): TransactionInstruction {
   const keys: Array<AccountMeta> = [
     { pubkey: accounts.distributor, isSigner: false, isWritable: true },
@@ -103,7 +103,7 @@ export function newDistributor(
       clawbackStartTs: args.clawbackStartTs,
       claimsClosable: args.claimsClosable,
     },
-    buffer
+    buffer,
   );
   const data = Buffer.concat([identifier, buffer]).slice(0, 8 + len);
   const ix = new TransactionInstruction({ keys, programId, data });

packages/distributor/solana/generated/instructions/setClawbackReceiver.ts

@@ -13,7 +13,7 @@ export interface SetClawbackReceiverAccounts {
 
 export function setClawbackReceiver(
   accounts: SetClawbackReceiverAccounts,
-  programId: PublicKey = PROGRAM_ID
+  programId: PublicKey = PROGRAM_ID,
 ): TransactionInstruction {
   const keys: Array<AccountMeta> = [
     { pubkey: accounts.distributor, isSigner: false, isWritable: true },

packages/distributor/solana/utils.ts

@@ -29,7 +29,7 @@ export async function wrappedSignAndExecuteTransaction(
   connection: Connection,
   invoker: Keypair | SignerWalletAdapter,
   tx: Transaction,
-  hash: BlockhashWithExpiryBlockHeight
+  hash: BlockhashWithExpiryBlockHeight,
 ): Promise<string> {
   try {
     const signature = await signAndExecuteTransaction(connection, invoker, tx, hash);

packages/eslint-config/index.js

@@ -23,11 +23,15 @@ module.exports = {
     "prettier/prettier": [
       "error",
       {
+        parser: "typescript",
         endOfLine: "auto",
         printWidth: 120,
         tabWidth: 2,
         arrowParens: "always",
         bracketSpacing: true,
+        importOrder: ["<THIRD_PARTY_MODULES>", "^[./]"],
+        importOrderSeparation: true,
+        importOrderSortSpecifiers: true,
       },
     ],
     "react/jsx-filename-extension": "off",

packages/eslint-config/package.json

@@ -4,11 +4,12 @@
   "license": "ISC",
   "main": "index.js",
   "devDependencies": {
-    "eslint": "8.29.0",
-    "eslint-config-airbnb-typescript": "17.0.0",
-    "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-jest": "27.1.6",
-    "eslint-plugin-prettier": "4.2.1",
-    "prettier": "2.8.1"
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "eslint": "^8.56.0",
+    "eslint-config-airbnb-typescript": "^17.1.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-jest": "^27.9.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "prettier": "^3.2.5"
   }
 }

packages/stream/__tests__/aptos/streamClient.spec.ts

@@ -68,7 +68,7 @@ describe("AptosStreamClient", () => {
           ...mockData,
           ...mockRecipient,
         },
-        { senderWallet: mockWallet }
+        { senderWallet: mockWallet },
       );
 
       // Assert

packages/stream/aptos/StreamClient.ts

@@ -59,7 +59,7 @@ export default class AptosStreamClient extends BaseStreamClient {
         ...streamData,
         recipients: [{ ...streamData }],
       },
-      wallet
+      wallet,
     )[0];
 
     const hash = await wallet.signAndSubmitTransaction(payload);
@@ -72,7 +72,7 @@ export default class AptosStreamClient extends BaseStreamClient {
    */
   public async createMultiple(
     multipleStreamData: ICreateMultipleStreamData,
-    { senderWallet }: ICreateStreamAptosExt
+    { senderWallet }: ICreateStreamAptosExt,
   ): Promise<IMultiTransactionResult> {
     const wallet = new AptosWalletWrapper(senderWallet, this.client);
 
@@ -113,7 +113,7 @@ export default class AptosStreamClient extends BaseStreamClient {
    */
   public async withdraw(
     withdrawData: IWithdrawData,
-    { senderWallet, tokenId }: ITransactionAptosExt
+    { senderWallet, tokenId }: ITransactionAptosExt,
   ): Promise<ITransactionResult> {
     const payload = {
       type: "withdraw",
@@ -133,7 +133,7 @@ export default class AptosStreamClient extends BaseStreamClient {
    */
   public async cancel(
     cancelData: ICancelData,
-    { senderWallet, tokenId }: ITransactionAptosExt
+    { senderWallet, tokenId }: ITransactionAptosExt,
   ): Promise<ITransactionResult> {
     const payload = {
       type: "cancel",
@@ -153,7 +153,7 @@ export default class AptosStreamClient extends BaseStreamClient {
    */
   public async transfer(
     transferData: ITransferData,
-    { senderWallet, tokenId }: ITransactionAptosExt
+    { senderWallet, tokenId }: ITransactionAptosExt,
   ): Promise<ITransactionResult> {
     const payload = {
       type: "transfer",
@@ -173,7 +173,7 @@ export default class AptosStreamClient extends BaseStreamClient {
    */
   public async topup(
     topupData: ITopUpData,
-    { senderWallet, tokenId }: ITransactionAptosExt
+    { senderWallet, tokenId }: ITransactionAptosExt,
   ): Promise<ITransactionResult> {
     const payload = {
       type: "topup",
@@ -217,7 +217,7 @@ export default class AptosStreamClient extends BaseStreamClient {
    */
   public async update(
     updateData: IUpdateData,
-    { senderWallet, tokenId }: ITransactionAptosExt
+    { senderWallet, tokenId }: ITransactionAptosExt,
   ): Promise<ITransactionResult> {
     const wallet = new AptosWalletWrapper(senderWallet, this.client);
 
@@ -275,7 +275,7 @@ export default class AptosStreamClient extends BaseStreamClient {
   // Utility function to prepare transaction payloads for multiple recipients.
   private generateMultiPayloads(
     multipleStreamData: ICreateMultipleStreamData,
-    wallet: AptosWalletWrapper<any>
+    wallet: AptosWalletWrapper<any>,
   ): [string, Types.TransactionPayload_EntryFunctionPayload][] {
     return multipleStreamData.recipients.map((recipient) => {
       const acc = new AptosAccount(); // Generate random address as seeds for deriving "escrow" account

packages/stream/common/BaseStreamClient.ts

@@ -21,7 +21,7 @@ export abstract class BaseStreamClient {
 
   abstract createMultiple(
     multipleStreamData: ICreateMultipleStreamData,
-    chainSpecificParams: any
+    chainSpecificParams: any,
   ): Promise<IMultiTransactionResult>;
 
   abstract withdraw(withdrawData: IWithdrawData, chainSpecificParams: any): Promise<ITransactionResult>;