@aeternity/aepp-sdk 12.1.3 → 13.0.0-alpha.1

package/src/tx/index.ts

@@ -22,114 +22,37 @@
  * the creation of transactions to {@link Node}.
  * These methods provide ability to create native transactions.
  */
-import BigNumber from 'bignumber.js';
-import {
-  ABI_VERSIONS, CtVersion, PROTOCOL_VM_ABI, TX_TTL, TxParamsCommon,
-} from './builder/schema';
-import { Tag } from './builder/constants';
-import {
-  ArgumentError, UnsupportedProtocolError, UnknownTxError, InvalidTxParamsError,
-} from '../utils/errors';
+import { TX_TTL, TxParamsCommon } from './builder/schema';
+import { ConsensusProtocolVersion, Tag } from './builder/constants';
+import { ArgumentError, InvalidTxParamsError } from '../utils/errors';
 import Node from '../Node';
 import { Encoded } from '../utils/encoder';
 import { buildTx as syncBuildTx, unpackTx } from './builder/index';
-import { isKeyOfObject } from '../utils/other';
+import { isAccountNotFoundError } from '../utils/other';
 import { AE_AMOUNT_FORMATS } from '../utils/amount-formatter';
 
-type Int = number | string | BigNumber;
-
 export type BuildTxOptions <TxType extends Tag, OmitFields extends string> =
   Omit<Parameters<typeof _buildTx<TxType>>[1], OmitFields>;
 
