Bump versions

solana-nft-programs · Feb 4, 2022 · 29ce12d · 29ce12d
1 parent bbe0bda
commit 29ce12d
Show file tree

Hide file tree

Showing 14 changed files with 78 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cardinal/token-manager",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Cardinal token manager SDK",
   "keywords": [
     "solana",

diff --git a/programs/cardinal-paid-claim-approver/Cargo.toml b/programs/cardinal-paid-claim-approver/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cardinal-paid-claim-approver"
-version = "0.0.5"
+version = "0.0.6"
 description = "Cardinal paid claim approver"
 edition = "2021"
 homepage = "https://cardinal.so"
@@ -25,8 +25,8 @@ anchor-spl = "0.20.1"
 spl-associated-token-account = "1.0.2"
 spl-token = { version = "3.1.1", features = ["no-entrypoint"] }
 solana-program = "1.8.1"
-cardinal-token-manager = { version = "^0.0.5", path = "../cardinal-token-manager", features = ["cpi"] }
-cardinal-payment-manager = { version = "^0.0.5", path = "../cardinal-payment-manager", features = ["cpi"] }
+cardinal-token-manager = { version = "^0.0.6", path = "../cardinal-token-manager", features = ["cpi"] }
+cardinal-payment-manager = { version = "^0.0.6", path = "../cardinal-payment-manager", features = ["cpi"] }
 
 [dev-dependencies]
 proptest = { version = "1.0" }
diff --git a/programs/cardinal-payment-manager/Cargo.toml b/programs/cardinal-payment-manager/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cardinal-payment-manager"
-version = "0.0.5"
+version = "0.0.6"
 description = "Cardinal paid claim approver"
 edition = "2021"
 homepage = "https://cardinal.so"
@@ -25,7 +25,7 @@ anchor-spl = "0.20.1"
 spl-associated-token-account = "1.0.2"
 spl-token = { version = "3.1.1", features = ["no-entrypoint"] }
 solana-program = "1.8.1"
-cardinal-token-manager = { version = "^0.0.5", path = "../cardinal-token-manager", features = ["cpi"] }
+cardinal-token-manager = { version = "^0.0.6", path = "../cardinal-token-manager", features = ["cpi"] }
 
 [dev-dependencies]
 proptest = { version = "1.0" }
diff --git a/programs/cardinal-rent-receipt/Cargo.toml b/programs/cardinal-rent-receipt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cardinal-rent-receipt"
-version = "0.0.5"
+version = "0.0.6"
 description = "Cardinal paid claim approver"
 edition = "2021"
 homepage = "https://cardinal.so"
@@ -25,7 +25,7 @@ anchor-spl = "0.20.1"
 spl-associated-token-account = "1.0.2"
 spl-token = { version = "3.1.1", features = ["no-entrypoint"] }
 solana-program = "1.8.1"
-cardinal-token-manager = { version = "^0.0.5", path = "../cardinal-token-manager", features = ["cpi"] }
+cardinal-token-manager = { version = "^0.0.6", path = "../cardinal-token-manager", features = ["cpi"] }
 
 [dev-dependencies]
 proptest = { version = "1.0" }
diff --git a/programs/cardinal-rental-counter/Cargo.toml b/programs/cardinal-rental-counter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cardinal-rental-counter"
-version = "0.0.5"
+version = "0.0.6"
 description = "Cardinal paid claim approver"
 edition = "2021"
 homepage = "https://cardinal.so"
@@ -25,7 +25,7 @@ anchor-spl = "0.20.1"
 spl-associated-token-account = "1.0.2"
 spl-token = { version = "3.1.1", features = ["no-entrypoint"] }
 solana-program = "1.8.1"
-cardinal-token-manager = { version = "^0.0.5", path = "../cardinal-token-manager", features = ["cpi"] }
+cardinal-token-manager = { version = "^0.0.6", path = "../cardinal-token-manager", features = ["cpi"] }
 
 [dev-dependencies]
 proptest = { version = "1.0" }
diff --git a/programs/cardinal-time-invalidator/Cargo.toml b/programs/cardinal-time-invalidator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cardinal-time-invalidator"
-version = "0.0.5"
+version = "0.0.6"
 description = "Program for a invalidating token managers based on time"
 edition = "2021"
 homepage = "https://cardinal.so"
@@ -25,7 +25,7 @@ anchor-spl = "0.20.1"
 spl-associated-token-account = "1.0.2"
 spl-token = { version = "3.1.1", features = ["no-entrypoint"] }
 solana-program = "1.8.1"
-cardinal-token-manager = { version = "^0.0.5", path = "../cardinal-token-manager", features = ["cpi"] }
+cardinal-token-manager = { version = "^0.0.6", path = "../cardinal-token-manager", features = ["cpi"] }
 
 [dev-dependencies]
 proptest = { version = "1.0" }
diff --git a/programs/cardinal-token-manager/Cargo.toml b/programs/cardinal-token-manager/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cardinal-token-manager"
-version = "0.0.5"
+version = "0.0.6"
 description = "Cardinal token manager"
 edition = "2021"
 homepage = "https://cardinal.so"

diff --git a/programs/cardinal-use-invalidator/Cargo.toml b/programs/cardinal-use-invalidator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cardinal-use-invalidator"
-version = "0.0.5"
+version = "0.0.6"
 description = "Cardinal usage invalidator and counter"
 edition = "2021"
 homepage = "https://cardinal.so"
@@ -25,7 +25,7 @@ anchor-spl = "0.20.1"
 spl-associated-token-account = "1.0.2"
 spl-token = { version = "3.1.1", features = ["no-entrypoint"] }
 solana-program = "1.8.1"
-cardinal-token-manager = { version = "^0.0.5", path = "../cardinal-token-manager", features = ["cpi"] }
+cardinal-token-manager = { version = "^0.0.6", path = "../cardinal-token-manager", features = ["cpi"] }
 
 [dev-dependencies]
 proptest = { version = "1.0" }
diff --git a/src/claimLinks.ts b/src/claimLinks.ts
@@ -14,17 +14,25 @@ import { TokenManagerKind } from "./programs/tokenManager";
 import { findTokenManagerAddress } from "./programs/tokenManager/pda";
 import { withFindOrInitAssociatedTokenAccount } from "./utils";
 
-export const getLink = (mintId: PublicKey, otp: Keypair): string => {
-  return `https://claim.cardinal.so/${mintId.toString()}?otp=${utils.bytes.bs58.encode(
+export const getLink = (
+  mintId: PublicKey,
+  otp: Keypair,
+  baseUrl = "https://app.cardinal.so"
+): string => {
+  return `${baseUrl}/${mintId.toString()}?otp=${utils.bytes.bs58.encode(
     otp.secretKey
   )}`;
 };
 
-export const fromLink = (link: string): [PublicKey, Keypair] => {
+export const fromLink = (
+  link: string,
+  baseUrl = "https://app.cardinal.so"
+): [PublicKey, Keypair] => {
   try {
     const [_, mintId, otp] =
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      /https:\/\/claim\.cardinal\.so\/(.*)\?otp=(.*)/.exec(link)!;
+      new RegExp(`${baseUrl}/(.*)\\?otp=(.*)`).exec(link)!;
+    console.log(mintId, otp);
     return [
       new web3.PublicKey(mintId as string),
       Keypair.fromSecretKey(utils.bytes.bs58.decode(otp as string)),

diff --git a/src/programs/timeInvalidator/accounts.ts b/src/programs/timeInvalidator/accounts.ts
@@ -1,13 +1,34 @@
-import type { AnchorTypes } from "@saberhq/anchor-contrib";
+import { Program, Provider } from "@project-serum/anchor";
+import type { Connection, PublicKey } from "@solana/web3.js";
 
-import type { TIME_INVALIDATOR_PROGRAM } from "./constants";
-
-export type TimeInvalidatorTypes = AnchorTypes<
+import type { AccountData } from "../../utils";
+import type {
   TIME_INVALIDATOR_PROGRAM,
-  {
-    tokenManager: TimeInvalidatorData;
-  }
->;
+  TimeInvalidatorData,
+} from "./constants";
+import { TIME_INVALIDATOR_ADDRESS, TIME_INVALIDATOR_IDL } from "./constants";
+
+// TODO fix types
+export const getUseInvalidator = async (
+  connection: Connection,
+  timeInvalidatorId: PublicKey
+): Promise<AccountData<TimeInvalidatorData>> => {
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  const provider = new Provider(connection, null, {});
+  const timeInvalidatorProgram = new Program<TIME_INVALIDATOR_PROGRAM>(
+    TIME_INVALIDATOR_IDL,
+    TIME_INVALIDATOR_ADDRESS,
+    provider
+  );
 
-type Accounts = TimeInvalidatorTypes["Accounts"];
-export type TimeInvalidatorData = Accounts["timeInvalidator"];
+  const parsed = await timeInvalidatorProgram.account.timeInvalidator.fetch(
+    timeInvalidatorId
+  );
+  return {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    parsed,
+    pubkey: timeInvalidatorId,
+  };
+};
diff --git a/src/programs/timeInvalidator/constants.ts b/src/programs/timeInvalidator/constants.ts
@@ -1,3 +1,4 @@
+import type { AnchorTypes } from "@saberhq/anchor-contrib";
 import { PublicKey } from "@solana/web3.js";
 
 import * as TIME_INVALIDATOR_TYPES from "../../idl/cardinal_time_invalidator";
@@ -12,3 +13,13 @@ export const TIME_INVALIDATOR_IDL = TIME_INVALIDATOR_TYPES.IDL;
 
 export type TIME_INVALIDATOR_PROGRAM =
   TIME_INVALIDATOR_TYPES.CardinalTimeInvalidator;
+
+export type TimeInvalidatorTypes = AnchorTypes<
+  TIME_INVALIDATOR_PROGRAM,
+  {
+    tokenManager: TimeInvalidatorData;
+  }
+>;
+
+type Accounts = TimeInvalidatorTypes["Accounts"];
+export type TimeInvalidatorData = Accounts["timeInvalidator"];
diff --git a/src/programs/timeInvalidator/index.ts b/src/programs/timeInvalidator/index.ts
@@ -1,3 +1,4 @@
-export * from "./accounts";
+export * as accounts from "./accounts";
 export * from "./constants";
 export * as instruction from "./instruction";
+export * as pda from "./pda";
diff --git a/src/programs/useInvalidator/instruction.ts b/src/programs/useInvalidator/instruction.ts
@@ -60,7 +60,6 @@ export const incrementUsages = async (
   );
 
   const [useInvalidatorId] = await findUseInvalidatorAddress(tokenManagerId);
-  console.log("-------------", usages);
 
   return useInvalidatorProgram.instruction.incrementUsages(new BN(usages), {
     accounts: {