@aeternity/aepp-sdk 12.0.0 → 12.1.0

package/es/tx/builder/schema.mjs

@@ -3,8 +3,9 @@
  */
 // # RLP version number
 // # https://github.com/aeternity/protocol/blob/master/serializations.md#binary-serialization
-import { Name, NameId, NameFee, Deposit, GasPrice } from "./field-types.mjs";
-export * from "./constants.mjs";
+import { Tag } from "./constants.mjs";
+import { uInt, shortUInt, coinAmount, name, nameId, nameFee, deposit, gasLimit, gasPrice, fee } from "./field-types/index.mjs";
+import { Encoding } from "../../utils/encoder.mjs";
 export let ORACLE_TTL_TYPES; // # TRANSACTION DEFAULT TTL
 
 (function (ORACLE_TTL_TYPES) {
@@ -29,7 +30,6 @@ export const RESPONSE_TTL = {
 }; // # CONTRACT
 
 export const AMOUNT = 0;
-export const GAS_MAX = 1600000 - 21000;
 export const MAX_AUTH_FUN_GAS = 50000;
 export const DRY_RUN_ACCOUNT = {
   pub: 'ak_11111111111111111111111111111111273Yts',
@@ -37,66 +37,12 @@ export const DRY_RUN_ACCOUNT = {
 };
 
 /**
- * Enum with transaction types
- * @see {@link https://github.com/aeternity/protocol/blob/0f6dee3d9d1e8e2469816798f5c7587a6c918f94/serializations.md#binary-serialization}
- */
-export let TX_TYPE;
-/**
+ * @category transaction builder
  * @see {@link https://github.com/aeternity/protocol/blob/0f6dee3d9d1e8e2469816798f5c7587a6c918f94/contracts/contract_vms.md#virtual-machines-on-the-%C3%A6ternity-blockchain}
  */
-
-(function (TX_TYPE) {
-  TX_TYPE[TX_TYPE["account"] = 10] = "account";
-  TX_TYPE[TX_TYPE["signed"] = 11] = "signed";
-  TX_TYPE[TX_TYPE["spend"] = 12] = "spend";
-  TX_TYPE[TX_TYPE["oracleRegister"] = 22] = "oracleRegister";
-  TX_TYPE[TX_TYPE["oracleQuery"] = 23] = "oracleQuery";
-  TX_TYPE[TX_TYPE["oracleResponse"] = 24] = "oracleResponse";
-  TX_TYPE[TX_TYPE["oracleExtend"] = 25] = "oracleExtend";
-  TX_TYPE[TX_TYPE["nameClaim"] = 32] = "nameClaim";
-  TX_TYPE[TX_TYPE["namePreClaim"] = 33] = "namePreClaim";
-  TX_TYPE[TX_TYPE["nameUpdate"] = 34] = "nameUpdate";
-  TX_TYPE[TX_TYPE["nameRevoke"] = 35] = "nameRevoke";
-  TX_TYPE[TX_TYPE["nameTransfer"] = 36] = "nameTransfer";
-  TX_TYPE[TX_TYPE["contract"] = 40] = "contract";
-  TX_TYPE[TX_TYPE["contractCallResult"] = 41] = "contractCallResult";
-  TX_TYPE[TX_TYPE["contractCreate"] = 42] = "contractCreate";
-  TX_TYPE[TX_TYPE["contractCall"] = 43] = "contractCall";
-  TX_TYPE[TX_TYPE["channelCreate"] = 50] = "channelCreate";
-  TX_TYPE[TX_TYPE["channelDeposit"] = 51] = "channelDeposit";
-  TX_TYPE[TX_TYPE["channelWithdraw"] = 52] = "channelWithdraw";
-  TX_TYPE[TX_TYPE["channelCloseMutual"] = 53] = "channelCloseMutual";
-  TX_TYPE[TX_TYPE["channelCloseSolo"] = 54] = "channelCloseSolo";
-  TX_TYPE[TX_TYPE["channelSlash"] = 55] = "channelSlash";
-  TX_TYPE[TX_TYPE["channelSettle"] = 56] = "channelSettle";
-  TX_TYPE[TX_TYPE["channelOffChain"] = 57] = "channelOffChain";
-  TX_TYPE[TX_TYPE["channel"] = 58] = "channel";
-  TX_TYPE[TX_TYPE["channelSnapshotSolo"] = 59] = "channelSnapshotSolo";
-  TX_TYPE[TX_TYPE["proofOfInclusion"] = 60] = "proofOfInclusion";
-  TX_TYPE[TX_TYPE["stateTrees"] = 62] = "stateTrees";
-  TX_TYPE[TX_TYPE["merklePatriciaTree"] = 63] = "merklePatriciaTree";
-  TX_TYPE[TX_TYPE["merklePatriciaTreeValue"] = 64] = "merklePatriciaTreeValue";
-  TX_TYPE[TX_TYPE["sophiaByteCode"] = 70] = "sophiaByteCode";
-  TX_TYPE[TX_TYPE["gaAttach"] = 80] = "gaAttach";
-  TX_TYPE[TX_TYPE["gaMeta"] = 81] = "gaMeta";
-  TX_TYPE[TX_TYPE["payingFor"] = 82] = "payingFor";
-  TX_TYPE[TX_TYPE["channelForceProgress"] = 521] = "channelForceProgress";
-  TX_TYPE[TX_TYPE["channelOffChainUpdateTransfer"] = 570] = "channelOffChainUpdateTransfer";
-  TX_TYPE[TX_TYPE["channelOffChainUpdateDeposit"] = 571] = "channelOffChainUpdateDeposit";
-  TX_TYPE[TX_TYPE["channelOffChainUpdateWithdrawal"] = 572] = "channelOffChainUpdateWithdrawal";
-  TX_TYPE[TX_TYPE["channelOffChainCreateContract"] = 573] = "channelOffChainCreateContract";
-  TX_TYPE[TX_TYPE["channelOffChainCallContract"] = 574] = "channelOffChainCallContract";
-  TX_TYPE[TX_TYPE["channelReconnect"] = 575] = "channelReconnect";
-  TX_TYPE[TX_TYPE["contractsTree"] = 621] = "contractsTree";
-  TX_TYPE[TX_TYPE["contractCallsTree"] = 622] = "contractCallsTree";
-  TX_TYPE[TX_TYPE["channelsTree"] = 623] = "channelsTree";
-  TX_TYPE[TX_TYPE["nameserviceTree"] = 624] = "nameserviceTree";
-  TX_TYPE[TX_TYPE["oraclesTree"] = 625] = "oraclesTree";
-  TX_TYPE[TX_TYPE["accountsTree"] = 626] = "accountsTree";
-})(TX_TYPE || (TX_TYPE = {}));
-
 export let VM_VERSIONS;
 /**
+ * @category transaction builder
  * @see {@link https://github.com/aeternity/protocol/blob/0f6dee3d9d1e8e2469816798f5c7587a6c918f94/contracts/contract_vms.md#virtual-machines-on-the-%C3%A6ternity-blockchain}
  */
 
@@ -111,6 +57,9 @@ export let VM_VERSIONS;
 })(VM_VERSIONS || (VM_VERSIONS = {}));
 
 export let ABI_VERSIONS;
+/**
+ * @category transaction builder
+ */
 
 (function (ABI_VERSIONS) {
   ABI_VERSIONS[ABI_VERSIONS["NO_ABI"] = 0] = "NO_ABI";
@@ -126,194 +75,196 @@ export let PROTOCOL_VERSIONS; // First abi/vm by default
 
 export const PROTOCOL_VM_ABI = {
   [PROTOCOL_VERSIONS.IRIS]: {
-    [TX_TYPE.contractCreate]: {
+    [Tag.ContractCreateTx]: {
       vmVersion: [VM_VERSIONS.FATE_2],
       abiVersion: [ABI_VERSIONS.FATE]
     },
     // TODO: Ensure that AEVM (SOPHIA?) is still available here
-    [TX_TYPE.contractCall]: {
+    [Tag.ContractCallTx]: {
       vmVersion: [],
       abiVersion: [ABI_VERSIONS.FATE, ABI_VERSIONS.SOPHIA]
     },
-    [TX_TYPE.oracleRegister]: {
+    [Tag.OracleRegisterTx]: {
       vmVersion: [],
       abiVersion: [ABI_VERSIONS.NO_ABI, ABI_VERSIONS.SOPHIA]
     }
   }
 };
+
+/**
+ * @category transaction builder
+ */
 export let FIELD_TYPES;
 
 (function (FIELD_TYPES) {
-  FIELD_TYPES[FIELD_TYPES["int"] = 0] = "int";
-  FIELD_TYPES[FIELD_TYPES["shortInt"] = 1] = "shortInt";
-  FIELD_TYPES[FIELD_TYPES["amount"] = 2] = "amount";
-  FIELD_TYPES[FIELD_TYPES["id"] = 3] = "id";
-  FIELD_TYPES[FIELD_TYPES["ids"] = 4] = "ids";
-  FIELD_TYPES[FIELD_TYPES["string"] = 5] = "string";
-  FIELD_TYPES[FIELD_TYPES["binary"] = 6] = "binary";
-  FIELD_TYPES[FIELD_TYPES["bool"] = 7] = "bool";
-  FIELD_TYPES[FIELD_TYPES["hex"] = 8] = "hex";
-  FIELD_TYPES[FIELD_TYPES["rlpBinary"] = 9] = "rlpBinary";
-  FIELD_TYPES[FIELD_TYPES["rlpBinaries"] = 10] = "rlpBinaries";
-  FIELD_TYPES[FIELD_TYPES["rawBinary"] = 11] = "rawBinary";
-  FIELD_TYPES[FIELD_TYPES["signatures"] = 12] = "signatures";
-  FIELD_TYPES[FIELD_TYPES["pointers"] = 13] = "pointers";
-  FIELD_TYPES[FIELD_TYPES["offChainUpdates"] = 14] = "offChainUpdates";
-  FIELD_TYPES[FIELD_TYPES["callStack"] = 15] = "callStack";
-  FIELD_TYPES[FIELD_TYPES["proofOfInclusion"] = 16] = "proofOfInclusion";
-  FIELD_TYPES[FIELD_TYPES["mptrees"] = 17] = "mptrees";
-  FIELD_TYPES[FIELD_TYPES["callReturnType"] = 18] = "callReturnType";
-  FIELD_TYPES[FIELD_TYPES["ctVersion"] = 19] = "ctVersion";
-  FIELD_TYPES[FIELD_TYPES["abiVersion"] = 20] = "abiVersion";
-  FIELD_TYPES[FIELD_TYPES["ttlType"] = 21] = "ttlType";
-  FIELD_TYPES[FIELD_TYPES["sophiaCodeTypeInfo"] = 22] = "sophiaCodeTypeInfo";
-  FIELD_TYPES[FIELD_TYPES["payload"] = 23] = "payload";
-  FIELD_TYPES[FIELD_TYPES["stateTree"] = 24] = "stateTree";
+  FIELD_TYPES[FIELD_TYPES["id"] = 0] = "id";
+  FIELD_TYPES[FIELD_TYPES["ids"] = 1] = "ids";
+  FIELD_TYPES[FIELD_TYPES["string"] = 2] = "string";
+  FIELD_TYPES[FIELD_TYPES["binary"] = 3] = "binary";
+  FIELD_TYPES[FIELD_TYPES["bool"] = 4] = "bool";
+  FIELD_TYPES[FIELD_TYPES["hex"] = 5] = "hex";
+  FIELD_TYPES[FIELD_TYPES["rlpBinary"] = 6] = "rlpBinary";
+  FIELD_TYPES[FIELD_TYPES["rlpBinaries"] = 7] = "rlpBinaries";
+  FIELD_TYPES[FIELD_TYPES["rawBinary"] = 8] = "rawBinary";
+  FIELD_TYPES[FIELD_TYPES["signatures"] = 9] = "signatures";
+  FIELD_TYPES[FIELD_TYPES["pointers"] = 10] = "pointers";
+  FIELD_TYPES[FIELD_TYPES["offChainUpdates"] = 11] = "offChainUpdates";
+  FIELD_TYPES[FIELD_TYPES["callStack"] = 12] = "callStack";
+  FIELD_TYPES[FIELD_TYPES["proofOfInclusion"] = 13] = "proofOfInclusion";
+  FIELD_TYPES[FIELD_TYPES["mptrees"] = 14] = "mptrees";
+  FIELD_TYPES[FIELD_TYPES["callReturnType"] = 15] = "callReturnType";
+  FIELD_TYPES[FIELD_TYPES["ctVersion"] = 16] = "ctVersion";
+  FIELD_TYPES[FIELD_TYPES["abiVersion"] = 17] = "abiVersion";
+  FIELD_TYPES[FIELD_TYPES["ttlType"] = 18] = "ttlType";
+  FIELD_TYPES[FIELD_TYPES["sophiaCodeTypeInfo"] = 19] = "sophiaCodeTypeInfo";
+  FIELD_TYPES[FIELD_TYPES["payload"] = 20] = "payload";
+  FIELD_TYPES[FIELD_TYPES["stateTree"] = 21] = "stateTree";
 })(FIELD_TYPES || (FIELD_TYPES = {}));
 
-const BASE_TX = [['tag', FIELD_TYPES.shortInt], ['VSN', FIELD_TYPES.shortInt]];
+const BASE_TX = [['tag', shortUInt], ['VSN', shortUInt]];
 export const TX_SCHEMA = {
-  [TX_TYPE.account]: {
-    2: [...BASE_TX, ['flags', FIELD_TYPES.int], ['nonce', FIELD_TYPES.shortInt], ['balance', FIELD_TYPES.int], ['gaContract', FIELD_TYPES.id, ['ct', 'nm']], ['gaAuthFun', FIELD_TYPES.binary, 'cb']]
+  [Tag.Account]: {
+    1: [...BASE_TX, ['nonce', shortUInt], ['balance', uInt]],
+    2: [...BASE_TX, ['flags', uInt], ['nonce', shortUInt], ['balance', uInt], ['gaContract', FIELD_TYPES.id, [Encoding.ContractAddress, Encoding.Name]], ['gaAuthFun', FIELD_TYPES.binary, Encoding.ContractBytearray]]
   },
-  [TX_TYPE.signed]: {
+  [Tag.SignedTx]: {
     1: [...BASE_TX, ['signatures', FIELD_TYPES.signatures], ['encodedTx', FIELD_TYPES.rlpBinary]]
   },
-  [TX_TYPE.spend]: {
-    1: [...BASE_TX, ['senderId', FIELD_TYPES.id, 'ak'], ['recipientId', FIELD_TYPES.id, ['ak', 'nm']], ['amount', FIELD_TYPES.amount], ['fee', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt], ['nonce', FIELD_TYPES.shortInt], ['payload', FIELD_TYPES.payload]]
+  [Tag.SpendTx]: {
+    1: [...BASE_TX, ['senderId', FIELD_TYPES.id, Encoding.AccountAddress], ['recipientId', FIELD_TYPES.id, [Encoding.AccountAddress, Encoding.Name]], ['amount', coinAmount], ['fee', fee], ['ttl', shortUInt], ['nonce', shortUInt], ['payload', FIELD_TYPES.payload]]
   },
-  [TX_TYPE.namePreClaim]: {
-    1: [...BASE_TX, ['accountId', FIELD_TYPES.id, 'ak'], ['nonce', FIELD_TYPES.shortInt], ['commitmentId', FIELD_TYPES.id, 'cm'], ['fee', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt]]
+  [Tag.NamePreclaimTx]: {
+    1: [...BASE_TX, ['accountId', FIELD_TYPES.id, Encoding.AccountAddress], ['nonce', shortUInt], ['commitmentId', FIELD_TYPES.id, Encoding.Commitment], ['fee', fee], ['ttl', shortUInt]]
   },
-  [TX_TYPE.nameClaim]: {
-    2: [...BASE_TX, ['accountId', FIELD_TYPES.id, 'ak'], ['nonce', FIELD_TYPES.shortInt], ['name', Name], ['nameSalt', FIELD_TYPES.int], ['nameFee', NameFee], ['fee', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt]]
+  [Tag.NameClaimTx]: {
+    2: [...BASE_TX, ['accountId', FIELD_TYPES.id, Encoding.AccountAddress], ['nonce', shortUInt], ['name', name], ['nameSalt', uInt], ['nameFee', nameFee], ['fee', fee], ['ttl', shortUInt]]
   },
-  [TX_TYPE.nameUpdate]: {
-    1: [...BASE_TX, ['accountId', FIELD_TYPES.id, 'ak'], ['nonce', FIELD_TYPES.shortInt], ['nameId', NameId], ['nameTtl', FIELD_TYPES.int], ['pointers', FIELD_TYPES.pointers], ['clientTtl', FIELD_TYPES.shortInt], ['fee', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt]]
+  [Tag.NameUpdateTx]: {
+    1: [...BASE_TX, ['accountId', FIELD_TYPES.id, Encoding.AccountAddress], ['nonce', shortUInt], ['nameId', nameId], ['nameTtl', uInt], ['pointers', FIELD_TYPES.pointers], ['clientTtl', shortUInt], ['fee', fee], ['ttl', shortUInt]]
   },
-  [TX_TYPE.nameTransfer]: {
-    1: [...BASE_TX, ['accountId', FIELD_TYPES.id, 'ak'], ['nonce', FIELD_TYPES.shortInt], ['nameId', NameId], ['recipientId', FIELD_TYPES.id, ['ak', 'nm']], ['fee', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt]]
+  [Tag.NameTransferTx]: {
+    1: [...BASE_TX, ['accountId', FIELD_TYPES.id, Encoding.AccountAddress], ['nonce', shortUInt], ['nameId', nameId], ['recipientId', FIELD_TYPES.id, [Encoding.AccountAddress, Encoding.Name]], ['fee', fee], ['ttl', shortUInt]]
   },
-  [TX_TYPE.nameRevoke]: {
-    1: [...BASE_TX, ['accountId', FIELD_TYPES.id, 'ak'], ['nonce', FIELD_TYPES.shortInt], ['nameId', NameId], ['fee', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt]]
+  [Tag.NameRevokeTx]: {
+    1: [...BASE_TX, ['accountId', FIELD_TYPES.id, Encoding.AccountAddress], ['nonce', shortUInt], ['nameId', nameId], ['fee', fee], ['ttl', shortUInt]]
   },
-  [TX_TYPE.contract]: {
-    1: [...BASE_TX, ['owner', FIELD_TYPES.id, 'ak'], ['ctVersion', FIELD_TYPES.ctVersion], ['code', FIELD_TYPES.binary, 'cb'], ['log', FIELD_TYPES.binary, 'cb'], ['active', FIELD_TYPES.bool], ['referers', FIELD_TYPES.ids, 'ak'], ['deposit', Deposit]]
+  [Tag.Contract]: {
+    1: [...BASE_TX, ['owner', FIELD_TYPES.id, 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], ['deposit', deposit]]
   },
-  [TX_TYPE.contractCreate]: {
-    1: [...BASE_TX, ['ownerId', FIELD_TYPES.id, 'ak'], ['nonce', FIELD_TYPES.shortInt], ['code', FIELD_TYPES.binary, 'cb'], ['ctVersion', FIELD_TYPES.ctVersion], ['fee', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt], ['deposit', Deposit], ['amount', FIELD_TYPES.amount], ['gasLimit', FIELD_TYPES.shortInt], ['gasPrice', GasPrice], ['callData', FIELD_TYPES.binary, 'cb']]
+  [Tag.ContractCreateTx]: {
+    1: [...BASE_TX, ['ownerId', FIELD_TYPES.id, Encoding.AccountAddress], ['nonce', shortUInt], ['code', FIELD_TYPES.binary, Encoding.ContractBytearray], ['ctVersion', FIELD_TYPES.ctVersion], ['fee', fee], ['ttl', shortUInt], ['deposit', deposit], ['amount', coinAmount], ['gasLimit', gasLimit], ['gasPrice', gasPrice], ['callData', FIELD_TYPES.binary, Encoding.ContractBytearray]]
   },
-  [TX_TYPE.contractCall]: {
-    1: [...BASE_TX, ['callerId', FIELD_TYPES.id, 'ak'], ['nonce', FIELD_TYPES.shortInt], ['contractId', FIELD_TYPES.id, ['ct', 'nm']], ['abiVersion', FIELD_TYPES.abiVersion], ['fee', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt], ['amount', FIELD_TYPES.amount], ['gasLimit', FIELD_TYPES.shortInt], ['gasPrice', GasPrice], ['callData', FIELD_TYPES.binary, 'cb']]
+  [Tag.ContractCallTx]: {
+    1: [...BASE_TX, ['callerId', FIELD_TYPES.id, Encoding.AccountAddress], ['nonce', shortUInt], ['contractId', FIELD_TYPES.id, [Encoding.ContractAddress, Encoding.Name]], ['abiVersion', FIELD_TYPES.abiVersion], ['fee', fee], ['ttl', shortUInt], ['amount', coinAmount], ['gasLimit', gasLimit], ['gasPrice', gasPrice], ['callData', FIELD_TYPES.binary, Encoding.ContractBytearray]]
   },
-  [TX_TYPE.contractCallResult]: {
-    1: [...BASE_TX, ['callerId', FIELD_TYPES.id, 'ak'], ['callerNonce', FIELD_TYPES.shortInt], ['height', FIELD_TYPES.shortInt], ['contractId', FIELD_TYPES.id, 'ct'], ['gasPrice', GasPrice], ['gasUsed', FIELD_TYPES.shortInt], ['returnValue', FIELD_TYPES.binary, 'cb'], ['returnType', FIELD_TYPES.callReturnType], // TODO: add serialization for
+  [Tag.ContractCall]: {
+    1: [...BASE_TX, ['callerId', FIELD_TYPES.id, Encoding.AccountAddress], ['callerNonce', shortUInt], ['height', shortUInt], ['contractId', FIELD_TYPES.id, Encoding.ContractAddress], ['gasPrice', gasPrice], ['gasUsed', shortUInt], ['returnValue', FIELD_TYPES.binary, Encoding.ContractBytearray], ['returnType', FIELD_TYPES.callReturnType], // TODO: add serialization for
     //  <log> :: [ { <address> :: id, [ <topics> :: binary() ], <data> :: binary() } ]
     ['log', FIELD_TYPES.rawBinary]]
   },
-  [TX_TYPE.oracleRegister]: {
-    1: [...BASE_TX, ['accountId', FIELD_TYPES.id, 'ak'], ['nonce', FIELD_TYPES.shortInt], ['queryFormat', FIELD_TYPES.string], ['responseFormat', FIELD_TYPES.string], ['queryFee', FIELD_TYPES.amount], ['oracleTtlType', FIELD_TYPES.ttlType], ['oracleTtlValue', FIELD_TYPES.shortInt], ['fee', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt], ['abiVersion', FIELD_TYPES.abiVersion]]
+  [Tag.OracleRegisterTx]: {
+    1: [...BASE_TX, ['accountId', FIELD_TYPES.id, Encoding.AccountAddress], ['nonce', shortUInt], ['queryFormat', FIELD_TYPES.string], ['responseFormat', FIELD_TYPES.string], ['queryFee', coinAmount], ['oracleTtlType', FIELD_TYPES.ttlType], ['oracleTtlValue', shortUInt], ['fee', fee], ['ttl', shortUInt], ['abiVersion', FIELD_TYPES.abiVersion]]
   },
-  [TX_TYPE.oracleExtend]: {
-    1: [...BASE_TX, ['oracleId', FIELD_TYPES.id, ['ok', 'nm']], ['nonce', FIELD_TYPES.shortInt], ['oracleTtlType', FIELD_TYPES.ttlType], ['oracleTtlValue', FIELD_TYPES.shortInt], ['fee', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt]]
+  [Tag.OracleExtendTx]: {
+    1: [...BASE_TX, ['oracleId', FIELD_TYPES.id, [Encoding.OracleAddress, Encoding.Name]], ['nonce', shortUInt], ['oracleTtlType', FIELD_TYPES.ttlType], ['oracleTtlValue', shortUInt], ['fee', fee], ['ttl', shortUInt]]
   },
-  [TX_TYPE.oracleQuery]: {
-    1: [...BASE_TX, ['senderId', FIELD_TYPES.id, 'ak'], ['nonce', FIELD_TYPES.shortInt], ['oracleId', FIELD_TYPES.id, ['ok', 'nm']], ['query', FIELD_TYPES.string], ['queryFee', FIELD_TYPES.amount], ['queryTtlType', FIELD_TYPES.ttlType], ['queryTtlValue', FIELD_TYPES.shortInt], ['responseTtlType', FIELD_TYPES.ttlType], ['responseTtlValue', FIELD_TYPES.shortInt], ['fee', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt]]
+  [Tag.OracleQueryTx]: {
+    1: [...BASE_TX, ['senderId', FIELD_TYPES.id, Encoding.AccountAddress], ['nonce', shortUInt], ['oracleId', FIELD_TYPES.id, [Encoding.OracleAddress, Encoding.Name]], ['query', FIELD_TYPES.string], ['queryFee', coinAmount], ['queryTtlType', FIELD_TYPES.ttlType], ['queryTtlValue', shortUInt], ['responseTtlType', FIELD_TYPES.ttlType], ['responseTtlValue', shortUInt], ['fee', fee], ['ttl', shortUInt]]
   },
-  [TX_TYPE.oracleResponse]: {
-    1: [...BASE_TX, ['oracleId', FIELD_TYPES.id, 'ok'], ['nonce', FIELD_TYPES.shortInt], ['queryId', FIELD_TYPES.binary, 'oq'], ['response', FIELD_TYPES.string], ['responseTtlType', FIELD_TYPES.ttlType], ['responseTtlValue', FIELD_TYPES.shortInt], ['fee', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt]]
+  [Tag.OracleResponseTx]: {
+    1: [...BASE_TX, ['oracleId', FIELD_TYPES.id, Encoding.OracleAddress], ['nonce', shortUInt], ['queryId', FIELD_TYPES.binary, Encoding.OracleQueryId], ['response', FIELD_TYPES.string], ['responseTtlType', FIELD_TYPES.ttlType], ['responseTtlValue', shortUInt], ['fee', fee], ['ttl', shortUInt]]
   },
-  [TX_TYPE.channelCreate]: {
-    2: [...BASE_TX, ['initiator', FIELD_TYPES.id, 'ak'], ['initiatorAmount', FIELD_TYPES.int], ['responder', FIELD_TYPES.id, 'ak'], ['responderAmount', FIELD_TYPES.int], ['channelReserve', FIELD_TYPES.int], ['lockPeriod', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt], ['fee', FIELD_TYPES.int], ['initiatorDelegateIds', FIELD_TYPES.string], ['responderDelegateIds', FIELD_TYPES.string], ['stateHash', FIELD_TYPES.binary, 'st'], ['nonce', FIELD_TYPES.shortInt]]
+  [Tag.ChannelCreateTx]: {
+    2: [...BASE_TX, ['initiator', FIELD_TYPES.id, Encoding.AccountAddress], ['initiatorAmount', uInt], ['responder', FIELD_TYPES.id, Encoding.AccountAddress], ['responderAmount', uInt], ['channelReserve', uInt], ['lockPeriod', uInt], ['ttl', shortUInt], ['fee', fee], ['initiatorDelegateIds', FIELD_TYPES.string], ['responderDelegateIds', FIELD_TYPES.string], ['stateHash', FIELD_TYPES.binary, 'st'], ['nonce', shortUInt]]
   },
-  [TX_TYPE.channelCloseMutual]: {
-    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, 'ch'], ['fromId', FIELD_TYPES.id, 'ak'], ['initiatorAmountFinal', FIELD_TYPES.int], ['responderAmountFinal', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt], ['fee', FIELD_TYPES.int], ['nonce', FIELD_TYPES.shortInt]]
+  [Tag.ChannelCloseMutualTx]: {
+    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, Encoding.Channel], ['fromId', FIELD_TYPES.id, Encoding.AccountAddress], ['initiatorAmountFinal', uInt], ['responderAmountFinal', uInt], ['ttl', shortUInt], ['fee', fee], ['nonce', shortUInt]]
   },
-  [TX_TYPE.channelCloseSolo]: {
-    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, 'ch'], ['fromId', FIELD_TYPES.id, 'ak'], ['payload', FIELD_TYPES.binary, 'tx'], ['poi', FIELD_TYPES.binary, 'pi'], ['ttl', FIELD_TYPES.shortInt], ['fee', FIELD_TYPES.int], ['nonce', FIELD_TYPES.shortInt]]
+  [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'], ['ttl', shortUInt], ['fee', fee], ['nonce', shortUInt]]
   },
-  [TX_TYPE.channelSlash]: {
-    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, 'ch'], ['fromId', FIELD_TYPES.id, 'ak'], ['payload', FIELD_TYPES.binary, 'tx'], ['poi', FIELD_TYPES.binary, 'pi'], ['ttl', FIELD_TYPES.shortInt], ['fee', FIELD_TYPES.int], ['nonce', FIELD_TYPES.shortInt]]
+  [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'], ['ttl', shortUInt], ['fee', fee], ['nonce', shortUInt]]
   },
-  [TX_TYPE.channelDeposit]: {
-    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, 'ch'], ['fromId', FIELD_TYPES.id, 'ak'], ['amount', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt], ['fee', FIELD_TYPES.int], ['stateHash', FIELD_TYPES.binary, 'st'], ['round', FIELD_TYPES.int], ['nonce', FIELD_TYPES.shortInt]]
+  [Tag.ChannelDepositTx]: {
+    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, Encoding.Channel], ['fromId', FIELD_TYPES.id, Encoding.AccountAddress], ['amount', uInt], ['ttl', shortUInt], ['fee', fee], ['stateHash', FIELD_TYPES.binary, 'st'], ['round', shortUInt], ['nonce', shortUInt]]
   },
-  [TX_TYPE.channelWithdraw]: {
-    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, 'ch'], ['toId', FIELD_TYPES.id, 'ak'], ['amount', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt], ['fee', FIELD_TYPES.int], ['stateHash', FIELD_TYPES.binary, 'st'], ['round', FIELD_TYPES.int], ['nonce', FIELD_TYPES.shortInt]]
+  [Tag.ChannelWithdrawTx]: {
+    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, Encoding.Channel], ['toId', FIELD_TYPES.id, Encoding.AccountAddress], ['amount', uInt], ['ttl', shortUInt], ['fee', fee], ['stateHash', FIELD_TYPES.binary, 'st'], ['round', shortUInt], ['nonce', shortUInt]]
   },
-  [TX_TYPE.channelSettle]: {
-    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, 'ch'], ['fromId', FIELD_TYPES.id, 'ak'], ['initiatorAmountFinal', FIELD_TYPES.int], ['responderAmountFinal', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt], ['fee', FIELD_TYPES.int], ['nonce', FIELD_TYPES.shortInt]]
+  [Tag.ChannelSettleTx]: {
+    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, Encoding.Channel], ['fromId', FIELD_TYPES.id, Encoding.AccountAddress], ['initiatorAmountFinal', uInt], ['responderAmountFinal', uInt], ['ttl', shortUInt], ['fee', fee], ['nonce', shortUInt]]
   },
-  [TX_TYPE.channelForceProgress]: {
-    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, 'ch'], ['fromId', FIELD_TYPES.id, 'ak'], ['payload', FIELD_TYPES.binary, 'tx'], ['round', FIELD_TYPES.int], ['update', FIELD_TYPES.binary, 'cb'], ['stateHash', FIELD_TYPES.binary, 'st'], ['offChainTrees', FIELD_TYPES.stateTree], ['ttl', FIELD_TYPES.shortInt], ['fee', FIELD_TYPES.int], ['nonce', FIELD_TYPES.shortInt]]
+  [Tag.ChannelForceProgressTx]: {
+    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, Encoding.Channel], ['fromId', FIELD_TYPES.id, Encoding.AccountAddress], ['payload', FIELD_TYPES.binary, 'tx'], ['round', shortUInt], ['update', FIELD_TYPES.binary, Encoding.ContractBytearray], ['stateHash', FIELD_TYPES.binary, 'st'], ['offChainTrees', FIELD_TYPES.stateTree], ['ttl', shortUInt], ['fee', fee], ['nonce', shortUInt]]
   },
-  [TX_TYPE.channelOffChain]: {
-    2: [...BASE_TX, ['channelId', FIELD_TYPES.id, 'ch'], ['round', FIELD_TYPES.int], ['stateHash', FIELD_TYPES.binary, 'st']]
+  [Tag.ChannelOffChainTx]: {
+    2: [...BASE_TX, ['channelId', FIELD_TYPES.id, Encoding.Channel], ['round', shortUInt], ['stateHash', FIELD_TYPES.binary, 'st']]
   },
-  [TX_TYPE.channel]: {
-    3: [...BASE_TX, ['initiator', FIELD_TYPES.id, 'ak'], ['responder', FIELD_TYPES.id, 'ak'], ['channelAmount', FIELD_TYPES.int], ['initiatorAmount', FIELD_TYPES.int], ['responderAmount', FIELD_TYPES.int], ['channelReserve', FIELD_TYPES.int], ['initiatorDelegateIds', FIELD_TYPES.ids], ['responderDelegateIds', FIELD_TYPES.ids], ['stateHash', FIELD_TYPES.hex], ['round', FIELD_TYPES.int], ['soloRound', FIELD_TYPES.int], ['lockPeriod', FIELD_TYPES.int], ['lockedUntil', FIELD_TYPES.int], ['initiatorAuth', FIELD_TYPES.binary, 'cb'], ['responderAuth', FIELD_TYPES.binary, 'cb']]
+  [Tag.Channel]: {
+    3: [...BASE_TX, ['initiator', FIELD_TYPES.id, Encoding.AccountAddress], ['responder', FIELD_TYPES.id, Encoding.AccountAddress], ['channelAmount', uInt], ['initiatorAmount', uInt], ['responderAmount', uInt], ['channelReserve', uInt], ['initiatorDelegateIds', FIELD_TYPES.ids], ['responderDelegateIds', FIELD_TYPES.ids], ['stateHash', FIELD_TYPES.hex], ['round', shortUInt], ['soloRound', uInt], ['lockPeriod', uInt], ['lockedUntil', uInt], ['initiatorAuth', FIELD_TYPES.binary, Encoding.ContractBytearray], ['responderAuth', FIELD_TYPES.binary, Encoding.ContractBytearray]]
   },
-  [TX_TYPE.channelSnapshotSolo]: {
-    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, 'ch'], ['fromId', FIELD_TYPES.id, 'ak'], ['payload', FIELD_TYPES.binary, 'tx'], ['ttl', FIELD_TYPES.shortInt], ['fee', FIELD_TYPES.int], ['nonce', FIELD_TYPES.shortInt]]
+  [Tag.ChannelSnapshotSoloTx]: {
+    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, Encoding.Channel], ['fromId', FIELD_TYPES.id, Encoding.AccountAddress], ['payload', FIELD_TYPES.binary, 'tx'], ['ttl', shortUInt], ['fee', fee], ['nonce', shortUInt]]
   },
-  [TX_TYPE.channelOffChainUpdateTransfer]: {
-    1: [...BASE_TX, ['from', FIELD_TYPES.id, 'ak'], ['to', FIELD_TYPES.id, 'ak'], ['amount', FIELD_TYPES.int]]
+  [Tag.ChannelOffChainUpdateTransfer]: {
+    1: [...BASE_TX, ['from', FIELD_TYPES.id, Encoding.AccountAddress], ['to', FIELD_TYPES.id, Encoding.AccountAddress], ['amount', uInt]]
   },
-  [TX_TYPE.channelOffChainUpdateDeposit]: {
-    1: [...BASE_TX, ['from', FIELD_TYPES.id, 'ak'], ['amount', FIELD_TYPES.int]]
+  [Tag.ChannelOffChainUpdateDeposit]: {
+    1: [...BASE_TX, ['from', FIELD_TYPES.id, Encoding.AccountAddress], ['amount', uInt]]
   },
-  [TX_TYPE.channelOffChainUpdateWithdrawal]: {
-    1: [...BASE_TX, ['from', FIELD_TYPES.id, 'ak'], ['amount', FIELD_TYPES.int]]
+  [Tag.ChannelOffChainUpdateWithdraw]: {
+    1: [...BASE_TX, ['from', FIELD_TYPES.id, Encoding.AccountAddress], ['amount', uInt]]
   },
-  [TX_TYPE.channelOffChainCreateContract]: {
-    1: [...BASE_TX, ['owner', FIELD_TYPES.id, 'ak'], ['ctVersion', FIELD_TYPES.ctVersion], ['code', FIELD_TYPES.binary, 'cb'], ['deposit', FIELD_TYPES.int], ['callData', FIELD_TYPES.binary, 'cb']]
+  [Tag.ChannelOffChainUpdateCreateContract]: {
+    1: [...BASE_TX, ['owner', FIELD_TYPES.id, Encoding.AccountAddress], ['ctVersion', FIELD_TYPES.ctVersion], ['code', FIELD_TYPES.binary, Encoding.ContractBytearray], ['deposit', uInt], ['callData', FIELD_TYPES.binary, Encoding.ContractBytearray]]
   },
-  [TX_TYPE.channelOffChainCallContract]: {
-    1: [...BASE_TX, ['caller', FIELD_TYPES.id, 'ak'], ['contract', FIELD_TYPES.id, 'ct'], ['abiVersion', FIELD_TYPES.abiVersion], ['amount', FIELD_TYPES.int], ['callData', FIELD_TYPES.binary, 'cb'], ['callStack', FIELD_TYPES.callStack], ['gasPrice', GasPrice], ['gasLimit', FIELD_TYPES.shortInt]]
+  [Tag.ChannelOffChainUpdateCallContract]: {
+    1: [...BASE_TX, ['caller', FIELD_TYPES.id, Encoding.AccountAddress], ['contract', FIELD_TYPES.id, Encoding.ContractAddress], ['abiVersion', FIELD_TYPES.abiVersion], ['amount', uInt], ['callData', FIELD_TYPES.binary, Encoding.ContractBytearray], ['callStack', FIELD_TYPES.callStack], ['gasPrice', gasPrice], ['gasLimit', gasLimit]]
   },
-  [TX_TYPE.channelReconnect]: {
-    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, 'ch'], ['round', FIELD_TYPES.int], ['role', FIELD_TYPES.string], ['pubkey', FIELD_TYPES.id, 'ak']]
+  [Tag.ChannelClientReconnectTx]: {
+    1: [...BASE_TX, ['channelId', FIELD_TYPES.id, Encoding.Channel], ['round', shortUInt], ['role', FIELD_TYPES.string], ['pubkey', FIELD_TYPES.id, Encoding.AccountAddress]]
   },
-  [TX_TYPE.proofOfInclusion]: {
+  [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]]
   },
-  [TX_TYPE.stateTrees]: {
+  [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]]
   },
-  [TX_TYPE.merklePatriciaTree]: {
+  [Tag.Mtree]: {
     1: [...BASE_TX, ['values', FIELD_TYPES.rlpBinaries]]
   },
-  [TX_TYPE.merklePatriciaTreeValue]: {
+  [Tag.MtreeValue]: {
     1: [...BASE_TX, ['key', FIELD_TYPES.hex], ['value', FIELD_TYPES.rawBinary]]
   },
-  [TX_TYPE.contractsTree]: {
+  [Tag.ContractsMtree]: {
     1: [...BASE_TX, ['contracts', FIELD_TYPES.rlpBinary]]
   },
-  [TX_TYPE.contractCallsTree]: {
+  [Tag.CallsMtree]: {
     1: [...BASE_TX, ['calls', FIELD_TYPES.rlpBinary]]
   },
-  [TX_TYPE.channelsTree]: {
+  [Tag.ChannelsMtree]: {
     1: [...BASE_TX, ['channels', FIELD_TYPES.rlpBinary]]
   },
-  [TX_TYPE.nameserviceTree]: {
+  [Tag.NameserviceMtree]: {
     1: [...BASE_TX, ['mtree', FIELD_TYPES.rlpBinary]]
   },
-  [TX_TYPE.oraclesTree]: {
+  [Tag.OraclesMtree]: {
     1: [...BASE_TX, ['otree', FIELD_TYPES.rlpBinary]]
   },
-  [TX_TYPE.accountsTree]: {
+  [Tag.AccountsMtree]: {
     1: [...BASE_TX, ['accounts', FIELD_TYPES.rlpBinary]]
   },
-  [TX_TYPE.gaAttach]: {
-    1: [...BASE_TX, ['ownerId', FIELD_TYPES.id, 'ak'], ['nonce', FIELD_TYPES.shortInt], ['code', FIELD_TYPES.binary, 'cb'], ['authFun', FIELD_TYPES.rawBinary], ['ctVersion', FIELD_TYPES.ctVersion], ['fee', FIELD_TYPES.int], ['ttl', FIELD_TYPES.shortInt], ['gasLimit', FIELD_TYPES.shortInt], ['gasPrice', GasPrice], ['callData', FIELD_TYPES.binary, 'cb']]
+  [Tag.GaAttachTx]: {
+    1: [...BASE_TX, ['ownerId', FIELD_TYPES.id, Encoding.AccountAddress], ['nonce', shortUInt], ['code', FIELD_TYPES.binary, Encoding.ContractBytearray], ['authFun', FIELD_TYPES.rawBinary], ['ctVersion', FIELD_TYPES.ctVersion], ['fee', fee], ['ttl', shortUInt], ['gasLimit', gasLimit], ['gasPrice', gasPrice], ['callData', FIELD_TYPES.binary, Encoding.ContractBytearray]]
   },
-  [TX_TYPE.gaMeta]: {
-    2: [...BASE_TX, ['gaId', FIELD_TYPES.id, 'ak'], ['authData', FIELD_TYPES.binary, 'cb'], ['abiVersion', FIELD_TYPES.abiVersion], ['fee', FIELD_TYPES.int], ['gasLimit', FIELD_TYPES.shortInt], ['gasPrice', GasPrice], ['tx', FIELD_TYPES.rlpBinary]]
+  [Tag.GaMetaTx]: {
+    2: [...BASE_TX, ['gaId', FIELD_TYPES.id, Encoding.AccountAddress], ['authData', FIELD_TYPES.binary, Encoding.ContractBytearray], ['abiVersion', FIELD_TYPES.abiVersion], ['fee', fee], ['gasLimit', gasLimit], ['gasPrice', gasPrice], ['tx', FIELD_TYPES.rlpBinary]]
   },
-  [TX_TYPE.payingFor]: {
-    1: [...BASE_TX, ['payerId', FIELD_TYPES.id, 'ak'], ['nonce', FIELD_TYPES.shortInt], ['fee', FIELD_TYPES.int], ['tx', FIELD_TYPES.rlpBinary]]
+  [Tag.PayingForTx]: {
+    1: [...BASE_TX, ['payerId', FIELD_TYPES.id, Encoding.AccountAddress], ['nonce', shortUInt], ['fee', fee], ['tx', FIELD_TYPES.rlpBinary]]
   },
-  [TX_TYPE.sophiaByteCode]: {
+  [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]]
   }
 };