Remove references to futarchy-ts

Author: metaproph3t

justfile

@@ -9,7 +9,7 @@ build-verifiable PROGRAM_NAME:
 	solana-verify build --library-name {{ PROGRAM_NAME }} -b ellipsislabs/solana:1.16.10
 
 deploy PROGRAM_NAME CLUSTER:
-	solana program deploy -u {{ CLUSTER }} --program-id ./target/deploy/{{ PROGRAM_NAME }}-keypair.json ./target/deploy/{{ PROGRAM_NAME }}.so --final && PROGRAM_ID=$(solana-keygen pubkey ./target/deploy/{{ PROGRAM_NAME }}-keypair.json) && anchor idl init --filepath ./target/idl/{{ PROGRAM_NAME }}.json $PROGRAM_ID --provider.cluster {{ CLUSTER }}
+	solana program deploy -u {{ CLUSTER }} --program-id ./target/deploy/{{ PROGRAM_NAME }}-keypair.json ./target/deploy/{{ PROGRAM_NAME }}.so --with-compute-unit-price 5 --max-sign-attempts 15 && PROGRAM_ID=$(solana-keygen pubkey ./target/deploy/{{ PROGRAM_NAME }}-keypair.json) && anchor idl init --filepath ./target/idl/{{ PROGRAM_NAME }}.json $PROGRAM_ID --provider.cluster {{ CLUSTER }}
 
 upgrade PROGRAM_NAME PROGRAM_ID CLUSTER:
 	anchor upgrade ./target/deploy/{{ PROGRAM_NAME }}.so -p {{ PROGRAM_ID }} --provider.cluster {{ CLUSTER }}

package.json

@@ -19,7 +19,7 @@
         "arweave": "^1.14.4",
         "solana-bankrun": "^0.3.0",
         "spl-token-bankrun": "0.2.5",
-        "@metadaoproject/futarchy-ts": "4.1.0"
+        "@metadaoproject/futarchy": "0.3.0-alpha.0"
     },
     "devDependencies": {
         "@mercurial-finance/dynamic-amm-sdk": "^0.4.19",

scripts/initializeDao.ts

@@ -1,5 +1,5 @@
 import * as anchor from "@coral-xyz/anchor";
-import { AutocratClient } from "@metadaoproject/futarchy-ts";
+import { AutocratClient } from "@metadaoproject/futarchy";
 import {
   DEAN_DEVNET,
   DEVNET_DARK,
@@ -15,6 +15,14 @@ let autocratClient: AutocratClient = AutocratClient.createClient({
 });
 
 async function main() {
+  await autocratClient.initializeDao(META, 500, 5, 2500, DEVNET_MUSDC);
+  await autocratClient.initializeDao(
+    DEAN_DEVNET,
+    0.001,
+    1_000_000,
+    500,
+    DEVNET_MUSDC
+  );
   await autocratClient.initializeDao(
     DEVNET_DARK,
     0.2,

tests/amm.ts

@@ -23,7 +23,7 @@ import {
   AmmClient,
   PriceMath,
   getAmmLpMintAddr,
-} from "@metadaoproject/futarchy-ts";
+} from "@metadaoproject/futarchy";
 import { Keypair, PublicKey } from "@solana/web3.js";
 import { assert } from "chai";
 import { expectError, fastForward } from "./utils/utils";

tests/autocrat.ts

@@ -39,18 +39,16 @@ import {
   getAmmAddr,
   getAmmLpMintAddr,
   getVaultAddr,
-} from "../futarchy-ts/src";
-import { PriceMath } from "../futarchy-ts/src/utils/priceMath";
-// import { AutocratClient } from "../futarchy-ts/src/AutocratClient";
-import { AutocratClient } from "@metadaoproject/futarchy-ts";
+} from "@metadaoproject/futarchy";
+import { PriceMath } from "@metadaoproject/futarchy";
+import { AutocratClient, ConditionalVaultClient } from "@metadaoproject/futarchy";
 import {
   ComputeBudgetInstruction,
   ComputeBudgetProgram,
   SystemProgram,
   Transaction,
   TransactionInstruction,
 } from "@solana/web3.js";
-import { ConditionalVaultClient } from "../futarchy-ts/src/ConditionalVaultClient";
 
 const AutocratIDL: Autocrat = require("../target/idl/autocrat.json");
 const ConditionalVaultIDL: ConditionalVault = require("../target/idl/conditional_vault.json");

tests/conditionalVault.ts

@@ -36,11 +36,11 @@ import { ConditionalVault } from "../target/types/conditional_vault";
 import { expectError } from "./utils/utils";
 import {
   CONDITIONAL_VAULT_PROGRAM_ID,
+  ConditionalVaultClient,
   getVaultAddr,
   getVaultFinalizeMintAddr,
   getVaultRevertMintAddr,
-} from "../futarchy-ts/src";
-import { ConditionalVaultClient } from "../futarchy-ts/src/ConditionalVaultClient";
+} from "@metadaoproject/futarchy";
 const ConditionalVaultIDL: ConditionalVault = require("../target/idl/conditional_vault.json");
 
 export type VaultProgram = anchor.Program<ConditionalVault>;

yarn.lock

@@ -910,10 +910,10 @@
     decimal.js "10.3.1"
     jsbi "4.3.0"
 
-"@metadaoproject/futarchy-ts@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@metadaoproject/futarchy-ts/-/futarchy-ts-4.0.0.tgz#e0fa653dd870721ffcf7e3602c6785d9eacf8ff8"
-  integrity sha512-Fc8q/JF/3x4DOPW9bXjg9/cyS8E4qVjkOYcFt+AdjxAnWbuuNMg9FW28sSet+LuUmRgqzik11Z7NkJi2/QhO3g==
+"@metadaoproject/futarchy@0.3.0-alpha.0":
+  version "0.3.0-alpha.0"
+  resolved "https://registry.yarnpkg.com/@metadaoproject/futarchy/-/futarchy-0.3.0-alpha.0.tgz#47a2b2e28a48b0dabd9c25cbb0c8f8b82a7a4208"
+  integrity sha512-8FnMXTrq1gM3pAiBpNyn/wy8s8b8/zzugRfp0beX1+RcZX78LmfnwMPId8R8ozhV2DkE/doQ6eEiSgKYq+VWGA==
   dependencies:
     "@coral-xyz/anchor" "^0.29.0"
     "@solana/spl-token" "^0.3.7"