@msafe/sui3-sdk 0.0.21 → 0.0.23

package/dist/index.js

@@ -102,7 +102,8 @@ import {
   TransactionSubTypes,
   TransactionType,
   buildObjectTransferTxb,
-  buildRejectTxb
+  buildRejectTxb,
+  isSameAddress
 } from "@msafe/sui3-utils";
 import { TransactionBlock } from "@mysten/sui.js/transactions";
 import { normalizeStructTag as normalizeStructTag3 } from "@mysten/sui.js/utils";
@@ -194,6 +195,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 {
@@ -481,6 +488,7 @@ var MSafeAccount = class _MSafeAccount {
     };
     return getAllOwnedObjects(this.suiClient, this.address, filterCoinObjectOptions);
   }
+  // TODO: Calculate the votes
   async pendingTransaction() {
     const res = await this.backend.getPendingTransactions({ msafeAddress: this.address });
     if (!res.pending) {
@@ -498,12 +506,15 @@ var MSafeAccount = class _MSafeAccount {
       sequenceNumber: pendingTx.sequenceNumber,
       payload: pendingTx.payload,
       votes: pendingTx.votes,
+      approvalWeight: this.calculateWeightFromVotes(pendingTx.votes),
       msafeAddress: pendingTx.msafeAddress,
       rejectDigest: rejectPending?.digest ?? "",
       rejectPayload: rejectPending?.payload ?? "",
-      rejectVotes: rejectPending?.votes ?? []
+      rejectVotes: rejectPending?.votes ?? [],
+      rejectWeight: this.calculateWeightFromVotes(rejectPending?.votes ?? [])
     };
   }
+  // TODO: Calculate the votes.
   async historyTransaction(pagination) {
     return this.backend.getHistoryTransactions({
       msafeAddress: this.address,
@@ -622,33 +633,41 @@ var MSafeAccount = class _MSafeAccount {
       dryRunResult
     };
   }
-  async executePendingTx(pending) {
-    let gotSigs;
-    let payload;
-    if (pending.votes.length >= this.info.threshold) {
-      gotSigs = new Map(pending.votes.map((vote) => [vote.userAddress, vote.signature]));
-      payload = pending.payload;
-    } else if (pending.rejectVotes && pending.rejectPayload && pending.rejectVotes?.length >= this.info.threshold) {
-      gotSigs = new Map(pending.rejectVotes.map((vote) => [vote.userAddress, vote.signature]));
-      payload = pending.rejectPayload;
-    } else {
-      throw new Error("Not enough signatures");
+  async executePendingTx(pending, isRejectTx = false) {
+    const votes = isRejectTx ? pending.rejectVotes : pending.votes;
+    const payload = isRejectTx ? pending.rejectPayload : pending.payload;
+    if (this.calculateWeightFromVotes(votes) < this.info.threshold) {
+      throw new Error("Not enough signature");
     }
-    const sigs = [];
+    const sortedSigs = [];
+    const gotSigs = new Map(votes.map((vote) => [vote.userAddress, vote.signature]));
     for (let i = 0; i < this.info.owners.length; i++) {
       const owner = this.info.owners[i];
       const signature = gotSigs.get(owner.address);
       if (signature) {
-        sigs.push(signature);
+        sortedSigs.push(signature);
       }
     }
-    const multiSignature = this.multiSig.combinePartialSignatures(sigs);
+    const multiSignature = this.multiSig.combinePartialSignatures(sortedSigs);
     return this.suiClient.executeTransactionBlock({
       transactionBlock: HexToUint8Array(payload),
       signature: multiSignature,
       options: { showEffects: true }
     });
   }
+  calculateWeightFromVotes(votes) {
+    return this.calculateWeight(votes.map((vote) => vote.userAddress));
+  }
+  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]));
+      if (found) {
+        gotWeight += found.weight;
+      }
+    }
+    return gotWeight;
+  }
   get address() {
     return this.multiSig.address;
   }
@@ -750,16 +769,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;
@@ -775,13 +791,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
     );
@@ -790,22 +803,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) {
@@ -816,13 +823,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
@@ -830,78 +834,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
@@ -909,52 +889,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}` };
@@ -972,6 +930,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
@@ -1186,6 +1195,7 @@ export {
   SignatureVerifier,
   TESTNET_RPC_URL,
   Uint8ArrayToHex,
+  addPrefix,
   getAllCoins,
   getMSafeConfig,
   getPublicKeyFromChain,