Client lib fixes

.github/workflows/action_deploy-prod.yml

@@ -102,7 +102,7 @@ jobs:
       - name: Deploy to npm
         run: |
           npm publish --workspace packages/interfaces
-          npm publish --workspace packages/client
+          cd packages/client/lib && npm publish
 
   roll-firestore:
     runs-on: ubuntu-latest

.github/workflows/action_deploy-wen.yml

@@ -63,7 +63,7 @@ jobs:
       - name: Deploy to npm as "upcoming" package
         run: |
           npm publish --workspace packages/interfaces --tag next
-          npm publish --workspace packages/client --tag next
+          cd packages/client/lib && npm publish --tag next
   deploy_functions:
     runs-on: ubuntu-latest
     environment: staging

packages/client/package.json

@@ -9,11 +9,11 @@
     "serve": "run-p \"run:search\" \"run:functions\"",
     "lint": "eslint --ext .js,.ts src",
     "build": "tsc",
+    "postbuild": "cp package.json ./lib",
     "test": "jest"
   },
   "dependencies": {
     "@build-5/interfaces": "*",
-    "@iota/sdk": "1.1.4",
     "axios": "^1.6.2",
     "bip39": "3.1.0",
     "form-data": "^4.0.0",

packages/client/src/index.ts

@@ -1,3 +1,2 @@
 export { https } from './https';
 export { otr } from './otr';
-export { createWallet } from './wallet';

packages/client/src/otr/datasets/common.ts

@@ -1,4 +1,4 @@
-import { Dataset, MIN_IOTA_AMOUNT, Network } from '@build-5/interfaces';
+import { Dataset, Network } from '@build-5/interfaces';
 import { v4 as uuid } from 'uuid';
 import { MemberOtrDataset } from './MemberOtrDataset';
 import { ProposalOtrDataset } from './ProposalOtrDataset';
@@ -32,34 +32,30 @@ export class OtrRequest<T> {
     public readonly nativeToken?: INativeToken,
   ) {}
 
-  getMetadata = () => {
-    const data = {
-      targetAddress: this.otrAddress,
-      amount: this.amount,
-      metadata: { request: this.metadata },
-      nativeToken: this.nativeToken,
-      tag: this.generateTag(),
-    };
-    return { ...data, amount: Math.max(MIN_IOTA_AMOUNT / 2, this.amount || 0) };
-  };
+  getMetadata = () => ({
+    targetAddress: this.otrAddress,
+    metadata: { request: this.metadata },
+    nativeToken: this.nativeToken,
+    tag: this.generateTag(),
+    amount: this.amount,
+  });
 
   getFireflyDeepLink = () => {
-    const { amount, metadata, nativeToken, tag } = this.getMetadata();
+    const { metadata, nativeToken, tag } = this.getMetadata();
     const walletType = getFireflyWalletType(this.otrAddress);
     return (
       walletType +
       `://wallet/sendConfirmation?address=${this.otrAddress}` +
       '&disableToggleGift=true&disableChangeExpiration=true' +
-      `&amount=${nativeToken ? nativeToken.amount : amount}` +
+      `&amount=${nativeToken ? nativeToken.amount : this.amount}` +
       `&tag=${tag}&giftStorageDeposit=true` +
       `&metadata=${JSON.stringify(metadata)}` +
       (nativeToken ? `&assetId=${nativeToken?.id}` : '')
     );
   };
 
   getBloomDeepLink = () => {
-    const { amount, metadata, nativeToken, tag } = this.getMetadata();
-
+    const { metadata, nativeToken, tag, amount } = this.getMetadata();
     const parameters = {
       address: this.otrAddress,
       baseCoinAmount: Number(amount).toFixed(0),
@@ -103,3 +99,19 @@ const getFireflyWalletType = (otrAddress: string) => {
   }
   throw Error('Invalid otr address, ono firefly wallet type found');
 };
+
+export const toHex = (stringToConvert: string) =>
+  '0x' +
+  stringToConvert
+    .split('')
+    .map((c) => c.charCodeAt(0).toString(16).padStart(2, '0'))
+    .join('');
+
+export const otrAddressToNetwork = (address: string): Network => {
+  for (const network of Object.values(Network)) {
+    if (address.startsWith(network)) {
+      return network as Network;
+    }
+  }
+  throw Error('Invalid otr address');
+};

packages/client/src/otr/otr.ts

@@ -15,7 +15,7 @@ import { NftOtrDataset } from './datasets/NftOtrDataset';
 import { ProposalOtrDataset } from './datasets/ProposalOtrDataset';
 import { SpaceOtrDataset } from './datasets/SpaceOtrDataset';
 import { TokenOtrDataset } from './datasets/TokenOtrDataset';
-import { DatasetType } from './datasets/common';
+import { DatasetType, toHex } from './datasets/common';
 
 export class OtrWrapper {
   constructor(private readonly otrAddress: string) {}
@@ -42,13 +42,17 @@ export class OtrWrapper {
   }
 
   trackByTag = (tag: string) => {
-    const origin = this.otrAddress.startsWith(Network.SMR) ? Build5.PROD : Build5.TEST;
+    const origin = this.otrAddress.startsWith(Network.RMS) ? Build5.TEST : Build5.PROD;
     return new Observable(origin, tag);
   };
 }
 
-class Observable extends RxjsObservable<TangleResponse> {
-  private observer: Subscriber<TangleResponse> | undefined;
+interface TagTrackResult extends TangleResponse {
+  chainReference?: string;
+}
+
+class Observable extends RxjsObservable<TagTrackResult> {
+  private observer: Subscriber<TagTrackResult> | undefined;
   private paymentsSubs: Subscription | undefined;
   private payments: string[] = [];
   private dataset: TransactionDataset<Dataset.TRANSACTION> | undefined;
@@ -83,12 +87,15 @@ class Observable extends RxjsObservable<TangleResponse> {
       const result = await this.dataset!.getBySourceTransaction(payment.uid);
       const credit = result.find((t) => t.type === TransactionType.CREDIT_TANGLE_REQUEST);
       if (credit) {
-        this.observer?.next(credit.payload.response);
+        this.observer?.next({
+          ...credit.payload.response,
+          chainReference: credit.payload.chainReference || '',
+        });
         return;
       }
       const transfer = result.find((t) => t.type === TransactionType.UNLOCK);
       if (transfer) {
-        this.observer?.next({ status: 'success' });
+        this.observer?.next({ status: 'Success' });
         return;
       }
       await new Promise((resolve) => setTimeout(resolve, 1000));
@@ -100,10 +107,3 @@ class Observable extends RxjsObservable<TangleResponse> {
     this.observer?.complete();
   };
 }
-
-const toHex = (stringToConvert: string) =>
-  '0x' +
-  stringToConvert
-    .split('')
-    .map((c) => c.charCodeAt(0).toString(16).padStart(2, '0'))
-    .join('');