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

package/src/tx/builder/schema.ts

@@ -8,12 +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,
+  address, pointers, entry, enumeration, mptree, shortUIntConst, string, encoded, raw,
+  array, boolean, ctVersion, abiVersion,
 } from './field-types';
-import { Encoded, Encoding } from '../../utils/encoder';
-import MPTree from '../../utils/mptree';
+import { Encoding } from '../../utils/encoder';
 import { UnionToIntersection } from '../../utils/other';
-import { AddressEncodings } from './field-types/address';
+import { idTagToEncoding } from './field-types/address';
 
 export enum ORACLE_TTL_TYPES {
   delta = 0,
@@ -35,130 +35,18 @@ export const DRY_RUN_ACCOUNT = {
 
 export type TxField = [
   name: string,
-  type: FIELD_TYPES | Field,
-  prefix?: Encoding | Encoding[],
+  type: Field,
 ];
 
-/**
- * @category transaction builder
- * @see {@link https://github.com/aeternity/protocol/blob/0f6dee3d9d1e8e2469816798f5c7587a6c918f94/contracts/contract_vms.md#virtual-machines-on-the-%C3%A6ternity-blockchain}
- */
-export enum VM_VERSIONS {
-  NO_VM = 0,
-  SOPHIA = 1,
-  SOPHIA_IMPROVEMENTS_MINERVA = 3,
-  SOPHIA_IMPROVEMENTS_FORTUNA = 4,
-  FATE = 5,
-  SOPHIA_IMPROVEMENTS_LIMA = 6,
-  FATE_2 = 7,
-}
-
-/**
- * @category transaction builder
- * @see {@link https://github.com/aeternity/protocol/blob/0f6dee3d9d1e8e2469816798f5c7587a6c918f94/contracts/contract_vms.md#virtual-machines-on-the-%C3%A6ternity-blockchain}
- */
-export enum ABI_VERSIONS {
-  NO_ABI = 0,
-  SOPHIA = 1,
-  FATE = 3,
-}
-
 export enum CallReturnType {
   Ok = 0,
   Error = 1,
   Revert = 2,
 }
 
-/**
- * @category transaction builder
- */
-export enum PROTOCOL_VERSIONS {
-  IRIS = 5,
-}
+type TxElem = readonly [string, Field];
 
-// First abi/vm by default
-export const PROTOCOL_VM_ABI = {
-  [PROTOCOL_VERSIONS.IRIS]: {
-    [Tag.ContractCreateTx]: {
-      vmVersion: [VM_VERSIONS.FATE_2], abiVersion: [ABI_VERSIONS.FATE],
-    },
-    // TODO: Ensure that AEVM (SOPHIA?) is still available here
-    [Tag.ContractCallTx]: {
-      vmVersion: [], abiVersion: [ABI_VERSIONS.FATE, ABI_VERSIONS.SOPHIA],
-    },
-    [Tag.OracleRegisterTx]: {
-      vmVersion: [], abiVersion: [ABI_VERSIONS.NO_ABI, ABI_VERSIONS.SOPHIA],
-    },
-  },
-} as const;
-
-type PrefixType<Prefix> = Prefix extends Encoding
-  ? Encoded.Generic<Prefix>
-  : Prefix extends readonly Encoding[]
-    ? Encoded.Generic<Prefix[number]>
-    : Encoded.Generic<any>;
-
-/**
- * @category transaction builder
- */
-export interface CtVersion {
-  vmVersion: VM_VERSIONS;
-  abiVersion: ABI_VERSIONS;
-}
-
-/**
- * @category transaction builder
- */
-export enum FIELD_TYPES {
-  string,
-  binary,
-  bool,
-  hex,
-  rlpBinary,
-  rlpBinaries,
-  rawBinary,
-  signatures,
-  offChainUpdates,
-  callStack,
-  proofOfInclusion,
-  mptrees,
-  ctVersion,
-  sophiaCodeTypeInfo,
-  payload,
-  stateTree,
-}
-
-interface BuildFieldTypes<Prefix extends undefined | Encoding | readonly Encoding[]> {
-  [FIELD_TYPES.string]: string;
-  [FIELD_TYPES.binary]: PrefixType<Prefix>;
-  [FIELD_TYPES.bool]: Boolean;
-  [FIELD_TYPES.hex]: string;
-  [FIELD_TYPES.rlpBinary]: any;
-  [FIELD_TYPES.rlpBinaries]: any[];
-  [FIELD_TYPES.rawBinary]: Uint8Array;
-  [FIELD_TYPES.signatures]: Uint8Array[];
-  [FIELD_TYPES.offChainUpdates]: any;
-  [FIELD_TYPES.callStack]: any;
-  [FIELD_TYPES.proofOfInclusion]: any;
-  [FIELD_TYPES.mptrees]: MPTree[];
-  [FIELD_TYPES.ctVersion]: CtVersion;
-  [FIELD_TYPES.sophiaCodeTypeInfo]: any;
-  [FIELD_TYPES.payload]: string | undefined;
-  [FIELD_TYPES.stateTree]: any;
-}
-
-type TxElem = readonly [string, FIELD_TYPES | Field]
-| readonly [string, FIELD_TYPES, Encoding | readonly Encoding[]];
-
-type BuildTxArgBySchemaType<
-  Type extends FIELD_TYPES | Field,
-  Prefix extends undefined | Encoding | readonly Encoding[],
-> =
-  Type extends Field
-    ? Parameters<Type['serialize']>[0]
-    : Type extends FIELD_TYPES
-      ? BuildFieldTypes<Prefix>[Type]
-      : never;
+type BuildTxArgBySchemaType<Type extends Field> = Parameters<Type['serialize']>[0];
 
 type NullablePartial<
   T,
@@ -169,7 +57,7 @@ type BuildTxArgBySchema<SchemaLine> =
   UnionToIntersection<
   SchemaLine extends ReadonlyArray<infer Elem>
     ? Elem extends TxElem
-      ? NullablePartial<{ [k in Elem[0]]: BuildTxArgBySchemaType<Elem[1], Elem[2]> }>
+      ? NullablePartial<{ [k in Elem[0]]: BuildTxArgBySchemaType<Elem[1]> }>
       : never
     : never
   >;
@@ -178,60 +66,75 @@ export type RawTxObject<Tx extends TxSchema> = {
   [k in keyof Tx]-?: Tx[k] extends BigNumber ? string : Tx[k]
 };
 
-const BASE_TX = [
-  ['tag', shortUInt],
-  ['VSN', shortUInt],
-] as const;
-
+/**
+ * @see {@link https://github.com/aeternity/protocol/blob/c007deeac4a01e401238412801ac7084ac72d60e/serializations.md#accounts-version-1-basic-accounts}
+ */
 export const TX_SCHEMA = {
   [Tag.Account]: {
     1: [
-      ...BASE_TX,
+      ['tag', shortUIntConst(Tag.Account)],
+      ['version', shortUIntConst(1)],
       ['nonce', shortUInt],
       ['balance', uInt],
     ],
     2: [
-      ...BASE_TX,
+      ['tag', shortUIntConst(Tag.Account)],
+      ['version', shortUIntConst(2)],
       ['flags', uInt],
       ['nonce', shortUInt],
       ['balance', uInt],
-      ['gaContract', address<Encoding.ContractAddress | Encoding.Name>()],
-      ['gaAuthFun', FIELD_TYPES.binary, Encoding.ContractBytearray],
+      ['gaContract', address(Encoding.ContractAddress, Encoding.Name)],
+      ['gaAuthFun', encoded(Encoding.ContractBytearray)],
     ],
   },
   [Tag.SignedTx]: {
     1: [
-      ...BASE_TX,
-      ['signatures', FIELD_TYPES.signatures],
-      ['encodedTx', FIELD_TYPES.rlpBinary],
+      ['tag', shortUIntConst(Tag.SignedTx)],
+      ['version', shortUIntConst(1)],
+      ['signatures', array(raw)],
+      ['encodedTx', entry()],
     ],
   },
   [Tag.SpendTx]: {
     1: [
-      ...BASE_TX,
-      ['senderId', address<Encoding.AccountAddress>()],
-      ['recipientId', address<Encoding.AccountAddress | Encoding.Name>()],
+      ['tag', shortUIntConst(Tag.SpendTx)],
+      ['version', shortUIntConst(1)],
+      ['senderId', address(Encoding.AccountAddress)],
+      ['recipientId', address(Encoding.AccountAddress, Encoding.Name)],
       ['amount', coinAmount],
       ['fee', fee],
       ['ttl', shortUInt],
       ['nonce', shortUInt],
-      ['payload', FIELD_TYPES.payload],
+      ['payload', encoded(Encoding.Bytearray, true)],
+    ],
+  },
+  [Tag.Name]: {
+    1: [
+      ['tag', shortUIntConst(Tag.Name)],
+      ['version', shortUIntConst(1)],
+      ['accountId', address(Encoding.AccountAddress)],
+      ['nameTtl', shortUInt],
+      ['status', raw],
+      ['clientTtl', shortUInt],
+      ['pointers', pointers],
     ],
   },
   [Tag.NamePreclaimTx]: {
     1: [
-      ...BASE_TX,
-      ['accountId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.NamePreclaimTx)],
+      ['version', shortUIntConst(1)],
+      ['accountId', address(Encoding.AccountAddress)],
       ['nonce', shortUInt],
-      ['commitmentId', address<Encoding.Commitment>()],
+      ['commitmentId', address(Encoding.Commitment)],
       ['fee', fee],
       ['ttl', shortUInt],
     ],
   },
   [Tag.NameClaimTx]: {
     2: [
-      ...BASE_TX,
-      ['accountId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.NameClaimTx)],
+      ['version', shortUIntConst(2)],
+      ['accountId', address(Encoding.AccountAddress)],
       ['nonce', shortUInt],
       ['name', name],
       ['nameSalt', uInt],
@@ -242,8 +145,9 @@ export const TX_SCHEMA = {
   },
   [Tag.NameUpdateTx]: {
     1: [
-      ...BASE_TX,
-      ['accountId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.NameUpdateTx)],
+      ['version', shortUIntConst(1)],
+      ['accountId', address(Encoding.AccountAddress)],
       ['nonce', shortUInt],
       ['nameId', nameId],
       ['nameTtl', shortUInt],
@@ -255,19 +159,21 @@ export const TX_SCHEMA = {
   },
   [Tag.NameTransferTx]: {
     1: [
-      ...BASE_TX,
-      ['accountId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.NameTransferTx)],
+      ['version', shortUIntConst(1)],
+      ['accountId', address(Encoding.AccountAddress)],
       ['nonce', shortUInt],
       ['nameId', nameId],
-      ['recipientId', address<Encoding.AccountAddress | Encoding.Name>()],
+      ['recipientId', address(Encoding.AccountAddress, Encoding.Name)],
       ['fee', fee],
       ['ttl', shortUInt],
     ],
   },
   [Tag.NameRevokeTx]: {
     1: [
-      ...BASE_TX,
-      ['accountId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.NameRevokeTx)],
+      ['version', shortUIntConst(1)],
+      ['accountId', address(Encoding.AccountAddress)],
       ['nonce', shortUInt],
       ['nameId', nameId],
       ['fee', fee],
@@ -276,84 +182,102 @@ export const TX_SCHEMA = {
   },
   [Tag.Contract]: {
     1: [
-      ...BASE_TX,
-      ['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', addresses<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.Contract)],
+      ['version', shortUIntConst(1)],
+      ['owner', address(Encoding.AccountAddress)],
+      ['ctVersion', ctVersion],
+      ['code', encoded(Encoding.ContractBytearray)],
+      ['log', encoded(Encoding.ContractBytearray)],
+      ['active', boolean],
+      ['referers', array(address(Encoding.AccountAddress))],
       ['deposit', deposit],
     ],
   },
   [Tag.ContractCreateTx]: {
     1: [
-      ...BASE_TX,
-      ['ownerId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.ContractCreateTx)],
+      ['version', shortUIntConst(1)],
+      ['ownerId', address(Encoding.AccountAddress)],
       ['nonce', shortUInt],
-      ['code', FIELD_TYPES.binary, Encoding.ContractBytearray],
-      ['ctVersion', FIELD_TYPES.ctVersion],
+      ['code', encoded(Encoding.ContractBytearray)],
+      ['ctVersion', ctVersion],
       ['fee', fee],
       ['ttl', shortUInt],
       ['deposit', deposit],
       ['amount', coinAmount],
       ['gasLimit', gasLimit],
       ['gasPrice', gasPrice],
-      ['callData', FIELD_TYPES.binary, Encoding.ContractBytearray],
+      ['callData', encoded(Encoding.ContractBytearray)],
     ],
   },
   [Tag.ContractCallTx]: {
     1: [
-      ...BASE_TX,
-      ['callerId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.ContractCallTx)],
+      ['version', shortUIntConst(1)],
+      ['callerId', address(Encoding.AccountAddress)],
       ['nonce', shortUInt],
-      ['contractId', address<Encoding.ContractAddress | Encoding.Name>()],
-      ['abiVersion', enumeration<ABI_VERSIONS>()],
+      ['contractId', address(Encoding.ContractAddress, Encoding.Name)],
+      ['abiVersion', abiVersion],
       ['fee', fee],
       ['ttl', shortUInt],
       ['amount', coinAmount],
       ['gasLimit', gasLimit],
       ['gasPrice', gasPrice],
-      ['callData', FIELD_TYPES.binary, Encoding.ContractBytearray],
+      ['callData', encoded(Encoding.ContractBytearray)],
     ],
   },
   [Tag.ContractCall]: {
     1: [
-      ...BASE_TX,
-      ['callerId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.ContractCall)],
+      ['version', shortUIntConst(1)],
+      ['callerId', address(Encoding.AccountAddress)],
       ['callerNonce', shortUInt],
       ['height', shortUInt],
-      ['contractId', address<Encoding.ContractAddress>()],
+      ['contractId', address(Encoding.ContractAddress)],
       ['gasPrice', gasPrice],
       ['gasUsed', shortUInt],
-      ['returnValue', FIELD_TYPES.binary, Encoding.ContractBytearray],
-      ['returnType', enumeration<CallReturnType>()],
+      ['returnValue', encoded(Encoding.ContractBytearray)],
+      ['returnType', enumeration(CallReturnType)],
       // TODO: add serialization for
       //  <log> :: [ { <address> :: id, [ <topics> :: binary() ], <data> :: binary() } ]
-      ['log', FIELD_TYPES.rawBinary],
+      ['log', raw],
+    ],
+  },
+  [Tag.Oracle]: {
+    1: [
+      ['tag', shortUIntConst(Tag.Oracle)],
+      ['version', shortUIntConst(1)],
+      ['accountId', address(Encoding.AccountAddress)],
+      ['queryFormat', string],
+      ['responseFormat', string],
+      ['queryFee', coinAmount],
+      ['oracleTtlValue', shortUInt],
+      ['abiVersion', abiVersion],
     ],
   },
   [Tag.OracleRegisterTx]: {
     1: [
-      ...BASE_TX,
-      ['accountId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.OracleRegisterTx)],
+      ['version', shortUIntConst(1)],
+      ['accountId', address(Encoding.AccountAddress)],
       ['nonce', shortUInt],
-      ['queryFormat', FIELD_TYPES.string],
-      ['responseFormat', FIELD_TYPES.string],
+      ['queryFormat', string],
+      ['responseFormat', string],
       ['queryFee', coinAmount],
-      ['oracleTtlType', enumeration<ORACLE_TTL_TYPES>()],
+      ['oracleTtlType', enumeration(ORACLE_TTL_TYPES)],
       ['oracleTtlValue', shortUInt],
       ['fee', fee],
       ['ttl', shortUInt],
-      ['abiVersion', enumeration<ABI_VERSIONS>()],
+      ['abiVersion', abiVersion],
     ],
   },
   [Tag.OracleExtendTx]: {
     1: [
-      ...BASE_TX,
-      ['oracleId', address<Encoding.OracleAddress | Encoding.Name>()],
+      ['tag', shortUIntConst(Tag.OracleExtendTx)],
+      ['version', shortUIntConst(1)],
+      ['oracleId', address(Encoding.OracleAddress, Encoding.Name)],
       ['nonce', shortUInt],
-      ['oracleTtlType', enumeration<ORACLE_TTL_TYPES>()],
+      ['oracleTtlType', enumeration(ORACLE_TTL_TYPES)],
       ['oracleTtlValue', shortUInt],
       ['fee', fee],
       ['ttl', shortUInt],
@@ -361,15 +285,16 @@ export const TX_SCHEMA = {
   },
   [Tag.OracleQueryTx]: {
     1: [
-      ...BASE_TX,
-      ['senderId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.OracleQueryTx)],
+      ['version', shortUIntConst(1)],
+      ['senderId', address(Encoding.AccountAddress)],
       ['nonce', shortUInt],
-      ['oracleId', address<Encoding.OracleAddress | Encoding.Name>()],
-      ['query', FIELD_TYPES.string],
+      ['oracleId', address(Encoding.OracleAddress, Encoding.Name)],
+      ['query', string],
       ['queryFee', coinAmount],
-      ['queryTtlType', enumeration<ORACLE_TTL_TYPES>()],
+      ['queryTtlType', enumeration(ORACLE_TTL_TYPES)],
       ['queryTtlValue', shortUInt],
-      ['responseTtlType', enumeration<ORACLE_TTL_TYPES>()],
+      ['responseTtlType', enumeration(ORACLE_TTL_TYPES)],
       ['responseTtlValue', shortUInt],
       ['fee', fee],
       ['ttl', shortUInt],
@@ -377,12 +302,13 @@ export const TX_SCHEMA = {
   },
   [Tag.OracleResponseTx]: {
     1: [
-      ...BASE_TX,
-      ['oracleId', address<Encoding.OracleAddress>()],
+      ['tag', shortUIntConst(Tag.OracleResponseTx)],
+      ['version', shortUIntConst(1)],
+      ['oracleId', address(Encoding.OracleAddress)],
       ['nonce', shortUInt],
-      ['queryId', FIELD_TYPES.binary, Encoding.OracleQueryId],
-      ['response', FIELD_TYPES.string],
-      ['responseTtlType', enumeration<ORACLE_TTL_TYPES>()],
+      ['queryId', encoded(Encoding.OracleQueryId)],
+      ['response', string],
+      ['responseTtlType', enumeration(ORACLE_TTL_TYPES)],
       ['responseTtlValue', shortUInt],
       ['fee', fee],
       ['ttl', shortUInt],
@@ -390,26 +316,28 @@ export const TX_SCHEMA = {
   },
   [Tag.ChannelCreateTx]: {
     2: [
-      ...BASE_TX,
-      ['initiator', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.ChannelCreateTx)],
+      ['version', shortUIntConst(2)],
+      ['initiator', address(Encoding.AccountAddress)],
       ['initiatorAmount', uInt],
-      ['responder', address<Encoding.AccountAddress>()],
+      ['responder', address(Encoding.AccountAddress)],
       ['responderAmount', uInt],
       ['channelReserve', uInt],
       ['lockPeriod', uInt],
       ['ttl', shortUInt],
       ['fee', fee],
-      ['initiatorDelegateIds', FIELD_TYPES.string],
-      ['responderDelegateIds', FIELD_TYPES.string],
-      ['stateHash', FIELD_TYPES.binary, Encoding.State],
+      ['initiatorDelegateIds', array(address(...idTagToEncoding))],
+      ['responderDelegateIds', array(address(...idTagToEncoding))],
+      ['stateHash', encoded(Encoding.State)],
       ['nonce', shortUInt],
     ],
   },
   [Tag.ChannelCloseMutualTx]: {
     1: [
-      ...BASE_TX,
-      ['channelId', address<Encoding.Channel>()],
-      ['fromId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.ChannelCloseMutualTx)],
+      ['version', shortUIntConst(1)],
+      ['channelId', address(Encoding.Channel)],
+      ['fromId', address(Encoding.AccountAddress)],
       ['initiatorAmountFinal', uInt],
       ['responderAmountFinal', uInt],
       ['ttl', shortUInt],
@@ -419,11 +347,12 @@ export const TX_SCHEMA = {
   },
   [Tag.ChannelCloseSoloTx]: {
     1: [
-      ...BASE_TX,
-      ['channelId', address<Encoding.Channel>()],
-      ['fromId', address<Encoding.AccountAddress>()],
-      ['payload', FIELD_TYPES.binary, Encoding.Transaction],
-      ['poi', FIELD_TYPES.binary, Encoding.Poi],
+      ['tag', shortUIntConst(Tag.ChannelCloseSoloTx)],
+      ['version', shortUIntConst(1)],
+      ['channelId', address(Encoding.Channel)],
+      ['fromId', address(Encoding.AccountAddress)],
+      ['payload', encoded(Encoding.Transaction)],
+      ['poi', entry(Tag.TreesPoi)],
       ['ttl', shortUInt],
       ['fee', fee],
       ['nonce', shortUInt],
@@ -431,11 +360,12 @@ export const TX_SCHEMA = {
   },
   [Tag.ChannelSlashTx]: {
     1: [
-      ...BASE_TX,
-      ['channelId', address<Encoding.Channel>()],
-      ['fromId', address<Encoding.AccountAddress>()],
-      ['payload', FIELD_TYPES.binary, Encoding.Transaction],
-      ['poi', FIELD_TYPES.binary, Encoding.Poi],
+      ['tag', shortUIntConst(Tag.ChannelSlashTx)],
+      ['version', shortUIntConst(1)],
+      ['channelId', address(Encoding.Channel)],
+      ['fromId', address(Encoding.AccountAddress)],
+      ['payload', encoded(Encoding.Transaction)],
+      ['poi', entry(Tag.TreesPoi)],
       ['ttl', shortUInt],
       ['fee', fee],
       ['nonce', shortUInt],
@@ -443,35 +373,38 @@ export const TX_SCHEMA = {
   },
   [Tag.ChannelDepositTx]: {
     1: [
-      ...BASE_TX,
-      ['channelId', address<Encoding.Channel>()],
-      ['fromId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.ChannelDepositTx)],
+      ['version', shortUIntConst(1)],
+      ['channelId', address(Encoding.Channel)],
+      ['fromId', address(Encoding.AccountAddress)],
       ['amount', uInt],
       ['ttl', shortUInt],
       ['fee', fee],
-      ['stateHash', FIELD_TYPES.binary, Encoding.State],
+      ['stateHash', encoded(Encoding.State)],
       ['round', shortUInt],
       ['nonce', shortUInt],
     ],
   },
   [Tag.ChannelWithdrawTx]: {
     1: [
-      ...BASE_TX,
-      ['channelId', address<Encoding.Channel>()],
-      ['toId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.ChannelWithdrawTx)],
+      ['version', shortUIntConst(1)],
+      ['channelId', address(Encoding.Channel)],
+      ['toId', address(Encoding.AccountAddress)],
       ['amount', uInt],
       ['ttl', shortUInt],
       ['fee', fee],
-      ['stateHash', FIELD_TYPES.binary, Encoding.State],
+      ['stateHash', encoded(Encoding.State)],
       ['round', shortUInt],
       ['nonce', shortUInt],
     ],
   },
   [Tag.ChannelSettleTx]: {
     1: [
-      ...BASE_TX,
-      ['channelId', address<Encoding.Channel>()],
-      ['fromId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.ChannelSettleTx)],
+      ['version', shortUIntConst(1)],
+      ['channelId', address(Encoding.Channel)],
+      ['fromId', address(Encoding.AccountAddress)],
       ['initiatorAmountFinal', uInt],
       ['responderAmountFinal', uInt],
       ['ttl', shortUInt],
@@ -481,14 +414,15 @@ export const TX_SCHEMA = {
   },
   [Tag.ChannelForceProgressTx]: {
     1: [
-      ...BASE_TX,
-      ['channelId', address<Encoding.Channel>()],
-      ['fromId', address<Encoding.AccountAddress>()],
-      ['payload', FIELD_TYPES.binary, Encoding.Transaction],
+      ['tag', shortUIntConst(Tag.ChannelForceProgressTx)],
+      ['version', shortUIntConst(1)],
+      ['channelId', address(Encoding.Channel)],
+      ['fromId', address(Encoding.AccountAddress)],
+      ['payload', encoded(Encoding.Transaction)],
       ['round', shortUInt],
-      ['update', FIELD_TYPES.binary, Encoding.ContractBytearray],
-      ['stateHash', FIELD_TYPES.binary, Encoding.State],
-      ['offChainTrees', FIELD_TYPES.stateTree],
+      ['update', encoded(Encoding.ContractBytearray)],
+      ['stateHash', encoded(Encoding.State)],
+      ['offChainTrees', encoded(Encoding.StateTrees)],
       ['ttl', shortUInt],
       ['fee', fee],
       ['nonce', shortUInt],
@@ -496,38 +430,41 @@ export const TX_SCHEMA = {
   },
   [Tag.ChannelOffChainTx]: {
     2: [
-      ...BASE_TX,
-      ['channelId', address<Encoding.Channel>()],
+      ['tag', shortUIntConst(Tag.ChannelOffChainTx)],
+      ['version', shortUIntConst(2)],
+      ['channelId', address(Encoding.Channel)],
       ['round', shortUInt],
-      ['stateHash', FIELD_TYPES.binary, Encoding.State],
+      ['stateHash', encoded(Encoding.State)],
     ],
   },
   [Tag.Channel]: {
     3: [
-      ...BASE_TX,
-      ['initiator', address<Encoding.AccountAddress>()],
-      ['responder', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.Channel)],
+      ['version', shortUIntConst(3)],
+      ['initiator', address(Encoding.AccountAddress)],
+      ['responder', address(Encoding.AccountAddress)],
       ['channelAmount', uInt],
       ['initiatorAmount', uInt],
       ['responderAmount', uInt],
       ['channelReserve', uInt],
-      ['initiatorDelegateIds', addresses<AddressEncodings>()],
-      ['responderDelegateIds', addresses<AddressEncodings>()],
-      ['stateHash', FIELD_TYPES.hex],
+      ['initiatorDelegateIds', array(address(...idTagToEncoding))],
+      ['responderDelegateIds', array(address(...idTagToEncoding))],
+      ['stateHash', encoded(Encoding.State)],
       ['round', shortUInt],
       ['soloRound', uInt],
       ['lockPeriod', uInt],
       ['lockedUntil', uInt],
-      ['initiatorAuth', FIELD_TYPES.binary, Encoding.ContractBytearray],
-      ['responderAuth', FIELD_TYPES.binary, Encoding.ContractBytearray],
+      ['initiatorAuth', encoded(Encoding.ContractBytearray)],
+      ['responderAuth', encoded(Encoding.ContractBytearray)],
     ],
   },
   [Tag.ChannelSnapshotSoloTx]: {
     1: [
-      ...BASE_TX,
-      ['channelId', address<Encoding.Channel>()],
-      ['fromId', address<Encoding.AccountAddress>()],
-      ['payload', FIELD_TYPES.binary, Encoding.Transaction],
+      ['tag', shortUIntConst(Tag.ChannelSnapshotSoloTx)],
+      ['version', shortUIntConst(1)],
+      ['channelId', address(Encoding.Channel)],
+      ['fromId', address(Encoding.AccountAddress)],
+      ['payload', encoded(Encoding.Transaction)],
       ['ttl', shortUInt],
       ['fee', fee],
       ['nonce', shortUInt],
@@ -535,181 +472,194 @@ export const TX_SCHEMA = {
   },
   [Tag.ChannelOffChainUpdateTransfer]: {
     1: [
-      ...BASE_TX,
-      ['from', address<Encoding.AccountAddress>()],
-      ['to', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.ChannelOffChainUpdateTransfer)],
+      ['version', shortUIntConst(1)],
+      ['from', address(Encoding.AccountAddress)],
+      ['to', address(Encoding.AccountAddress)],
       ['amount', uInt],
     ],
   },
   [Tag.ChannelOffChainUpdateDeposit]: {
     1: [
-      ...BASE_TX,
-      ['from', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.ChannelOffChainUpdateDeposit)],
+      ['version', shortUIntConst(1)],
+      ['from', address(Encoding.AccountAddress)],
       ['amount', uInt],
     ],
   },
   [Tag.ChannelOffChainUpdateWithdraw]: {
     1: [
-      ...BASE_TX,
-      ['from', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.ChannelOffChainUpdateWithdraw)],
+      ['version', shortUIntConst(1)],
+      ['from', address(Encoding.AccountAddress)],
       ['amount', uInt],
     ],
   },
   [Tag.ChannelOffChainUpdateCreateContract]: {
     1: [
-      ...BASE_TX,
-      ['owner', address<Encoding.AccountAddress>()],
-      ['ctVersion', FIELD_TYPES.ctVersion],
-      ['code', FIELD_TYPES.binary, Encoding.ContractBytearray],
+      ['tag', shortUIntConst(Tag.ChannelOffChainUpdateCreateContract)],
+      ['version', shortUIntConst(1)],
+      ['owner', address(Encoding.AccountAddress)],
+      ['ctVersion', ctVersion],
+      ['code', encoded(Encoding.ContractBytearray)],
       ['deposit', uInt],
-      ['callData', FIELD_TYPES.binary, Encoding.ContractBytearray],
+      ['callData', encoded(Encoding.ContractBytearray)],
     ],
   },
   [Tag.ChannelOffChainUpdateCallContract]: {
     1: [
-      ...BASE_TX,
-      ['caller', address<Encoding.AccountAddress>()],
-      ['contract', address<Encoding.ContractAddress>()],
-      ['abiVersion', enumeration<ABI_VERSIONS>()],
+      ['tag', shortUIntConst(Tag.ChannelOffChainUpdateCallContract)],
+      ['version', shortUIntConst(1)],
+      ['caller', address(Encoding.AccountAddress)],
+      ['contract', address(Encoding.ContractAddress)],
+      ['abiVersion', abiVersion],
       ['amount', uInt],
-      ['callData', FIELD_TYPES.binary, Encoding.ContractBytearray],
-      ['callStack', FIELD_TYPES.callStack],
+      ['callData', encoded(Encoding.ContractBytearray)],
+      ['callStack', raw],
       ['gasPrice', gasPrice],
       ['gasLimit', gasLimit],
     ],
   },
   [Tag.ChannelClientReconnectTx]: {
     1: [
-      ...BASE_TX,
-      ['channelId', address<Encoding.Channel>()],
+      ['tag', shortUIntConst(Tag.ChannelClientReconnectTx)],
+      ['version', shortUIntConst(1)],
+      ['channelId', address(Encoding.Channel)],
       ['round', shortUInt],
-      ['role', FIELD_TYPES.string],
-      ['pubkey', address<Encoding.AccountAddress>()],
+      ['role', string],
+      ['pubkey', address(Encoding.AccountAddress)],
     ],
   },
   [Tag.TreesPoi]: {
     1: [
-      ...BASE_TX,
-      ['accounts', FIELD_TYPES.mptrees],
-      ['calls', FIELD_TYPES.mptrees],
-      ['channels', FIELD_TYPES.mptrees],
-      ['contracts', FIELD_TYPES.mptrees],
-      ['ns', FIELD_TYPES.mptrees],
-      ['oracles', FIELD_TYPES.mptrees],
+      ['tag', shortUIntConst(Tag.TreesPoi)],
+      ['version', shortUIntConst(1)],
+      ['accounts', array(mptree(Encoding.AccountAddress, Tag.Account))],
+      ['calls', array(mptree(Encoding.Bytearray, Tag.ContractCall))],
+      ['channels', array(mptree(Encoding.Channel, Tag.Channel))],
+      ['contracts', array(mptree(Encoding.ContractAddress, Tag.Contract))],
+      ['ns', array(mptree(Encoding.Name, Tag.Name))],
+      ['oracles', array(mptree(Encoding.OracleAddress, Tag.Oracle))],
     ],
   },
   [Tag.StateTrees]: {
     1: [
-      ...BASE_TX,
-      ['contracts', FIELD_TYPES.rlpBinary],
-      ['calls', FIELD_TYPES.rlpBinary],
-      ['channels', FIELD_TYPES.rlpBinary],
-      ['ns', FIELD_TYPES.rlpBinary],
-      ['oracles', FIELD_TYPES.rlpBinary],
-      ['accounts', FIELD_TYPES.rlpBinary],
+      ['tag', shortUIntConst(Tag.StateTrees)],
+      ['version', shortUIntConst(1)],
+      ['contracts', entry()],
+      ['calls', entry()],
+      ['channels', entry()],
+      ['ns', entry()],
+      ['oracles', entry()],
+      ['accounts', entry()],
     ],
   },
   [Tag.Mtree]: {
     1: [
-      ...BASE_TX,
-      ['values', FIELD_TYPES.rlpBinaries],
+      ['tag', shortUIntConst(Tag.Mtree)],
+      ['version', shortUIntConst(1)],
+      ['values', array(entry())],
     ],
   },
   [Tag.MtreeValue]: {
     1: [
-      ...BASE_TX,
-      ['key', FIELD_TYPES.hex],
-      ['value', FIELD_TYPES.rawBinary],
+      ['tag', shortUIntConst(Tag.MtreeValue)],
+      ['version', shortUIntConst(1)],
+      ['key', raw],
+      ['value', raw],
     ],
   },
   [Tag.ContractsMtree]: {
     1: [
-      ...BASE_TX,
-      ['contracts', FIELD_TYPES.rlpBinary],
+      ['tag', shortUIntConst(Tag.ContractsMtree)],
+      ['version', shortUIntConst(1)],
+      ['contracts', entry()],
     ],
   },
   [Tag.CallsMtree]: {
     1: [
-      ...BASE_TX,
-      ['calls', FIELD_TYPES.rlpBinary],
+      ['tag', shortUIntConst(Tag.CallsMtree)],
+      ['version', shortUIntConst(1)],
+      ['calls', entry()],
     ],
   },
   [Tag.ChannelsMtree]: {
     1: [
-      ...BASE_TX,
-      ['channels', FIELD_TYPES.rlpBinary],
+      ['tag', shortUIntConst(Tag.ChannelsMtree)],
+      ['version', shortUIntConst(1)],
+      ['channels', entry()],
     ],
   },
   [Tag.NameserviceMtree]: {
     1: [
-      ...BASE_TX,
-      ['mtree', FIELD_TYPES.rlpBinary],
+      ['tag', shortUIntConst(Tag.NameserviceMtree)],
+      ['version', shortUIntConst(1)],
+      ['mtree', entry()],
     ],
   },
   [Tag.OraclesMtree]: {
     1: [
-      ...BASE_TX,
-      ['otree', FIELD_TYPES.rlpBinary],
+      ['tag', shortUIntConst(Tag.OraclesMtree)],
+      ['version', shortUIntConst(1)],
+      ['otree', entry()],
     ],
   },
   [Tag.AccountsMtree]: {
     1: [
-      ...BASE_TX,
-      ['accounts', FIELD_TYPES.rlpBinary],
+      ['tag', shortUIntConst(Tag.AccountsMtree)],
+      ['version', shortUIntConst(1)],
+      ['accounts', entry()],
     ],
   },
   [Tag.GaAttachTx]: {
     1: [
-      ...BASE_TX,
-      ['ownerId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.GaAttachTx)],
+      ['version', shortUIntConst(1)],
+      ['ownerId', address(Encoding.AccountAddress)],
       ['nonce', shortUInt],
-      ['code', FIELD_TYPES.binary, Encoding.ContractBytearray],
-      ['authFun', FIELD_TYPES.rawBinary],
-      ['ctVersion', FIELD_TYPES.ctVersion],
+      ['code', encoded(Encoding.ContractBytearray)],
+      ['authFun', raw],
+      ['ctVersion', ctVersion],
       ['fee', fee],
       ['ttl', shortUInt],
       ['gasLimit', gasLimit],
       ['gasPrice', gasPrice],
-      ['callData', FIELD_TYPES.binary, Encoding.ContractBytearray],
+      ['callData', encoded(Encoding.ContractBytearray)],
     ],
   },
   [Tag.GaMetaTx]: {
     2: [
-      ...BASE_TX,
-      ['gaId', address<Encoding.AccountAddress>()],
-      ['authData', FIELD_TYPES.binary, Encoding.ContractBytearray],
-      ['abiVersion', enumeration<ABI_VERSIONS>()],
+      ['tag', shortUIntConst(Tag.GaMetaTx)],
+      ['version', shortUIntConst(2)],
+      ['gaId', address(Encoding.AccountAddress)],
+      ['authData', encoded(Encoding.ContractBytearray)],
+      ['abiVersion', abiVersion],
       ['fee', fee],
       ['gasLimit', gasLimit],
       ['gasPrice', gasPrice],
-      ['tx', FIELD_TYPES.rlpBinary],
+      ['tx', entry()],
     ],
   },
   [Tag.PayingForTx]: {
     1: [
-      ...BASE_TX,
-      ['payerId', address<Encoding.AccountAddress>()],
+      ['tag', shortUIntConst(Tag.PayingForTx)],
+      ['version', shortUIntConst(1)],
+      ['payerId', address(Encoding.AccountAddress)],
       ['nonce', shortUInt],
       ['fee', fee],
-      ['tx', FIELD_TYPES.rlpBinary],
-    ],
-  },
-  [Tag.CompilerSophia]: {
-    3: [
-      ...BASE_TX,
-      ['sourceCodeHash', FIELD_TYPES.rawBinary],
-      ['typeInfo', FIELD_TYPES.sophiaCodeTypeInfo],
-      ['byteCode', FIELD_TYPES.rawBinary],
-      ['compilerVersion', FIELD_TYPES.string],
-      ['payable', FIELD_TYPES.bool],
+      ['tx', entry()],
     ],
   },
 } as const;
 
+type TxTypeSchemasNotCombined = {
+  [tag in Tag]: {
+    [ver in keyof typeof TX_SCHEMA[tag]]: BuildTxArgBySchema<typeof TX_SCHEMA[tag][ver]>
+  }
+};
+
 export type TxTypeSchemas = {
-  [key in Tag]: BuildTxArgBySchema<
-    typeof TX_SCHEMA[key][keyof typeof TX_SCHEMA[key]]
-  >
+  [key in Tag]: TxTypeSchemasNotCombined[key][keyof TxTypeSchemasNotCombined[key]]
 };
 
 export type TxSchema = TxTypeSchemas[Tag];