@alephium/web3 0.27.4 → 0.28.0

package/dist/src/utils/exchange.d.ts

@@ -1,11 +1,10 @@
 import { Transaction } from '../api/api-alephium';
 import { Address } from '../signer';
 export declare function validateExchangeAddress(address: string): void;
-export declare function isSimpleALPHTransferTx(tx: Transaction): boolean;
-export declare function isSimpleTransferTokenTx(tx: Transaction): boolean;
+export declare function isALPHTransferTx(tx: Transaction): boolean;
 export declare function getALPHDepositInfo(tx: Transaction): {
     targetAddress: Address;
     depositAmount: bigint;
-};
+}[];
 export declare function getSenderAddress(tx: Transaction): Address;
 export declare function getAddressFromUnlockScript(unlockScript: string): Address;

package/dist/src/utils/exchange.js

@@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAddressFromUnlockScript = exports.getSenderAddress = exports.getALPHDepositInfo = exports.isSimpleTransferTokenTx = exports.isSimpleALPHTransferTx = exports.validateExchangeAddress = void 0;
+exports.getAddressFromUnlockScript = exports.getSenderAddress = exports.getALPHDepositInfo = exports.isALPHTransferTx = exports.validateExchangeAddress = void 0;
 const __1 = require("..");
 function validateExchangeAddress(address) {
     let decoded;
@@ -38,34 +38,40 @@ function validateExchangeAddress(address) {
     }
 }
 exports.validateExchangeAddress = validateExchangeAddress;
