@aeternity/aepp-sdk 8.2.1 → 10.0.0

package/src/tx/builder/index.js

@@ -1,7 +1,7 @@
 import BigNumber from 'bignumber.js'
 import { decode as rlpDecode, encode as rlpEncode } from 'rlp'
 import { AE_AMOUNT_FORMATS, formatAmount } from '../../utils/amount-formatter'
-import { assertedType } from '../../utils/crypto'
+import { hash } from '../../utils/crypto'
 
 import {
   DEFAULT_FEE,
@@ -24,8 +24,7 @@ import {
   writeInt,
   buildPointers,
   encode,
-  decode,
-  buildHash
+  decode
 } from './helpers'
 import { toBytes } from '../../utils/bytes'
 import MPTree from '../../utils/mptree'
@@ -131,6 +130,8 @@ function serializeField (value, type, prefix) {
       return toBytes(value)
     case FIELD_TYPES.pointers:
       return buildPointers(value)
+    case FIELD_TYPES.rlpBinary:
+      return value.rlpEncoded ?? value
     case FIELD_TYPES.mptrees:
       return value.map(t => t.serialize())
     case FIELD_TYPES.ctVersion:
@@ -157,14 +158,16 @@ function validateField (value, key, type, prefix) {
     case FIELD_TYPES.amount:
     case FIELD_TYPES.int: {
       const isMinusValue = (!isNaN(value) || BigNumber.isBigNumber(value)) && BigNumber(value).lt(0)
-      return assert((!isNaN(value) || BigNumber.isBigNumber(value)) && BigNumber(value).gte(0), { value, isMinusValue })
+      return assert(
+        (!isNaN(value) || BigNumber.isBigNumber(value)) && BigNumber(value).gte(0),
+        { value, isMinusValue }
+      )
+    }
+    case FIELD_TYPES.id: {
+      const prefixes = Array.isArray(prefix) ? prefix : [prefix]
+      const p = prefixes.find(p => p === value.split('_')[0])
+      return assert(p && PREFIX_ID_TAG[value.split('_')[0]], { value, prefix })
     }
-    case FIELD_TYPES.id:
-      if (Array.isArray(prefix)) {
-        const p = prefix.find(p => p === value.split('_')[0])
-        return assert(p && PREFIX_ID_TAG[value.split('_')[0]], { value, prefix })
-      }
-      return assert(assertedType(value, prefix) && PREFIX_ID_TAG[value.split('_')[0]] && value.split('_')[0] === prefix, { value, prefix })
     case FIELD_TYPES.binary:
       return assert(value.split('_')[0] === prefix, { prefix, value })
     case FIELD_TYPES.string:
@@ -181,7 +184,10 @@ function validateField (value, key, type, prefix) {
 function transformParams (params, schema, { denomination } = {}) {
   params = schema
     .filter(([_, t]) => t === FIELD_TYPES.amount)
-    .reduce((acc, [key]) => ({ ...params, [key]: formatAmount(params[key], { denomination }) }), params)
+    .reduce(
+      (acc, [key]) => ({ ...params, [key]: formatAmount(params[key], { denomination }) }),
+      params
+    )
   const schemaKeys = schema.map(([k]) => k)
   return Object
     .entries(params)
@@ -253,7 +259,12 @@ function buildFee (txType, { params, gas = 0, multiplier, vsn }) {
   const { rlpEncoded: txWithOutFee } = buildTx({ ...params }, txType, { vsn })
   const txSize = txWithOutFee.length
   return TX_FEE_BASE_GAS(txType)
-    .plus(TX_FEE_OTHER_GAS(txType)({ txSize, relativeTtl: getOracleRelativeTtl(params, txType) }))
+    .plus(TX_FEE_OTHER_GAS(txType, txSize, {
+      relativeTtl: getOracleRelativeTtl(params, txType),
+      innerTxSize: [TX_TYPE.gaMeta, TX_TYPE.payingFor].includes(txType)
+        ? params.tx.tx.encodedTx.rlpEncoded.length
+        : 0
+    }))
     .times(multiplier)
 }
 
@@ -289,7 +300,9 @@ export function validateParams (params, schema, { excludeKeys = [] }) {
   return schema
     .filter(([key]) => !excludeKeys.includes(key) && key !== 'payload')
     .reduce(
-      (acc, [key, type, prefix]) => Object.assign(acc, validateField(params[key], key, type, prefix)),
+      (acc, [key, type, prefix]) => Object.assign(
+        acc, validateField(params[key], key, type, prefix)
+      ),
       {}
     )
 }
@@ -301,12 +314,16 @@ export function validateParams (params, schema, { excludeKeys = [] }) {
  * @param {Object} params Object with tx params
  * @param {Array} schema Transaction schema
  * @param {Object} [options={}] options
- * @param {Array} [options.excludeKeys=[]] excludeKeys Array of keys to exclude for validation and build
- * @param {String} [options.denomination='aettos'] denomination Denomination of amounts (default: aettos)
+ * @param {String[]} [options.excludeKeys=[]] Array of keys to exclude for validation and build
+ * @param {String} [options.denomination='aettos'] Denomination of amounts
  * @throws {Error} Validation error
  * @return {Array} Array with binary fields of transaction
  */
-export function buildRawTx (params, schema, { excludeKeys = [], denomination = AE_AMOUNT_FORMATS.AETTOS } = {}) {
+export function buildRawTx (
+  params,
+  schema,
+  { excludeKeys = [], denomination = AE_AMOUNT_FORMATS.AETTOS } = {}
+) {
   const filteredSchema = schema.filter(([key]) => !excludeKeys.includes(key))
 
   // Transform `amount` type fields to `aettos`
@@ -369,14 +386,25 @@ const getSchema = ({ vsn, objId, type }) => {
  * @param {Object} params Object with tx params
  * @param {String} type Transaction type
  * @param {Object} [options={}] options
- * @param {Object} [options.excludeKeys] excludeKeys Array of keys to exclude for validation and build
+ * @param {String[]} [options.excludeKeys] Array of keys to exclude for validation and build
  * @param {String} [options.prefix] Prefix of transaction
  * @throws {Error} Validation error
- * @return {Object} { tx, rlpEncoded, binary } Object with tx -> Base64Check transaction hash with 'tx_' prefix, rlp encoded transaction and binary transaction
+ * @returns {Object} object
+ * @returns {String} object.tx Base64Check transaction hash with 'tx_' prefix
+ * @returns {Buffer} object.rlpEncoded rlp encoded transaction
+ * @returns {Array<Buffer>} object.binary binary transaction
  */
-export function buildTx (params, type, { excludeKeys = [], prefix = 'tx', vsn = VSN, denomination = AE_AMOUNT_FORMATS.AETTOS } = {}) {
+export function buildTx (
+  params,
+  type,
+  { excludeKeys = [], prefix = 'tx', vsn = VSN, denomination = AE_AMOUNT_FORMATS.AETTOS } = {}
+) {
   const [schema, tag] = getSchema({ type, vsn })
-  const binary = buildRawTx({ ...params, VSN: vsn, tag }, schema, { excludeKeys, denomination: params.denomination || denomination }).filter(e => e !== undefined)
+  const binary = buildRawTx(
+    { ...params, VSN: vsn, tag },
+    schema,
+    { excludeKeys, denomination: params.denomination || denomination }
+  ).filter(e => e !== undefined)
 
   const rlpEncoded = rlpEncode(binary)
   const tx = encode(rlpEncoded, prefix)
@@ -388,10 +416,14 @@ export function buildTx (params, type, { excludeKeys = [], prefix = 'tx', vsn =
  * Unpack transaction hash
  * @function
  * @alias module:@aeternity/aepp-sdk/es/tx/builder
- * @param {String|Buffer} encodedTx String or RLP encoded transaction array (if fromRlpBinary flag is true)
+ * @param {String|Buffer} encodedTx String or RLP encoded transaction array
+ * (if fromRlpBinary flag is true)
  * @param {Boolean} fromRlpBinary Unpack from RLP encoded transaction (default: false)
  * @param {String} prefix - Prefix of data
- * @return {Object} { tx, rlpEncoded, binary } Object with tx -> Object with transaction param's, rlp encoded transaction and binary transaction
+ * @returns {Object} object
+ * @returns {Object} object.tx Object with transaction param's
+ * @returns {Buffer} object.rlpEncoded rlp encoded transaction
+ * @returns {Array<Buffer>} object.binary binary transaction
  */
 export function unpackTx (encodedTx, fromRlpBinary = false, prefix = 'tx') {
   const rlpEncoded = fromRlpBinary ? encodedTx : decode(encodedTx, prefix)
@@ -409,13 +441,20 @@ export function unpackTx (encodedTx, fromRlpBinary = false, prefix = 'tx') {
  * @function
  * @alias module:@aeternity/aepp-sdk/es/tx/builder
  * @param {String | Buffer} rawTx base64 or rlp encoded transaction
- * @param {Object} options
- * @param {Boolean} options.raw
  * @return {String} Transaction hash
  */
-export function buildTxHash (rawTx, options) {
-  if (typeof rawTx === 'string' && rawTx.indexOf('tx_') !== -1) return buildHash('th', unpackTx(rawTx).rlpEncoded, options)
-  return buildHash('th', rawTx, options)
+export function buildTxHash (rawTx) {
+  const data = typeof rawTx === 'string' && rawTx.startsWith('tx_') ? decode(rawTx, 'tx') : rawTx
+  return encode(hash(data), 'th')
 }
 
-export default { calculateMinFee, calculateFee, unpackTx, unpackRawTx, buildTx, buildRawTx, validateParams, buildTxHash }
+export default {
+  calculateMinFee,
+  calculateFee,
+  unpackTx,
+  unpackRawTx,
+  buildTx,
+  buildRawTx,
+  validateParams,
+  buildTxHash
+}

package/src/tx/builder/schema.js

@@ -22,7 +22,7 @@ export const RESPONSE_TTL = { type: 'delta', value: 10 }
 // # CONTRACT
 export const DEPOSIT = 0
 export const AMOUNT = 0
-export const GAS = 1600000 - 21000
+export const GAS = 25000
 export const MIN_GAS_PRICE = 1e9
 export const MAX_AUTH_FUN_GAS = 50000
 export const DRY_RUN_ACCOUNT = { pub: 'ak_11111111111111111111111111111111273Yts', amount: '100000000000000000000000000000000000' }
@@ -36,18 +36,21 @@ export const NAME_MAX_CLIENT_TTL = 84600
 export const CLIENT_TTL = NAME_MAX_CLIENT_TTL
 export const NAME_FEE = 0
 // # see https://github.com/aeternity/aeternity/blob/72e440b8731422e335f879a31ecbbee7ac23a1cf/apps/aecore/src/aec_governance.erl#L67
-export const NAME_FEE_MULTIPLIER = 100000000000000
+export const NAME_FEE_MULTIPLIER = 1e14 // 100000000000000
 export const NAME_FEE_BID_INCREMENT = 0.05 // # the increment is in percentage
 // # see https://github.com/aeternity/aeternity/blob/72e440b8731422e335f879a31ecbbee7ac23a1cf/apps/aecore/src/aec_governance.erl#L272
 export const NAME_BID_TIMEOUT_BLOCKS = 480 // # ~1 day
+// # this is the max length for a domain that requires a base fee to be paid
+export const NAME_MAX_LENGTH_FEE = 31
 export const NAME_BID_MAX_LENGTH = 12 // # this is the max length for a domain to be part of a bid
-export const NAME_ID_KEY = {
+export const POINTER_KEY_BY_PREFIX = {
   ak: 'account_pubkey',
   ok: 'oracle_pubkey',
   ct: 'contract_pubkey',
   ch: 'channel'
 }
-// # ref: https://github.com/aeternity/aeternity/blob/72e440b8731422e335f879a31ecbbee7ac23a1cf/apps/aecore/src/aec_governance.erl#L290
+// # https://github.com/aeternity/aeternity/blob/72e440b8731422e335f879a31ecbbee7ac23a1cf/apps/aecore/src/aec_governance.erl#L290
+// # https://github.com/aeternity/protocol/blob/master/AENS.md#protocol-fees-and-protection-times
 // # bid ranges:
 export const NAME_BID_RANGES = {
   31: BigNumber(3).times(NAME_FEE_MULTIPLIER),
@@ -149,12 +152,14 @@ const OBJECT_TAG_ORACLES_TREE = 625
 const OBJECT_TAG_ACCOUNTS_TREE = 626
 const OBJECT_TAG_GA_ATTACH = 80
 const OBJECT_TAG_GA_META = 81
+const OBJECT_TAG_PAYING_FOR = 82
 const OBJECT_TAG_SOPHIA_BYTE_CODE = 70
 
 const TX_FIELD = (name, type, prefix) => [name, type, prefix]
 const TX_SCHEMA_FIELD = (schema, objectId) => [schema, objectId]
 
-const revertObject = (obj) => Object.entries(obj).reduce((acc, [key, v]) => (acc[v] = key) && acc, {})
+const revertObject = (obj) => Object.entries(obj)
+  .reduce((acc, [key, v]) => (acc[v] = key) && acc, {})
 
 /**
  * @constant
@@ -225,6 +230,7 @@ export const TX_TYPE = {
   // GA ACCOUNTS
   gaAttach: 'gaAttach',
   gaMeta: 'gaMeta',
+  payingFor: 'payingFor',
   sophiaByteCode: 'sophiaByteCode'
 }
 
@@ -324,6 +330,7 @@ export const OBJECT_ID_TX_TYPE = {
   // GA Accounts
   [OBJECT_TAG_GA_ATTACH]: TX_TYPE.gaAttach,
   [OBJECT_TAG_GA_META]: TX_TYPE.gaMeta,
+  [OBJECT_TAG_PAYING_FOR]: TX_TYPE.payingFor,
   [OBJECT_TAG_SOPHIA_BYTE_CODE]: TX_TYPE.sophiaByteCode
 }
 
@@ -361,33 +368,39 @@ export const KEY_BLOCK_INTERVAL = 3
 
 // MAP WITH FEE CALCULATION https://github.com/aeternity/protocol/blob/master/consensus/consensus.md#gas
 export const TX_FEE_BASE_GAS = (txType) => {
-  switch (txType) {
-    // case TX_TYPE.gaMeta: // TODO investigate MetaTx calculation
-    case TX_TYPE.gaAttach:
-    case TX_TYPE.contractCreate:
-      return BigNumber(5 * BASE_GAS)
-    // Todo Implement meta tx fee calculation
-    case TX_TYPE.gaMeta:
-    case TX_TYPE.contractCall:
-      return BigNumber(12 * BASE_GAS)
-    default:
-      return BigNumber(BASE_GAS)
-  }
+  const factor = ({
+    [TX_TYPE.channelForceProgress]: 30,
+    [TX_TYPE.channelOffChain]: 0,
+    [TX_TYPE.channelOffChainCallContract]: 0,
+    [TX_TYPE.channelOffChainCreateContract]: 0,
+    [TX_TYPE.channelOffChainUpdateDeposit]: 0,
+    [TX_TYPE.channelOffChainUpdateWithdrawal]: 0,
+    [TX_TYPE.channelOffChainUpdateTransfer]: 0,
+    [TX_TYPE.contractCreate]: 5,
+    [TX_TYPE.contractCall]: 12,
+    [TX_TYPE.gaAttach]: 5,
+    [TX_TYPE.gaMeta]: 5,
+    [TX_TYPE.payingFor]: 1 / 5
+  })[txType] || 1
+  return new BigNumber(factor * BASE_GAS)
 }
 
-export const TX_FEE_OTHER_GAS = (txType) => ({ txSize, relativeTtl }) => {
+export const TX_FEE_OTHER_GAS = (txType, txSize, { relativeTtl, innerTxSize }) => {
   switch (txType) {
     case TX_TYPE.oracleRegister:
     case TX_TYPE.oracleExtend:
     case TX_TYPE.oracleQuery:
     case TX_TYPE.oracleResponse:
-      return BigNumber(txSize)
+      return new BigNumber(txSize)
         .times(GAS_PER_BYTE)
         .plus(
           Math.ceil(32000 * relativeTtl / Math.floor(60 * 24 * 365 / KEY_BLOCK_INTERVAL))
         )
+    case TX_TYPE.gaMeta:
+    case TX_TYPE.payingFor:
+      return new BigNumber(txSize).minus(innerTxSize).times(GAS_PER_BYTE)
     default:
-      return BigNumber(txSize).times(GAS_PER_BYTE)
+      return new BigNumber(txSize).times(GAS_PER_BYTE)
   }
 }
 
@@ -547,6 +560,14 @@ const GA_META_TX_2 = [
   TX_FIELD('tx', FIELD_TYPES.rlpBinary)
 ]
 
+const PAYING_FOR_TX = [
+  ...BASE_TX,
+  TX_FIELD('payerId', FIELD_TYPES.id, 'ak'),
+  TX_FIELD('nonce', FIELD_TYPES.int),
+  TX_FIELD('fee', FIELD_TYPES.int),
+  TX_FIELD('tx', FIELD_TYPES.rlpBinary)
+]
+
 const CONTRACT_CREATE_TX = [
   ...BASE_TX,
   TX_FIELD('ownerId', FIELD_TYPES.id, 'ak'),
@@ -586,7 +607,8 @@ const CONTRACT_CALL_RESULT_TX = [
   TX_FIELD('gasUsed', FIELD_TYPES.int),
   TX_FIELD('returnValue', FIELD_TYPES.binary, 'cb'),
   TX_FIELD('returnType', FIELD_TYPES.callReturnType),
-  // TODO: add serialization for <log> :: [ { <address> :: id, [ <topics> :: binary() ], <data> :: binary() } ]
+  // TODO: add serialization for
+  //  <log> :: [ { <address> :: id, [ <topics> :: binary() ], <data> :: binary() } ]
   TX_FIELD('log', FIELD_TYPES.rawBinary)
 ]
 
@@ -966,19 +988,29 @@ export const TX_SERIALIZATION_SCHEMA = {
     1: TX_SCHEMA_FIELD(CHANNEL_SNAPSHOT_SOLO_TX, OBJECT_TAG_CHANNEL_SNAPSHOT_SOLO_TX)
   },
   [TX_TYPE.channelOffChainUpdateTransfer]: {
-    1: TX_SCHEMA_FIELD(CHANNEL_OFFCHAIN_UPDATE_TRANSFER_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_UPDATE_TRANSFER_TX)
+    1: TX_SCHEMA_FIELD(
+      CHANNEL_OFFCHAIN_UPDATE_TRANSFER_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_UPDATE_TRANSFER_TX
+    )
   },
   [TX_TYPE.channelOffChainUpdateDeposit]: {
-    1: TX_SCHEMA_FIELD(CHANNEL_OFFCHAIN_UPDATE_DEPOSIT_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_UPDATE_DEPOSIT_TX)
+    1: TX_SCHEMA_FIELD(
+      CHANNEL_OFFCHAIN_UPDATE_DEPOSIT_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_UPDATE_DEPOSIT_TX
+    )
   },
   [TX_TYPE.channelOffChainUpdateWithdrawal]: {
-    1: TX_SCHEMA_FIELD(CHANNEL_OFFCHAIN_UPDATE_WITHDRAWAL_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_UPDATE_WITHDRAWAL_TX)
+    1: TX_SCHEMA_FIELD(
+      CHANNEL_OFFCHAIN_UPDATE_WITHDRAWAL_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_UPDATE_WITHDRAWAL_TX
+    )
   },
   [TX_TYPE.channelOffChainCreateContract]: {
-    1: TX_SCHEMA_FIELD(CHANNEL_OFFCHAIN_CREATE_CONTRACT_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_CREATE_CONTRACT_TX)
+    1: TX_SCHEMA_FIELD(
+      CHANNEL_OFFCHAIN_CREATE_CONTRACT_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_CREATE_CONTRACT_TX
+    )
   },
   [TX_TYPE.channelOffChainCallContract]: {
-    1: TX_SCHEMA_FIELD(CHANNEL_OFFCHAIN_CALL_CONTRACT_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_CALL_CONTRACT_TX)
+    1: TX_SCHEMA_FIELD(
+      CHANNEL_OFFCHAIN_CALL_CONTRACT_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_CALL_CONTRACT_TX
+    )
   },
   [TX_TYPE.channelReconnect]: {
     1: TX_SCHEMA_FIELD(CHANNEL_RECONNECT_TX, OBJECT_TAG_CHANNEL_RECONNECT_TX)
@@ -1018,6 +1050,9 @@ export const TX_SERIALIZATION_SCHEMA = {
   },
   [TX_TYPE.gaMeta]: {
     2: TX_SCHEMA_FIELD(GA_META_TX_2, OBJECT_TAG_GA_META)
+  },
+  [TX_TYPE.payingFor]: {
+    1: TX_SCHEMA_FIELD(PAYING_FOR_TX, OBJECT_TAG_PAYING_FOR)
   }
 }
 
@@ -1101,19 +1136,29 @@ export const TX_DESERIALIZATION_SCHEMA = {
     1: TX_SCHEMA_FIELD(CHANNEL_SNAPSHOT_SOLO_TX, OBJECT_TAG_CHANNEL_SNAPSHOT_SOLO_TX)
   },
   [OBJECT_TAG_CHANNEL_OFFCHAIN_UPDATE_TRANSFER_TX]: {
-    1: TX_SCHEMA_FIELD(CHANNEL_OFFCHAIN_UPDATE_TRANSFER_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_UPDATE_TRANSFER_TX)
+    1: TX_SCHEMA_FIELD(
+      CHANNEL_OFFCHAIN_UPDATE_TRANSFER_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_UPDATE_TRANSFER_TX
+    )
   },
   [OBJECT_TAG_CHANNEL_OFFCHAIN_UPDATE_DEPOSIT_TX]: {
-    1: TX_SCHEMA_FIELD(CHANNEL_OFFCHAIN_UPDATE_DEPOSIT_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_UPDATE_DEPOSIT_TX)
+    1: TX_SCHEMA_FIELD(
+      CHANNEL_OFFCHAIN_UPDATE_DEPOSIT_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_UPDATE_DEPOSIT_TX
+    )
   },
   [OBJECT_TAG_CHANNEL_OFFCHAIN_UPDATE_WITHDRAWAL_TX]: {
-    1: TX_SCHEMA_FIELD(CHANNEL_OFFCHAIN_UPDATE_WITHDRAWAL_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_UPDATE_WITHDRAWAL_TX)
+    1: TX_SCHEMA_FIELD(
+      CHANNEL_OFFCHAIN_UPDATE_WITHDRAWAL_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_UPDATE_WITHDRAWAL_TX
+    )
   },
   [OBJECT_TAG_CHANNEL_OFFCHAIN_CREATE_CONTRACT_TX]: {
-    1: TX_SCHEMA_FIELD(CHANNEL_OFFCHAIN_CREATE_CONTRACT_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_CREATE_CONTRACT_TX)
+    1: TX_SCHEMA_FIELD(
+      CHANNEL_OFFCHAIN_CREATE_CONTRACT_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_CREATE_CONTRACT_TX
+    )
   },
   [OBJECT_TAG_CHANNEL_OFFCHAIN_CALL_CONTRACT_TX]: {
-    1: TX_SCHEMA_FIELD(CHANNEL_OFFCHAIN_CALL_CONTRACT_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_CALL_CONTRACT_TX)
+    1: TX_SCHEMA_FIELD(
+      CHANNEL_OFFCHAIN_CALL_CONTRACT_TX, OBJECT_TAG_CHANNEL_OFFCHAIN_CALL_CONTRACT_TX
+    )
   },
   [OBJECT_TAG_CHANNEL_RECONNECT_TX]: {
     1: TX_SCHEMA_FIELD(CHANNEL_RECONNECT_TX, OBJECT_TAG_CHANNEL_RECONNECT_TX)
@@ -1154,6 +1199,9 @@ export const TX_DESERIALIZATION_SCHEMA = {
   [OBJECT_TAG_GA_META]: {
     2: TX_SCHEMA_FIELD(GA_META_TX_2, OBJECT_TAG_GA_META)
   },
+  [OBJECT_TAG_PAYING_FOR]: {
+    1: TX_SCHEMA_FIELD(PAYING_FOR_TX, OBJECT_TAG_PAYING_FOR)
+  },
   [OBJECT_TAG_CHANNEL_FORCE_PROGRESS_TX]: {
     1: TX_SCHEMA_FIELD(CHANNEL_FORCE_PROGRESS_TX, OBJECT_TAG_CHANNEL_FORCE_PROGRESS_TX)
   },
@@ -1161,93 +1209,3 @@ export const TX_DESERIALIZATION_SCHEMA = {
     3: TX_SCHEMA_FIELD(CONTRACT_BYTE_CODE_LIMA, OBJECT_TAG_SOPHIA_BYTE_CODE)
   }
 }
-
-// VERIFICATION SCHEMA
-
-const ERROR_TYPE = { ERROR: 'error', WARNING: 'warning' }
-const VERIFICATION_FIELD = (msg, verificationFn, error) => [msg, verificationFn, error]
-
-const VALIDATORS = {
-  signature: 'signature',
-  insufficientFee: 'insufficientFee',
-  expiredTTL: 'expiredTTL',
-  insufficientBalanceForAmountFee: 'insufficientBalanceForAmountFee',
-  insufficientBalanceForAmount: 'insufficientBalanceForAmount',
-  nonceUsed: 'nonceUsed',
-  nonceHigh: 'nonceHigh',
-  minGasPrice: 'minGasPrice',
-  vmAndAbiVersion: 'vmAndAbiVersion',
-  insufficientBalanceForFeeNameFee: 'insufficientBalanceForFeeNameFee'
-}
-
-const ERRORS = {
-  invalidSignature: { key: 'InvalidSignature', type: ERROR_TYPE.ERROR, txKey: 'signature' },
-  insufficientFee: { key: 'InsufficientFee', type: ERROR_TYPE.ERROR, txKey: 'fee' },
-  expiredTTL: { key: 'ExpiredTTL', type: ERROR_TYPE.ERROR, txKey: 'ttl' },
-  insufficientBalanceForAmountFee: { key: 'InsufficientBalanceForAmountFee', type: ERROR_TYPE.WARNING, txKey: 'fee' },
-  insufficientBalanceForAmount: { key: 'InsufficientBalanceForAmount', type: ERROR_TYPE.WARNING, txKey: 'amount' },
-  nonceUsed: { key: 'NonceUsed', type: ERROR_TYPE.ERROR, txKey: 'nonce' },
-  nonceHigh: { key: 'NonceHigh', type: ERROR_TYPE.WARNING, txKey: 'nonce' },
-  minGasPrice: { key: 'minGasPrice', type: ERROR_TYPE.ERROR, txKey: 'gasPrice' },
-  vmAndAbiVersion: { key: 'vmAndAbiVersion', type: ERROR_TYPE.ERROR, txKey: 'ctVersion' },
-  insufficientBalanceForFeeNameFee: { key: 'insufficientBalanceForFeeNameFee', type: ERROR_TYPE.ERROR, txKey: 'nameFee' }
-}
-
-export const SIGNATURE_VERIFICATION_SCHEMA = [
-  VERIFICATION_FIELD(
-    () => 'The signature cannot be verified, please verify that you used the correct network id and the correct private key for the sender address',
-    VALIDATORS.signature,
-    ERRORS.invalidSignature
-  )
-]
-export const CONTRACT_VERIFICATION_SCHEMA = [
-  VERIFICATION_FIELD(
-    ({ ctVersion, consensusProtocolVersion, txType }) => `Wrong abi/vm version, Supported is: ${PROTOCOL_VM_ABI[consensusProtocolVersion] ? JSON.stringify(PROTOCOL_VM_ABI[consensusProtocolVersion][txType]) : ' None for this protocol ' + consensusProtocolVersion}`,
-    VALIDATORS.vmAndAbiVersion,
-    ERRORS.vmAndAbiVersion
-  ),
-  VERIFICATION_FIELD(
-    () => `The gasPrice must be bigger then ${MIN_GAS_PRICE}`,
-    VALIDATORS.minGasPrice,
-    ERRORS.minGasPrice
-  )
-]
-export const NAME_CLAIM_VERIFICATION_SCHEMA = [
-  VERIFICATION_FIELD(
-    ({ balance }) => `The account balance ${balance} is not enough to execute the transaction`,
-    VALIDATORS.insufficientBalanceForFeeNameFee,
-    ERRORS.insufficientBalanceForFeeNameFee
-  )
-]
-export const BASE_VERIFICATION_SCHEMA = [
-  VERIFICATION_FIELD(
-    ({ minFee }) => `The fee for the transaction is too low, the minimum fee for this transaction is ${minFee}`,
-    VALIDATORS.insufficientFee,
-    ERRORS.insufficientFee
-  ),
-  VERIFICATION_FIELD(
-    ({ height }) => `The TTL is already expired, the current height is ${height}`,
-    VALIDATORS.expiredTTL,
-    ERRORS.expiredTTL
-  ),
-  VERIFICATION_FIELD(
-    ({ balance }) => `The account balance ${balance} is not enough to execute the transaction`,
-    VALIDATORS.insufficientBalanceForAmountFee,
-    ERRORS.insufficientBalanceForAmountFee
-  ),
-  VERIFICATION_FIELD(
-    ({ balance }) => `The account balance ${balance} is not enough to execute the transaction`,
-    VALIDATORS.insufficientBalanceForAmount,
-    ERRORS.insufficientBalanceForAmount
-  ),
-  VERIFICATION_FIELD(
-    ({ accountNonce }) => `The nonce is invalid (already used). Next valid nonce is ${accountNonce + 1})`,
-    VALIDATORS.nonceUsed,
-    ERRORS.nonceUsed
-  ),
-  VERIFICATION_FIELD(
-    ({ accountNonce }) => `The nonce is technically valid but will not be processed immediately by the node (next valid nonce is ${accountNonce + 1})`,
-    VALIDATORS.nonceHigh,
-    ERRORS.nonceHigh
-  )
-]