chore: refining subscribe method

subtopia-algo · Sep 24, 2023 · 0e62fbf · 0e62fbf
1 parent a5e7e0e
commit 0e62fbf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/clients/SubtopiaClient.ts b/src/clients/SubtopiaClient.ts
@@ -584,17 +584,18 @@ export class SubtopiaClient {
       oracleAdminState.valueRaw
     );
     const platformFeeAmount = await this.getSubscriptionPlatformFee();
-    const creatorLockerId = await SubtopiaRegistryClient.getLocker({
+    const state = await this.getAppState(parseWholeUnits);
+    const managerLockerID = await SubtopiaRegistryClient.getLocker({
       registryID: TESTNET_SUBTOPIA_REGISTRY_ID,
       algodClient: this.algodClient,
-      ownerAddress: this.creator.addr,
+      ownerAddress: state.manager,
     });
 
-    if (!creatorLockerId) {
+    if (!managerLockerID) {
       throw new Error("Creator locker is not initialized");
     }
 
-    const lockerAddress = getApplicationAddress(creatorLockerId);
+    const lockerAddress = getApplicationAddress(managerLockerID);
 
     const createSubscriptionAtc = new AtomicTransactionComposer();
     createSubscriptionAtc.addMethodCall({
@@ -643,7 +644,7 @@ export class SubtopiaClient {
       methodArgs: [
         subscriber.addr,
         duration.valueOf(),
-        creatorLockerId,
+        managerLockerID,
         this.oracleID,
         {
           txn: makePaymentTxnWithSuggestedParamsFromObject({

diff --git a/src/clients/SubtopiaRegistryClient.ts b/src/clients/SubtopiaRegistryClient.ts
@@ -331,18 +331,18 @@ export class SubtopiaRegistryClient {
   }): Promise<{
     txID: string;
   }> {
-    const oldOwnerLockerId = await SubtopiaRegistryClient.getLocker({
+    const oldOwnerLockerID = await SubtopiaRegistryClient.getLocker({
       registryID: this.appID,
       algodClient: this.algodClient,
       ownerAddress: this.creator.addr,
     });
-    const newOwnerLockerId = await SubtopiaRegistryClient.getLocker({
+    const newOwnerLockerID = await SubtopiaRegistryClient.getLocker({
       registryID: this.appID,
       algodClient: this.algodClient,
       ownerAddress: newOwnerAddress,
     });
 
-    if (!oldOwnerLockerId) {
+    if (!oldOwnerLockerID) {
       throw new Error("Locker not found");
     }
 
@@ -363,7 +363,7 @@ export class SubtopiaRegistryClient {
       },
     ];
 
-    if (!newOwnerLockerId) {
+    if (!newOwnerLockerID) {
       boxes.push.apply(boxes, [
         {
           appIndex: this.appID,
@@ -407,13 +407,13 @@ export class SubtopiaRegistryClient {
       }),
       methodArgs: [
         infrastructureID,
-        oldOwnerLockerId,
+        oldOwnerLockerID,
         newOwnerAddress,
         {
           txn: makePaymentTxnWithSuggestedParamsFromObject({
             from: this.creator.addr,
             to: this.appAddress,
-            amount: algosToMicroalgos(newOwnerLockerId ? 1 : 0.5),
+            amount: algosToMicroalgos(newOwnerLockerID ? 1 : 0.5),
             suggestedParams: await getParamsWithFeeCount(this.algodClient, 0),
           }),
           signer: this.creator.signer,
@@ -422,10 +422,10 @@ export class SubtopiaRegistryClient {
       boxes: boxes,
       sender: this.creator.addr,
       signer: this.creator.signer,
-      appForeignApps: newOwnerLockerId ? [newOwnerLockerId] : undefined,
+      appForeignApps: newOwnerLockerID ? [newOwnerLockerID] : undefined,
       suggestedParams: await getParamsWithFeeCount(
         this.algodClient,
-        newOwnerLockerId ? 10 : 11
+        newOwnerLockerID ? 10 : 11
       ),
     });