Merge pull request #144 from staratlasmeta/v0.6.0

V0.6.0

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [ 16.11.1 ]
+        node-version: [ 16.17.1 ]
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/docs.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.11.1]
+        node-version: [16.17.1]
     steps:
       - uses: oleksiyrudenko/gha-git-credentials@v2-latest
         with:

.nvmrc

@@ -1 +1 @@
-16.15.0
+16.17.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@staratlas/factory",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "description": "Star Atlas Factory for constructing Transactions targeting Solana on-chain programs",
   "repository": {
     "type": "git",
@@ -20,6 +20,7 @@
     "clean": "rm -rf dist",
     "prepare": "npm run build",
     "lint": "eslint src --max-warnings=0",
+    "lint:fix": "npm run lint -- --fix",
     "test": "jest --detectOpenHandles --no-cache --silent",
     "start": "tsc --watch",
     "docs": "npx typedoc --out docs src",

src/atlas-staking/instruction_builders/stakeTokens.ts

@@ -10,7 +10,7 @@ export interface StakeTokensParams extends BaseStakingParams {
   stakeMint: web3.PublicKey;
   registeredStake: web3.PublicKey;
   stakingAccount: web3.PublicKey;
-  stakeQuantity: number;
+  stakeQuantity: BN;
 }
 
 /**
@@ -47,7 +47,7 @@ export async function stakeTokensInstruction({
   };
 
   const ix = await program.methods
-    .stakeTokens(new BN(stakeQuantity))
+    .stakeTokens(stakeQuantity)
     .accounts({
       user,
       stakeMint,

src/marketplace/instruction_builders/exchangeOrder.ts

@@ -23,6 +23,7 @@ export interface ExchangeOrderParams extends BaseParams {
   stakingProgramId: web3.PublicKey;
   registeredStake: web3.PublicKey;
   stakingAccount: web3.PublicKey;
+  extraAccounts?: web3.AccountMeta[];
 }
 
 /**
@@ -43,6 +44,7 @@ export interface ExchangeOrderParams extends BaseParams {
  * @param stakingProgramId - Deployed program ID for the Staking program
  * @param registeredStake - ATLAS staking `RegisteredStake` account
  * @param stakingAccount - Seller's ATLAS staking account
+ * @param extraAccounts - Extra accounts, used for buddy link
  */
 export async function createExchangeInstruction({
   connection,
@@ -60,6 +62,7 @@ export async function createExchangeInstruction({
   stakingProgramId,
   registeredStake,
   stakingAccount,
+  extraAccounts = [],
 }: ExchangeOrderParams): Promise<FactoryReturn> {
   const program = getMarketplaceProgram({ connection, programId });
   const ixSet: FactoryReturn = {
@@ -175,6 +178,7 @@ export async function createExchangeInstruction({
       stakingAccount,
       feeReduction,
     })
+    .remainingAccounts(extraAccounts)
     .instruction();
 
   ixSet.instructions.push(exchangeIx);

src/marketplace/pda_getters/pda_getters.ts

@@ -1,6 +1,6 @@
 import { AnchorProvider, Idl, Program, web3 } from '@project-serum/anchor';
 import { PublicKey } from '@solana/web3.js';
-import { RegisteredCurrencyItem } from '../types';
+import { FeeExemptItem, RegisteredCurrencyItem } from '../types';
 import * as Seeds from './seeds';
 import { getGmIDL } from './../utils/getMarketplaceProgram';
 
@@ -117,3 +117,15 @@ export async function getFeeExemptAccount(
     programId
   );
 }
+
+export async function getAllFeeExemptAccounts(
+  connection: web3.Connection,
+  programId: web3.PublicKey
+): Promise<FeeExemptItem[]> {
+  const provider = new AnchorProvider(connection, null, null);
+  const idl = getGmIDL(programId);
+  const program = new Program(idl as Idl, programId, provider);
+  const feeExemptAccounts = await program.account.feeReduction.all();
+
+  return feeExemptAccounts as FeeExemptItem[];
+}

src/marketplace/services/GmClientService.ts

@@ -16,13 +16,14 @@ import {
   getOpenOrdersForPlayerAndAsset,
   getOpenOrdersForPlayerAndCurrency,
   getAllRegisteredCurrencies,
+  getAllFeeExemptAccounts,
 } from '../pda_getters';
-import { OrderAccountItem } from '../types';
+import { GmFeeExemption, OrderAccountItem } from '../types';
 import { createTransactionFromInstructions } from './helpers';
 import { getAssociatedTokenAddress } from '../../util';
 import { Order, OrderSide } from '../models/Order';
 import { GmRegisteredCurrency } from '../types';
-import { ONE_MILLION } from './constants';
+import { ONE_MILLION, TEN_THOUSAND } from './constants';
 import { convertDecimalPriceToBn } from '../utils';
 import { getStakingAccount } from '../../atlas-staking';
 
@@ -303,7 +304,8 @@ export class GmClientService {
     /** Default to sell order values */
     let orderMethod:
       | typeof createInitializeBuyOrderInstruction
-      | typeof createInitializeSellOrderInstruction = createInitializeSellOrderInstruction;
+      | typeof createInitializeSellOrderInstruction =
+      createInitializeSellOrderInstruction;
     let depositMint: PublicKey = itemMint;
     let receiveMint: PublicKey = quoteMint;
 
@@ -514,4 +516,26 @@ export class GmClientService {
       });
     });
   }
+
+  async getAllFeeExemptions(
+    connection: Connection,
+    programId: PublicKey
+  ): Promise<GmFeeExemption[]> {
+    const result: GmFeeExemption[] = [];
+
+    const feeExemptAccounts = await getAllFeeExemptAccounts(
+      connection,
+      programId
+    );
+
+    for (const feeExemptAccount of feeExemptAccounts) {
+      result.push({
+        publicKey: feeExemptAccount.account.account.toString(),
+        feeReductionPercentageAsDecimal:
+          feeExemptAccount.account.discount.toNumber() / TEN_THOUSAND,
+      });
+    }
+
+    return result;
+  }
 }

src/marketplace/services/constants.ts

@@ -1 +1,2 @@
 export const ONE_MILLION = 1000000;
+export const TEN_THOUSAND = 10000;

src/marketplace/types/marketplace_accounts.ts

@@ -35,6 +35,11 @@ export type RoyaltyTier = {
 
 export type RoyaltyTiers = [RoyaltyTier];
 
+export interface FeeExemptItem {
+  publicKey: web3.PublicKey;
+  account: FeeExemptInfo;
+}
+
 export enum GmLogs {
   CancelOrderMemo = 'CancelOrderMemo',
   ExchangeMemo = 'ExchangeMemo',

src/marketplace/types/services.ts

@@ -47,3 +47,8 @@ export type GmCurrencyLogEvent = {
   royalty: BN;
   timestamp: BN;
 };
+
+export type GmFeeExemption = {
+  publicKey: string;
+  feeReductionPercentageAsDecimal: number;
+};