@lightsparkdev/lightspark-sdk 1.6.0 → 1.7.0

package/src/objects/WithdrawalRequest.ts

@@ -9,6 +9,7 @@ import {
   CurrencyAmountToJson,
 } from "./CurrencyAmount.js";
 import type Entity from "./Entity.js";
+import RequestInitiator from "./RequestInitiator.js";
 import WithdrawalMode from "./WithdrawalMode.js";
 import WithdrawalRequestStatus from "./WithdrawalRequestStatus.js";
 import type WithdrawalRequestToChannelClosingTransactionsConnection from "./WithdrawalRequestToChannelClosingTransactionsConnection.js";
@@ -55,6 +56,8 @@ class WithdrawalRequest implements Entity {
     public readonly withdrawalMode: WithdrawalMode,
     /** The current status of this withdrawal request. **/
     public readonly status: WithdrawalRequestStatus,
+    /** The initiator of the withdrawal. **/
+    public readonly initiator: RequestInitiator,
     /** The typename of the object **/
     public readonly typename: string,
     /**
@@ -320,6 +323,7 @@ ${FRAGMENT}
       withdrawal_request_completed_at: this.completedAt,
       withdrawal_request_withdrawal: { id: this.withdrawalId } ?? undefined,
       withdrawal_request_idempotency_key: this.idempotencyKey,
+      withdrawal_request_initiator: this.initiator,
     };
   }
 }
@@ -336,6 +340,8 @@ export const WithdrawalRequestFromJson = (obj: any): WithdrawalRequest => {
       WithdrawalMode.FUTURE_VALUE,
     WithdrawalRequestStatus[obj["withdrawal_request_status"]] ??
       WithdrawalRequestStatus.FUTURE_VALUE,
+    RequestInitiator[obj["withdrawal_request_initiator"]] ??
+      RequestInitiator.FUTURE_VALUE,
     "WithdrawalRequest",
     !!obj["withdrawal_request_estimated_amount"]
       ? CurrencyAmountFromJson(obj["withdrawal_request_estimated_amount"])
@@ -406,6 +412,7 @@ fragment WithdrawalRequestFragment on WithdrawalRequest {
         id
     }
     withdrawal_request_idempotency_key: idempotency_key
+    withdrawal_request_initiator: initiator
 }`;
 
 export default WithdrawalRequest;

package/src/objects/index.ts

@@ -152,6 +152,7 @@ export { default as ReleaseChannelPerCommitmentSecretOutput } from "./ReleaseCha
 export { default as ReleasePaymentPreimageInput } from "./ReleasePaymentPreimageInput.js";
 export { default as ReleasePaymentPreimageOutput } from "./ReleasePaymentPreimageOutput.js";
 export { default as RemoteSigningSubEventType } from "./RemoteSigningSubEventType.js";
+export { default as RequestInitiator } from "./RequestInitiator.js";
 export { default as RequestWithdrawalInput } from "./RequestWithdrawalInput.js";
 export { default as RequestWithdrawalOutput } from "./RequestWithdrawalOutput.js";
 export { default as RichText } from "./RichText.js";

package/src/tests/integration/general-regtest.test.ts

@@ -586,6 +586,9 @@ describe(p1SuiteName, () => {
         nodeId,
         1000,
         metadata,
+        undefined,
+        Buffer.from("key"),
+        "$bob@vasp2.com",
       );
       expect(umaInvoice?.status).toEqual(PaymentRequestStatus.OPEN);
     },

package/src/tests/uma-utils.test.ts

@@ -0,0 +1,70 @@
+import { beforeEach, describe, expect, jest, test } from "@jest/globals";
+import LightsparkClient from "../client.js";
+import { getCredentialsFromEnvOrThrow } from "../env.js";
+import { AccountTokenAuthProvider } from "../index.js";
+import { TESTS_TIMEOUT } from "./integration/constants.js";
+
+const { apiTokenClientId, apiTokenClientSecret, baseUrl } =
+  getCredentialsFromEnvOrThrow();
+
+const accountAuthProvider = new AccountTokenAuthProvider(
+  apiTokenClientId,
+  apiTokenClientSecret,
+);
+
+const lightsparkClient = new LightsparkClient(accountAuthProvider, baseUrl);
+
+describe("UmaUtils", () => {
+  beforeEach(() => {
+    jest.spyOn(lightsparkClient, "getUtcDateTime");
+  });
+
+  test(
+    "Should return same uma identifier hash for same month",
+    async () => {
+      const privKeyBytes = Buffer.from("xyz");
+      (lightsparkClient.getUtcDateTime as jest.Mock).mockReturnValue(
+        new Date(Date.UTC(2021, 0, 1, 0, 0, 0)),
+      );
+      const hashedUma = await lightsparkClient.hashUmaIdentifier(
+        "user@domain.com",
+        privKeyBytes,
+      );
+      const hashedUmaSameMonth = await lightsparkClient.hashUmaIdentifier(
+        "user@domain.com",
+        privKeyBytes,
+      );
+
+      expect(hashedUmaSameMonth).toStrictEqual(hashedUma);
+      console.log(hashedUma);
+    },
+    TESTS_TIMEOUT,
+  );
+
+  test(
+    "Should return different uma identifier hash for different months",
+    async () => {
+      const privKeyBytes = Buffer.from("xyz");
+      (lightsparkClient.getUtcDateTime as jest.Mock).mockReturnValue(
+        new Date(Date.UTC(2021, 0, 1, 0, 0, 0)),
+      );
+      const hashedUma = await lightsparkClient.hashUmaIdentifier(
+        "user@domain.com",
+        privKeyBytes,
+      );
+
+      (lightsparkClient.getUtcDateTime as jest.Mock).mockReturnValue(
+        new Date(Date.UTC(2021, 1, 1, 0, 0, 0)),
+      );
+      const hashedUmaNewMonth = await lightsparkClient.hashUmaIdentifier(
+        "user@domain.com",
+        privKeyBytes,
+      );
+
+      expect(hashedUmaNewMonth).not.toStrictEqual(hashedUma);
+      console.log(hashedUma);
+      console.log(hashedUmaNewMonth);
+    },
+    TESTS_TIMEOUT,
+  );
+});