@msafe/sui3-sdk 0.0.22 → 0.0.24

package/dist/index.js

@@ -1,5 +1,10 @@
 // src/core/CreateHelper.ts
-import { MultiSigAccount, PublicKeySerde, SigningMessageHelper } from "@msafe/sui3-utils";
+import {
+  isSameAddress,
+  MultiSigAccount,
+  PublicKeySerde,
+  SigningMessageHelper
+} from "@msafe/sui3-utils";
 var CreateHelper = class {
   constructor(globals, pkHelper) {
     this.globals = globals;
@@ -17,6 +22,21 @@ var CreateHelper = class {
   async validateCreateInfo(createInfo) {
     return this.calculateMSafeAddress(createInfo);
   }
+  /**
+   * Add user manually added public key for an address. If user input the public key with
+   * extra signature scheme flag, the scheme value will be automatically fixed.
+   *
+   * @param address
+   * @param pkEncoded
+   * @throws error if the public key does not match
+   */
+  addPublicKey(address, pkEncoded) {
+    const pk = PublicKeySerde.de(pkEncoded);
+    if (!isSameAddress(address, pk.toSuiAddress())) {
+      throw new Error("Public key not match");
+    }
+    this.pkHelper.addPublicKey(address, pk);
+  }
   async submitMSafeCreation(creationInfo) {
     const msafeAddress = await this.validateCreateInfo(creationInfo);
     const signingMessage = SigningMessageHelper.createMSafeMessage(msafeAddress);
@@ -103,7 +123,7 @@ import {
   TransactionType,
   buildObjectTransferTxb,
   buildRejectTxb,
-  isSameAddress
+  isSameAddress as isSameAddress2
 } from "@msafe/sui3-utils";
 import { TransactionBlock } from "@mysten/sui.js/transactions";
 import { normalizeStructTag as normalizeStructTag3 } from "@mysten/sui.js/utils";
@@ -195,6 +215,12 @@ var Formatter = class {
     return Coin.isCoin(struct);
   }
 };
+function addPrefix(s, prefix) {
+  if (s.startsWith(prefix)) {
+    return s;
+  }
+  return prefix + s;
+}
 
 // src/utils/crypto.ts
 var SignatureVerifier = class _SignatureVerifier {
@@ -655,7 +681,7 @@ var MSafeAccount = class _MSafeAccount {
   calculateWeight(addressList) {
     let gotWeight = 0;
     for (let i = 0; i < addressList.length; i++) {
-      const found = this.info.owners.find((owner) => isSameAddress(owner.address, addressList[i]));
+      const found = this.info.owners.find((owner) => isSameAddress2(owner.address, addressList[i]));
       if (found) {
         gotWeight += found.weight;
       }
@@ -680,6 +706,8 @@ var MSafeAccount = class _MSafeAccount {
 };
 
 // src/core/PublicKeyHelper.ts
+import { isSameAddress as isSameAddress3 } from "@msafe/sui3-utils";
+import { normalizeSuiAddress as normalizeSuiAddress2 } from "@mysten/sui.js/utils";
 var PublicKeyHelper = class {
   constructor(globals) {
     this.globals = globals;
@@ -724,6 +752,12 @@ var PublicKeyHelper = class {
     }
     return results;
   }
+  addPublicKey(address, publicKey) {
+    if (!isSameAddress3(address, publicKey.toSuiAddress())) {
+      throw new Error("Invalid public key");
+    }
+    this.knownPublicKeys.set(normalizeSuiAddress2(address), publicKey);
+  }
   async _getPublicKey(address) {
     const pkBackend = await this.getPublicKeyFromBackend(address);
     if (pkBackend) {
@@ -763,16 +797,13 @@ var BackendImpl = class _BackendImpl {
   }
   _token;
   async authSign(input) {
-    const res = await axios.post(`${this.apiURL}/auth/login`, input);
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid authSign return: ${res}`);
-    }
+    const res = await this.post(`/auth/login`, input);
     this._token = res.data.accessToken;
     return this._token;
   }
   async verifyToken(jwt) {
     try {
-      const res = await axios.get(`${this.apiURL}/auth`, { headers: this.headers(jwt) });
+      const res = await this.get(`/auth`, { headers: this.headers(jwt) });
       return res.status === 200;
     } catch (_) {
       return false;
@@ -788,13 +819,10 @@ var BackendImpl = class _BackendImpl {
     const query = {
       userAddressList: addresses
     };
-    const res = await axios.get(`${this.apiURL}/user/public-keys`, {
+    const res = await this.get(`/user/public-keys`, {
       params: query,
       headers: this.headers()
     });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid getPublicKeyBatch return: ${res}`);
-    }
     return res.data?.map(
       (publicKeyWithSchema) => publicKeyWithSchema ? PublicKeySerde3.de(publicKeyWithSchema) : void 0
     );
@@ -803,22 +831,16 @@ var BackendImpl = class _BackendImpl {
     const q = {
       msafeAddress
     };
-    const res = await axios.get(`${this.apiURL}/msafe`, {
+    const res = await this.get(`/msafe`, {
       params: q,
       headers: this.headers()
     });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid getPublicKeyBatch return: ${res}`);
-    }
     return _BackendImpl.toMSafeConfig(res.data);
   }
   async getUserInfo() {
-    const userRes = await axios.get(`${this.apiURL}/user`, {
+    const userRes = await this.get(`/user`, {
       headers: this.headers()
     });
-    if (userRes.status !== 200 && userRes.status !== 201) {
-      throw new Error(`invalid getPublicKeyBatch return: ${userRes}`);
-    }
     return userRes.data;
   }
   async getOwnedMSafeByStatus(input) {
@@ -829,13 +851,10 @@ var BackendImpl = class _BackendImpl {
         limit: input.pagination.limit.toString()
       } : {}
     };
-    const res = await axios.get(`${this.apiURL}/msafe/owned`, {
+    const res = await this.get(`/msafe/owned`, {
       params: q,
       headers: this.headers()
     });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid getOwnedMSafeByStatus return: ${res}`);
-    }
     return {
       data: res.data.data.map(_BackendImpl.toMSafeConfig),
       meta: res.data.meta
@@ -843,78 +862,54 @@ var BackendImpl = class _BackendImpl {
   }
   async updateMSafeStatus(input) {
     const p = input;
-    const res = await axios.post(`${this.apiURL}/msafe/status`, p, { headers: this.headers() });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`Invalid updateMSafeStatus return: ${res}`);
-    }
+    await this.post(`/msafe/status`, p, { headers: this.headers() });
   }
   async getPendingTransactions(input) {
-    const res = await axios.get(`${this.apiURL}/transaction/pending`, {
+    const res = await this.get(`/transaction/pending`, {
       params: input,
       headers: this.headers()
     });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid getPublicKeyBatch return: ${res}`);
-    }
     return res.data;
   }
   async getHistoryTransactions(input) {
-    const res = await axios.get(`${this.apiURL}/transaction/history`, {
+    const res = await this.get(`/transaction/history`, {
       params: input,
       headers: this.headers()
     });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid getCurrentSequenceNumber return: ${res}`);
-    }
     return res.data;
   }
   async getFutureIntentions(input) {
-    const res = await axios.get(`${this.apiURL}/transaction/intention`, {
+    const res = await this.get(`/transaction/intention`, {
       params: input,
       headers: this.headers()
     });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid getCurrentSequenceNumber return: ${res}`);
-    }
     return res.data;
   }
   async getCurrentSequenceNumber(address) {
-    const res = await axios.get(`${this.apiURL}/transaction/sn/current`, {
+    const res = await this.get(`/transaction/sn/current`, {
       params: {
         msafeAddress: address
       },
       headers: this.headers()
     });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid getCurrentSequenceNumber return: ${res}`);
-    }
     return res.data;
   }
   async getNextSequenceNumber(address) {
-    const res = await axios.get(`${this.apiURL}/transaction/sn/next`, {
+    const res = await this.get(`/transaction/sn/next`, {
       params: {
         msafeAddress: address
       },
       headers: this.headers()
     });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid getNextSequenceNumber return: ${res}`);
-    }
     return res.data;
   }
   async createMSafeAccount(input) {
-    const res = await axios.post(`${this.apiURL}/msafe/create`, input, {
+    await this.post(`/msafe/create`, input, {
       headers: this.headers()
     });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid createMSafeAccount return: ${res}`);
-    }
   }
   async proposeIntention(input) {
-    const res = await axios.post(`${this.apiURL}/transaction/intention`, input, { headers: this.headers() });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid proposeIntention return: ${res}`);
-    }
+    await this.post(`/transaction/intention`, input, { headers: this.headers() });
   }
   // TODO later
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -922,52 +917,30 @@ var BackendImpl = class _BackendImpl {
     return void 0;
   }
   async rejectCurrentTx(input) {
-    const res = await axios.post(`${this.apiURL}/transaction/pending/reject`, input, {
+    await this.post(`/transaction/pending/reject`, input, {
       headers: this.headers()
     });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid voteForTransaction return: ${res}`);
-    }
   }
   async voteForTransaction(input) {
-    const res = await axios.post(`${this.apiURL}/transaction/pending/vote`, input, {
+    await this.post(`/transaction/pending/vote`, input, {
       headers: this.headers()
     });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid voteForTransaction return: ${res}`);
-    }
   }
   async buildNextIntentionAndAddToPending(input) {
-    const res = await axios.post(`${this.apiURL}/transaction/pending/build`, input, { headers: this.headers() });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid buildNextIntentionAndAddToPending return: ${res}`);
-    }
+    await this.post(`/transaction/pending/build`, input, { headers: this.headers() });
   }
   async skipNextFailedIntention(input) {
-    const res = await axios.post(`${this.apiURL}/transaction/pending/skip`, input, { headers: this.headers() });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid skipNextFailedIntention return: ${res}`);
-    }
+    await this.post(`/transaction/pending/skip`, input, { headers: this.headers() });
   }
   async getAddressBookEntries(pagination) {
-    const res = await axios.get(`${this.apiURL}/address-book`, {
+    const res = await this.get(`/address-book`, {
       headers: this.headers(),
       params: pagination
     });
-    if (res.status !== 200) {
-      throw new Error(`Invalid address-book return: ${res}`);
-    }
     return res.data;
   }
   async updateAddressBook(input) {
-    const res = await axios.post(`${this.apiURL}/address-book`, input, { headers: this.headers() });
-    if (res.status !== 200 && res.status !== 201) {
-      throw new Error(`invalid updateAddressBook return: ${res}`);
-    }
-  }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async processExecutedTransaction(_digest) {
-    return void 0;
+    await this.post(`/address-book`, input, { headers: this.headers() });
   }
   headers(token) {
     return { Authorization: `Bearer ${token || this._token}` };
@@ -985,6 +958,57 @@ var BackendImpl = class _BackendImpl {
       }))
     };
   }
+  async get(url, config) {
+    const fullUrl = this.getFullUrl(url);
+    try {
+      return await axios.get(fullUrl, config);
+    } catch (e) {
+      throw BackendError.fromError(e) ?? e;
+    }
+  }
+  async post(url, data, config) {
+    const fullUrl = this.getFullUrl(url);
+    try {
+      return await axios.post(fullUrl, data, config);
+    } catch (e) {
+      throw BackendError.fromError(e) ?? e;
+    }
+  }
+  getFullUrl(url) {
+    return url.startsWith(this.apiURL) ? url : `${this.apiURL}${addPrefix(url, "/")}`;
+  }
+};
+var BackendError = class _BackendError extends Error {
+  constructor(e) {
+    super();
+    this.e = e;
+    Error.captureStackTrace(this, this.constructor);
+  }
+  name;
+  static fromError(e) {
+    if (axios.isAxiosError(e) && e?.response?.data && "message" in e.response.data) {
+      return new _BackendError(e);
+    }
+    return void 0;
+  }
+  get status() {
+    return this.e.response?.status ?? void 0;
+  }
+  get message() {
+    return `Request to ${this.endpoint} failed: ${this.status} ${this.respMessage() ?? "Unknown resp"}`;
+  }
+  respMessage() {
+    if (!this.e.response?.data) {
+      return void 0;
+    }
+    return (this.e.response?.data).message ?? void 0;
+  }
+  get endpoint() {
+    return this.e.config?.url ?? "";
+  }
+  toString() {
+    return this.message;
+  }
 };
 
 // src/globals/const.ts
@@ -1199,6 +1223,7 @@ export {
   SignatureVerifier,
   TESTNET_RPC_URL,
   Uint8ArrayToHex,
+  addPrefix,
   getAllCoins,
   getMSafeConfig,
   getPublicKeyFromChain,