fix: v0.3 updates

fedimint-clientd/src/main.rs

@@ -230,7 +230,7 @@ fn fedimint_v2_rest() -> Router<AppState> {
         .route("/backup", post(fedimint::admin::backup::handle_rest))
         .route(
             "/discover-version",
-            get(fedimint::admin::discover_version::handle_rest),
+            post(fedimint::admin::discover_version::handle_rest),
         )
         .route(
             "/federation-ids",

wrappers/fedimint-ts/FedimintClient.ts

@@ -4,15 +4,18 @@ import type {
   ListOperationsRequest,
   FederationIdsResponse,
   OperationOutput,
-} from "./types/common";
+  DiscoverVersionRequest,
+  DiscoverVersionResponse,
+  JoinRequest,
+} from "./types";
 import type {
   AwaitInvoiceRequest,
   Gateway,
   LnInvoiceRequest,
   LnInvoiceResponse,
   LnPayRequest,
   LnPayResponse,
-} from "./types/modules/ln";
+} from "./types";
 import type {
   CombineRequest,
   CombineResponse,
@@ -24,15 +27,15 @@ import type {
   SplitResponse,
   ValidateRequest,
   ValidateResponse,
-} from "./types/modules/mint";
+} from "./types";
 import type {
   AwaitDepositRequest,
   AwaitDepositResponse,
   DepositAddressRequest,
   DepositAddressResponse,
   WithdrawRequest,
   WithdrawResponse,
-} from "./types/modules/wallet";
+} from "./types";
 
 type FedimintResponse<T> = Promise<T>;
 
