Merge branch 'main' into feature/reclaim_rent

src/tools/create_3land_collectible.ts

@@ -0,0 +1,69 @@
+import { createCollectionImp, createSingleImp } from "@3land/listings-sdk";
+import {
+  StoreInitOptions,
+  CreateCollectionOptions,
+  CreateSingleOptions,
+} from "@3land/listings-sdk/dist/types/implementation/implementationTypes";
+
+/**
+ * Create a collection on 3Land
+ * @param optionsWithBase58 represents the privateKey of the wallet - can be an array of numbers, Uint8Array or base58 string
+ * @param collectionOpts represents the options for the collection creation
+ * @returns
+ */
+export async function createCollection(
+  optionsWithBase58: StoreInitOptions,
+  collectionOpts: CreateCollectionOptions,
+) {
+  try {
+    const collection = await createCollectionImp(
+      optionsWithBase58,
+      collectionOpts,
+    );
+    return collection;
+  } catch (error: any) {
+    throw new Error(`Collection creation failed: ${error.message}`);
+  }
+}
+
+/**
+ * Create a single edition on 3Land
+ * @param optionsWithBase58 represents the privateKey of the wallet - can be an array of numbers, Uint8Array or base58 string
+ * @param collectionAccount represents the account for the nft collection
+ * @param createItemOptions the options for the creation of the single NFT listing
+ * @returns
+ */
+export async function createSingle(
+  optionsWithBase58: StoreInitOptions,
+  collectionAccount: string,
+  createItemOptions: CreateSingleOptions,
+  isMainnet: boolean,
+) {
+  try {
+    const landStore = isMainnet
+      ? "AmQNs2kgw4LvS9sm6yE9JJ4Hs3JpVu65eyx9pxMG2xA"
+      : "GyPCu89S63P9NcCQAtuSJesiefhhgpGWrNVJs4bF2cSK";
+
+    const singleEditionTx = await createSingleImp(
+      optionsWithBase58,
+      landStore,
+      collectionAccount,
+      createItemOptions,
+    );
+    return singleEditionTx;
+  } catch (error: any) {
+    throw new Error(`Single edition creation failed: ${error.message}`);
+  }
+}
+
+/**
+ * Buy a single edition on 3Land
+ * @param
+ * @returns
+ */
+// export async function buySingle() {
+//   try {
+//   } catch (error: any) {
+//     throw new Error(`Buying single edition failed: ${error.message}`);
+//   }
+// }

src/tools/flash_close_trade.ts

@@ -1,5 +1,5 @@
 import { ComputeBudgetProgram } from "@solana/web3.js";
-import { PoolConfig, Privilege, Side } from "flash-sdk";
+import { PoolConfig, Side } from "flash-sdk";
 import { BN } from "@coral-xyz/anchor";
 import { SolanaAgentKit } from "../index";
 import {
@@ -9,6 +9,7 @@ import {
   getNftTradingAccountInfo,
   fetchOraclePrice,
   createPerpClient,
+  get_flash_privilege,
 } from "../utils/flashUtils";
 import { FlashCloseTradeParams } from "../types";
 
@@ -93,7 +94,7 @@ export async function flashCloseTrade(
       priceWithSlippage,
       sideEnum,
       poolConfig,
-      Privilege.Referral,
+      get_flash_privilege(agent),
       tradingAccounts.nftTradingAccountPk,
       tradingAccounts.nftReferralAccountPK,
       tradingAccounts.nftOwnerRebateTokenAccountPk,

src/tools/flash_open_trade.ts

@@ -3,7 +3,6 @@ import {
   PerpetualsClient,
   OraclePrice,
   PoolConfig,
-  Privilege,
   Side,
   CustodyAccount,
   Custody,
@@ -18,6 +17,7 @@ import {
   OPEN_POSITION_CU,
   fetchOraclePrice,
   createPerpClient,
+  get_flash_privilege,
 } from "../utils/flashUtils";
 import { FlashTradeParams } from "../types";
 
@@ -141,7 +141,7 @@ export async function flashOpenTrade(
       positionSize,
       side === "long" ? Side.Long : Side.Short,
       poolConfig,
-      Privilege.Referral,
+      get_flash_privilege(agent),
       tradingAccounts.nftTradingAccountPk,
       tradingAccounts.nftReferralAccountPK,
       tradingAccounts.nftOwnerRebateTokenAccountPk!,

src/tools/index.ts

@@ -48,3 +48,5 @@ export * from "./trade";
 export * from "./transfer";
 export * from "./flash_open_trade";
 export * from "./flash_close_trade";
+
+export * from "./create_3land_collectible";