-function isSimpleALPHTransferTx(tx) {
-    return isSimpleTransferTx(tx) && checkALPHOutput(tx);
+function isALPHTransferTx(tx) {
+    return isTransferTx(tx) && checkALPHOutput(tx);
 }
-exports.isSimpleALPHTransferTx = isSimpleALPHTransferTx;
-function isSimpleTransferTokenTx(tx) {
-    const isTransferTx = isSimpleTransferTx(tx);
-    if (isTransferTx) {
-        const senderAddress = getSenderAddress(tx);
-        const targetAddress = tx.unsigned.fixedOutputs.find((o) => o.address !== senderAddress).address;
-        return checkTokenOutput(tx, targetAddress);
-    }
-    return false;
-}
-exports.isSimpleTransferTokenTx = isSimpleTransferTokenTx;
-// we assume that the tx is a simple transfer tx, i.e. isSimpleTransferALPHTx(tx) == true
+exports.isALPHTransferTx = isALPHTransferTx;
 function getALPHDepositInfo(tx) {
-    const senderAddress = getSenderAddress(tx);
-    const targetAddress = tx.unsigned.fixedOutputs.find((o) => o.address !== senderAddress).address;
-    let depositAmount = 0n;
+    if (!isALPHTransferTx(tx)) {
+        return [];
+    }
+    const inputAddresses = [];
+    for (const input of tx.unsigned.inputs) {
+        try {
+            const address = getAddressFromUnlockScript(input.unlockScript);
+            if (!inputAddresses.includes(address)) {
+                inputAddresses.push(address);
+            }
+        }
+        catch (_) { }
+    }
+    const result = new Map();
     tx.unsigned.fixedOutputs.forEach((o) => {
-        if (o.address === targetAddress) {
-            depositAmount += BigInt(o.attoAlphAmount);
+        if (!inputAddresses.includes(o.address)) {
+            const amount = result.get(o.address);
+            if (amount === undefined) {
+                result.set(o.address, BigInt(o.attoAlphAmount));
+            }
+            else {
+                result.set(o.address, BigInt(o.attoAlphAmount) + amount);
+            }
         }
     });
-    return { targetAddress, depositAmount };
+    return Array.from(result.entries()).map(([key, value]) => ({ targetAddress: key, depositAmount: value }));
 }
 exports.getALPHDepositInfo = getALPHDepositInfo;
-// we assume that the tx is a simple transfer tx, i.e. isSimpleTransferALPHTx(tx) == true
+// we assume that the tx is a simple transfer tx, i.e. isSimpleALPHTransferTx(tx) == true
 function getSenderAddress(tx) {
     return getAddressFromUnlockScript(tx.unsigned.inputs[0].unlockScript);
 }
@@ -100,47 +106,16 @@ function getAddressFromUnlockScript(unlockScript) {
     }
 }
 exports.getAddressFromUnlockScript = getAddressFromUnlockScript;
-function getSenderAddressAnyTx(tx) {
-    try {
-        const inputAddresses = tx.unsigned.inputs.map((i) => getAddressFromUnlockScript(i.unlockScript));
-        // we have checked that the inputs is not empty
-        const sender = inputAddresses[0];
-        return inputAddresses.slice(1).every((addr) => addr === sender) ? sender : undefined;
-    }
-    catch (_) {
-        return undefined;
-    }
-}
 function checkALPHOutput(tx) {
     const outputs = tx.unsigned.fixedOutputs;
     return outputs.every((o) => o.tokens.length === 0);
 }
-function checkTokenOutput(tx, to) {
-    // we have checked the output address
-    const outputs = tx.unsigned.fixedOutputs.filter((o) => o.address === to);
-    if (outputs[0].tokens.length === 0) {
-        return false;
-    }
-    const tokenId = outputs[0].tokens[0].id;
-    return outputs.every((o) => BigInt(o.attoAlphAmount) === __1.DUST_AMOUNT && o.tokens.length === 1 && o.tokens[0].id === tokenId);
-}
-function isSimpleTransferTx(tx) {
+function isTransferTx(tx) {
     if (tx.contractInputs.length !== 0 ||
         tx.generatedOutputs.length !== 0 ||
         tx.unsigned.inputs.length === 0 ||
         tx.unsigned.scriptOpt !== undefined) {
         return false;
     }
-    const sender = getSenderAddressAnyTx(tx);
-    if (sender === undefined) {
-        return false;
-    }
-    const outputAddresses = [];
-    tx.unsigned.fixedOutputs.forEach((o) => {
-        if (!outputAddresses.includes(o.address)) {
-            outputAddresses.push(o.address);
-        }
-    });
-    return ((outputAddresses.length === 1 && outputAddresses[0] !== sender) ||
-        (outputAddresses.length === 2 && outputAddresses.includes(sender)));
+    return true;
 }

package/dist/src/utils/index.d.ts

@@ -6,4 +6,4 @@ export * from './utils';
 export * from './subscription';
 export * from './sign';
 export * from './number';
-export { validateExchangeAddress, isSimpleALPHTransferTx, isSimpleTransferTokenTx, getSenderAddress, getALPHDepositInfo } from './exchange';
+export { validateExchangeAddress, isALPHTransferTx, getSenderAddress, getALPHDepositInfo } from './exchange';

package/dist/src/utils/index.js

@@ -31,7 +31,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getALPHDepositInfo = exports.getSenderAddress = exports.isSimpleTransferTokenTx = exports.isSimpleALPHTransferTx = exports.validateExchangeAddress = void 0;
+exports.getALPHDepositInfo = exports.getSenderAddress = exports.isALPHTransferTx = exports.validateExchangeAddress = void 0;
 __exportStar(require("./webcrypto"), exports);
 __exportStar(require("./address"), exports);
 __exportStar(require("./bs58"), exports);
@@ -42,7 +42,6 @@ __exportStar(require("./sign"), exports);
 __exportStar(require("./number"), exports);
 var exchange_1 = require("./exchange");
 Object.defineProperty(exports, "validateExchangeAddress", { enumerable: true, get: function () { return exchange_1.validateExchangeAddress; } });
-Object.defineProperty(exports, "isSimpleALPHTransferTx", { enumerable: true, get: function () { return exchange_1.isSimpleALPHTransferTx; } });
-Object.defineProperty(exports, "isSimpleTransferTokenTx", { enumerable: true, get: function () { return exchange_1.isSimpleTransferTokenTx; } });
+Object.defineProperty(exports, "isALPHTransferTx", { enumerable: true, get: function () { return exchange_1.isALPHTransferTx; } });
 Object.defineProperty(exports, "getSenderAddress", { enumerable: true, get: function () { return exchange_1.getSenderAddress; } });
 Object.defineProperty(exports, "getALPHDepositInfo", { enumerable: true, get: function () { return exchange_1.getALPHDepositInfo; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "0.27.4",
+  "version": "0.28.0",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",

package/src/utils/exchange.ts

@@ -16,7 +16,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AddressType, DUST_AMOUNT, addressFromPublicKey, addressFromScript, binToHex, bs58, hexToBinUnsafe } from '..'
+import { AddressType, addressFromPublicKey, addressFromScript, binToHex, bs58, hexToBinUnsafe } from '..'
 import { Transaction } from '../api/api-alephium'
 import { Address } from '../signer'
 
@@ -37,34 +37,38 @@ export function validateExchangeAddress(address: string) {
   }
 }
 
-export function isSimpleALPHTransferTx(tx: Transaction): boolean {
-  return isSimpleTransferTx(tx) && checkALPHOutput(tx)
+export function isALPHTransferTx(tx: Transaction): boolean {
+  return isTransferTx(tx) && checkALPHOutput(tx)
 }
 
-export function isSimpleTransferTokenTx(tx: Transaction): boolean {
-  const isTransferTx = isSimpleTransferTx(tx)
-  if (isTransferTx) {
-    const senderAddress = getSenderAddress(tx)
-    const targetAddress = tx.unsigned.fixedOutputs.find((o) => o.address !== senderAddress)!.address
-    return checkTokenOutput(tx, targetAddress)
+export function getALPHDepositInfo(tx: Transaction): { targetAddress: Address; depositAmount: bigint }[] {
+  if (!isALPHTransferTx(tx)) {
+    return []
   }
-  return false
-}
-
-// we assume that the tx is a simple transfer tx, i.e. isSimpleTransferALPHTx(tx) == true
-export function getALPHDepositInfo(tx: Transaction): { targetAddress: Address; depositAmount: bigint } {
-  const senderAddress = getSenderAddress(tx)
-  const targetAddress = tx.unsigned.fixedOutputs.find((o) => o.address !== senderAddress)!.address
-  let depositAmount = 0n
+  const inputAddresses: Address[] = []
+  for (const input of tx.unsigned.inputs) {
+    try {
+      const address = getAddressFromUnlockScript(input.unlockScript)
+      if (!inputAddresses.includes(address)) {
+        inputAddresses.push(address)
+      }
+    } catch (_) {}
+  }
+  const result = new Map<Address, bigint>()
   tx.unsigned.fixedOutputs.forEach((o) => {
-    if (o.address === targetAddress) {
-      depositAmount += BigInt(o.attoAlphAmount)
+    if (!inputAddresses.includes(o.address)) {
+      const amount = result.get(o.address)
+      if (amount === undefined) {
+        result.set(o.address, BigInt(o.attoAlphAmount))
+      } else {
+        result.set(o.address, BigInt(o.attoAlphAmount) + amount)
+      }
     }
   })
-  return { targetAddress, depositAmount }
+  return Array.from(result.entries()).map(([key, value]) => ({ targetAddress: key, depositAmount: value }))
 }
 
-// we assume that the tx is a simple transfer tx, i.e. isSimpleTransferALPHTx(tx) == true
+// we assume that the tx is a simple transfer tx, i.e. isSimpleALPHTransferTx(tx) == true
 export function getSenderAddress(tx: Transaction): Address {
   return getAddressFromUnlockScript(tx.unsigned.inputs[0].unlockScript)
 }
@@ -96,35 +100,12 @@ export function getAddressFromUnlockScript(unlockScript: string): Address {
   }
 }
 
-function getSenderAddressAnyTx(tx: Transaction): Address | undefined {
-  try {
-    const inputAddresses = tx.unsigned.inputs.map((i) => getAddressFromUnlockScript(i.unlockScript))
-    // we have checked that the inputs is not empty
-    const sender = inputAddresses[0]
-    return inputAddresses.slice(1).every((addr) => addr === sender) ? sender : undefined
-  } catch (_) {
-    return undefined
-  }
-}
-
 function checkALPHOutput(tx: Transaction): boolean {
   const outputs = tx.unsigned.fixedOutputs
   return outputs.every((o) => o.tokens.length === 0)
 }
 
-function checkTokenOutput(tx: Transaction, to: Address): boolean {
-  // we have checked the output address
-  const outputs = tx.unsigned.fixedOutputs.filter((o) => o.address === to)
-  if (outputs[0].tokens.length === 0) {
-    return false
-  }
-  const tokenId = outputs[0].tokens[0].id
-  return outputs.every(
-    (o) => BigInt(o.attoAlphAmount) === DUST_AMOUNT && o.tokens.length === 1 && o.tokens[0].id === tokenId
-  )
-}
-
-function isSimpleTransferTx(tx: Transaction): boolean {
+function isTransferTx(tx: Transaction): boolean {
   if (
     tx.contractInputs.length !== 0 ||
     tx.generatedOutputs.length !== 0 ||
@@ -133,18 +114,5 @@ function isSimpleTransferTx(tx: Transaction): boolean {
   ) {
     return false
   }
-  const sender = getSenderAddressAnyTx(tx)
-  if (sender === undefined) {
-    return false
-  }
-  const outputAddresses: Address[] = []
-  tx.unsigned.fixedOutputs.forEach((o) => {
-    if (!outputAddresses.includes(o.address)) {
-      outputAddresses.push(o.address)
-    }
-  })
-  return (
-    (outputAddresses.length === 1 && outputAddresses[0] !== sender) ||
-    (outputAddresses.length === 2 && outputAddresses.includes(sender))
-  )
+  return true
 }

package/src/utils/index.ts

@@ -24,10 +24,4 @@ export * from './utils'
 export * from './subscription'
 export * from './sign'
 export * from './number'
-export {
-  validateExchangeAddress,
-  isSimpleALPHTransferTx,
-  isSimpleTransferTokenTx,
-  getSenderAddress,
-  getALPHDepositInfo
-} from './exchange'
+export { validateExchangeAddress, isALPHTransferTx, getSenderAddress, getALPHDepositInfo } from './exchange'