@@ -186,8 +189,16 @@ class FedimintClient {
   /**
    * Returns the API version to use to communicate with the federation
    */
-  public async discoverVersion(): FedimintResponse<string> {
-    return this.get<string>("/admin/discover-version");
+  public async discoverVersion(
+    threshold?: number
+  ): FedimintResponse<DiscoverVersionResponse> {
+    const request: DiscoverVersionRequest = threshold ? { threshold } : {};
+    console.log("request", request);
+
+    return this.post<DiscoverVersionResponse>(
+      "/admin/discover-version",
+      request
+    );
   }
 
   /**
@@ -209,11 +220,12 @@ class FedimintClient {
    * Returns an array of federation IDs that the client is now connected to
    */
   public async join(
-    inviteCode: string
+    inviteCode: string,
+    useManualSecret: boolean = false
   ): FedimintResponse<FederationIdsResponse> {
-    return await this.post<FederationIdsResponse>("/admin/join", {
-      inviteCode,
-    });
+    const request: JoinRequest = { inviteCode, useManualSecret };
+
+    return await this.post<FederationIdsResponse>("/admin/join", request);
   }
 
   /**

wrappers/fedimint-ts/test.ts

@@ -5,21 +5,21 @@ dotenv.config();
 
 const logMethod = (method: string) => {
   console.log("--------------------");
-  console.log(`\nMethod: ${method}`);
+  console.log(`Method: ${method}`);
 };
 
 const logInputAndOutput = (input: any, output: any) => {
   console.log("Input: ", input);
   console.log("Output: ", output);
-  console.log("--------------------\n\n");
+  console.log("--------------------");
 };
 
 async function buildTestClient() {
   const baseUrl = process.env.BASE_URL || "http://127.0.0.1:3333";
   const password = process.env.PASSWORD || "password";
   const builder = new FedimintClientBuilder();
   builder.setBaseUrl(baseUrl).setPassword(password).setActiveFederationId(
-    "412d2a9338ebeee5957382eb06eac07fa5235087b5a7d5d0a6e18c635394e9ed" // Fedi Alpha Mutinynet
+    "15db8cb4f1ec8e484d73b889372bec94812580f929e8148b7437d359af422cd3" // Fedi Alpha Mutinynet
   );
 
   return await builder.build();
@@ -109,17 +109,18 @@ async function main() {
   logInputAndOutput({ notesVec }, data);
 
   // ONCHAIN METHODS
-  // // `/v2/onchain/deposit-address`
-  // logMethod("/v2/onchain/deposit-address");
-  // data = await fedimintClient.onchain.createDepositAddress(1000);
-  // logInputAndOutput({ timeout: 1000 }, data);
+  // `/v2/onchain/deposit-address`
+  logMethod("/v2/onchain/deposit-address");
+  data = await fedimintClient.onchain.createDepositAddress(1000);
+  logInputAndOutput({ timeout: 1000 }, data);
+  // `/v2/onchain/withdraw`
+  logMethod("/v2/onchain/withdraw");
+  data = await fedimintClient.onchain.withdraw(data.address, 1000);
+  logInputAndOutput({ address: data.address, amountMsat: 1000 }, data);
   // // `/v2/onchain/await-deposit`
   // logMethod("/v2/onchain/await-deposit");
   // data = await fedimintClient.onchain.awaitDeposit(data.operationId);
   // logInputAndOutput({ operationId: data.operationId }, data);
-  // // `/v2/onchain/withdraw`
-  // logMethod("/v2/onchain/withdraw");
-  // data = await fedimintClient.
 }
 
 main().catch(console.error);

wrappers/fedimint-ts/types.ts

@@ -15,6 +15,23 @@ interface InfoResponse {
   denominationsMsat: TieredSummary;
 }
 
+interface FederationIdsResponse {
+  federationIds: string[];
+}
+
+interface DiscoverVersionRequest {
+  threshold?: number;
+}
+
+interface DiscoverVersionResponse {
+  [federationId: string]: any;
+}
+
+interface JoinRequest {
+  inviteCode: string;
+  useManualSecret: boolean;
+}
+
 interface BackupRequest {
   metadata: { [key: string]: string };
 }
@@ -100,7 +117,6 @@ interface AwaitInvoiceRequest {
 interface LnPayRequest {
   paymentInfo: string;
   amountMsat?: number;
-  finishInBackground: boolean;
   lnurlComment?: string;
 }
 
@@ -124,59 +140,14 @@ interface SwitchGatewayRequest {
   gatewayId: string;
 }
 
-interface FederationIdPrefix {
-  0: number; // Assuming u8 is equivalent to number in TypeScript
-  1: number;
-  2: number;
-  3: number;
-}
+type FederationIdPrefix = string;
 
 interface TieredMulti<T> {
-  [amount: number]: T[]; // Assuming Amount is equivalent to number in TypeScript
-}
-
-interface Signature {
-  0: G1Affine;
-}
-
-interface G1Affine {
-  x: Fp;
-  y: Fp;
-  infinity: Choice;
-}
-
-interface Fp {
-  0: number[]; // Assuming u64 is equivalent to number in TypeScript
-}
-
-interface Choice {
-  0: number; // Assuming u8 is equivalent to number in TypeScript
-}
-
-interface KeyPair {
-  0: number[]; // Assuming c_uchar is equivalent to number in TypeScript
-}
-
-interface OOBNotesData {
-  Notes?: TieredMulti<SpendableNote>;
-  FederationIdPrefix?: FederationIdPrefix;
-  Default?: {
-    variant: number; // Assuming u64 is equivalent to number in TypeScript
-    bytes: number[]; // Assuming Vec<u8> is equivalent to number[] in TypeScript
-  };
-}
-
-interface OOBNotes {
-  0: OOBNotesData[];
-}
-
-interface SpendableNote {
-  signature: Signature;
-  spendKey: KeyPair;
+  [amount: number]: T[];
 }
 
 interface ReissueRequest {
-  notes: OOBNotes;
+  notes: string;
 }
 
 interface ReissueResponse {
@@ -191,37 +162,41 @@ interface SpendRequest {
 
 interface SpendResponse {
   operation: string;
-  notes: OOBNotes;
+  notes: string;
 }
 
 interface ValidateRequest {
-  notes: OOBNotes;
+  notes: string;
 }
 
 interface ValidateResponse {
   amountMsat: number;
 }
 
 interface SplitRequest {
-  notes: OOBNotes;
+  notes: string;
 }
 
 interface SplitResponse {
-  notes: Record<number, OOBNotes>;
+  notes: Record<number, string>;
 }
 
 interface CombineRequest {
-  notes: OOBNotes[];
+  notesVec: string[];
 }
 
 interface CombineResponse {
-  notes: OOBNotes;
+  notes: string;
 }
 
 export type {
   Tiered,
   TieredSummary,
   InfoResponse,
+  FederationIdsResponse,
+  DiscoverVersionRequest,
+  DiscoverVersionResponse,
+  JoinRequest,
   BackupRequest,
   ListOperationsRequest,
   OperationOutput,