-/**
- * Validated vm/abi version or get default based on transaction type and NODE version
- * @category transaction builder
- * @param txType - Type of transaction
- * @param ctVersion - Object with vm and abi version fields
- * @returns Object with vm/abi version
- */
-export async function getVmVersion(
-  txType: Tag.ContractCreateTx, ctVersion: Partial<CtVersion> & { onNode: Node }
-): Promise<CtVersion>;
-export async function getVmVersion(
-  txType: Tag, ctVersion: Partial<Pick<CtVersion, 'abiVersion'>> & { onNode: Node }
-): Promise<Pick<CtVersion, 'abiVersion'>>;
-export async function getVmVersion(
-  txType: Tag,
-  { vmVersion, abiVersion, onNode }: Partial<CtVersion> & { onNode: Node },
-): Promise<Partial<CtVersion>> {
-  const { consensusProtocolVersion } = await onNode.getNodeInfo();
-  if (!isKeyOfObject(consensusProtocolVersion, PROTOCOL_VM_ABI)) {
-    throw new UnsupportedProtocolError('Not supported consensus protocol version');
-  }
-  const supportedProtocol = PROTOCOL_VM_ABI[consensusProtocolVersion];
-  if (!isKeyOfObject(txType, supportedProtocol)) {
-    throw new UnknownTxError('Not supported tx type');
-  }
-  const protocolForTX = supportedProtocol[txType];
-  abiVersion ??= protocolForTX.abiVersion[0];
-  vmVersion ??= protocolForTX.vmVersion[0];
-  return { vmVersion, abiVersion };
-}
-
-/**
- * Calculate fee, get absolute ttl (ttl + height), get account nonce
- * @category transaction builder
- * @param txType - Type of transaction
- * @param params - Object which contains all tx data
- * @returns Object with account nonce, absolute ttl and transaction fee
- */
-export async function prepareTxParams(
-  txType: Tag,
-  {
-    senderId,
-    nonce,
-    ttl = TX_TTL,
-    absoluteTtl,
-    strategy,
-    onNode,
-  }: PrepareTxParamsOptions,
-): Promise<{ ttl: number; nonce: number }> {
-  nonce ??= (
-    await onNode.getAccountNextNonce(senderId, { strategy }).catch(() => ({ nextNonce: 1 }))
-  ).nextNonce;
-
-  if (ttl !== 0) {
-    if (ttl < 0) throw new ArgumentError('ttl', 'greater or equal to 0', ttl);
-    ttl += absoluteTtl === true ? 0 : (await onNode.getCurrentKeyBlock()).height;
-  }
-
-  return { ttl, nonce };
-}
-
-interface PrepareTxParamsOptions extends Pick<TxParamsCommon, 'nonce' | 'ttl'> {
-  senderId: Encoded.AccountAddress;
-  absoluteTtl?: boolean;
-  strategy?: 'continuity' | 'max';
-  onNode: Node;
-}
-
 // TODO: find a better name or rearrange methods
 /**
  * @category transaction builder
  */
 export async function _buildTx<TxType extends Tag>(
   txType: TxType,
-  { denomination, absoluteTtl, ..._params }:
-  Omit<Parameters<typeof syncBuildTx<TxType, 'tx'>>[0], 'fee' | 'nonce' | 'ttl' | 'ctVersion' | 'abiVersion'>
+  {
+    denomination, absoluteTtl, strategy, onNode, ..._params
+  }: Omit<Parameters<typeof syncBuildTx<TxType>>[0], 'tag' | 'nonce' | 'ttl'>
   & {
-    onNode: Node;
-    fee?: Int;
-    nonce?: number;
-    ttl?: number;
     denomination?: AE_AMOUNT_FORMATS;
     absoluteTtl?: boolean;
+    strategy?: 'continuity' | 'max';
+    onNode: Node;
+    ttl?: number;
+    nonce?: number;
   }
   & (TxType extends Tag.OracleExtendTx | Tag.OracleResponseTx
-    ? { callerId: Encoded.AccountAddress } : {})
-  & (TxType extends Tag.ContractCreateTx | Tag.GaAttachTx ? { ctVersion?: CtVersion } : {})
-  & (TxType extends Tag.ContractCallTx | Tag.OracleRegisterTx
-    ? { abiVersion?: ABI_VERSIONS } : {}),
+    ? { callerId: Encoded.AccountAddress } : {}),
 ): Promise<Encoded.Transaction> {
   // TODO: avoid this assertion
   const params = _params as unknown as TxParamsCommon & { onNode: Node };
@@ -151,6 +74,9 @@ export async function _buildTx<TxType extends Tag>(
     case Tag.GaAttachTx:
       senderKey = 'ownerId';
       break;
+    case Tag.GaMetaTx:
+      senderKey = 'gaId';
+      break;
     case Tag.ContractCallTx:
     case Tag.OracleExtendTx:
     case Tag.OracleResponseTx:
@@ -168,25 +94,36 @@ export async function _buildTx<TxType extends Tag>(
     default:
       throw new ArgumentError('txType', 'valid transaction type', txType);
   }
-  // TODO: move specific cases to field-types
-  if ([Tag.ContractCreateTx, Tag.GaAttachTx].includes(txType)) {
-    params.ctVersion = await getVmVersion(
-      Tag.ContractCreateTx,
-      { ...params, ...params.ctVersion },
-    );
-  }
-  if (txType === Tag.ContractCallTx) {
-    params.abiVersion = (await getVmVersion(Tag.ContractCallTx, params)).abiVersion;
-  }
-  if (txType === Tag.OracleRegisterTx) {
-    params.abiVersion ??= ABI_VERSIONS.NO_ABI;
+
+  if (
+    Object.keys(ConsensusProtocolVersion).length !== 2
+    && (((Tag.ContractCreateTx === txType || Tag.GaAttachTx === txType) && params.ctVersion == null)
+    || ((Tag.ContractCallTx === txType || Tag.GaMetaTx === txType) && params.abiVersion == null))
+  ) {
+    const { consensusProtocolVersion } = await onNode.getNodeInfo();
+    // @ts-expect-error remove after fixing buildTx types
+    params.consensusProtocolVersion = consensusProtocolVersion;
   }
+
   if (txType === Tag.PayingForTx) {
     params.tx = unpackTx(params.tx);
   }
   const senderId = params[senderKey];
   // TODO: do this check on TypeScript level
   if (senderId == null) throw new InvalidTxParamsError(`Transaction field ${senderKey} is missed`);
-  const extraParams = await prepareTxParams(txType, { ...params, senderId, absoluteTtl });
-  return syncBuildTx({ ...params, ...extraParams } as any, txType, { denomination }).tx;
+
+  params.nonce ??= (
+    await onNode.getAccountNextNonce(senderId, { strategy }).catch((error) => {
+      if (!isAccountNotFoundError(error)) throw error;
+      return { nextNonce: 1 };
+    })
+  ).nextNonce;
+
+  params.ttl ??= TX_TTL;
+  if (params.ttl !== 0) {
+    if (params.ttl < 0) throw new ArgumentError('ttl', 'greater or equal to 0', params.ttl);
+    params.ttl += absoluteTtl === true ? 0 : (await onNode.getCurrentKeyBlock()).height;
+  }
+
+  return syncBuildTx({ ...params, tag: txType } as any, { denomination });
 }

package/src/tx/validator.ts

@@ -1,27 +1,14 @@
 import BigNumber from 'bignumber.js';
 import { hash, verify } from '../utils/crypto';
-import {
-  CtVersion,
-  PROTOCOL_VM_ABI,
-  RawTxObject,
-  TxParamsCommon,
-  TxSchema,
-  TxTypeSchemas,
-} from './builder/schema';
-import { Tag } from './builder/constants';
-import { TxUnpacked, unpackTx } from './builder';
-import { UnsupportedProtocolError } from '../utils/errors';
-import { concatBuffers, isKeyOfObject } from '../utils/other';
-import {
-  decode, encode, Encoded, Encoding,
-} from '../utils/encoder';
-import Node from '../Node';
-
-interface Account {
-  balance: bigint;
-  id: Encoded.AccountAddress;
-  nonce: number;
-}
+import { RawTxObject, TxParamsCommon, TxSchema } from './builder/schema';
+import { ProtocolToVmAbi } from './builder/field-types/ct-version';
+import { Tag, ConsensusProtocolVersion } from './builder/constants';
+import { buildTx, unpackTx } from './builder';
+import { concatBuffers, isAccountNotFoundError } from '../utils/other';
+import { Encoded, decode } from '../utils/encoder';
+import Node, { TransformNodeType } from '../Node';
+import { Account } from '../apis/node';
+import { genAggressiveCacheGetResponsesPolicy } from '../utils/autorest';
 
 export interface ValidatorResult {
   message: string;
@@ -29,30 +16,18 @@ export interface ValidatorResult {
   checkedKeys: string[];
 }
 
+type UnpackedTx = ReturnType<typeof unpackTx>['tx'];
+
 type Validator = (
-  tx: {
-    encodedTx: TxUnpacked<TxSchema>;
-    signatures: Buffer[];
-    tx: TxUnpacked<TxSchema> & {
-      tx: TxTypeSchemas[Tag.SignedTx];
-    };
-    nonce?: number;
-    ttl?: number;
-    amount?: number;
-    fee?: number;
-    nameFee?: number;
-    ctVersion?: Partial<CtVersion>;
-    abiVersion?: number;
-    contractId?: Encoded.ContractAddress;
-  },
+  tx: UnpackedTx,
   options: {
-    account?: Account;
+    // TODO: remove after fixing node types
+    account?: TransformNodeType<Account> & { id: Encoded.AccountAddress };
     nodeNetworkId: string;
     parentTxTypes: Tag[];
     node: Node;
-    txType: Tag;
     height: number;
-    consensusProtocolVersion: number;
+    consensusProtocolVersion: ConsensusProtocolVersion;
   }
 ) => ValidatorResult[] | Promise<ValidatorResult[]>;
 
@@ -68,30 +43,21 @@ const getSenderAddress = (
   .filter((a) => a)
   .map((a) => a?.toString().replace(/^ok_/, 'ak_'))[0] as Encoded.AccountAddress | undefined;
 
-/**
- * Transaction Validator
- * This function validates some of transaction properties,
- * to make sure it can be posted it to the chain
- * @category transaction builder
- * @param transaction - Base64Check-encoded transaction
- * @param node - Node to validate transaction against
- * @param parentTxTypes - Types of parent transactions
- * @returns Array with verification errors
- * @example const errors = await verifyTransaction(transaction, node)
- */
-export default async function verifyTransaction(
-  transaction: Encoded.Transaction | Encoded.Poi,
+async function verifyTransactionInternal(
+  tx: UnpackedTx,
   node: Node,
-  parentTxTypes: Tag[] = [],
+  parentTxTypes: Tag[],
 ): Promise<ValidatorResult[]> {
-  const { tx, txType } = unpackTx<Tag.SignedTx>(transaction);
   const address = getSenderAddress(tx)
-    ?? (txType === Tag.SignedTx ? getSenderAddress(tx.encodedTx.tx) : undefined);
+    ?? (tx.tag === Tag.SignedTx ? getSenderAddress(tx.encodedTx) : undefined);
   const [account, { height }, { consensusProtocolVersion, nodeNetworkId }] = await Promise.all([
     address == null
       ? undefined
       : node.getAccountByPubkey(address)
-        .catch(() => ({ id: address, balance: 0n, nonce: 0 }))
+        .catch((error) => {
+          if (!isAccountNotFoundError(error)) throw error;
+          return { id: address, balance: 0n, nonce: 0 };
+        })
         // TODO: remove after fixing https://github.com/aeternity/aepp-sdk-js/issues/1537
         .then((acc) => ({ ...acc, id: acc.id as Encoded.AccountAddress })),
     node.getCurrentKeyBlockHeight(),
@@ -100,28 +66,47 @@ export default async function verifyTransaction(
 
   return (await Promise.all(
     validators.map((v) => v(
-      tx as any,
+      tx,
       {
-        txType, node, account, height, consensusProtocolVersion, nodeNetworkId, parentTxTypes,
+        node, account, height, consensusProtocolVersion, nodeNetworkId, parentTxTypes,
       },
     )),
   )).flat();
 }
 
+/**
+ * Transaction Validator
+ * This function validates some transaction properties,
+ * to make sure it can be posted it to the chain
+ * @category transaction builder
+ * @param transaction - Base64Check-encoded transaction
+ * @param nodeNotCached - Node to validate transaction against
+ * @returns Array with verification errors
+ * @example const errors = await verifyTransaction(transaction, node)
+ */
+export default async function verifyTransaction(
+  transaction: Parameters<typeof unpackTx>[0],
+  nodeNotCached: Node,
+): Promise<ValidatorResult[]> {
+  const node = new Node(nodeNotCached.$host, { ignoreVersion: true });
+  node.pipeline.addPolicy(genAggressiveCacheGetResponsesPolicy());
+  return verifyTransactionInternal(unpackTx(transaction), node, []);
+}
+
 validators.push(
   ({ encodedTx, signatures }, { account, nodeNetworkId, parentTxTypes }) => {
-    if ((encodedTx ?? signatures) === undefined) return [];
+    if ((encodedTx ?? signatures) == null) return [];
     if (account == null) return [];
-    if (signatures.length !== 1) return []; // TODO: Support multisignature?
+    if (signatures.length !== 1) return []; // TODO: Support multisignature like in state channels
     const prefix = Buffer.from([
       nodeNetworkId,
       ...parentTxTypes.includes(Tag.PayingForTx) ? ['inner_tx'] : [],
     ].join('-'));
-    const txWithNetworkId = concatBuffers([prefix, encodedTx.rlpEncoded]);
-    const txHashWithNetworkId = concatBuffers([prefix, hash(encodedTx.rlpEncoded)]);
-    const decodedPub = decode(account.id);
-    if (verify(txWithNetworkId, signatures[0], decodedPub)
-      || verify(txHashWithNetworkId, signatures[0], decodedPub)) return [];
+    const txBinary = decode(buildTx(encodedTx));
+    const txWithNetworkId = concatBuffers([prefix, txBinary]);
+    const txHashWithNetworkId = concatBuffers([prefix, hash(txBinary)]);
+    if (verify(txWithNetworkId, signatures[0], account.id)
+      || verify(txHashWithNetworkId, signatures[0], account.id)) return [];
     return [{
       message: 'Signature cannot be verified, please ensure that you transaction have'
         + ' the correct prefix and the correct private key for the sender address',
@@ -129,16 +114,12 @@ validators.push(
       checkedKeys: ['encodedTx', 'signatures'],
     }];
   },
-  async ({ encodedTx, tx }, { node, parentTxTypes, txType }) => {
-    if ((encodedTx ?? tx) === undefined) return [];
-    return verifyTransaction(
-      encode((encodedTx ?? tx).rlpEncoded, Encoding.Transaction),
-      node,
-      [...parentTxTypes, txType],
-    );
+  async ({ encodedTx, tx, tag }, { node, parentTxTypes }) => {
+    if ((encodedTx ?? tx) == null) return [];
+    return verifyTransactionInternal(encodedTx ?? tx, node, [...parentTxTypes, tag]);
   },
   ({ ttl }, { height }) => {
-    if (ttl === undefined) return [];
+    if (ttl == null) return [];
     ttl = +ttl;
     if (ttl === 0 || ttl >= height) return [];
     return [{
@@ -148,13 +129,13 @@ validators.push(
     }];
   },
   ({
-    amount, fee, nameFee, tx,
-  }, { account, parentTxTypes, txType }) => {
+    amount, fee, nameFee, tx, tag,
+  }, { account, parentTxTypes }) => {
     if (account == null) return [];
-    if ((amount ?? fee ?? nameFee) === undefined) return [];
+    if ((amount ?? fee ?? nameFee) == null) return [];
     fee ??= 0;
     const cost = new BigNumber(fee).plus(nameFee ?? 0).plus(amount ?? 0)
-      .plus(txType === Tag.PayingForTx ? (tx.tx.encodedTx.tx).fee : 0)
+      .plus(tag === Tag.PayingForTx ? tx.encodedTx.fee : 0)
       .minus(parentTxTypes.includes(Tag.PayingForTx) ? fee : 0);
     if (cost.lte(account.balance.toString())) return [];
     return [{
@@ -163,6 +144,18 @@ validators.push(
       checkedKeys: ['amount', 'fee', 'nameFee'],
     }];
   },
+  ({ signatures, tag }, { account }) => {
+    if (account == null) return [];
+    let message;
+    if (tag === Tag.SignedTx && account.kind === 'generalized' && signatures.length !== 0) {
+      message = 'Generalized account can\'t be used to generate SignedTx with signatures';
+    }
+    if (tag === Tag.GaMetaTx && account.kind === 'basic') {
+      message = 'Basic account can\'t be used to generate GaMetaTx';
+    }
+    if (message == null) return [];
+    return [{ message, key: 'InvalidAccountType', checkedKeys: ['tag'] }];
+  },
   ({ nonce }, { account, parentTxTypes }) => {
     if (nonce == null || account == null || parentTxTypes.includes(Tag.GaMetaTx)) return [];
     nonce = +nonce;
@@ -181,34 +174,36 @@ validators.push(
       checkedKeys: ['nonce'],
     }];
   },
-  ({ ctVersion, abiVersion }, { txType, consensusProtocolVersion }) => {
-    if (!isKeyOfObject(consensusProtocolVersion, PROTOCOL_VM_ABI)) {
-      throw new UnsupportedProtocolError(`Unsupported protocol: ${consensusProtocolVersion}`);
-    }
-    const protocol = PROTOCOL_VM_ABI[consensusProtocolVersion];
+  ({ ctVersion, abiVersion, tag }, { consensusProtocolVersion }) => {
+    const oracleCall = Tag.Oracle === tag || Tag.OracleRegisterTx === tag;
+    const contractCreate = Tag.ContractCreateTx === tag || Tag.GaAttachTx === tag;
+    const contractCall = Tag.ContractCallTx === tag || Tag.GaMetaTx === tag;
+    const type = (oracleCall ? 'oracle-call' : null)
+      ?? (contractCreate ? 'contract-create' : null)
+      ?? (contractCall ? 'contract-call' : null);
+    if (type == null) return [];
+    // TODO: remove assertion after fixing buildTx types
+    const protocol = ProtocolToVmAbi[consensusProtocolVersion][type] as unknown as {
+      abiVersion: any[];
+      vmVersion: any[];
+    };
 
     // If not contract create tx
     if (ctVersion == null) ctVersion = { abiVersion };
-    const txProtocol = protocol[txType as keyof typeof protocol];
-    if (txProtocol == null) return [];
-    if (Object.entries(ctVersion).some(
-      ([
-        key,
-        value,
-      ]: [
-        key:keyof typeof txProtocol,
-        value:any]) => !(txProtocol[key].includes(+value as never)),
-    )) {
+    if (
+      !protocol.abiVersion.includes(ctVersion.abiVersion)
+      || (contractCreate && !protocol.vmVersion.includes(ctVersion.vmVersion))
+    ) {
       return [{
-        message: `ABI/VM version ${JSON.stringify(ctVersion)} is wrong, supported is: ${JSON.stringify(txProtocol)}`,
+        message: `ABI/VM version ${JSON.stringify(ctVersion)} is wrong, supported is: ${JSON.stringify(protocol)}`,
         key: 'VmAndAbiVersionMismatch',
         checkedKeys: ['ctVersion', 'abiVersion'],
       }];
     }
     return [];
   },
-  async ({ contractId }, { txType, node }) => {
-    if (Tag.ContractCallTx !== txType) return [];
+  async ({ contractId, tag }, { node }) => {
+    if (Tag.ContractCallTx !== tag) return [];
     contractId = contractId as Encoded.ContractAddress;
     try {
       const { active } = await node.getContract(contractId);

package/src/typings/@aeternity__aepp-calldata/index.d.ts

@@ -0,0 +1,20 @@
+declare module '@aeternity/aepp-calldata' {
+  // eslint-disable-next-line import/prefer-default-export
+  export class Encoder {
+    constructor(aci: object);
+
+    encode(contract: string, funName: string, args: any[]): `cb_${string}`;
+
+    decode(contract: string, funName: string, data: `cb_${string}`): any;
+
+    decodeString(data: `cb_${string}`): Uint8Array;
+
+    decodeFateString(data: `cb_${string}`): string;
+
+    decodeEvent(
+      contract: string,
+      encodedData: `cb_${string}`,
+      topics: BigInt[],
+    ): { [key: string]: any[] };
+  }
+}

package/src/utils/autorest.ts

@@ -31,7 +31,7 @@ export const genCombineGetRequestsPolicy = (): AdditionalPolicyConfig => {
 
   return {
     policy: {
-      name: 'combine-requests',
+      name: 'combine-get-requests',
       async sendRequest(request, next) {
         if (request.method !== 'GET') return next(request);
         const key = JSON.stringify([request.url, request.body]);
@@ -48,6 +48,21 @@ export const genCombineGetRequestsPolicy = (): AdditionalPolicyConfig => {
   };
 };
 
+export const genAggressiveCacheGetResponsesPolicy = (): PipelinePolicy => {
+  const getRequests = new Map<string, Promise<PipelineResponse>>();
+
+  return {
+    name: 'aggressive-cache-get-responses',
+    async sendRequest(request, next) {
+      if (request.method !== 'GET') return next(request);
+      const key = JSON.stringify([request.url, request.body]);
+      const response = getRequests.get(key) ?? next(request);
+      getRequests.set(key, response);
+      return response;
+    },
+  };
+};
+
 export const genErrorFormatterPolicy = (
   getMessage: (b: any) => string,
 ): AdditionalPolicyConfig => ({

package/src/utils/bytes.ts

@@ -16,19 +16,6 @@
  */
 import BigNumber from 'bignumber.js';
 import { NoSerializerFoundError, TypeError } from './errors';
-import { isBase64, isHex } from './string';
-
-/**
- * Convert bignumber to byte array
- * @param x - bignumber instance
- * @returns Buffer
- */
-export function bigNumberToByteArray(x: BigNumber): Buffer {
-  if (!x.isInteger()) throw new TypeError(`Unexpected not integer value: ${x.toFixed()}`);
-  let hexString = x.toString(16);
-  if (hexString.length % 2 === 1) hexString = `0${hexString}`;
-  return Buffer.from(hexString, 'hex');
-}
 
 /**
  * Convert string, number, or BigNumber to byte array
@@ -36,37 +23,22 @@ export function bigNumberToByteArray(x: BigNumber): Buffer {
  * @param big - enables force conversion to BigNumber
  * @returns Buffer
  */
+// eslint-disable-next-line import/prefer-default-export
 export function toBytes(val?: null | string | number | BigNumber, big = false): Buffer {
   // Encode a value to bytes.
   // If the value is an int it will be encoded as bytes big endian
   // Raises ValueError if the input is not an int or string
 
-  if (val === undefined || val === null) return Buffer.from([]);
+  if (val == null) return Buffer.from([]);
   if (Number.isInteger(val) || BigNumber.isBigNumber(val) || big) {
     if (!BigNumber.isBigNumber(val)) val = new BigNumber(val);
-    return bigNumberToByteArray(val);
+    if (!val.isInteger()) throw new TypeError(`Unexpected not integer value: ${val.toFixed()}`);
+    let hexString = val.toString(16);
+    if (hexString.length % 2 === 1) hexString = `0${hexString}`;
+    return Buffer.from(hexString, 'hex');
   }
   if (typeof val === 'string') {
     return Buffer.from(val);
   }
   throw new NoSerializerFoundError();
 }
-
-/**
- * Convert a string to a Buffer.  If encoding is not specified, hex-encoding
- * will be used if the input is valid hex.  If the input is valid base64 but
- * not valid hex, base64 will be used.  Otherwise, utf8 will be used.
- * @param str - String to be converted.
- * @param enc - Encoding of the input string.
- * @returns Buffer containing the input data.
- */
-export function str2buf(str: string, enc?: BufferEncoding): Buffer {
-  return Buffer.from(
-    str,
-    enc ?? (isHex(str) ? 'hex' : undefined) ?? (isBase64(str) ? 'base64' : undefined),
-  );
-}
-
-export const bytesToHex = (b: Uint8Array): string => Buffer.from(b).toString('hex');
-
-export const hexToBytes = (s: string): Uint8Array => Buffer.from(s, 'hex');

package/src/utils/crypto.ts

@@ -20,7 +20,6 @@ import nacl, { SignKeyPair } from 'tweetnacl';
 import { blake2b } from 'blakejs/blake2b.js';
 import { encode as varuintEncode } from 'varuint-bitcoin';
 
-import { str2buf } from './bytes';
 import { concatBuffers } from './other';
 import {
   decode, encode, Encoded, Encoding,
@@ -28,11 +27,11 @@ import {
 
 /**
  * Generate address from secret key
- * @param secret - Private key
+ * @param secret - Private key as hex string
  * @returns Public key encoded as address
  */
 export function getAddressFromPriv(secret: string | Uint8Array): Encoded.AccountAddress {
-  const secretBuffer = typeof secret === 'string' ? str2buf(secret) : secret;
+  const secretBuffer = typeof secret === 'string' ? Buffer.from(secret, 'hex') : secret;
   const keys = nacl.sign.keyPair.fromSecretKey(secretBuffer);
   return encode(keys.publicKey, Encoding.AccountAddress);
 }
@@ -60,7 +59,8 @@ export function isAddressValid(
  * @returns random salt
  */
 export function genSalt(): number {
-  return Math.floor(Math.random() * Math.floor(Number.MAX_SAFE_INTEGER));
+  const [random] = new BigUint64Array(nacl.randomBytes(8).buffer);
+  return Number(random % BigInt(Number.MAX_SAFE_INTEGER));
 }
 
 /**
@@ -155,18 +155,17 @@ export function sign(data: string | Uint8Array, privateKey: string | Uint8Array)
 
 /**
  * Verify that signature was signed by public key
- * @param data - Data to verify
- * @param signature - Signature to verify
- * @param publicKey - Key to verify against
- * @returns Valid?
+ * @param data - Data that was signed
+ * @param signature - Signature of data
+ * @param address - Address to verify against
+ * @returns is data was signed by address
  */
 export function verify(
   data: Uint8Array,
   signature: Uint8Array,
-  publicKey: string | Uint8Array,
+  address: Encoded.AccountAddress,
 ): boolean {
-  const publicKeyBuffer = typeof publicKey === 'string' ? str2buf(publicKey) : publicKey;
-  return nacl.sign.detached.verify(data, signature, publicKeyBuffer);
+  return nacl.sign.detached.verify(data, signature, decode(address));
 }
 
 export function messageToHash(message: string): Buffer {
@@ -179,12 +178,19 @@ export function signMessage(message: string, privateKey: string | Buffer): Uint8
   return sign(messageToHash(message), privateKey);
 }
 
+/**
+ * Verify that message was signed by address
+ * @param message - Message that was signed
+ * @param signature - Signature of message
+ * @param address - Address to verify against
+ * @returns is data was signed by address
+ */
 export function verifyMessage(
-  str: string,
+  message: string,
   signature: Uint8Array,
-  publicKey: string | Uint8Array,
+  address: Encoded.AccountAddress,
 ): boolean {
-  return verify(messageToHash(str), signature, publicKey);
+  return verify(messageToHash(message), signature, address);
 }
 
 /**
@@ -192,7 +198,7 @@ export function verifyMessage(
  *
  * Sign a message, and then verifying that signature
  * @param privateKey - Private key to verify
- * @param publicKey - Public key to verify
+ * @param publicKey - Public key to verify as hex string
  * @returns Valid?
  */
 export function isValidKeypair(
@@ -201,5 +207,6 @@ export function isValidKeypair(
 ): boolean {
   const message = Buffer.from('TheMessage');
   const signature = sign(message, privateKey);
-  return verify(message, signature, publicKey);
+  const publicKeyBuffer = typeof publicKey === 'string' ? Buffer.from(publicKey, 'hex') : publicKey;
+  return verify(message, signature, encode(publicKeyBuffer, Encoding.AccountAddress));
 }