fix: rotate should use the next threshold as default value for rotate

jrayback · Feb 4, 2024 · 1be8989 · 1be8989
1 parent b98dd02
commit 1be8989
Show file tree

Hide file tree

Showing 4 changed files with 387 additions and 285 deletions.
diff --git a/src/keri/app/aiding.ts b/src/keri/app/aiding.ts
@@ -51,14 +51,23 @@ export interface RotateIdentifierArgs {
     rstates?: any[];
 }
 
+/**
+ * Reducing the SignifyClient dependencies used by Identifier class
+ */
+export type IdentifierSignifyClient = Pick<
+    SignifyClient,
+    'fetch' | 'pidx' | 'manager'
+>;
+
 /** Identifier */
 export class Identifier {
-    public client: SignifyClient;
+    public client: IdentifierSignifyClient;
+
     /**
      * Identifier
-     * @param {SignifyClient} client
+     * @param {IdentifierSignifyClient} client
      */
-    constructor(client: SignifyClient) {
+    constructor(client: IdentifierSignifyClient) {
         this.client = client;
     }
 
@@ -263,7 +272,7 @@ export class Identifier {
         };
         jsondata[keeper.algo] = keeper.params();
 
-        const res = this.client.fetch(
+        const res = await this.client.fetch(
             '/identifiers/' + name + '?type=ixn',
             'PUT',
             jsondata
@@ -294,7 +303,7 @@ export class Identifier {
         const dig = state.d;
         const ridx = Number(state.s) + 1;
         const wits = state.b;
-        let isith = state.kt;
+        let isith = state.nt;
 
         let nsith = kargs.nsith ?? isith;
 
@@ -361,7 +370,11 @@ export class Identifier {
         };
         jsondata[keeper.algo] = keeper.params();
 
-        const res = this.client.fetch('/identifiers/' + name, 'PUT', jsondata);
+        const res = await this.client.fetch(
+            '/identifiers/' + name,
+            'PUT',
+            jsondata
+        );
         return new EventResult(serder, sigs, res);
     }
 
@@ -447,9 +460,13 @@ export class Identifier {
 export class EventResult {
     private readonly _serder: Serder;
     private readonly _sigs: string[];
-    private readonly promise: Promise<Response>;
+    private readonly promise: Promise<Response> | Response;
 
-    constructor(serder: Serder, sigs: string[], promise: Promise<Response>) {
+    constructor(
+        serder: Serder,
+        sigs: string[],
+        promise: Promise<Response> | Response
+    ) {
         this._serder = serder;
         this._sigs = sigs;
         this.promise = promise;

diff --git a/src/keri/app/controller.ts b/src/keri/app/controller.ts
@@ -282,8 +282,6 @@ export class Controller {
         for (const aid of aids) {
             const pre: string = aid['prefix'] as string;
             if ('salty' in aid) {
-                console.log('salty aid to rotate');
-                console.log(aid);
                 const salty: any = aid['salty'];
                 const cipher = new Cipher({ qb64: salty['sxlt'] });
                 const dnxt = decrypter.decrypt(null, cipher).qb64;