@aeternity/aepp-sdk 12.1.2 → 13.0.0-alpha.0

package/src/tx/builder/schema.ts

@@ -8,10 +8,12 @@ import BigNumber from 'bignumber.js';
 import { Tag } from './constants';
 import {
   Field, uInt, shortUInt, coinAmount, name, nameId, nameFee, deposit, gasLimit, gasPrice, fee,
+  address, addresses, pointers, enumeration,
 } from './field-types';
 import { Encoded, Encoding } from '../../utils/encoder';
 import MPTree from '../../utils/mptree';
-import { NamePointer } from '../../apis/node';
+import { UnionToIntersection } from '../../utils/other';
+import { AddressEncodings } from './field-types/address';
 
 export enum ORACLE_TTL_TYPES {
   delta = 0,
@@ -26,8 +28,6 @@ export const ORACLE_TTL = { type: ORACLE_TTL_TYPES.delta, value: 500 };
 export const QUERY_TTL = { type: ORACLE_TTL_TYPES.delta, value: 10 };
 export const RESPONSE_TTL = { type: ORACLE_TTL_TYPES.delta, value: 10 };
 // # CONTRACT
-export const AMOUNT = 0;
-export const MAX_AUTH_FUN_GAS = 50000;
 export const DRY_RUN_ACCOUNT = {
   pub: 'ak_11111111111111111111111111111111273Yts',
   amount: 100000000000000000000000000000000000n,
@@ -63,6 +63,12 @@ export enum ABI_VERSIONS {
   FATE = 3,
 }
 
+export enum CallReturnType {
+  Ok = 0,
+  Error = 1,
+  Revert = 2,
+}
+
 /**
  * @category transaction builder
  */
@@ -104,8 +110,6 @@ export interface CtVersion {
  * @category transaction builder
  */
 export enum FIELD_TYPES {
-  id,
-  ids,
   string,
   binary,
   bool,
@@ -114,23 +118,17 @@ export enum FIELD_TYPES {
   rlpBinaries,
   rawBinary,
   signatures,
-  pointers,
   offChainUpdates,
   callStack,
   proofOfInclusion,
   mptrees,
-  callReturnType,
   ctVersion,
-  abiVersion,
-  ttlType,
   sophiaCodeTypeInfo,
   payload,
   stateTree,
 }
 
 interface BuildFieldTypes<Prefix extends undefined | Encoding | readonly Encoding[]> {
-  [FIELD_TYPES.id]: PrefixType<Prefix>;
-  [FIELD_TYPES.ids]: Array<Encoded.Generic<Prefix extends Encoding[] ? Prefix : any>>;
   [FIELD_TYPES.string]: string;
   [FIELD_TYPES.binary]: PrefixType<Prefix>;
   [FIELD_TYPES.bool]: Boolean;
@@ -139,25 +137,16 @@ interface BuildFieldTypes<Prefix extends undefined | Encoding | readonly Encodin
   [FIELD_TYPES.rlpBinaries]: any[];
   [FIELD_TYPES.rawBinary]: Uint8Array;
   [FIELD_TYPES.signatures]: Uint8Array[];
-  [FIELD_TYPES.pointers]: NamePointer[];
   [FIELD_TYPES.offChainUpdates]: any;
   [FIELD_TYPES.callStack]: any;
   [FIELD_TYPES.proofOfInclusion]: any;
   [FIELD_TYPES.mptrees]: MPTree[];
-  [FIELD_TYPES.callReturnType]: any;
   [FIELD_TYPES.ctVersion]: CtVersion;
-  [FIELD_TYPES.abiVersion]: ABI_VERSIONS;
-  [FIELD_TYPES.ttlType]: ORACLE_TTL_TYPES;
   [FIELD_TYPES.sophiaCodeTypeInfo]: any;
   [FIELD_TYPES.payload]: string | undefined;
   [FIELD_TYPES.stateTree]: any;
 }
 
-// based on https://stackoverflow.com/a/50375286/6176994
-type UnionToIntersection<Union> =
-  (Union extends any ? (k: Union) => void : never) extends ((k: infer Intersection) => void)
-    ? Intersection : never;
-
 type TxElem = readonly [string, FIELD_TYPES | Field]
 | readonly [string, FIELD_TYPES, Encoding | readonly Encoding[]];
 
@@ -206,7 +195,7 @@ export const TX_SCHEMA = {
       ['flags', uInt],
       ['nonce', shortUInt],
       ['balance', uInt],
-      ['gaContract', FIELD_TYPES.id, [Encoding.ContractAddress, Encoding.Name]],
+      ['gaContract', address<Encoding.ContractAddress | Encoding.Name>()],
       ['gaAuthFun', FIELD_TYPES.binary, Encoding.ContractBytearray],
     ],
   },
@@ -220,8 +209,8 @@ export const TX_SCHEMA = {
   [Tag.SpendTx]: {
     1: [
       ...BASE_TX,
-      ['senderId', FIELD_TYPES.id, Encoding.AccountAddress],
-      ['recipientId', FIELD_TYPES.id, [Encoding.AccountAddress, Encoding.Name]],
+      ['senderId', address<Encoding.AccountAddress>()],
+      ['recipientId', address<Encoding.AccountAddress | Encoding.Name>()],
       ['amount', coinAmount],
       ['fee', fee],
       ['ttl', shortUInt],
@@ -232,9 +221,9 @@ export const TX_SCHEMA = {
   [Tag.NamePreclaimTx]: {
     1: [
       ...BASE_TX,
-      ['accountId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['accountId', address<Encoding.AccountAddress>()],
       ['nonce', shortUInt],
-      ['commitmentId', FIELD_TYPES.id, Encoding.Commitment],
+      ['commitmentId', address<Encoding.Commitment>()],
       ['fee', fee],
       ['ttl', shortUInt],
     ],
@@ -242,7 +231,7 @@ export const TX_SCHEMA = {
   [Tag.NameClaimTx]: {
     2: [
       ...BASE_TX,
-      ['accountId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['accountId', address<Encoding.AccountAddress>()],
       ['nonce', shortUInt],
       ['name', name],
       ['nameSalt', uInt],
@@ -254,11 +243,11 @@ export const TX_SCHEMA = {
   [Tag.NameUpdateTx]: {
     1: [
       ...BASE_TX,
-      ['accountId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['accountId', address<Encoding.AccountAddress>()],
       ['nonce', shortUInt],
       ['nameId', nameId],
-      ['nameTtl', uInt],
-      ['pointers', FIELD_TYPES.pointers],
+      ['nameTtl', shortUInt],
+      ['pointers', pointers],
       ['clientTtl', shortUInt],
       ['fee', fee],
       ['ttl', shortUInt],
@@ -267,10 +256,10 @@ export const TX_SCHEMA = {
   [Tag.NameTransferTx]: {
     1: [
       ...BASE_TX,
-      ['accountId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['accountId', address<Encoding.AccountAddress>()],
       ['nonce', shortUInt],
       ['nameId', nameId],
-      ['recipientId', FIELD_TYPES.id, [Encoding.AccountAddress, Encoding.Name]],
+      ['recipientId', address<Encoding.AccountAddress | Encoding.Name>()],
       ['fee', fee],
       ['ttl', shortUInt],
     ],
@@ -278,7 +267,7 @@ export const TX_SCHEMA = {
   [Tag.NameRevokeTx]: {
     1: [
       ...BASE_TX,
-      ['accountId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['accountId', address<Encoding.AccountAddress>()],
       ['nonce', shortUInt],
       ['nameId', nameId],
       ['fee', fee],
@@ -288,19 +277,19 @@ export const TX_SCHEMA = {
   [Tag.Contract]: {
     1: [
       ...BASE_TX,
-      ['owner', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['owner', address<Encoding.AccountAddress>()],
       ['ctVersion', FIELD_TYPES.ctVersion],
       ['code', FIELD_TYPES.binary, Encoding.ContractBytearray],
       ['log', FIELD_TYPES.binary, Encoding.ContractBytearray],
       ['active', FIELD_TYPES.bool],
-      ['referers', FIELD_TYPES.ids, Encoding.AccountAddress],
+      ['referers', addresses<Encoding.AccountAddress>()],
       ['deposit', deposit],
     ],
   },
   [Tag.ContractCreateTx]: {
     1: [
       ...BASE_TX,
-      ['ownerId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['ownerId', address<Encoding.AccountAddress>()],
       ['nonce', shortUInt],
       ['code', FIELD_TYPES.binary, Encoding.ContractBytearray],
       ['ctVersion', FIELD_TYPES.ctVersion],
@@ -316,10 +305,10 @@ export const TX_SCHEMA = {
   [Tag.ContractCallTx]: {
     1: [
       ...BASE_TX,
-      ['callerId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['callerId', address<Encoding.AccountAddress>()],
       ['nonce', shortUInt],
-      ['contractId', FIELD_TYPES.id, [Encoding.ContractAddress, Encoding.Name]],
-      ['abiVersion', FIELD_TYPES.abiVersion],
+      ['contractId', address<Encoding.ContractAddress | Encoding.Name>()],
+      ['abiVersion', enumeration<ABI_VERSIONS>()],
       ['fee', fee],
       ['ttl', shortUInt],
       ['amount', coinAmount],
@@ -331,14 +320,14 @@ export const TX_SCHEMA = {
   [Tag.ContractCall]: {
     1: [
       ...BASE_TX,
-      ['callerId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['callerId', address<Encoding.AccountAddress>()],
       ['callerNonce', shortUInt],
       ['height', shortUInt],
-      ['contractId', FIELD_TYPES.id, Encoding.ContractAddress],
+      ['contractId', address<Encoding.ContractAddress>()],
       ['gasPrice', gasPrice],
       ['gasUsed', shortUInt],
       ['returnValue', FIELD_TYPES.binary, Encoding.ContractBytearray],
-      ['returnType', FIELD_TYPES.callReturnType],
+      ['returnType', enumeration<CallReturnType>()],
       // TODO: add serialization for
       //  <log> :: [ { <address> :: id, [ <topics> :: binary() ], <data> :: binary() } ]
       ['log', FIELD_TYPES.rawBinary],
@@ -347,24 +336,24 @@ export const TX_SCHEMA = {
   [Tag.OracleRegisterTx]: {
     1: [
       ...BASE_TX,
-      ['accountId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['accountId', address<Encoding.AccountAddress>()],
       ['nonce', shortUInt],
       ['queryFormat', FIELD_TYPES.string],
       ['responseFormat', FIELD_TYPES.string],
       ['queryFee', coinAmount],
-      ['oracleTtlType', FIELD_TYPES.ttlType],
+      ['oracleTtlType', enumeration<ORACLE_TTL_TYPES>()],
       ['oracleTtlValue', shortUInt],
       ['fee', fee],
       ['ttl', shortUInt],
-      ['abiVersion', FIELD_TYPES.abiVersion],
+      ['abiVersion', enumeration<ABI_VERSIONS>()],
     ],
   },
   [Tag.OracleExtendTx]: {
     1: [
       ...BASE_TX,
-      ['oracleId', FIELD_TYPES.id, [Encoding.OracleAddress, Encoding.Name]],
+      ['oracleId', address<Encoding.OracleAddress | Encoding.Name>()],
       ['nonce', shortUInt],
-      ['oracleTtlType', FIELD_TYPES.ttlType],
+      ['oracleTtlType', enumeration<ORACLE_TTL_TYPES>()],
       ['oracleTtlValue', shortUInt],
       ['fee', fee],
       ['ttl', shortUInt],
@@ -373,14 +362,14 @@ export const TX_SCHEMA = {
   [Tag.OracleQueryTx]: {
     1: [
       ...BASE_TX,
-      ['senderId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['senderId', address<Encoding.AccountAddress>()],
       ['nonce', shortUInt],
-      ['oracleId', FIELD_TYPES.id, [Encoding.OracleAddress, Encoding.Name]],
+      ['oracleId', address<Encoding.OracleAddress | Encoding.Name>()],
       ['query', FIELD_TYPES.string],
       ['queryFee', coinAmount],
-      ['queryTtlType', FIELD_TYPES.ttlType],
+      ['queryTtlType', enumeration<ORACLE_TTL_TYPES>()],
       ['queryTtlValue', shortUInt],
-      ['responseTtlType', FIELD_TYPES.ttlType],
+      ['responseTtlType', enumeration<ORACLE_TTL_TYPES>()],
       ['responseTtlValue', shortUInt],
       ['fee', fee],
       ['ttl', shortUInt],
@@ -389,11 +378,11 @@ export const TX_SCHEMA = {
   [Tag.OracleResponseTx]: {
     1: [
       ...BASE_TX,
-      ['oracleId', FIELD_TYPES.id, Encoding.OracleAddress],
+      ['oracleId', address<Encoding.OracleAddress>()],
       ['nonce', shortUInt],
       ['queryId', FIELD_TYPES.binary, Encoding.OracleQueryId],
       ['response', FIELD_TYPES.string],
-      ['responseTtlType', FIELD_TYPES.ttlType],
+      ['responseTtlType', enumeration<ORACLE_TTL_TYPES>()],
       ['responseTtlValue', shortUInt],
       ['fee', fee],
       ['ttl', shortUInt],
@@ -402,9 +391,9 @@ export const TX_SCHEMA = {
   [Tag.ChannelCreateTx]: {
     2: [
       ...BASE_TX,
-      ['initiator', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['initiator', address<Encoding.AccountAddress>()],
       ['initiatorAmount', uInt],
-      ['responder', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['responder', address<Encoding.AccountAddress>()],
       ['responderAmount', uInt],
       ['channelReserve', uInt],
       ['lockPeriod', uInt],
@@ -412,15 +401,15 @@ export const TX_SCHEMA = {
       ['fee', fee],
       ['initiatorDelegateIds', FIELD_TYPES.string],
       ['responderDelegateIds', FIELD_TYPES.string],
-      ['stateHash', FIELD_TYPES.binary, 'st'],
+      ['stateHash', FIELD_TYPES.binary, Encoding.State],
       ['nonce', shortUInt],
     ],
   },
   [Tag.ChannelCloseMutualTx]: {
     1: [
       ...BASE_TX,
-      ['channelId', FIELD_TYPES.id, Encoding.Channel],
-      ['fromId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['channelId', address<Encoding.Channel>()],
+      ['fromId', address<Encoding.AccountAddress>()],
       ['initiatorAmountFinal', uInt],
       ['responderAmountFinal', uInt],
       ['ttl', shortUInt],
@@ -431,10 +420,10 @@ export const TX_SCHEMA = {
   [Tag.ChannelCloseSoloTx]: {
     1: [
       ...BASE_TX,
-      ['channelId', FIELD_TYPES.id, Encoding.Channel],
-      ['fromId', FIELD_TYPES.id, Encoding.AccountAddress],
-      ['payload', FIELD_TYPES.binary, 'tx'],
-      ['poi', FIELD_TYPES.binary, 'pi'],
+      ['channelId', address<Encoding.Channel>()],
+      ['fromId', address<Encoding.AccountAddress>()],
+      ['payload', FIELD_TYPES.binary, Encoding.Transaction],
+      ['poi', FIELD_TYPES.binary, Encoding.Poi],
       ['ttl', shortUInt],
       ['fee', fee],
       ['nonce', shortUInt],
@@ -443,10 +432,10 @@ export const TX_SCHEMA = {
   [Tag.ChannelSlashTx]: {
     1: [
       ...BASE_TX,
-      ['channelId', FIELD_TYPES.id, Encoding.Channel],
-      ['fromId', FIELD_TYPES.id, Encoding.AccountAddress],
-      ['payload', FIELD_TYPES.binary, 'tx'],
-      ['poi', FIELD_TYPES.binary, 'pi'],
+      ['channelId', address<Encoding.Channel>()],
+      ['fromId', address<Encoding.AccountAddress>()],
+      ['payload', FIELD_TYPES.binary, Encoding.Transaction],
+      ['poi', FIELD_TYPES.binary, Encoding.Poi],
       ['ttl', shortUInt],
       ['fee', fee],
       ['nonce', shortUInt],
@@ -455,12 +444,12 @@ export const TX_SCHEMA = {
   [Tag.ChannelDepositTx]: {
     1: [
       ...BASE_TX,
-      ['channelId', FIELD_TYPES.id, Encoding.Channel],
-      ['fromId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['channelId', address<Encoding.Channel>()],
+      ['fromId', address<Encoding.AccountAddress>()],
       ['amount', uInt],
       ['ttl', shortUInt],
       ['fee', fee],
-      ['stateHash', FIELD_TYPES.binary, 'st'],
+      ['stateHash', FIELD_TYPES.binary, Encoding.State],
       ['round', shortUInt],
       ['nonce', shortUInt],
     ],
@@ -468,12 +457,12 @@ export const TX_SCHEMA = {
   [Tag.ChannelWithdrawTx]: {
     1: [
       ...BASE_TX,
-      ['channelId', FIELD_TYPES.id, Encoding.Channel],
-      ['toId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['channelId', address<Encoding.Channel>()],
+      ['toId', address<Encoding.AccountAddress>()],
       ['amount', uInt],
       ['ttl', shortUInt],
       ['fee', fee],
-      ['stateHash', FIELD_TYPES.binary, 'st'],
+      ['stateHash', FIELD_TYPES.binary, Encoding.State],
       ['round', shortUInt],
       ['nonce', shortUInt],
     ],
@@ -481,8 +470,8 @@ export const TX_SCHEMA = {
   [Tag.ChannelSettleTx]: {
     1: [
       ...BASE_TX,
-      ['channelId', FIELD_TYPES.id, Encoding.Channel],
-      ['fromId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['channelId', address<Encoding.Channel>()],
+      ['fromId', address<Encoding.AccountAddress>()],
       ['initiatorAmountFinal', uInt],
       ['responderAmountFinal', uInt],
       ['ttl', shortUInt],
@@ -493,12 +482,12 @@ export const TX_SCHEMA = {
   [Tag.ChannelForceProgressTx]: {
     1: [
       ...BASE_TX,
-      ['channelId', FIELD_TYPES.id, Encoding.Channel],
-      ['fromId', FIELD_TYPES.id, Encoding.AccountAddress],
-      ['payload', FIELD_TYPES.binary, 'tx'],
+      ['channelId', address<Encoding.Channel>()],
+      ['fromId', address<Encoding.AccountAddress>()],
+      ['payload', FIELD_TYPES.binary, Encoding.Transaction],
       ['round', shortUInt],
       ['update', FIELD_TYPES.binary, Encoding.ContractBytearray],
-      ['stateHash', FIELD_TYPES.binary, 'st'],
+      ['stateHash', FIELD_TYPES.binary, Encoding.State],
       ['offChainTrees', FIELD_TYPES.stateTree],
       ['ttl', shortUInt],
       ['fee', fee],
@@ -508,22 +497,22 @@ export const TX_SCHEMA = {
   [Tag.ChannelOffChainTx]: {
     2: [
       ...BASE_TX,
-      ['channelId', FIELD_TYPES.id, Encoding.Channel],
+      ['channelId', address<Encoding.Channel>()],
       ['round', shortUInt],
-      ['stateHash', FIELD_TYPES.binary, 'st'],
+      ['stateHash', FIELD_TYPES.binary, Encoding.State],
     ],
   },
   [Tag.Channel]: {
     3: [
       ...BASE_TX,
-      ['initiator', FIELD_TYPES.id, Encoding.AccountAddress],
-      ['responder', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['initiator', address<Encoding.AccountAddress>()],
+      ['responder', address<Encoding.AccountAddress>()],
       ['channelAmount', uInt],
       ['initiatorAmount', uInt],
       ['responderAmount', uInt],
       ['channelReserve', uInt],
-      ['initiatorDelegateIds', FIELD_TYPES.ids],
-      ['responderDelegateIds', FIELD_TYPES.ids],
+      ['initiatorDelegateIds', addresses<AddressEncodings>()],
+      ['responderDelegateIds', addresses<AddressEncodings>()],
       ['stateHash', FIELD_TYPES.hex],
       ['round', shortUInt],
       ['soloRound', uInt],
@@ -536,9 +525,9 @@ export const TX_SCHEMA = {
   [Tag.ChannelSnapshotSoloTx]: {
     1: [
       ...BASE_TX,
-      ['channelId', FIELD_TYPES.id, Encoding.Channel],
-      ['fromId', FIELD_TYPES.id, Encoding.AccountAddress],
-      ['payload', FIELD_TYPES.binary, 'tx'],
+      ['channelId', address<Encoding.Channel>()],
+      ['fromId', address<Encoding.AccountAddress>()],
+      ['payload', FIELD_TYPES.binary, Encoding.Transaction],
       ['ttl', shortUInt],
       ['fee', fee],
       ['nonce', shortUInt],
@@ -547,29 +536,29 @@ export const TX_SCHEMA = {
   [Tag.ChannelOffChainUpdateTransfer]: {
     1: [
       ...BASE_TX,
-      ['from', FIELD_TYPES.id, Encoding.AccountAddress],
-      ['to', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['from', address<Encoding.AccountAddress>()],
+      ['to', address<Encoding.AccountAddress>()],
       ['amount', uInt],
     ],
   },
   [Tag.ChannelOffChainUpdateDeposit]: {
     1: [
       ...BASE_TX,
-      ['from', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['from', address<Encoding.AccountAddress>()],
       ['amount', uInt],
     ],
   },
   [Tag.ChannelOffChainUpdateWithdraw]: {
     1: [
       ...BASE_TX,
-      ['from', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['from', address<Encoding.AccountAddress>()],
       ['amount', uInt],
     ],
   },
   [Tag.ChannelOffChainUpdateCreateContract]: {
     1: [
       ...BASE_TX,
-      ['owner', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['owner', address<Encoding.AccountAddress>()],
       ['ctVersion', FIELD_TYPES.ctVersion],
       ['code', FIELD_TYPES.binary, Encoding.ContractBytearray],
       ['deposit', uInt],
@@ -579,9 +568,9 @@ export const TX_SCHEMA = {
   [Tag.ChannelOffChainUpdateCallContract]: {
     1: [
       ...BASE_TX,
-      ['caller', FIELD_TYPES.id, Encoding.AccountAddress],
-      ['contract', FIELD_TYPES.id, Encoding.ContractAddress],
-      ['abiVersion', FIELD_TYPES.abiVersion],
+      ['caller', address<Encoding.AccountAddress>()],
+      ['contract', address<Encoding.ContractAddress>()],
+      ['abiVersion', enumeration<ABI_VERSIONS>()],
       ['amount', uInt],
       ['callData', FIELD_TYPES.binary, Encoding.ContractBytearray],
       ['callStack', FIELD_TYPES.callStack],
@@ -592,10 +581,10 @@ export const TX_SCHEMA = {
   [Tag.ChannelClientReconnectTx]: {
     1: [
       ...BASE_TX,
-      ['channelId', FIELD_TYPES.id, Encoding.Channel],
+      ['channelId', address<Encoding.Channel>()],
       ['round', shortUInt],
       ['role', FIELD_TYPES.string],
-      ['pubkey', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['pubkey', address<Encoding.AccountAddress>()],
     ],
   },
   [Tag.TreesPoi]: {
@@ -672,7 +661,7 @@ export const TX_SCHEMA = {
   [Tag.GaAttachTx]: {
     1: [
       ...BASE_TX,
-      ['ownerId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['ownerId', address<Encoding.AccountAddress>()],
       ['nonce', shortUInt],
       ['code', FIELD_TYPES.binary, Encoding.ContractBytearray],
       ['authFun', FIELD_TYPES.rawBinary],
@@ -687,9 +676,9 @@ export const TX_SCHEMA = {
   [Tag.GaMetaTx]: {
     2: [
       ...BASE_TX,
-      ['gaId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['gaId', address<Encoding.AccountAddress>()],
       ['authData', FIELD_TYPES.binary, Encoding.ContractBytearray],
-      ['abiVersion', FIELD_TYPES.abiVersion],
+      ['abiVersion', enumeration<ABI_VERSIONS>()],
       ['fee', fee],
       ['gasLimit', gasLimit],
       ['gasPrice', gasPrice],
@@ -699,7 +688,7 @@ export const TX_SCHEMA = {
   [Tag.PayingForTx]: {
     1: [
       ...BASE_TX,
-      ['payerId', FIELD_TYPES.id, Encoding.AccountAddress],
+      ['payerId', address<Encoding.AccountAddress>()],
       ['nonce', shortUInt],
       ['fee', fee],
       ['tx', FIELD_TYPES.rlpBinary],

package/src/tx/index.ts

@@ -33,7 +33,7 @@ import {
 import Node from '../Node';
 import { Encoded } from '../utils/encoder';
 import { buildTx as syncBuildTx, unpackTx } from './builder/index';
-import { isKeyOfObject } from '../utils/other';
+import { isAccountNotFoundError, isKeyOfObject } from '../utils/other';
 import { AE_AMOUNT_FORMATS } from '../utils/amount-formatter';
 
 type Int = number | string | BigNumber;
@@ -48,13 +48,13 @@ export type BuildTxOptions <TxType extends Tag, OmitFields extends string> =
  * @param ctVersion - Object with vm and abi version fields
  * @returns Object with vm/abi version
  */
-export async function getVmVersion(
+async function getVmVersion(
   txType: Tag.ContractCreateTx, ctVersion: Partial<CtVersion> & { onNode: Node }
 ): Promise<CtVersion>;
-export async function getVmVersion(
+async function getVmVersion(
   txType: Tag, ctVersion: Partial<Pick<CtVersion, 'abiVersion'>> & { onNode: Node }
 ): Promise<Pick<CtVersion, 'abiVersion'>>;
-export async function getVmVersion(
+async function getVmVersion(
   txType: Tag,
   { vmVersion, abiVersion, onNode }: Partial<CtVersion> & { onNode: Node },
 ): Promise<Partial<CtVersion>> {
@@ -79,7 +79,7 @@ export async function getVmVersion(
  * @param params - Object which contains all tx data
  * @returns Object with account nonce, absolute ttl and transaction fee
  */
-export async function prepareTxParams(
+async function prepareTxParams(
   txType: Tag,
   {
     senderId,
@@ -88,10 +88,18 @@ export async function prepareTxParams(
     absoluteTtl,
     strategy,
     onNode,
-  }: PrepareTxParamsOptions,
+  }: {
+    senderId: Encoded.AccountAddress;
+    absoluteTtl?: boolean;
+    strategy?: 'continuity' | 'max';
+    onNode: Node;
+  } & Pick<TxParamsCommon, 'nonce' | 'ttl'>,
 ): Promise<{ ttl: number; nonce: number }> {
   nonce ??= (
-    await onNode.getAccountNextNonce(senderId, { strategy }).catch(() => ({ nextNonce: 1 }))
+    await onNode.getAccountNextNonce(senderId, { strategy }).catch((error) => {
+      if (!isAccountNotFoundError(error)) throw error;
+      return { nextNonce: 1 };
+    })
   ).nextNonce;
 
   if (ttl !== 0) {
@@ -102,13 +110,6 @@ export async function prepareTxParams(
   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
@@ -151,6 +152,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:
@@ -175,7 +179,7 @@ export async function _buildTx<TxType extends Tag>(
       { ...params, ...params.ctVersion },
     );
   }
-  if (txType === Tag.ContractCallTx) {
+  if ([Tag.ContractCallTx, Tag.GaMetaTx].includes(txType)) {
     params.abiVersion = (await getVmVersion(Tag.ContractCallTx, params)).abiVersion;
   }
   if (txType === Tag.OracleRegisterTx) {