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

package/dist/aepp-sdk.js

@@ -1,13 +1,13 @@
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("@azure/core-rest-pipeline"), require("bignumber.js"), require("@azure/core-client"), require("rlp"), require("bs58"), require("buffer"), require("tweetnacl"), require("varuint-bitcoin"), require("@aeternity/uuid"), require("@aeternity/argon2"), require("tweetnacl-auth"), require("bip32-path"), require("aes-js"), require("@aeternity/aepp-calldata"), require("json-bigint"), require("events"), require("websocket"));
+		module.exports = factory(require("@azure/core-rest-pipeline"), require("rlp"), require("bignumber.js"), require("bs58"), require("buffer"), require("tweetnacl"), require("varuint-bitcoin"), require("@azure/core-client"), require("@aeternity/uuid"), require("@aeternity/argon2"), require("tweetnacl-auth"), require("bip32-path"), require("aes-js"), require("@aeternity/aepp-calldata"), require("json-bigint"), require("events"), require("websocket"));
 	else if(typeof define === 'function' && define.amd)
-		define(["@azure/core-rest-pipeline", "bignumber.js", "@azure/core-client", "rlp", "bs58", "buffer", "tweetnacl", "varuint-bitcoin", "@aeternity/uuid", "@aeternity/argon2", "tweetnacl-auth", "bip32-path", "aes-js", "@aeternity/aepp-calldata", "json-bigint", "events", "websocket"], factory);
+		define(["@azure/core-rest-pipeline", "rlp", "bignumber.js", "bs58", "buffer", "tweetnacl", "varuint-bitcoin", "@azure/core-client", "@aeternity/uuid", "@aeternity/argon2", "tweetnacl-auth", "bip32-path", "aes-js", "@aeternity/aepp-calldata", "json-bigint", "events", "websocket"], factory);
 	else if(typeof exports === 'object')
-		exports["Aeternity"] = factory(require("@azure/core-rest-pipeline"), require("bignumber.js"), require("@azure/core-client"), require("rlp"), require("bs58"), require("buffer"), require("tweetnacl"), require("varuint-bitcoin"), require("@aeternity/uuid"), require("@aeternity/argon2"), require("tweetnacl-auth"), require("bip32-path"), require("aes-js"), require("@aeternity/aepp-calldata"), require("json-bigint"), require("events"), require("websocket"));
+		exports["Aeternity"] = factory(require("@azure/core-rest-pipeline"), require("rlp"), require("bignumber.js"), require("bs58"), require("buffer"), require("tweetnacl"), require("varuint-bitcoin"), require("@azure/core-client"), require("@aeternity/uuid"), require("@aeternity/argon2"), require("tweetnacl-auth"), require("bip32-path"), require("aes-js"), require("@aeternity/aepp-calldata"), require("json-bigint"), require("events"), require("websocket"));
 	else
-		root["Aeternity"] = factory(root["@azure/core-rest-pipeline"], root["bignumber.js"], root["@azure/core-client"], root["rlp"], root["bs58"], root["buffer"], root["tweetnacl"], root["varuint-bitcoin"], root["@aeternity/uuid"], root["@aeternity/argon2"], root["tweetnacl-auth"], root["bip32-path"], root["aes-js"], root["@aeternity/aepp-calldata"], root["json-bigint"], root["events"], root["websocket"]);
-})(global, (__WEBPACK_EXTERNAL_MODULE__5039__, __WEBPACK_EXTERNAL_MODULE__5192__, __WEBPACK_EXTERNAL_MODULE__4711__, __WEBPACK_EXTERNAL_MODULE__3485__, __WEBPACK_EXTERNAL_MODULE__3783__, __WEBPACK_EXTERNAL_MODULE__9408__, __WEBPACK_EXTERNAL_MODULE__79__, __WEBPACK_EXTERNAL_MODULE__7480__, __WEBPACK_EXTERNAL_MODULE__3983__, __WEBPACK_EXTERNAL_MODULE__7417__, __WEBPACK_EXTERNAL_MODULE__9882__, __WEBPACK_EXTERNAL_MODULE__1986__, __WEBPACK_EXTERNAL_MODULE__8236__, __WEBPACK_EXTERNAL_MODULE__7946__, __WEBPACK_EXTERNAL_MODULE__2716__, __WEBPACK_EXTERNAL_MODULE__3735__, __WEBPACK_EXTERNAL_MODULE__8079__) => {
+		root["Aeternity"] = factory(root["@azure/core-rest-pipeline"], root["rlp"], root["bignumber.js"], root["bs58"], root["buffer"], root["tweetnacl"], root["varuint-bitcoin"], root["@azure/core-client"], root["@aeternity/uuid"], root["@aeternity/argon2"], root["tweetnacl-auth"], root["bip32-path"], root["aes-js"], root["@aeternity/aepp-calldata"], root["json-bigint"], root["events"], root["websocket"]);
+})(global, (__WEBPACK_EXTERNAL_MODULE__5039__, __WEBPACK_EXTERNAL_MODULE__3485__, __WEBPACK_EXTERNAL_MODULE__5192__, __WEBPACK_EXTERNAL_MODULE__3783__, __WEBPACK_EXTERNAL_MODULE__9408__, __WEBPACK_EXTERNAL_MODULE__79__, __WEBPACK_EXTERNAL_MODULE__7480__, __WEBPACK_EXTERNAL_MODULE__4711__, __WEBPACK_EXTERNAL_MODULE__3983__, __WEBPACK_EXTERNAL_MODULE__7417__, __WEBPACK_EXTERNAL_MODULE__9882__, __WEBPACK_EXTERNAL_MODULE__1986__, __WEBPACK_EXTERNAL_MODULE__8236__, __WEBPACK_EXTERNAL_MODULE__7946__, __WEBPACK_EXTERNAL_MODULE__2716__, __WEBPACK_EXTERNAL_MODULE__3735__, __WEBPACK_EXTERNAL_MODULE__8079__) => {
 return /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
@@ -662,6 +662,8 @@ module.exports = parent;
 
 var parent = __webpack_require__(281);
 __webpack_require__(8783);
+__webpack_require__(2731);
+__webpack_require__(5605);
 __webpack_require__(5799);
 __webpack_require__(1943);
 __webpack_require__(6774);
@@ -1100,6 +1102,18 @@ module.exports = function (object, key, value) {
 };
 
 
+/***/ }),
+
+/***/ 9202:
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+var defineProperty = __webpack_require__(5988);
+
+module.exports = function (target, name, descriptor) {
+  return defineProperty.f(target, name, descriptor);
+};
+
+
 /***/ }),
 
 /***/ 5929:
@@ -1240,11 +1254,9 @@ module.exports = {
 /***/ }),
 
 /***/ 2861:
-/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
-
-var getBuiltIn = __webpack_require__(626);
+/***/ ((module) => {
 
-module.exports = getBuiltIn('navigator', 'userAgent') || '';
+module.exports = typeof navigator != 'undefined' && String(navigator.userAgent) || '';
 
 
 /***/ }),
@@ -1376,9 +1388,9 @@ module.exports = function (options, source) {
 
     if (USE_NATIVE && typeof targetProperty == typeof sourceProperty) continue;
 
-    // bind timers to global for call from export context
+    // bind methods to global for calling from export context
     if (options.bind && USE_NATIVE) resultProperty = bind(sourceProperty, global);
-    // wrap global constructors for prevent changs in this version
+    // wrap global constructors for prevent changes in this version
     else if (options.wrap && USE_NATIVE) resultProperty = wrapConstructor(sourceProperty);
     // make static versions for prototype methods
     else if (PROTO && isCallable(sourceProperty)) resultProperty = uncurryThis(sourceProperty);
@@ -1512,6 +1524,22 @@ module.exports = {
 };
 
 
+/***/ }),
+
+/***/ 5526:
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+var uncurryThis = __webpack_require__(5329);
+var aCallable = __webpack_require__(4883);
+
+module.exports = function (object, key, method) {
+  try {
+    // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+    return uncurryThis(aCallable(Object.getOwnPropertyDescriptor(object, key)[method]));
+  } catch (error) { /* empty */ }
+};
+
+
 /***/ }),
 
 /***/ 7484:
@@ -1565,6 +1593,42 @@ module.exports = function (namespace, method) {
 };
 
 
+/***/ }),
+
+/***/ 3323:
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+var uncurryThis = __webpack_require__(5329);
+var isArray = __webpack_require__(1052);
+var isCallable = __webpack_require__(7475);
+var classof = __webpack_require__(2532);
+var toString = __webpack_require__(5803);
+
+var push = uncurryThis([].push);
+
+module.exports = function (replacer) {
+  if (isCallable(replacer)) return replacer;
+  if (!isArray(replacer)) return;
+  var rawLength = replacer.length;
+  var keys = [];
+  for (var i = 0; i < rawLength; i++) {
+    var element = replacer[i];
+    if (typeof element == 'string') push(keys, element);
+    else if (typeof element == 'number' || classof(element) == 'Number' || classof(element) == 'String') push(keys, toString(element));
+  }
+  var keysLength = keys.length;
+  var root = true;
+  return function (key, value) {
+    if (root) {
+      root = false;
+      return value;
+    }
+    if (isArray(this)) return value;
+    for (var j = 0; j < keysLength; j++) if (keys[j] === key) return value;
+  };
+};
+
+
 /***/ }),
 
 /***/ 4229:
@@ -2543,7 +2607,7 @@ exports.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 /* eslint-disable no-proto -- safe */
-var uncurryThis = __webpack_require__(5329);
+var uncurryThisAccessor = __webpack_require__(5526);
 var anObject = __webpack_require__(6059);
 var aPossiblePrototype = __webpack_require__(1851);
 
@@ -2556,8 +2620,7 @@ module.exports = Object.setPrototypeOf || ('__proto__' in {} ? function () {
   var test = {};
   var setter;
   try {
-    // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-    setter = uncurryThis(Object.getOwnPropertyDescriptor(Object.prototype, '__proto__').set);
+    setter = uncurryThisAccessor(Object.prototype, '__proto__', 'set');
     setter(test, []);
     CORRECT_SETTER = test instanceof Array;
   } catch (error) { /* empty */ }
@@ -2747,10 +2810,10 @@ var store = __webpack_require__(3030);
 (module.exports = function (key, value) {
   return store[key] || (store[key] = value !== undefined ? value : {});
 })('versions', []).push({
-  version: '3.27.0',
+  version: '3.29.0',
   mode: IS_PURE ? 'pure' : 'global',
-  copyright: '© 2014-2022 Denis Pushkarev (zloirock.ru)',
-  license: 'https://github.com/zloirock/core-js/blob/v3.27.0/LICENSE',
+  copyright: '© 2014-2023 Denis Pushkarev (zloirock.ru)',
+  license: 'https://github.com/zloirock/core-js/blob/v3.29.0/LICENSE',
   source: 'https://github.com/zloirock/core-js'
 });
 
@@ -3132,21 +3195,15 @@ var uid = __webpack_require__(9418);
 var NATIVE_SYMBOL = __webpack_require__(3405);
 var USE_SYMBOL_AS_UID = __webpack_require__(2302);
 
-var WellKnownSymbolsStore = shared('wks');
 var Symbol = global.Symbol;
-var symbolFor = Symbol && Symbol['for'];
-var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol : Symbol && Symbol.withoutSetter || uid;
+var WellKnownSymbolsStore = shared('wks');
+var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol['for'] || Symbol : Symbol && Symbol.withoutSetter || uid;
 
 module.exports = function (name) {
-  if (!hasOwn(WellKnownSymbolsStore, name) || !(NATIVE_SYMBOL || typeof WellKnownSymbolsStore[name] == 'string')) {
-    var description = 'Symbol.' + name;
-    if (NATIVE_SYMBOL && hasOwn(Symbol, name)) {
-      WellKnownSymbolsStore[name] = Symbol[name];
-    } else if (USE_SYMBOL_AS_UID && symbolFor) {
-      WellKnownSymbolsStore[name] = symbolFor(description);
-    } else {
-      WellKnownSymbolsStore[name] = createWellKnownSymbol(description);
-    }
+  if (!hasOwn(WellKnownSymbolsStore, name)) {
+    WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn(Symbol, name)
+      ? Symbol[name]
+      : createWellKnownSymbol('Symbol.' + name);
   } return WellKnownSymbolsStore[name];
 };
 
@@ -3182,15 +3239,13 @@ var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails(function () {
   return array.concat()[0] !== array;
 });
 
-var SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('concat');
-
 var isConcatSpreadable = function (O) {
   if (!isObject(O)) return false;
   var spreadable = O[IS_CONCAT_SPREADABLE];
   return spreadable !== undefined ? !!spreadable : isArray(O);
 };
 
-var FORCED = !IS_CONCAT_SPREADABLE_SUPPORT || !SPECIES_SUPPORT;
+var FORCED = !IS_CONCAT_SPREADABLE_SUPPORT || !arrayMethodHasSpeciesSupport('concat');
 
 // `Array.prototype.concat` method
 // https://tc39.es/ecma262/#sec-array.prototype.concat
@@ -3308,13 +3363,13 @@ var apply = __webpack_require__(9730);
 var call = __webpack_require__(8834);
 var uncurryThis = __webpack_require__(5329);
 var fails = __webpack_require__(5981);
-var isArray = __webpack_require__(1052);
 var isCallable = __webpack_require__(7475);
-var isObject = __webpack_require__(941);
 var isSymbol = __webpack_require__(6664);
 var arraySlice = __webpack_require__(3765);
+var getReplacerFunction = __webpack_require__(3323);
 var NATIVE_SYMBOL = __webpack_require__(3405);
 
+var $String = String;
 var $stringify = getBuiltIn('JSON', 'stringify');
 var exec = uncurryThis(/./.exec);
 var charAt = uncurryThis(''.charAt);
@@ -3344,13 +3399,13 @@ var ILL_FORMED_UNICODE = fails(function () {
 
 var stringifyWithSymbolsFix = function (it, replacer) {
   var args = arraySlice(arguments);
-  var $replacer = replacer;
-  if (!isObject(replacer) && it === undefined || isSymbol(it)) return; // IE8 returns string on undefined
-  if (!isArray(replacer)) replacer = function (key, value) {
-    if (isCallable($replacer)) value = call($replacer, this, key, value);
+  var $replacer = getReplacerFunction(replacer);
+  if (!isCallable($replacer) && (it === undefined || isSymbol(it))) return; // IE8 returns string on undefined
+  args[1] = function (key, value) {
+    // some old implementations (like WebKit) could pass numbers as keys
+    if (isCallable($replacer)) value = call($replacer, this, $String(key), value);
     if (!isSymbol(value)) return value;
   };
-  args[1] = replacer;
   return apply($stringify, null, args);
 };
 
@@ -3546,6 +3601,7 @@ var definePropertyModule = __webpack_require__(5988);
 var definePropertiesModule = __webpack_require__(9938);
 var propertyIsEnumerableModule = __webpack_require__(6760);
 var defineBuiltIn = __webpack_require__(5929);
+var defineBuiltInAccessor = __webpack_require__(9202);
 var shared = __webpack_require__(8726);
 var sharedKey = __webpack_require__(4262);
 var hiddenKeys = __webpack_require__(7748);
@@ -3717,7 +3773,7 @@ if (!NATIVE_SYMBOL) {
 
   if (DESCRIPTORS) {
     // https://github.com/tc39/proposal-Symbol-description
-    nativeDefineProperty(SymbolPrototype, 'description', {
+    defineBuiltInAccessor(SymbolPrototype, 'description', {
       configurable: true,
       get: function description() {
         return getInternalState(this).description;
@@ -4027,6 +4083,75 @@ var defineWellKnownSymbol = __webpack_require__(3464);
 defineWellKnownSymbol('dispose');
 
 
+/***/ }),
+
+/***/ 2731:
+/***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
+
+var $ = __webpack_require__(6887);
+var getBuiltIn = __webpack_require__(626);
+var uncurryThis = __webpack_require__(5329);
+
+var Symbol = getBuiltIn('Symbol');
+var keyFor = Symbol.keyFor;
+var thisSymbolValue = uncurryThis(Symbol.prototype.valueOf);
+
+// `Symbol.isRegistered` method
+// https://tc39.es/proposal-symbol-predicates/#sec-symbol-isregistered
+$({ target: 'Symbol', stat: true }, {
+  isRegistered: function isRegistered(value) {
+    try {
+      return keyFor(thisSymbolValue(value)) !== undefined;
+    } catch (error) {
+      return false;
+    }
+  }
+});
+
+
+/***/ }),
+
+/***/ 5605:
+/***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
+
+var $ = __webpack_require__(6887);
+var shared = __webpack_require__(8726);
+var getBuiltIn = __webpack_require__(626);
+var uncurryThis = __webpack_require__(5329);
+var isSymbol = __webpack_require__(6664);
+var wellKnownSymbol = __webpack_require__(9813);
+
+var Symbol = getBuiltIn('Symbol');
+var $isWellKnown = Symbol.isWellKnown;
+var getOwnPropertyNames = getBuiltIn('Object', 'getOwnPropertyNames');
+var thisSymbolValue = uncurryThis(Symbol.prototype.valueOf);
+var WellKnownSymbolsStore = shared('wks');
+
+for (var i = 0, symbolKeys = getOwnPropertyNames(Symbol), symbolKeysLength = symbolKeys.length; i < symbolKeysLength; i++) {
+  // some old engines throws on access to some keys like `arguments` or `caller`
+  try {
+    var symbolKey = symbolKeys[i];
+    if (isSymbol(Symbol[symbolKey])) wellKnownSymbol(symbolKey);
+  } catch (error) { /* empty */ }
+}
+
+// `Symbol.isWellKnown` method
+// https://tc39.es/proposal-symbol-predicates/#sec-symbol-iswellknown
+// We should patch it for newly added well-known symbols. If it's not required, this module just will not be injected
+$({ target: 'Symbol', stat: true, forced: true }, {
+  isWellKnown: function isWellKnown(value) {
+    if ($isWellKnown && $isWellKnown(value)) return true;
+    try {
+      var symbol = thisSymbolValue(value);
+      for (var j = 0, keys = getOwnPropertyNames(WellKnownSymbolsStore), keysLength = keys.length; j < keysLength; j++) {
+        if (WellKnownSymbolsStore[keys[j]] == symbol) return true;
+      }
+    } catch (error) { /* empty */ }
+    return false;
+  }
+});
+
+
 /***/ }),
 
 /***/ 5799:
@@ -4999,7 +5124,6 @@ __webpack_require__.d(__webpack_exports__, {
   "InvalidRpcMessageError": () => (/* reexport */ InvalidRpcMessageError),
   "InvalidSignatureError": () => (/* reexport */ InvalidSignatureError),
   "InvalidTxError": () => (/* reexport */ InvalidTxError),
-  "InvalidTxParamsError": () => (/* reexport */ InvalidTxParamsError),
   "MAX_AUTH_FUN_GAS": () => (/* reexport */ MAX_AUTH_FUN_GAS),
   "MESSAGE_DIRECTION": () => (/* reexport */ MESSAGE_DIRECTION),
   "METHODS": () => (/* reexport */ METHODS),
@@ -5035,7 +5159,6 @@ __webpack_require__.d(__webpack_exports__, {
   "ORACLE_TTL_TYPES": () => (/* reexport */ ORACLE_TTL_TYPES),
   "PayloadLengthError": () => (/* reexport */ PayloadLengthError),
   "PrefixNotFoundError": () => (/* reexport */ PrefixNotFoundError),
-  "QUERY_FEE": () => (/* reexport */ QUERY_FEE),
   "QUERY_TTL": () => (/* reexport */ QUERY_TTL),
   "RESPONSE_TTL": () => (/* reexport */ RESPONSE_TTL),
   "RPC_STATUS": () => (/* reexport */ RPC_STATUS),
@@ -5053,8 +5176,6 @@ __webpack_require__.d(__webpack_exports__, {
   "RpcUnsupportedProtocolError": () => (/* reexport */ RpcUnsupportedProtocolError),
   "SUBSCRIPTION_TYPES": () => (/* reexport */ SUBSCRIPTION_TYPES),
   "SchemaNotFoundError": () => (/* reexport */ SchemaNotFoundError),
-  "TX_SCHEMA": () => (/* reexport */ TX_SCHEMA),
-  "TX_TTL": () => (/* reexport */ TX_TTL),
   "Tag": () => (/* reexport */ Tag),
   "TagNotFoundError": () => (/* reexport */ TagNotFoundError),
   "TransactionError": () => (/* reexport */ TransactionError),
@@ -5070,15 +5191,12 @@ __webpack_require__.d(__webpack_exports__, {
   "UnknownPathNibbleError": () => (/* reexport */ UnknownPathNibbleError),
   "UnknownRpcClientError": () => (/* reexport */ UnknownRpcClientError),
   "UnsubscribedAccountError": () => (/* reexport */ UnsubscribedAccountError),
-  "UnsupportedABIversionError": () => (/* reexport */ UnsupportedABIversionError),
   "UnsupportedPlatformError": () => (/* reexport */ UnsupportedPlatformError),
   "UnsupportedProtocolError": () => (/* reexport */ UnsupportedProtocolError),
-  "UnsupportedVMversionError": () => (/* reexport */ UnsupportedVMversionError),
   "UnsupportedVersionError": () => (/* reexport */ UnsupportedVersionError),
   "VmVersion": () => (/* reexport */ VmVersion),
   "WALLET_TYPE": () => (/* reexport */ WALLET_TYPE),
   "WalletError": () => (/* reexport */ WalletError),
-  "_buildTx": () => (/* reexport */ _buildTx),
   "_getPollInterval": () => (/* reexport */ _getPollInterval),
   "aensBid": () => (/* reexport */ aensBid),
   "aensClaim": () => (/* reexport */ aensClaim),
@@ -5089,9 +5207,11 @@ __webpack_require__.d(__webpack_exports__, {
   "aensUpdate": () => (/* reexport */ aensUpdate),
   "awaitHeight": () => (/* reexport */ awaitHeight),
   "buildAuthTxHash": () => (/* reexport */ buildAuthTxHash),
+  "buildAuthTxHashByGaMetaTx": () => (/* reexport */ buildAuthTxHashByGaMetaTx),
   "buildContractId": () => (/* reexport */ buildContractId),
   "buildContractIdByContractTx": () => (/* reexport */ buildContractIdByContractTx),
   "buildTx": () => (/* reexport */ buildTx),
+  "buildTxAsync": () => (/* reexport */ buildTxAsync),
   "buildTxHash": () => (/* reexport */ buildTxHash),
   "commitmentHash": () => (/* reexport */ commitmentHash),
   "computeAuctionEndBlock": () => (/* reexport */ computeAuctionEndBlock),
@@ -5119,6 +5239,9 @@ __webpack_require__.d(__webpack_exports__, {
   "getContractByteCode": () => (/* reexport */ getContractByteCode),
   "getCurrentGeneration": () => (/* reexport */ getCurrentGeneration),
   "getDefaultPointerKey": () => (/* reexport */ getDefaultPointerKey),
+  "getExecutionCost": () => (/* reexport */ getExecutionCost),
+  "getExecutionCostBySignedTx": () => (/* reexport */ getExecutionCostBySignedTx),
+  "getExecutionCostUsingNode": () => (/* reexport */ getExecutionCostUsingNode),
   "getFileSystem": () => (/* reexport */ getFileSystem),
   "getGeneration": () => (/* reexport */ getGeneration),
   "getHdWalletAccountFromSeed": () => (/* reexport */ getHdWalletAccountFromSeed),
@@ -5133,6 +5256,7 @@ __webpack_require__.d(__webpack_exports__, {
   "getOracleObject": () => (/* reexport */ getOracleObject),
   "getQueryObject": () => (/* reexport */ getQueryObject),
   "getSaveHDWalletAccounts": () => (/* reexport */ getSaveHDWalletAccounts),
+  "getTransactionSignerAddress": () => (/* reexport */ getTransactionSignerAddress),
   "hash": () => (/* reexport */ hash),
   "isAddressValid": () => (/* reexport */ isAddressValid),
   "isAuctionName": () => (/* reexport */ isAuctionName),
@@ -5151,7 +5275,6 @@ __webpack_require__.d(__webpack_exports__, {
   "registerOracle": () => (/* reexport */ registerOracle),
   "resolveName": () => (/* reexport */ resolveName),
   "respondToQuery": () => (/* reexport */ respondToQuery),
-  "send": () => (/* reexport */ send),
   "sendTransaction": () => (/* reexport */ sendTransaction),
   "sign": () => (/* reexport */ sign),
   "signMessage": () => (/* reexport */ signMessage),
@@ -5286,16 +5409,6 @@ __webpack_require__.d(chain_namespaceObject, {
   "waitForTxConfirm": () => (waitForTxConfirm)
 });
 
-// NAMESPACE OBJECT: ./src/spend.ts
-var spend_namespaceObject = {};
-__webpack_require__.r(spend_namespaceObject);
-__webpack_require__.d(spend_namespaceObject, {
-  "payForTransaction": () => (payForTransaction),
-  "send": () => (send),
-  "spend": () => (spend),
-  "transferFunds": () => (transferFunds)
-});
-
 // NAMESPACE OBJECT: ./src/aens.ts
 var aens_namespaceObject = {};
 __webpack_require__.r(aens_namespaceObject);
@@ -5323,11 +5436,21 @@ __webpack_require__.d(oracle_namespaceObject, {
   "respondToQuery": () => (respondToQuery)
 });
 
+// NAMESPACE OBJECT: ./src/spend.ts
+var spend_namespaceObject = {};
+__webpack_require__.r(spend_namespaceObject);
+__webpack_require__.d(spend_namespaceObject, {
+  "payForTransaction": () => (payForTransaction),
+  "spend": () => (spend),
+  "transferFunds": () => (transferFunds)
+});
+
 // NAMESPACE OBJECT: ./src/contract/ga.ts
 var ga_namespaceObject = {};
 __webpack_require__.r(ga_namespaceObject);
 __webpack_require__.d(ga_namespaceObject, {
   "buildAuthTxHash": () => (buildAuthTxHash),
+  "buildAuthTxHashByGaMetaTx": () => (buildAuthTxHashByGaMetaTx),
   "createGeneralizedAccount": () => (createGeneralizedAccount)
 });
 
@@ -5337,11 +5460,11 @@ __webpack_require__.r(models_mappers_namespaceObject);
 __webpack_require__.d(models_mappers_namespaceObject, {
   "Aci": () => (Aci),
   "ApiVersion": () => (ApiVersion),
-  "ByteCode": () => (mappers_ByteCode),
   "ByteCodeInput": () => (ByteCodeInput),
   "BytecodeCallResultInput": () => (BytecodeCallResultInput),
   "Calldata": () => (Calldata),
   "CompileOpts": () => (CompileOpts),
+  "CompileResult": () => (CompileResult),
   "CompilerError": () => (mappers_CompilerError),
   "CompilerVersion": () => (CompilerVersion),
   "Contract": () => (mappers_Contract),
@@ -6060,16 +6183,6 @@ class InvalidSignatureError extends TransactionError {
   }
 }
 
-/**
- * @category exception
- */
-class InvalidTxParamsError extends TransactionError {
-  constructor(message) {
-    super(message);
-    this.name = 'InvalidTxParamsError';
-  }
-}
-
 /**
  * @category exception
  */
@@ -6084,8 +6197,8 @@ class PrefixNotFoundError extends TransactionError {
  * @category exception
  */
 class SchemaNotFoundError extends TransactionError {
-  constructor(schemaName, key, version) {
-    super(`Transaction ${schemaName} not implemented for ${key} version ${version}`);
+  constructor(key, version) {
+    super(`Transaction schema not implemented for tag ${key} version ${version}`);
     this.name = 'SchemaNotFoundError';
   }
 }
@@ -6110,26 +6223,6 @@ class TxNotInChainError extends TransactionError {
   }
 }
 
-/**
- * @category exception
- */
-class UnsupportedABIversionError extends TransactionError {
-  constructor(message) {
-    super(message);
-    this.name = 'UnsupportedABIversionError';
-  }
-}
-
-/**
- * @category exception
- */
-class UnsupportedVMversionError extends TransactionError {
-  constructor(message) {
-    super(message);
-    this.name = 'UnsupportedVMversionError';
-  }
-}
-
 /**
  * @category exception
  */
@@ -6160,22 +6253,6 @@ class RpcConnectionError extends WalletError {
   }
 }
 ;// CONCATENATED MODULE: ./src/utils/amount-formatter.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2018 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
 
 
 
@@ -6464,22 +6541,6 @@ function encode(data, type) {
   return `${type}_${encoder.encode(data)}`;
 }
 ;// CONCATENATED MODULE: ./src/utils/crypto.ts
-/*
- * ISC License (ISC)
- * Copyright 2018 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
 
 // js extension is required for mjs build, not importing the whole package to reduce bundle size
 // eslint-disable-next-line import/extensions
@@ -6711,6 +6772,7 @@ let ConsensusProtocolVersion;
  */
 (function (ConsensusProtocolVersion) {
   ConsensusProtocolVersion[ConsensusProtocolVersion["Iris"] = 5] = "Iris";
+  ConsensusProtocolVersion[ConsensusProtocolVersion["Ceres"] = 6] = "Ceres";
 })(ConsensusProtocolVersion || (ConsensusProtocolVersion = {}));
 let VmVersion;
 
@@ -6794,25 +6856,41 @@ let Tag; // KeyBlock = 100,
   Tag[Tag["GaAttachTx"] = 80] = "GaAttachTx";
   Tag[Tag["GaMetaTx"] = 81] = "GaMetaTx";
   Tag[Tag["PayingForTx"] = 82] = "PayingForTx";
+  Tag[Tag["GaMetaTxAuthData"] = 810] = "GaMetaTxAuthData";
 })(Tag || (Tag = {}));
 ;// CONCATENATED MODULE: ./src/tx/builder/field-types/ct-version.ts
 
-
-// First abi/vm by default
+/*
+ * First abi/vm by default
+ * @see {@link https://github.com/aeternity/protocol/blob/71cf111/contracts/contract_vms.md#virtual-machines-on-the-æternity-blockchain}
+ */
 const ProtocolToVmAbi = {
   [ConsensusProtocolVersion.Iris]: {
     'contract-create': {
       vmVersion: [VmVersion.Fate2],
       abiVersion: [AbiVersion.Fate]
     },
-    // TODO: Ensure that AEVM (Sophia?) is still available here
     'contract-call': {
       vmVersion: [],
       abiVersion: [AbiVersion.Fate, AbiVersion.Sophia]
     },
     'oracle-call': {
       vmVersion: [],
-      abiVersion: [AbiVersion.NoAbi, AbiVersion.Sophia]
+      abiVersion: [AbiVersion.NoAbi, AbiVersion.Fate]
+    }
+  },
+  [ConsensusProtocolVersion.Ceres]: {
+    'contract-create': {
+      vmVersion: [VmVersion.Fate2],
+      abiVersion: [AbiVersion.Fate]
+    },
+    'contract-call': {
+      vmVersion: [],
+      abiVersion: [AbiVersion.Fate]
+    },
+    'oracle-call': {
+      vmVersion: [],
+      abiVersion: [AbiVersion.NoAbi, AbiVersion.Fate]
     }
   }
 };
@@ -6825,13 +6903,24 @@ function getProtocolDetails(protocolVersion, type) {
   };
 }
 /* harmony default export */ const ct_version = ({
-  serialize(value, {
+  serialize(value, params, {
     consensusProtocolVersion = ConsensusProtocolVersion.Iris
   }) {
     var _value;
     (_value = value) !== null && _value !== void 0 ? _value : value = getProtocolDetails(consensusProtocolVersion, 'contract-create');
     return Buffer.from([value.vmVersion, 0, value.abiVersion]);
   },
+  async prepare(value, params,
+  // TODO: { consensusProtocolVersion: ConsensusProtocolVersion } | { onNode: Node } | {}
+  options) {
+    if (value != null) return value;
+    if (options.consensusProtocolVersion != null) return undefined;
+    if (Object.keys(ConsensusProtocolVersion).length === 2) return undefined;
+    if (options.onNode != null) {
+      return getProtocolDetails((await options.onNode.getNodeInfo()).consensusProtocolVersion, 'contract-create');
+    }
+    return undefined;
+  },
   deserialize(buffer) {
     const [vm,, abi] = buffer;
     return {
@@ -6846,34 +6935,36 @@ var external_rlp_ = __webpack_require__(3485);
 
 
 /* harmony default export */ const abi_version = ({
+  _getProtocolDetails(c, tag) {
+    const kind = Tag.ContractCallTx === tag || Tag.GaMetaTx === tag ? 'contract-call' : 'oracle-call';
+    return getProtocolDetails(c, kind).abiVersion;
+  },
   serialize(value, {
-    tag,
+    tag
+  }, {
     consensusProtocolVersion = ConsensusProtocolVersion.Iris
   }) {
-    const result = value !== null && value !== void 0 ? value : getProtocolDetails(consensusProtocolVersion, Tag.ContractCallTx === tag || Tag.GaMetaTx === tag ? 'contract-call' : 'oracle-call').abiVersion;
+    const result = value !== null && value !== void 0 ? value : this._getProtocolDetails(consensusProtocolVersion, tag);
     return Buffer.from([result]);
   },
+  async prepare(value, {
+    tag
+  },
+  // TODO: { consensusProtocolVersion: ConsensusProtocolVersion } | { onNode: Node } | {}
+  options) {
+    if (value != null) return value;
+    if (options.consensusProtocolVersion != null) return undefined;
+    if (Object.keys(ConsensusProtocolVersion).length === 2) return undefined;
+    if (options.onNode != null) {
+      return this._getProtocolDetails((await options.onNode.getNodeInfo()).consensusProtocolVersion, tag);
+    }
+    return undefined;
+  },
   deserialize(buffer) {
     return buffer[0];
   }
 });
 ;// CONCATENATED MODULE: ./src/utils/bytes.ts
-/*
- * ISC License (ISC)
- * Copyright 2018 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
 
 
 
@@ -7142,13 +7233,12 @@ function isAuctionName(name) {
   serializeAettos(value) {
     return value !== null && value !== void 0 ? value : '0';
   },
-  serialize(value, {
-    denomination,
-    ...options
+  serialize(value, params, {
+    denomination = AE_AMOUNT_FORMATS.AETTOS
   }) {
     return u_int.serialize(this.serializeAettos(value != null ? formatAmount(value, {
       denomination
-    }) : value, options));
+    }) : value, params));
   }
 });
 ;// CONCATENATED MODULE: ./src/tx/builder/field-types/deposit.ts
@@ -7159,13 +7249,14 @@ function isAuctionName(name) {
   /**
    * @param value - Deposit value in string format. Should be equal to '0'.
    * @param options - Options
+   * @param parameters - Parameters
    * @returns Deposit value Buffer.
    */
-  serialize(value, options) {
+  serialize(value, options, parameters) {
     var _value;
     (_value = value) !== null && _value !== void 0 ? _value : value = 0;
     if (+value !== 0) throw new IllegalArgumentError(`Contract deposit is not refundable, so it should be equal 0, got ${value.toString()} instead`);
-    return coin_amount.serialize(value, options);
+    return coin_amount.serialize(value, options, parameters);
   }
 });
 ;// CONCATENATED MODULE: ./src/tx/builder/field-types/encoded.ts
@@ -7194,6 +7285,9 @@ function genEntryField(tag) {
       buildTx
     }) {
       if (ArrayBuffer.isView(txParams)) return Buffer.from(txParams);
+      if (typeof txParams === 'string' && txParams.startsWith('tx_')) {
+        return decode(txParams);
+      }
       return decode(buildTx({
         ...txParams,
         ...(tag != null && {
@@ -7331,9 +7425,13 @@ function buildFee(builtTx, unpackTx, buildTx) {
     length
   } = decode(builtTx);
   const txObject = unpackTx(builtTx);
+  let innerTxSize = 0;
+  if (txObject.tag === Tag.GaMetaTx || txObject.tag === Tag.PayingForTx) {
+    innerTxSize = decode(buildTx(txObject.tx.encodedTx)).length;
+  }
   return TX_FEE_BASE_GAS(txObject.tag).plus(TX_FEE_OTHER_GAS(txObject.tag, length, {
     relativeTtl: getOracleRelativeTtl(txObject),
-    innerTxSize: txObject.tag === Tag.GaMetaTx || txObject.tag === Tag.PayingForTx ? decode(buildTx(txObject.tx.encodedTx)).length : 0
+    innerTxSize
   })).times(MIN_GAS_PRICE);
 }
 
@@ -7397,8 +7495,9 @@ function calculateGasLimitMax(gasMax, rebuildTx, unpackTx, buildTx) {
     rebuildTx,
     unpackTx,
     buildTx,
-    gasMax = 6e6,
     _computingGasLimit
+  }, {
+    gasMax = 6e6
   }) {
     if (_computingGasLimit != null) return short_u_int.serialize(_computingGasLimit);
     const gasLimitMax = tag === Tag.GaMetaTx ? MAX_AUTH_FUN_GAS : calculateGasLimitMax(gasMax, gasLimit => rebuildTx({
@@ -7425,6 +7524,44 @@ function calculateGasLimitMax(gasMax, rebuildTx, unpackTx, buildTx) {
     return value;
   }
 });
+;// CONCATENATED MODULE: ./src/tx/builder/field-types/map.ts
+
+
+function genMapField(encoding, tag) {
+  return {
+    serialize(object, {
+      buildTx
+    }) {
+      return decode(buildTx({
+        tag: Tag.Mtree,
+        values: Object.entries(object).map(([key, value]) => ({
+          tag: Tag.MtreeValue,
+          key: decode(key),
+          value: decode(buildTx({
+            ...value,
+            tag
+          }))
+        }))
+      }));
+    },
+    deserialize(buffer, {
+      unpackTx
+    }) {
+      const {
+        values
+      } = unpackTx(encode(buffer, Encoding.Transaction), Tag.Mtree);
+      return Object.fromEntries(values
+      // TODO: remove after resolving https://github.com/aeternity/aeternity/issues/4066
+      .filter(({
+        key
+      }) => encoding !== Encoding.ContractAddress || key.length === 32).map(({
+        key,
+        value
+      }) => [encode(key, encoding), unpackTx(encode(value, Encoding.Transaction), tag)]));
+    },
+    recursiveType: true
+  };
+}
 // EXTERNAL MODULE: ./node_modules/@babel/runtime-corejs3/helpers/classPrivateFieldSet.js
 var classPrivateFieldSet = __webpack_require__(719);
 var classPrivateFieldSet_default = /*#__PURE__*/__webpack_require__.n(classPrivateFieldSet);
@@ -7471,6 +7608,11 @@ class MPTree {
    */
   constructor(binary, encoding, tag, unpTx) {
     _classPrivateMethodInitSpec(this, _entriesRaw);
+    /**
+     * Retrieve value from Merkle Patricia Tree
+     * @param _key - The key of the element to retrieve
+     * @returns Value associated to the specified key
+     */
     _classPrivateMethodInitSpec(this, _getRaw);
     _classPrivateFieldInitSpec(this, _rootHash, {
       writable: true,
@@ -7545,13 +7687,6 @@ class MPTree {
   serialize() {
     return [Buffer.from(classPrivateFieldGet_default()(this, _rootHash), 'hex'), Object.entries(classPrivateFieldGet_default()(this, _nodes)).map(([mptHash, value]) => [Buffer.from(mptHash, 'hex'), value])];
   }
-
-  /**
-   * Retrieve value from Merkle Patricia Tree
-   * @param _key - The key of the element to retrieve
-   * @returns Value associated to the specified key
-   */
-
   /**
    * Retrieve value from Merkle Patricia Tree
    * @param key - The key of the element to retrieve
@@ -7718,8 +7853,8 @@ function genMPTreeField(encoding, tag) {
    * @param txFields - Transaction fields
    * @param txFields.name - AENS Name in transaction
    */
-  serialize(value, txFields) {
-    return coin_amount.serialize.call(this, value, txFields);
+  serialize(value, txFields, parameters) {
+    return coin_amount.serialize.call(this, value, txFields, parameters);
   }
 });
 ;// CONCATENATED MODULE: ./src/tx/builder/field-types/name-id.ts
@@ -7736,6 +7871,35 @@ const addressName = genAddressField(Encoding.Name);
     return addressName.serialize(isNameValid(value) ? produceNameId(value) : value);
   }
 });
+;// CONCATENATED MODULE: ./src/tx/builder/field-types/nonce.ts
+
+
+
+function genNonceField(senderKey) {
+  return {
+    ...short_u_int,
+    async prepare(value, params, options) {
+      if (value != null) return value;
+      const {
+        onNode,
+        strategy
+      } = options;
+      const senderId = options[senderKey];
+      const requirement = 'provided (or provide `nonce` instead)';
+      if (onNode == null) throw new ArgumentError('onNode', requirement, onNode);
+      if (senderId == null) throw new ArgumentError('senderId', requirement, senderId);
+      return (await onNode.getAccountNextNonce(senderId.replace(/^ok_/, 'ak_'), {
+        strategy
+      }).catch(error => {
+        if (!isAccountNotFoundError(error)) throw error;
+        return {
+          nextNonce: 1
+        };
+      })).nextNonce;
+    },
+    senderKey
+  };
+}
 ;// CONCATENATED MODULE: ./src/tx/builder/field-types/pointers.ts
 
 
@@ -7781,17 +7945,21 @@ const addressAny = genAddressField(...idTagToEncoding);
 ;// CONCATENATED MODULE: ./src/tx/builder/field-types/short-u-int-const.ts
 
 
-function genShortUIntConstField(value) {
+function genShortUIntConstField(constValue, optional) {
   return {
-    serialize(val) {
-      if (val != null && val !== value) throw new ArgumentError('ShortUIntConst', value, val);
-      return short_u_int.serialize(value);
+    serialize(value) {
+      if ((optional !== true || value != null) && value !== constValue) {
+        throw new ArgumentError('ShortUIntConst', constValue, value);
+      }
+      return short_u_int.serialize(constValue);
     },
     deserialize(buf) {
-      const val = short_u_int.deserialize(buf);
-      if (val !== value) throw new ArgumentError('ShortUIntConst', value, val);
-      return value;
-    }
+      const value = short_u_int.deserialize(buf);
+      if (value !== constValue) throw new ArgumentError('ShortUIntConst', constValue, value);
+      return constValue;
+    },
+    constValue,
+    constValueOptional: optional === true
   };
 }
 ;// CONCATENATED MODULE: ./src/tx/builder/field-types/string.ts
@@ -7804,6 +7972,47 @@ function genShortUIntConstField(value) {
     return buffer.toString();
   }
 });
+;// CONCATENATED MODULE: ./src/tx/builder/field-types/ttl.ts
+
+
+/* harmony default export */ const ttl = ({
+  ...short_u_int,
+  serialize(value) {
+    return short_u_int.serialize(value !== null && value !== void 0 ? value : 0);
+  },
+  async prepare(value, params,
+  // TODO: { absoluteTtl: true } | { absoluteTtl: false, onNode: Node }
+  {
+    onNode,
+    absoluteTtl
+  }) {
+    if (absoluteTtl !== true && value !== 0 && value != null) {
+      if (onNode == null) throw new ArgumentError('onNode', 'provided', onNode);
+      value += (await onNode.getCurrentKeyBlock()).height;
+    }
+    return value;
+  }
+});
+;// CONCATENATED MODULE: ./src/tx/builder/field-types/wrapped.ts
+
+function genWrappedField(tag) {
+  return {
+    serialize(payload, {
+      buildTx
+    }) {
+      return decode(buildTx({
+        tag,
+        payload
+      }));
+    },
+    deserialize(buffer, {
+      unpackTx
+    }) {
+      return unpackTx(encode(buffer, Encoding.Transaction), tag).payload;
+    },
+    recursiveType: true
+  };
+}
 ;// CONCATENATED MODULE: ./src/tx/builder/field-types/index.ts
 
 
@@ -7825,6 +8034,10 @@ function genShortUIntConstField(value) {
 
 
 
+
+
+
+
 
 
 
@@ -7845,16 +8058,20 @@ const field_types_fee = fee;
 const field_types_field = (/* unused pure expression or super */ null && (_field));
 const gasLimit = gas_limit;
 const gasPrice = gas_price;
+const map = genMapField;
 const mptree = genMPTreeField;
 const builder_field_types_name = field_types_name;
 const nameFee = name_fee;
 const nameId = name_id;
+const nonce = genNonceField;
 const field_types_pointers = pointers;
 const field_types_raw = raw;
 const shortUInt = short_u_int;
 const shortUIntConst = genShortUIntConstField;
 const field_types_string = string;
+const field_types_ttl = ttl;
 const uInt = u_int;
+const wrapped = genWrappedField;
 
 ;// CONCATENATED MODULE: ./src/tx/builder/schema.ts
 /**
@@ -7869,14 +8086,11 @@ const uInt = u_int;
 
 let ORACLE_TTL_TYPES;
 
-// # TRANSACTION DEFAULT TTL
+// # ORACLE
 (function (ORACLE_TTL_TYPES) {
   ORACLE_TTL_TYPES[ORACLE_TTL_TYPES["delta"] = 0] = "delta";
   ORACLE_TTL_TYPES[ORACLE_TTL_TYPES["block"] = 1] = "block";
 })(ORACLE_TTL_TYPES || (ORACLE_TTL_TYPES = {}));
-const TX_TTL = 0;
-// # ORACLE
-const QUERY_FEE = 30000;
 const ORACLE_TTL = {
   type: ORACLE_TTL_TYPES.delta,
   value: 500
@@ -7895,164 +8109,471 @@ const DRY_RUN_ACCOUNT = {
   amount: 100000000000000000000000000000000000n
 };
 let CallReturnType;
+
+// TODO: figure out how to omit overriding types of recursive fields
 (function (CallReturnType) {
   CallReturnType[CallReturnType["Ok"] = 0] = "Ok";
   CallReturnType[CallReturnType["Error"] = 1] = "Error";
   CallReturnType[CallReturnType["Revert"] = 2] = "Revert";
 })(CallReturnType || (CallReturnType = {}));
+const entryAny = entry();
+const entrySignedTx = entry(Tag.SignedTx);
+const entryMtreeValueArray = array(entry(Tag.MtreeValue));
+const entryTreesPoi = entry(Tag.TreesPoi);
+const mapContracts = map(Encoding.ContractAddress, Tag.Contract);
+const mapAccounts = map(Encoding.AccountAddress, Tag.Account);
+const mapCalls = map(Encoding.Bytearray, Tag.ContractCall);
+const mapChannels = map(Encoding.Channel, Tag.Channel);
+const mapNames = map(Encoding.Name, Tag.Name);
+const mapOracles = map(Encoding.OracleAddress, Tag.Oracle);
+
 /**
  * @see {@link https://github.com/aeternity/protocol/blob/c007deeac4a01e401238412801ac7084ac72d60e/serializations.md#accounts-version-1-basic-accounts}
  */
-const TX_SCHEMA = {
-  [Tag.Account]: {
-    1: [['tag', shortUIntConst(Tag.Account)], ['version', shortUIntConst(1)], ['nonce', shortUInt], ['balance', uInt]],
-    2: [['tag', shortUIntConst(Tag.Account)], ['version', shortUIntConst(2)], ['flags', uInt], ['nonce', shortUInt], ['balance', uInt], ['gaContract', address(Encoding.ContractAddress, Encoding.Name)], ['gaAuthFun', encoded(Encoding.ContractBytearray)]]
-  },
-  [Tag.SignedTx]: {
-    1: [['tag', shortUIntConst(Tag.SignedTx)], ['version', shortUIntConst(1)], ['signatures', array(field_types_raw)], ['encodedTx', entry()]]
-  },
-  [Tag.SpendTx]: {
-    1: [['tag', shortUIntConst(Tag.SpendTx)], ['version', shortUIntConst(1)], ['senderId', address(Encoding.AccountAddress)], ['recipientId', address(Encoding.AccountAddress, Encoding.Name)], ['amount', coinAmount], ['fee', field_types_fee], ['ttl', shortUInt], ['nonce', shortUInt], ['payload', encoded(Encoding.Bytearray, true)]]
-  },
-  [Tag.Name]: {
-    1: [['tag', shortUIntConst(Tag.Name)], ['version', shortUIntConst(1)], ['accountId', address(Encoding.AccountAddress)], ['nameTtl', shortUInt], ['status', field_types_raw], ['clientTtl', shortUInt], ['pointers', field_types_pointers]]
-  },
-  [Tag.NamePreclaimTx]: {
-    1: [['tag', shortUIntConst(Tag.NamePreclaimTx)], ['version', shortUIntConst(1)], ['accountId', address(Encoding.AccountAddress)], ['nonce', shortUInt], ['commitmentId', address(Encoding.Commitment)], ['fee', field_types_fee], ['ttl', shortUInt]]
-  },
-  [Tag.NameClaimTx]: {
-    2: [['tag', shortUIntConst(Tag.NameClaimTx)], ['version', shortUIntConst(2)], ['accountId', address(Encoding.AccountAddress)], ['nonce', shortUInt], ['name', builder_field_types_name], ['nameSalt', uInt], ['nameFee', nameFee], ['fee', field_types_fee], ['ttl', shortUInt]]
-  },
-  [Tag.NameUpdateTx]: {
-    1: [['tag', shortUIntConst(Tag.NameUpdateTx)], ['version', shortUIntConst(1)], ['accountId', address(Encoding.AccountAddress)], ['nonce', shortUInt], ['nameId', nameId], ['nameTtl', shortUInt], ['pointers', field_types_pointers], ['clientTtl', shortUInt], ['fee', field_types_fee], ['ttl', shortUInt]]
-  },
-  [Tag.NameTransferTx]: {
-    1: [['tag', shortUIntConst(Tag.NameTransferTx)], ['version', shortUIntConst(1)], ['accountId', address(Encoding.AccountAddress)], ['nonce', shortUInt], ['nameId', nameId], ['recipientId', address(Encoding.AccountAddress, Encoding.Name)], ['fee', field_types_fee], ['ttl', shortUInt]]
-  },
-  [Tag.NameRevokeTx]: {
-    1: [['tag', shortUIntConst(Tag.NameRevokeTx)], ['version', shortUIntConst(1)], ['accountId', address(Encoding.AccountAddress)], ['nonce', shortUInt], ['nameId', nameId], ['fee', field_types_fee], ['ttl', shortUInt]]
-  },
-  [Tag.Contract]: {
-    1: [['tag', shortUIntConst(Tag.Contract)], ['version', shortUIntConst(1)], ['owner', address(Encoding.AccountAddress)], ['ctVersion', ctVersion], ['code', encoded(Encoding.ContractBytearray)], ['log', encoded(Encoding.ContractBytearray)], ['active', builder_field_types_boolean], ['referers', array(address(Encoding.AccountAddress))], ['deposit', field_types_deposit]]
-  },
-  [Tag.ContractCreateTx]: {
-    1: [['tag', shortUIntConst(Tag.ContractCreateTx)], ['version', shortUIntConst(1)], ['ownerId', address(Encoding.AccountAddress)], ['nonce', shortUInt], ['code', encoded(Encoding.ContractBytearray)], ['ctVersion', ctVersion], ['fee', field_types_fee], ['ttl', shortUInt], ['deposit', field_types_deposit], ['amount', coinAmount], ['gasLimit', gasLimit], ['gasPrice', gasPrice], ['callData', encoded(Encoding.ContractBytearray)]]
-  },
-  [Tag.ContractCallTx]: {
-    1: [['tag', shortUIntConst(Tag.ContractCallTx)], ['version', shortUIntConst(1)], ['callerId', address(Encoding.AccountAddress)], ['nonce', shortUInt], ['contractId', address(Encoding.ContractAddress, Encoding.Name)], ['abiVersion', abiVersion], ['fee', field_types_fee], ['ttl', shortUInt], ['amount', coinAmount], ['gasLimit', gasLimit], ['gasPrice', gasPrice], ['callData', encoded(Encoding.ContractBytearray)]]
-  },
-  [Tag.ContractCall]: {
-    1: [['tag', shortUIntConst(Tag.ContractCall)], ['version', shortUIntConst(1)], ['callerId', address(Encoding.AccountAddress)], ['callerNonce', shortUInt], ['height', shortUInt], ['contractId', address(Encoding.ContractAddress)], ['gasPrice', gasPrice], ['gasUsed', shortUInt], ['returnValue', encoded(Encoding.ContractBytearray)], ['returnType', enumeration(CallReturnType)],
-    // TODO: add serialization for
-    //  <log> :: [ { <address> :: id, [ <topics> :: binary() ], <data> :: binary() } ]
-    ['log', field_types_raw]]
-  },
-  [Tag.Oracle]: {
-    1: [['tag', shortUIntConst(Tag.Oracle)], ['version', shortUIntConst(1)], ['accountId', address(Encoding.AccountAddress)], ['queryFormat', field_types_string], ['responseFormat', field_types_string], ['queryFee', coinAmount], ['oracleTtlValue', shortUInt], ['abiVersion', abiVersion]]
-  },
-  [Tag.OracleRegisterTx]: {
-    1: [['tag', shortUIntConst(Tag.OracleRegisterTx)], ['version', shortUIntConst(1)], ['accountId', address(Encoding.AccountAddress)], ['nonce', shortUInt], ['queryFormat', field_types_string], ['responseFormat', field_types_string], ['queryFee', coinAmount], ['oracleTtlType', enumeration(ORACLE_TTL_TYPES)], ['oracleTtlValue', shortUInt], ['fee', field_types_fee], ['ttl', shortUInt], ['abiVersion', abiVersion]]
-  },
-  [Tag.OracleExtendTx]: {
-    1: [['tag', shortUIntConst(Tag.OracleExtendTx)], ['version', shortUIntConst(1)], ['oracleId', address(Encoding.OracleAddress, Encoding.Name)], ['nonce', shortUInt], ['oracleTtlType', enumeration(ORACLE_TTL_TYPES)], ['oracleTtlValue', shortUInt], ['fee', field_types_fee], ['ttl', shortUInt]]
-  },
-  [Tag.OracleQueryTx]: {
-    1: [['tag', shortUIntConst(Tag.OracleQueryTx)], ['version', shortUIntConst(1)], ['senderId', address(Encoding.AccountAddress)], ['nonce', shortUInt], ['oracleId', address(Encoding.OracleAddress, Encoding.Name)], ['query', field_types_string], ['queryFee', coinAmount], ['queryTtlType', enumeration(ORACLE_TTL_TYPES)], ['queryTtlValue', shortUInt], ['responseTtlType', enumeration(ORACLE_TTL_TYPES)], ['responseTtlValue', shortUInt], ['fee', field_types_fee], ['ttl', shortUInt]]
-  },
-  [Tag.OracleResponseTx]: {
-    1: [['tag', shortUIntConst(Tag.OracleResponseTx)], ['version', shortUIntConst(1)], ['oracleId', address(Encoding.OracleAddress)], ['nonce', shortUInt], ['queryId', encoded(Encoding.OracleQueryId)], ['response', field_types_string], ['responseTtlType', enumeration(ORACLE_TTL_TYPES)], ['responseTtlValue', shortUInt], ['fee', field_types_fee], ['ttl', shortUInt]]
-  },
-  [Tag.ChannelCreateTx]: {
-    2: [['tag', shortUIntConst(Tag.ChannelCreateTx)], ['version', shortUIntConst(2)], ['initiator', address(Encoding.AccountAddress)], ['initiatorAmount', uInt], ['responder', address(Encoding.AccountAddress)], ['responderAmount', uInt], ['channelReserve', uInt], ['lockPeriod', uInt], ['ttl', shortUInt], ['fee', field_types_fee], ['initiatorDelegateIds', array(address(...idTagToEncoding))], ['responderDelegateIds', array(address(...idTagToEncoding))], ['stateHash', encoded(Encoding.State)], ['nonce', shortUInt]]
-  },
-  [Tag.ChannelCloseMutualTx]: {
-    1: [['tag', shortUIntConst(Tag.ChannelCloseMutualTx)], ['version', shortUIntConst(1)], ['channelId', address(Encoding.Channel)], ['fromId', address(Encoding.AccountAddress)], ['initiatorAmountFinal', uInt], ['responderAmountFinal', uInt], ['ttl', shortUInt], ['fee', field_types_fee], ['nonce', shortUInt]]
-  },
-  [Tag.ChannelCloseSoloTx]: {
-    1: [['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', field_types_fee], ['nonce', shortUInt]]
-  },
-  [Tag.ChannelSlashTx]: {
-    1: [['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', field_types_fee], ['nonce', shortUInt]]
-  },
-  [Tag.ChannelDepositTx]: {
-    1: [['tag', shortUIntConst(Tag.ChannelDepositTx)], ['version', shortUIntConst(1)], ['channelId', address(Encoding.Channel)], ['fromId', address(Encoding.AccountAddress)], ['amount', uInt], ['ttl', shortUInt], ['fee', field_types_fee], ['stateHash', encoded(Encoding.State)], ['round', shortUInt], ['nonce', shortUInt]]
-  },
-  [Tag.ChannelWithdrawTx]: {
-    1: [['tag', shortUIntConst(Tag.ChannelWithdrawTx)], ['version', shortUIntConst(1)], ['channelId', address(Encoding.Channel)], ['toId', address(Encoding.AccountAddress)], ['amount', uInt], ['ttl', shortUInt], ['fee', field_types_fee], ['stateHash', encoded(Encoding.State)], ['round', shortUInt], ['nonce', shortUInt]]
-  },
-  [Tag.ChannelSettleTx]: {
-    1: [['tag', shortUIntConst(Tag.ChannelSettleTx)], ['version', shortUIntConst(1)], ['channelId', address(Encoding.Channel)], ['fromId', address(Encoding.AccountAddress)], ['initiatorAmountFinal', uInt], ['responderAmountFinal', uInt], ['ttl', shortUInt], ['fee', field_types_fee], ['nonce', shortUInt]]
-  },
-  [Tag.ChannelForceProgressTx]: {
-    1: [['tag', shortUIntConst(Tag.ChannelForceProgressTx)], ['version', shortUIntConst(1)], ['channelId', address(Encoding.Channel)], ['fromId', address(Encoding.AccountAddress)], ['payload', encoded(Encoding.Transaction)], ['round', shortUInt], ['update', encoded(Encoding.ContractBytearray)], ['stateHash', encoded(Encoding.State)], ['offChainTrees', encoded(Encoding.StateTrees)], ['ttl', shortUInt], ['fee', field_types_fee], ['nonce', shortUInt]]
-  },
-  [Tag.ChannelOffChainTx]: {
-    2: [['tag', shortUIntConst(Tag.ChannelOffChainTx)], ['version', shortUIntConst(2)], ['channelId', address(Encoding.Channel)], ['round', shortUInt], ['stateHash', encoded(Encoding.State)]]
-  },
-  [Tag.Channel]: {
-    3: [['tag', shortUIntConst(Tag.Channel)], ['version', shortUIntConst(3)], ['initiator', address(Encoding.AccountAddress)], ['responder', address(Encoding.AccountAddress)], ['channelAmount', uInt], ['initiatorAmount', uInt], ['responderAmount', uInt], ['channelReserve', uInt], ['initiatorDelegateIds', array(address(...idTagToEncoding))], ['responderDelegateIds', array(address(...idTagToEncoding))], ['stateHash', encoded(Encoding.State)], ['round', shortUInt], ['soloRound', uInt], ['lockPeriod', uInt], ['lockedUntil', uInt], ['initiatorAuth', encoded(Encoding.ContractBytearray)], ['responderAuth', encoded(Encoding.ContractBytearray)]]
-  },
-  [Tag.ChannelSnapshotSoloTx]: {
-    1: [['tag', shortUIntConst(Tag.ChannelSnapshotSoloTx)], ['version', shortUIntConst(1)], ['channelId', address(Encoding.Channel)], ['fromId', address(Encoding.AccountAddress)], ['payload', encoded(Encoding.Transaction)], ['ttl', shortUInt], ['fee', field_types_fee], ['nonce', shortUInt]]
-  },
-  [Tag.ChannelOffChainUpdateTransfer]: {
-    1: [['tag', shortUIntConst(Tag.ChannelOffChainUpdateTransfer)], ['version', shortUIntConst(1)], ['from', address(Encoding.AccountAddress)], ['to', address(Encoding.AccountAddress)], ['amount', uInt]]
-  },
-  [Tag.ChannelOffChainUpdateDeposit]: {
-    1: [['tag', shortUIntConst(Tag.ChannelOffChainUpdateDeposit)], ['version', shortUIntConst(1)], ['from', address(Encoding.AccountAddress)], ['amount', uInt]]
-  },
-  [Tag.ChannelOffChainUpdateWithdraw]: {
-    1: [['tag', shortUIntConst(Tag.ChannelOffChainUpdateWithdraw)], ['version', shortUIntConst(1)], ['from', address(Encoding.AccountAddress)], ['amount', uInt]]
-  },
-  [Tag.ChannelOffChainUpdateCreateContract]: {
-    1: [['tag', shortUIntConst(Tag.ChannelOffChainUpdateCreateContract)], ['version', shortUIntConst(1)], ['owner', address(Encoding.AccountAddress)], ['ctVersion', ctVersion], ['code', encoded(Encoding.ContractBytearray)], ['deposit', uInt], ['callData', encoded(Encoding.ContractBytearray)]]
-  },
-  [Tag.ChannelOffChainUpdateCallContract]: {
-    1: [['tag', shortUIntConst(Tag.ChannelOffChainUpdateCallContract)], ['version', shortUIntConst(1)], ['caller', address(Encoding.AccountAddress)], ['contract', address(Encoding.ContractAddress)], ['abiVersion', abiVersion], ['amount', uInt], ['callData', encoded(Encoding.ContractBytearray)], ['callStack', field_types_raw], ['gasPrice', gasPrice], ['gasLimit', gasLimit]]
-  },
-  [Tag.ChannelClientReconnectTx]: {
-    1: [['tag', shortUIntConst(Tag.ChannelClientReconnectTx)], ['version', shortUIntConst(1)], ['channelId', address(Encoding.Channel)], ['round', shortUInt], ['role', field_types_string], ['pubkey', address(Encoding.AccountAddress)]]
-  },
-  [Tag.TreesPoi]: {
-    1: [['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: [['tag', shortUIntConst(Tag.StateTrees)], ['version', shortUIntConst(1)], ['contracts', entry()], ['calls', entry()], ['channels', entry()], ['ns', entry()], ['oracles', entry()], ['accounts', entry()]]
-  },
-  [Tag.Mtree]: {
-    1: [['tag', shortUIntConst(Tag.Mtree)], ['version', shortUIntConst(1)], ['values', array(entry())]]
-  },
-  [Tag.MtreeValue]: {
-    1: [['tag', shortUIntConst(Tag.MtreeValue)], ['version', shortUIntConst(1)], ['key', field_types_raw], ['value', field_types_raw]]
-  },
-  [Tag.ContractsMtree]: {
-    1: [['tag', shortUIntConst(Tag.ContractsMtree)], ['version', shortUIntConst(1)], ['contracts', entry()]]
-  },
-  [Tag.CallsMtree]: {
-    1: [['tag', shortUIntConst(Tag.CallsMtree)], ['version', shortUIntConst(1)], ['calls', entry()]]
-  },
-  [Tag.ChannelsMtree]: {
-    1: [['tag', shortUIntConst(Tag.ChannelsMtree)], ['version', shortUIntConst(1)], ['channels', entry()]]
-  },
-  [Tag.NameserviceMtree]: {
-    1: [['tag', shortUIntConst(Tag.NameserviceMtree)], ['version', shortUIntConst(1)], ['mtree', entry()]]
-  },
-  [Tag.OraclesMtree]: {
-    1: [['tag', shortUIntConst(Tag.OraclesMtree)], ['version', shortUIntConst(1)], ['otree', entry()]]
-  },
-  [Tag.AccountsMtree]: {
-    1: [['tag', shortUIntConst(Tag.AccountsMtree)], ['version', shortUIntConst(1)], ['accounts', entry()]]
-  },
-  [Tag.GaAttachTx]: {
-    1: [['tag', shortUIntConst(Tag.GaAttachTx)], ['version', shortUIntConst(1)], ['ownerId', address(Encoding.AccountAddress)], ['nonce', shortUInt], ['code', encoded(Encoding.ContractBytearray)], ['authFun', field_types_raw], ['ctVersion', ctVersion], ['fee', field_types_fee], ['ttl', shortUInt], ['gasLimit', gasLimit], ['gasPrice', gasPrice], ['callData', encoded(Encoding.ContractBytearray)]]
-  },
-  [Tag.GaMetaTx]: {
-    2: [['tag', shortUIntConst(Tag.GaMetaTx)], ['version', shortUIntConst(2)], ['gaId', address(Encoding.AccountAddress)], ['authData', encoded(Encoding.ContractBytearray)], ['abiVersion', abiVersion], ['fee', field_types_fee], ['gasLimit', gasLimit], ['gasPrice', gasPrice], ['tx', entry()]]
-  },
-  [Tag.PayingForTx]: {
-    1: [['tag', shortUIntConst(Tag.PayingForTx)], ['version', shortUIntConst(1)], ['payerId', address(Encoding.AccountAddress)], ['nonce', shortUInt], ['fee', field_types_fee], ['tx', entry()]]
-  }
-};
+const txSchema = [{
+  tag: shortUIntConst(Tag.Account),
+  version: shortUIntConst(1),
+  nonce: shortUInt,
+  balance: uInt
+}, {
+  tag: shortUIntConst(Tag.Account),
+  version: shortUIntConst(2, true),
+  flags: uInt,
+  nonce: shortUInt,
+  balance: uInt,
+  gaContract: address(Encoding.ContractAddress, Encoding.Name),
+  gaAuthFun: encoded(Encoding.ContractBytearray)
+}, {
+  tag: shortUIntConst(Tag.SignedTx),
+  version: shortUIntConst(1, true),
+  signatures: array(field_types_raw),
+  encodedTx: entryAny
+}, {
+  tag: shortUIntConst(Tag.SpendTx),
+  version: shortUIntConst(1, true),
+  senderId: address(Encoding.AccountAddress),
+  recipientId: address(Encoding.AccountAddress, Encoding.Name),
+  amount: coinAmount,
+  fee: field_types_fee,
+  ttl: field_types_ttl,
+  nonce: nonce('senderId'),
+  payload: encoded(Encoding.Bytearray, true)
+}, {
+  tag: shortUIntConst(Tag.Name),
+  version: shortUIntConst(1, true),
+  accountId: address(Encoding.AccountAddress),
+  nameTtl: shortUInt,
+  status: field_types_raw,
+  clientTtl: shortUInt,
+  pointers: field_types_pointers
+}, {
+  tag: shortUIntConst(Tag.NamePreclaimTx),
+  version: shortUIntConst(1, true),
+  accountId: address(Encoding.AccountAddress),
+  nonce: nonce('accountId'),
+  commitmentId: address(Encoding.Commitment),
+  fee: field_types_fee,
+  ttl: field_types_ttl
+}, {
+  tag: shortUIntConst(Tag.NameClaimTx),
+  version: shortUIntConst(2, true),
+  accountId: address(Encoding.AccountAddress),
+  nonce: nonce('accountId'),
+  name: builder_field_types_name,
+  nameSalt: uInt,
+  nameFee: nameFee,
+  fee: field_types_fee,
+  ttl: field_types_ttl
+}, {
+  tag: shortUIntConst(Tag.NameUpdateTx),
+  version: shortUIntConst(1, true),
+  accountId: address(Encoding.AccountAddress),
+  nonce: nonce('accountId'),
+  nameId: nameId,
+  nameTtl: shortUInt,
+  pointers: field_types_pointers,
+  clientTtl: shortUInt,
+  fee: field_types_fee,
+  ttl: field_types_ttl
+}, {
+  tag: shortUIntConst(Tag.NameTransferTx),
+  version: shortUIntConst(1, true),
+  accountId: address(Encoding.AccountAddress),
+  nonce: nonce('accountId'),
+  nameId: nameId,
+  recipientId: address(Encoding.AccountAddress, Encoding.Name),
+  fee: field_types_fee,
+  ttl: field_types_ttl
+}, {
+  tag: shortUIntConst(Tag.NameRevokeTx),
+  version: shortUIntConst(1, true),
+  accountId: address(Encoding.AccountAddress),
+  nonce: nonce('accountId'),
+  nameId: nameId,
+  fee: field_types_fee,
+  ttl: field_types_ttl
+}, {
+  tag: shortUIntConst(Tag.Contract),
+  version: shortUIntConst(1, true),
+  owner: address(Encoding.AccountAddress),
+  ctVersion: ctVersion,
+  code: encoded(Encoding.ContractBytearray),
+  log: encoded(Encoding.ContractBytearray),
+  active: builder_field_types_boolean,
+  referers: array(address(Encoding.AccountAddress)),
+  deposit: field_types_deposit
+}, {
+  tag: shortUIntConst(Tag.ContractCreateTx),
+  version: shortUIntConst(1, true),
+  ownerId: address(Encoding.AccountAddress),
+  nonce: nonce('ownerId'),
+  code: encoded(Encoding.ContractBytearray),
+  ctVersion: ctVersion,
+  fee: field_types_fee,
+  ttl: field_types_ttl,
+  deposit: field_types_deposit,
+  amount: coinAmount,
+  gasLimit: gasLimit,
+  gasPrice: gasPrice,
+  callData: encoded(Encoding.ContractBytearray)
+}, {
+  tag: shortUIntConst(Tag.ContractCallTx),
+  version: shortUIntConst(1, true),
+  callerId: address(Encoding.AccountAddress),
+  nonce: nonce('callerId'),
+  contractId: address(Encoding.ContractAddress, Encoding.Name),
+  abiVersion: abiVersion,
+  fee: field_types_fee,
+  ttl: field_types_ttl,
+  amount: coinAmount,
+  gasLimit: gasLimit,
+  gasPrice: gasPrice,
+  callData: encoded(Encoding.ContractBytearray)
+}, {
+  tag: shortUIntConst(Tag.ContractCall),
+  version: shortUIntConst(2, true),
+  callerId: address(Encoding.AccountAddress),
+  callerNonce: shortUInt,
+  height: shortUInt,
+  contractId: address(Encoding.ContractAddress),
+  // TODO: rename after resolving https://github.com/aeternity/protocol/issues/506
+  gasPrice: uInt,
+  gasUsed: shortUInt,
+  returnValue: encoded(Encoding.ContractBytearray),
+  returnType: enumeration(CallReturnType),
+  // TODO: add serialization for
+  //  <log> :: [ { <address> :: id, [ <topics> :: binary() }, <data> :: binary() } ]
+  log: array(field_types_raw)
+}, {
+  tag: shortUIntConst(Tag.Oracle),
+  version: shortUIntConst(1, true),
+  accountId: address(Encoding.AccountAddress),
+  queryFormat: field_types_string,
+  responseFormat: field_types_string,
+  queryFee: coinAmount,
+  oracleTtlValue: shortUInt,
+  abiVersion: abiVersion
+}, {
+  tag: shortUIntConst(Tag.OracleRegisterTx),
+  version: shortUIntConst(1, true),
+  accountId: address(Encoding.AccountAddress),
+  nonce: nonce('accountId'),
+  queryFormat: field_types_string,
+  responseFormat: field_types_string,
+  queryFee: coinAmount,
+  oracleTtlType: enumeration(ORACLE_TTL_TYPES),
+  oracleTtlValue: shortUInt,
+  fee: field_types_fee,
+  ttl: field_types_ttl,
+  abiVersion: abiVersion
+}, {
+  tag: shortUIntConst(Tag.OracleExtendTx),
+  version: shortUIntConst(1, true),
+  oracleId: address(Encoding.OracleAddress, Encoding.Name),
+  nonce: nonce('oracleId'),
+  oracleTtlType: enumeration(ORACLE_TTL_TYPES),
+  oracleTtlValue: shortUInt,
+  fee: field_types_fee,
+  ttl: field_types_ttl
+}, {
+  tag: shortUIntConst(Tag.OracleQueryTx),
+  version: shortUIntConst(1, true),
+  senderId: address(Encoding.AccountAddress),
+  nonce: nonce('senderId'),
+  oracleId: address(Encoding.OracleAddress, Encoding.Name),
+  query: field_types_string,
+  queryFee: coinAmount,
+  queryTtlType: enumeration(ORACLE_TTL_TYPES),
+  queryTtlValue: shortUInt,
+  responseTtlType: enumeration(ORACLE_TTL_TYPES),
+  responseTtlValue: shortUInt,
+  fee: field_types_fee,
+  ttl: field_types_ttl
+}, {
+  tag: shortUIntConst(Tag.OracleResponseTx),
+  version: shortUIntConst(1, true),
+  oracleId: address(Encoding.OracleAddress),
+  nonce: nonce('oracleId'),
+  queryId: encoded(Encoding.OracleQueryId),
+  response: field_types_string,
+  responseTtlType: enumeration(ORACLE_TTL_TYPES),
+  responseTtlValue: shortUInt,
+  fee: field_types_fee,
+  ttl: field_types_ttl
+}, {
+  tag: shortUIntConst(Tag.ChannelCreateTx),
+  version: shortUIntConst(2, true),
+  initiator: address(Encoding.AccountAddress),
+  initiatorAmount: uInt,
+  responder: address(Encoding.AccountAddress),
+  responderAmount: uInt,
+  channelReserve: uInt,
+  lockPeriod: uInt,
+  ttl: field_types_ttl,
+  fee: field_types_fee,
+  initiatorDelegateIds: array(address(...idTagToEncoding)),
+  responderDelegateIds: array(address(...idTagToEncoding)),
+  stateHash: encoded(Encoding.State),
+  nonce: nonce('initiator')
+}, {
+  tag: shortUIntConst(Tag.ChannelCloseMutualTx),
+  version: shortUIntConst(1, true),
+  channelId: address(Encoding.Channel),
+  fromId: address(Encoding.AccountAddress),
+  initiatorAmountFinal: uInt,
+  responderAmountFinal: uInt,
+  ttl: field_types_ttl,
+  fee: field_types_fee,
+  nonce: nonce('fromId')
+}, {
+  tag: shortUIntConst(Tag.ChannelCloseSoloTx),
+  version: shortUIntConst(1, true),
+  channelId: address(Encoding.Channel),
+  fromId: address(Encoding.AccountAddress),
+  payload: encoded(Encoding.Transaction),
+  poi: entryTreesPoi,
+  ttl: field_types_ttl,
+  fee: field_types_fee,
+  nonce: nonce('fromId')
+}, {
+  tag: shortUIntConst(Tag.ChannelSlashTx),
+  version: shortUIntConst(1, true),
+  channelId: address(Encoding.Channel),
+  fromId: address(Encoding.AccountAddress),
+  payload: encoded(Encoding.Transaction),
+  poi: entryTreesPoi,
+  ttl: field_types_ttl,
+  fee: field_types_fee,
+  nonce: nonce('fromId')
+}, {
+  tag: shortUIntConst(Tag.ChannelDepositTx),
+  version: shortUIntConst(1, true),
+  channelId: address(Encoding.Channel),
+  fromId: address(Encoding.AccountAddress),
+  amount: uInt,
+  ttl: field_types_ttl,
+  fee: field_types_fee,
+  stateHash: encoded(Encoding.State),
+  round: shortUInt,
+  nonce: nonce('fromId')
+}, {
+  tag: shortUIntConst(Tag.ChannelWithdrawTx),
+  version: shortUIntConst(1, true),
+  channelId: address(Encoding.Channel),
+  toId: address(Encoding.AccountAddress),
+  amount: uInt,
+  ttl: field_types_ttl,
+  fee: field_types_fee,
+  stateHash: encoded(Encoding.State),
+  round: shortUInt,
+  nonce: nonce('fromId')
+}, {
+  tag: shortUIntConst(Tag.ChannelSettleTx),
+  version: shortUIntConst(1, true),
+  channelId: address(Encoding.Channel),
+  fromId: address(Encoding.AccountAddress),
+  initiatorAmountFinal: uInt,
+  responderAmountFinal: uInt,
+  ttl: field_types_ttl,
+  fee: field_types_fee,
+  nonce: nonce('fromId')
+}, {
+  tag: shortUIntConst(Tag.ChannelForceProgressTx),
+  version: shortUIntConst(1, true),
+  channelId: address(Encoding.Channel),
+  fromId: address(Encoding.AccountAddress),
+  payload: encoded(Encoding.Transaction),
+  round: shortUInt,
+  update: encoded(Encoding.ContractBytearray),
+  stateHash: encoded(Encoding.State),
+  offChainTrees: encoded(Encoding.StateTrees),
+  ttl: field_types_ttl,
+  fee: field_types_fee,
+  nonce: nonce('fromId')
+}, {
+  tag: shortUIntConst(Tag.ChannelOffChainTx),
+  version: shortUIntConst(2, true),
+  channelId: address(Encoding.Channel),
+  round: shortUInt,
+  stateHash: encoded(Encoding.State)
+}, {
+  tag: shortUIntConst(Tag.Channel),
+  version: shortUIntConst(3, true),
+  initiator: address(Encoding.AccountAddress),
+  responder: address(Encoding.AccountAddress),
+  channelAmount: uInt,
+  initiatorAmount: uInt,
+  responderAmount: uInt,
+  channelReserve: uInt,
+  initiatorDelegateIds: array(address(...idTagToEncoding)),
+  responderDelegateIds: array(address(...idTagToEncoding)),
+  stateHash: encoded(Encoding.State),
+  round: shortUInt,
+  soloRound: uInt,
+  lockPeriod: uInt,
+  lockedUntil: uInt,
+  initiatorAuth: encoded(Encoding.ContractBytearray),
+  responderAuth: encoded(Encoding.ContractBytearray)
+}, {
+  tag: shortUIntConst(Tag.ChannelSnapshotSoloTx),
+  version: shortUIntConst(1, true),
+  channelId: address(Encoding.Channel),
+  fromId: address(Encoding.AccountAddress),
+  payload: encoded(Encoding.Transaction),
+  ttl: field_types_ttl,
+  fee: field_types_fee,
+  nonce: nonce('fromId')
+}, {
+  tag: shortUIntConst(Tag.ChannelOffChainUpdateTransfer),
+  version: shortUIntConst(1, true),
+  from: address(Encoding.AccountAddress),
+  to: address(Encoding.AccountAddress),
+  amount: uInt
+}, {
+  tag: shortUIntConst(Tag.ChannelOffChainUpdateDeposit),
+  version: shortUIntConst(1, true),
+  from: address(Encoding.AccountAddress),
+  amount: uInt
+}, {
+  tag: shortUIntConst(Tag.ChannelOffChainUpdateWithdraw),
+  version: shortUIntConst(1, true),
+  from: address(Encoding.AccountAddress),
+  amount: uInt
+}, {
+  tag: shortUIntConst(Tag.ChannelOffChainUpdateCreateContract),
+  version: shortUIntConst(1, true),
+  owner: address(Encoding.AccountAddress),
+  ctVersion: ctVersion,
+  code: encoded(Encoding.ContractBytearray),
+  deposit: uInt,
+  callData: encoded(Encoding.ContractBytearray)
+}, {
+  tag: shortUIntConst(Tag.ChannelOffChainUpdateCallContract),
+  version: shortUIntConst(1, true),
+  caller: address(Encoding.AccountAddress),
+  contract: address(Encoding.ContractAddress),
+  abiVersion: abiVersion,
+  amount: uInt,
+  callData: encoded(Encoding.ContractBytearray),
+  callStack: field_types_raw,
+  gasPrice: gasPrice,
+  gasLimit: gasLimit
+}, {
+  tag: shortUIntConst(Tag.ChannelClientReconnectTx),
+  version: shortUIntConst(1, true),
+  channelId: address(Encoding.Channel),
+  round: shortUInt,
+  role: field_types_string,
+  pubkey: address(Encoding.AccountAddress)
+}, {
+  tag: shortUIntConst(Tag.TreesPoi),
+  version: shortUIntConst(1, true),
+  // TODO: inline an extra wrapping array after resolving https://github.com/aeternity/protocol/issues/505
+  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: shortUIntConst(Tag.StateTrees),
+  version: shortUIntConst(0, true),
+  contracts: wrapped(Tag.ContractsMtree),
+  calls: wrapped(Tag.CallsMtree),
+  channels: wrapped(Tag.ChannelsMtree),
+  ns: wrapped(Tag.NameserviceMtree),
+  oracles: wrapped(Tag.OraclesMtree),
+  accounts: wrapped(Tag.AccountsMtree)
+}, {
+  tag: shortUIntConst(Tag.Mtree),
+  version: shortUIntConst(1, true),
+  values: entryMtreeValueArray
+}, {
+  tag: shortUIntConst(Tag.MtreeValue),
+  version: shortUIntConst(1, true),
+  key: field_types_raw,
+  value: field_types_raw
+}, {
+  tag: shortUIntConst(Tag.ContractsMtree),
+  version: shortUIntConst(1, true),
+  payload: mapContracts
+}, {
+  tag: shortUIntConst(Tag.CallsMtree),
+  version: shortUIntConst(1, true),
+  payload: mapCalls
+}, {
+  tag: shortUIntConst(Tag.ChannelsMtree),
+  version: shortUIntConst(1, true),
+  payload: mapChannels
+}, {
+  tag: shortUIntConst(Tag.NameserviceMtree),
+  version: shortUIntConst(1, true),
+  payload: mapNames
+}, {
+  tag: shortUIntConst(Tag.OraclesMtree),
+  version: shortUIntConst(1, true),
+  payload: mapOracles
+}, {
+  tag: shortUIntConst(Tag.AccountsMtree),
+  version: shortUIntConst(1, true),
+  payload: mapAccounts
+}, {
+  tag: shortUIntConst(Tag.GaAttachTx),
+  version: shortUIntConst(1, true),
+  ownerId: address(Encoding.AccountAddress),
+  nonce: nonce('ownerId'),
+  code: encoded(Encoding.ContractBytearray),
+  authFun: field_types_raw,
+  ctVersion: ctVersion,
+  fee: field_types_fee,
+  ttl: field_types_ttl,
+  gasLimit: gasLimit,
+  gasPrice: gasPrice,
+  callData: encoded(Encoding.ContractBytearray)
+}, {
+  tag: shortUIntConst(Tag.GaMetaTx),
+  version: shortUIntConst(2, true),
+  gaId: address(Encoding.AccountAddress),
+  authData: encoded(Encoding.ContractBytearray),
+  abiVersion: abiVersion,
+  fee: field_types_fee,
+  gasLimit: gasLimit,
+  gasPrice: gasPrice,
+  tx: entrySignedTx
+}, {
+  tag: shortUIntConst(Tag.PayingForTx),
+  version: shortUIntConst(1, true),
+  payerId: address(Encoding.AccountAddress),
+  nonce: nonce('payerId'),
+  fee: field_types_fee,
+  tx: entrySignedTx
+}, {
+  tag: shortUIntConst(Tag.GaMetaTxAuthData),
+  version: shortUIntConst(1, true),
+  fee: coinAmount,
+  gasPrice: gasPrice,
+  txHash: encoded(Encoding.TxHash)
+}];
 ;// CONCATENATED MODULE: ./src/tx/builder/index.ts
 
 
@@ -8062,33 +8583,18 @@ const TX_SCHEMA = {
 
 
 
-
-
 /**
  * JavaScript-based Transaction builder
  */
 
-/**
- * Unpack binary transaction
- * @category transaction builder
- * @param binary - Array with binary transaction field's
- * @param schema - Transaction schema
- * @returns Object with transaction field's
- */
-function unpackRawTx(binary, schema) {
-  if (binary.length !== schema.length) {
-    throw new ArgumentError('Transaction RLP length', schema.length, binary.length);
-  }
-  return schema.reduce((acc, [name, field], index) => {
-    // eslint-disable-next-line @typescript-eslint/no-use-before-define
-    const deserialized = field.deserialize(binary[index], {
-      unpackTx
-    });
-    return {
-      ...acc,
-      [name]: deserialized
-    };
-  }, {});
+function getSchema(tag, version) {
+  var _version;
+  const schemas = txSchema.filter(s => s.tag.constValue === tag);
+  if (schemas.length === 0) throw new SchemaNotFoundError(`${Tag[tag]} (${tag})`, 0);
+  (_version = version) !== null && _version !== void 0 ? _version : version = Math.max(...schemas.map(schema => schema.version.constValue));
+  const schema = schemas.find(s => s.version.constValue === version);
+  if (schema == null) throw new SchemaNotFoundError(`${Tag[tag]} (${tag})`, version);
+  return Object.entries(schema);
 }
 
 /**
@@ -8096,61 +8602,69 @@ function unpackRawTx(binary, schema) {
  * @category transaction builder
  * @param params - Object with tx params
  * @param options - options
- * @param options.denomination - Denomination of amounts
  * @param options.prefix - Prefix of transaction
- * @throws {@link InvalidTxParamsError}
- * @returns object
- * @returns object.tx Base64Check transaction hash with 'tx_' prefix
- * @returns object.rlpEncoded rlp encoded transaction
- * @returns object.binary binary transaction
+ * @returns object Base64Check transaction hash with 'tx_' prefix
  */
 function buildTx(params, {
-  prefix,
-  denomination = AE_AMOUNT_FORMATS.AETTOS
+  prefix
 } = {}) {
-  var _params$version;
-  const schemas = TX_SCHEMA[params.tag];
-  (_params$version = params.version) !== null && _params$version !== void 0 ? _params$version : params.version = Math.max(...Object.keys(schemas).map(a => +a));
-  if (!isKeyOfObject(params.version, schemas)) {
-    throw new SchemaNotFoundError('serialization', Tag[params.tag], params.version);
-  }
-  const schema = schemas[params.version];
-  const binary = schema.map(([key, field]) => field.serialize(params[key], {
+  const schema = getSchema(params.tag, params.version);
+  const binary = schema.map(([key, field]) => field.serialize(
+  // @ts-expect-error the type of `params[key]` can't be determined accurately
+  params[key], {
     ...params,
     // eslint-disable-next-line @typescript-eslint/no-use-before-define
     unpackTx,
     buildTx,
-    denomination,
     rebuildTx: overrideParams => buildTx({
       ...params,
       ...overrideParams
-    }, {
-      denomination
     })
-  }));
+  }, params));
 
   // @ts-expect-error looks like a TypeScript edge case
   return encode((0,external_rlp_.encode)(binary), prefix !== null && prefix !== void 0 ? prefix : Encoding.Transaction);
 }
+/**
+ * @category transaction builder
+ */
+async function buildTxAsync(params) {
+  await Promise.all(getSchema(params.tag, params.version).map(async ([key, field]) => {
+    if (field.prepare == null) return;
+    // @ts-expect-error the type of `params[key]` can't be determined accurately
+    params[key] = await field.prepare(params[key], params, params);
+  }));
+
+  // @ts-expect-error after preparation properties should be compatible with sync tx builder
+  return buildTx(params);
+}
 
 /**
- * Unpack transaction hash
+ * Unpack transaction encoded as string
  * @category transaction builder
  * @param encodedTx - Transaction to unpack
  * @param txType - Expected transaction type
- * @returns object
- * @returns object.tx Object with transaction param's
- * @returns object.txType Transaction type
+ * @returns Object with transaction param's
  */
 function unpackTx(encodedTx, txType) {
   const binary = (0,external_rlp_.decode)(decode(encodedTx));
   const tag = +readInt(binary[0]);
-  if (!isKeyOfObject(tag, TX_SCHEMA)) throw new DecodeError(`Unknown transaction tag: ${tag}`);
-  if (txType != null && txType !== tag) throw new DecodeError(`Expected transaction to have ${Tag[txType]} tag, got ${Tag[tag]} instead`);
   const version = +readInt(binary[1]);
-  if (!isKeyOfObject(version, TX_SCHEMA[tag])) throw new SchemaNotFoundError('deserialization', `tag ${tag}`, version);
-  const schema = TX_SCHEMA[tag][version];
-  return unpackRawTx(binary, schema);
+  const schema = getSchema(tag, version);
+  if (txType != null && txType !== tag) throw new DecodeError(`Expected transaction to have ${Tag[txType]} tag, got ${Tag[tag]} instead`);
+  if (binary.length !== schema.length) {
+    throw new ArgumentError('Transaction RLP length', schema.length, binary.length);
+  }
+  return schema.reduce((acc, [name, field], index) => {
+    // eslint-disable-next-line @typescript-eslint/no-use-before-define
+    const deserialized = field.deserialize(binary[index], {
+      unpackTx
+    });
+    return {
+      ...acc,
+      [name]: deserialized
+    };
+  }, {});
 }
 
 /**
@@ -8171,15 +8685,11 @@ function buildTxHash(rawTx) {
  * @returns Contract public key
  */
 function buildContractIdByContractTx(contractTx) {
-  const {
-    tag,
-    ownerId,
-    nonce
-  } = unpackTx(contractTx);
-  if (![Tag.ContractCreateTx, Tag.GaAttachTx].includes(tag)) {
-    throw new ArgumentError('contractCreateTx', 'a contractCreateTx or gaAttach', tag);
+  const params = unpackTx(contractTx);
+  if (Tag.ContractCreateTx !== params.tag && Tag.GaAttachTx !== params.tag) {
+    throw new ArgumentError('contractTx', 'a contractCreateTx or gaAttach', params.tag);
   }
-  return buildContractId(ownerId, +nonce);
+  return buildContractId(params.ownerId, params.nonce);
 }
 ;// CONCATENATED MODULE: ./src/utils/semver-satisfies.ts
 function semverSatisfies(version, geVersion, ltVersion) {
@@ -8244,15 +8754,18 @@ const genCombineGetRequestsPolicy = () => {
 const genAggressiveCacheGetResponsesPolicy = () => {
   const getRequests = new Map();
   return {
-    name: 'aggressive-cache-get-responses',
-    async sendRequest(request, next) {
-      var _getRequests$get;
-      if (request.method !== 'GET') return next(request);
-      const key = JSON.stringify([request.url, request.body]);
-      const response = (_getRequests$get = getRequests.get(key)) !== null && _getRequests$get !== void 0 ? _getRequests$get : next(request);
-      getRequests.set(key, response);
-      return response;
-    }
+    policy: {
+      name: 'aggressive-cache-get-responses',
+      async sendRequest(request, next) {
+        var _getRequests$get;
+        if (request.method !== 'GET') return next(request);
+        const key = JSON.stringify([request.url, request.body]);
+        const response = (_getRequests$get = getRequests.get(key)) !== null && _getRequests$get !== void 0 ? _getRequests$get : next(request);
+        getRequests.set(key, response);
+        return response;
+      }
+    },
+    position: 'perCall'
   };
 };
 const genErrorFormatterPolicy = getMessage => ({
@@ -8284,11 +8797,40 @@ const genVersionCheckPolicy = (name, ignorePath, versionPromise, geVersion, ltVe
   name: 'version-check',
   async sendRequest(request, next) {
     if (new URL(request.url).pathname === ignorePath) return next(request);
-    const args = [await versionPromise, geVersion, ltVersion];
+    const version = await versionPromise;
+    if (version instanceof Error) throw version;
+    const args = [version, geVersion, ltVersion];
     if (!semverSatisfies(...args)) throw new UnsupportedVersionError(name, ...args);
     return next(request);
   }
 });
+const genRetryOnFailurePolicy = (retryCount, retryOverallDelay) => ({
+  policy: {
+    name: 'retry-on-failure',
+    async sendRequest(request, next) {
+      const statusesToNotRetry = [200, 400, 403];
+      const intervals = new Array(retryCount).fill(0).map((_, idx) => ((idx + 1) / retryCount) ** 2);
+      const intervalSum = intervals.reduce((a, b) => a + b);
+      const intervalsInMs = intervals.map(el => el / intervalSum * retryOverallDelay);
+      let error;
+      for (let attempt = 0; attempt <= retryCount; attempt += 1) {
+        if (error != null) {
+          var _error$response$statu, _error$response2;
+          if (!(error instanceof core_rest_pipeline_.RestError) || statusesToNotRetry.includes((_error$response$statu = (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.status) !== null && _error$response$statu !== void 0 ? _error$response$statu : 0)) throw error;
+          await pause(intervalsInMs[attempt - 1]);
+        }
+        try {
+          return await next(request);
+        } catch (e) {
+          error = e;
+        }
+      }
+      if (error == null) throw new UnexpectedTsError();
+      throw error;
+    }
+  },
+  position: 'perCall'
+});
 // EXTERNAL MODULE: external "@azure/core-client"
 var core_client_ = __webpack_require__(4711);
 ;// CONCATENATED MODULE: ./src/apis/node/models/mappers.ts
@@ -8711,6 +9253,7 @@ const SignedTx = {
   }
 };
 const Tx = {
+  serializedName: "Tx",
   type: {
     name: "Composite",
     className: "Tx",
@@ -12455,7 +12998,7 @@ const CreateContractUnsignedTx = {
   }
 };
 let discriminators = {
-  "Tx.undefined": Tx,
+  "Tx.Tx": Tx,
   OffChainUpdate: OffChainUpdate,
   "OffChainUpdate.OffChainTransfer": OffChainTransfer,
   "OffChainUpdate.OffChainWithdrawal": OffChainWithdrawal,
@@ -12574,7 +13117,7 @@ const body1 = {
   parameterPath: "body",
   mapper: EncodedTx
 };
-const fromParam = {
+const from = {
   parameterPath: ["options", "from"],
   mapper: {
     serializedName: "from",
@@ -12597,7 +13140,7 @@ const limit = {
     }
   }
 };
-const typeParam = {
+const type = {
   parameterPath: ["options", "type"],
   mapper: {
     defaultValue: "all",
@@ -12632,7 +13175,6 @@ const parameters_name = {
 
 
 
-
 class Node extends core_client_.ServiceClient {
   /**
    * Initializes a new instance of the Node class.
@@ -12640,7 +13182,7 @@ class Node extends core_client_.ServiceClient {
    * @param options The parameter options
    */
   constructor($host, options) {
-    var _ref, _options$endpoint, _options;
+    var _ref, _options$endpoint;
     if ($host === undefined) {
       throw new Error("'$host' cannot be null");
     }
@@ -12660,24 +13202,9 @@ class Node extends core_client_.ServiceClient {
       userAgentOptions: {
         userAgentPrefix
       },
-      baseUri: (_ref = (_options$endpoint = options.endpoint) !== null && _options$endpoint !== void 0 ? _options$endpoint : options.baseUri) !== null && _ref !== void 0 ? _ref : "{$host}"
+      endpoint: (_ref = (_options$endpoint = options.endpoint) !== null && _options$endpoint !== void 0 ? _options$endpoint : options.baseUri) !== null && _ref !== void 0 ? _ref : "{$host}"
     };
     super(optionsWithDefaults);
-    if ((_options = options) !== null && _options !== void 0 && _options.pipeline && options.pipeline.getOrderedPolicies().length > 0) {
-      const pipelinePolicies = options.pipeline.getOrderedPolicies();
-      const bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(pipelinePolicy => pipelinePolicy.name === core_rest_pipeline_.bearerTokenAuthenticationPolicyName);
-      if (!bearerTokenAuthenticationPolicyFound) {
-        this.pipeline.removePolicy({
-          name: core_rest_pipeline_.bearerTokenAuthenticationPolicyName
-        });
-        this.pipeline.addPolicy(core_rest_pipeline_.bearerTokenAuthenticationPolicy({
-          scopes: `${optionsWithDefaults.baseUri}/.default`,
-          challengeCallbacks: {
-            authorizeRequestOnChallenge: core_client_.authorizeRequestOnClaimChallenge
-          }
-        }));
-      }
-    }
     // Parameter assignments
     this.$host = $host;
   }
@@ -13636,7 +14163,7 @@ const getOracleQueriesByPubkeyOperationSpec = {
       isError: true
     }
   },
-  queryParameters: [intAsString, fromParam, limit, typeParam],
+  queryParameters: [intAsString, from, limit, type],
   urlParameters: [$host, pubkey],
   headerParameters: [accept],
   serializer
@@ -13814,15 +14341,19 @@ class Node_Node extends NodeTransformed {
    * @param url - Url for node API
    * @param options - Options
    * @param options.ignoreVersion - Don't check node version
+   * @param options.retryCount - Amount of extra requests to do in case of failure
+   * @param options.retryOverallDelay - Time in ms to wait between all retries
    */
   constructor(url, {
     ignoreVersion = false,
+    retryCount = 3,
+    retryOverallDelay = 800,
     ...options
   } = {}) {
     // eslint-disable-next-line constructor-super
     super(url, {
       allowInsecureConnection: true,
-      additionalPolicies: [genRequestQueuesPolicy(), genCombineGetRequestsPolicy(), genErrorFormatterPolicy(body => ` ${body.reason}`)],
+      additionalPolicies: [genRequestQueuesPolicy(), genCombineGetRequestsPolicy(), genRetryOnFailurePolicy(retryCount, retryOverallDelay), genErrorFormatterPolicy(body => ` ${body.reason}`)],
       ...options
     });
     Node_classPrivateFieldInitSpec(this, _networkIdPromise, {
@@ -13833,10 +14364,10 @@ class Node_Node extends NodeTransformed {
       const statusPromise = this.getStatus();
       const versionPromise = statusPromise.then(({
         nodeVersion
-      }) => nodeVersion);
+      }) => nodeVersion, error => error);
       classPrivateFieldSet_default()(this, _networkIdPromise, statusPromise.then(({
         networkId
-      }) => networkId));
+      }) => networkId, error => error));
       this.pipeline.addPolicy(genVersionCheckPolicy('node', '/v3/status', versionPromise, '6.2.0', '7.0.0'));
     }
     this.intAsString = true;
@@ -13846,7 +14377,9 @@ class Node_Node extends NodeTransformed {
     (_classPrivateFieldGet2 = classPrivateFieldGet_default()(this, _networkIdPromise)) !== null && _classPrivateFieldGet2 !== void 0 ? _classPrivateFieldGet2 : classPrivateFieldSet_default()(this, _networkIdPromise, this.getStatus().then(({
       networkId
     }) => networkId));
-    return classPrivateFieldGet_default()(this, _networkIdPromise);
+    const networkId = await classPrivateFieldGet_default()(this, _networkIdPromise);
+    if (networkId instanceof Error) throw networkId;
+    return networkId;
   }
   async getNodeInfo() {
     const {
@@ -13869,143 +14402,347 @@ class Node_Node extends NodeTransformed {
     };
   }
 }
-;// CONCATENATED MODULE: ./src/tx/validator.ts
+;// CONCATENATED MODULE: ./src/tx/transaction-signer.ts
 
 
 
 
+/**
+ * Returns account address that signed a transaction
+ * @param transaction - transaction to get a signer of
+ */
+function getTransactionSignerAddress(transaction) {
+  var _getSchema$find;
+  const params = unpackTx(transaction);
+  switch (params.tag) {
+    case Tag.SignedTx:
+      return getTransactionSignerAddress(buildTx(params.encodedTx));
+    case Tag.GaMetaTx:
+      return params.gaId;
+    default:
+  }
+  const nonce = (_getSchema$find = getSchema(params.tag, params.version).find(([name]) => name === 'nonce')) === null || _getSchema$find === void 0 ? void 0 : _getSchema$find[1];
+  if (nonce == null) throw new TransactionError(`Transaction doesn't have nonce: ${Tag[params.tag]}`);
+  if (!('senderKey' in nonce)) throw new UnexpectedTsError();
+  const address = params[nonce.senderKey];
+  return address.replace(/^ok_/, 'ak_');
+}
+;// CONCATENATED MODULE: ./src/account/Base.ts
+/**
+ * Account is one of the three basic building blocks of an
+ * {@link AeSdk} and provides access to a signing key pair.
+ */
+class AccountBase {}
+;// CONCATENATED MODULE: ./src/account/Memory.ts
 
 
 
 
 
-const validators = [];
-const getSenderAddress = tx => ['senderId', 'accountId', 'ownerId', 'callerId', 'oracleId', 'fromId', 'initiator', 'gaId', 'payerId'].map(key => tx[key]).filter(a => a).map(a => a === null || a === void 0 ? void 0 : a.toString().replace(/^ok_/, 'ak_'))[0];
-async function verifyTransactionInternal(tx, node, parentTxTypes) {
-  var _getSenderAddress;
-  const address = (_getSenderAddress = getSenderAddress(tx)) !== null && _getSenderAddress !== void 0 ? _getSenderAddress : tx.tag === Tag.SignedTx ? getSenderAddress(tx.encodedTx) : undefined;
-  const [account, {
-    height
-  }, {
-    consensusProtocolVersion,
-    nodeNetworkId
-  }] = await Promise.all([address == null ? undefined : node.getAccountByPubkey(address).catch(error => {
-    if (!isAccountNotFoundError(error)) throw error;
-    return {
-      id: address,
-      balance: 0n,
-      nonce: 0
-    };
-  })
-  // TODO: remove after fixing https://github.com/aeternity/aepp-sdk-js/issues/1537
-  .then(acc => ({
-    ...acc,
-    id: acc.id
-  })), node.getCurrentKeyBlockHeight(), node.getNodeInfo()]);
-  return (await Promise.all(validators.map(v => v(tx, {
-    node,
-    account,
-    height,
-    consensusProtocolVersion,
-    nodeNetworkId,
-    parentTxTypes
-  })))).flat();
+
+
+const secretKeys = new WeakMap();
+function getBufferToSign(transaction, networkId, innerTx) {
+  const prefixes = [networkId];
+  if (innerTx) prefixes.push('inner_tx');
+  const rlpBinaryTx = decode(transaction);
+  return concatBuffers([Buffer.from(prefixes.join('-')), hash(rlpBinaryTx)]);
 }
 
 /**
- * Transaction Validator
- * This function validates some transaction properties,
- * to make sure it can be posted it to the chain
- * @category transaction builder
- * @param transaction - Base64Check-encoded transaction
- * @param nodeNotCached - Node to validate transaction against
- * @returns Array with verification errors
- * @example const errors = await verifyTransaction(transaction, node)
+ * In-memory account class
  */
-async function verifyTransaction(transaction, nodeNotCached) {
-  const node = new Node_Node(nodeNotCached.$host, {
-    ignoreVersion: true
-  });
-  node.pipeline.addPolicy(genAggressiveCacheGetResponsesPolicy());
-  return verifyTransactionInternal(unpackTx(transaction), node, []);
-}
-validators.push(({
-  encodedTx,
-  signatures
-}, {
-  account,
-  nodeNetworkId,
-  parentTxTypes
-}) => {
-  if ((encodedTx !== null && encodedTx !== void 0 ? encodedTx : signatures) == null) return [];
-  if (account == null) return [];
-  if (signatures.length !== 1) return []; // TODO: Support multisignature like in state channels
-  const prefix = Buffer.from([nodeNetworkId, ...(parentTxTypes.includes(Tag.PayingForTx) ? ['inner_tx'] : [])].join('-'));
-  const txBinary = decode(buildTx(encodedTx));
-  const txWithNetworkId = concatBuffers([prefix, txBinary]);
-  const txHashWithNetworkId = concatBuffers([prefix, hash(txBinary)]);
-  if (verify(txWithNetworkId, signatures[0], account.id) || verify(txHashWithNetworkId, signatures[0], account.id)) return [];
-  return [{
-    message: 'Signature cannot be verified, please ensure that you transaction have' + ' the correct prefix and the correct private key for the sender address',
-    key: 'InvalidSignature',
-    checkedKeys: ['encodedTx', 'signatures']
-  }];
-}, async ({
-  encodedTx,
-  tx,
-  tag
-}, {
-  node,
-  parentTxTypes
-}) => {
-  if ((encodedTx !== null && encodedTx !== void 0 ? encodedTx : tx) == null) return [];
-  return verifyTransactionInternal(encodedTx !== null && encodedTx !== void 0 ? encodedTx : tx, node, [...parentTxTypes, tag]);
-}, ({
-  ttl
-}, {
-  height
-}) => {
-  if (ttl == null) return [];
-  ttl = +ttl;
-  if (ttl === 0 || ttl >= height) return [];
-  return [{
-    message: `TTL ${ttl} is already expired, current height is ${height}`,
-    key: 'ExpiredTTL',
-    checkedKeys: ['ttl']
-  }];
-}, ({
-  amount,
-  fee,
-  nameFee,
-  tx,
-  tag
-}, {
-  account,
-  parentTxTypes
-}) => {
-  var _ref, _fee;
-  if (account == null) return [];
-  if (((_ref = amount !== null && amount !== void 0 ? amount : fee) !== null && _ref !== void 0 ? _ref : nameFee) == null) return [];
-  (_fee = fee) !== null && _fee !== void 0 ? _fee : fee = 0;
-  const cost = new (external_bignumber_js_default())(fee).plus(nameFee !== null && nameFee !== void 0 ? nameFee : 0).plus(amount !== null && amount !== void 0 ? amount : 0).plus(tag === Tag.PayingForTx ? tx.encodedTx.fee : 0).minus(parentTxTypes.includes(Tag.PayingForTx) ? fee : 0);
-  if (cost.lte(account.balance.toString())) return [];
-  return [{
-    message: `Account balance ${account.balance.toString()} is not enough to execute the transaction that costs ${cost.toFixed()}`,
-    key: 'InsufficientBalance',
-    checkedKeys: ['amount', 'fee', 'nameFee']
-  }];
-}, ({
-  signatures,
-  tag
-}, {
+class AccountMemory extends AccountBase {
+  /**
+   * @param secretKey - Secret key
+   */
+  constructor(secretKey) {
+    super();
+    secretKey = typeof secretKey === 'string' ? Buffer.from(secretKey, 'hex') : secretKey;
+    if (secretKey.length !== 64) {
+      throw new ArgumentError('secretKey', '64 bytes', secretKey.length);
+    }
+    secretKeys.set(this, secretKey);
+    this.address = encode(generateKeyPairFromSecret(secretKeys.get(this)).publicKey, Encoding.AccountAddress);
+  }
+
+  /**
+   * Generates a new AccountMemory using a random secret key
+   */
+  static generate() {
+    return new AccountMemory(generateKeyPair().secretKey);
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async sign(data, options) {
+    return sign(data, secretKeys.get(this));
+  }
+  async signTransaction(transaction, {
+    innerTx,
+    networkId,
+    ...options
+  } = {}) {
+    if (networkId == null) {
+      throw new ArgumentError('networkId', 'provided', networkId);
+    }
+    const rlpBinaryTx = decode(transaction);
+    const txWithNetworkId = getBufferToSign(transaction, networkId, innerTx === true);
+    const signatures = [await this.sign(txWithNetworkId, options)];
+    return buildTx({
+      tag: Tag.SignedTx,
+      encodedTx: rlpBinaryTx,
+      signatures
+    });
+  }
+  async signMessage(message, options) {
+    return this.sign(messageToHash(message), options);
+  }
+}
+;// CONCATENATED MODULE: ./src/tx/execution-cost.ts
+
+
+
+
+
+
+
+/**
+ * Calculates the cost of transaction execution
+ * Provides an upper cost of contract-call-related transactions because of `gasLimit`.
+ * Also assumes that oracle query fee is 0 unless it is provided in options.
+ * @param transaction - Transaction to calculate the cost of
+ * @param innerTx - Should be provided if transaction wrapped with Tag.PayingForTx
+ * @param gasUsed - Amount of gas actually used to make calculation more accurate
+ * @param queryFee - Oracle query fee
+ * @param isInitiator - Is transaction signer an initiator of state channel
+ */
+function getExecutionCost(transaction, {
+  innerTx,
+  gasUsed,
+  queryFee,
+  isInitiator
+} = {}) {
+  const params = unpackTx(transaction);
+  if (params.tag === Tag.SignedTx) {
+    throw new IllegalArgumentError('Transaction shouldn\'t be a SignedTx, use `getExecutionCostBySignedTx` instead');
+  }
+  let res = 0n;
+  if ('fee' in params && innerTx !== 'freeloader') {
+    res += BigInt(params.fee);
+  }
+  if (params.tag === Tag.NameClaimTx) {
+    res += BigInt(params.nameFee);
+  }
+  if (params.tag === Tag.OracleQueryTx) {
+    res += BigInt(params.queryFee);
+  }
+  if (params.tag === Tag.OracleResponseTx) {
+    res -= BigInt(queryFee !== null && queryFee !== void 0 ? queryFee : 0);
+  }
+  if (params.tag === Tag.ChannelSettleTx) {
+    if (isInitiator === true) res -= BigInt(params.initiatorAmountFinal);
+    if (isInitiator === false) res -= BigInt(params.responderAmountFinal);
+  }
+  if ((params.tag === Tag.SpendTx && params.senderId !== params.recipientId || params.tag === Tag.ContractCreateTx || params.tag === Tag.ContractCallTx || params.tag === Tag.ChannelDepositTx) && innerTx !== 'fee-payer') {
+    res += BigInt(params.amount);
+  }
+  if (params.tag === Tag.ContractCreateTx) res += BigInt(params.deposit);
+  if ((params.tag === Tag.ContractCreateTx || params.tag === Tag.ContractCallTx || params.tag === Tag.GaAttachTx || params.tag === Tag.GaMetaTx) && innerTx !== 'freeloader') {
+    res += BigInt(params.gasPrice) * BigInt(gasUsed !== null && gasUsed !== void 0 ? gasUsed : params.gasLimit);
+  }
+  if (params.tag === Tag.GaMetaTx || params.tag === Tag.PayingForTx) {
+    res += getExecutionCost(buildTx(params.tx.encodedTx), params.tag === Tag.PayingForTx ? {
+      innerTx: 'fee-payer'
+    } : {});
+  }
+  return res;
+}
+
+/**
+ * Calculates the cost of signed transaction execution
+ * @param transaction - Transaction to calculate the cost of
+ * @param networkId - Network id used to sign the transaction
+ * @param options - Options
+ */
+function getExecutionCostBySignedTx(transaction, networkId, options) {
+  const params = unpackTx(transaction, Tag.SignedTx);
+  if (params.encodedTx.tag === Tag.GaMetaTx) {
+    return getExecutionCost(buildTx(params.encodedTx), options);
+  }
+  const tx = buildTx(params.encodedTx);
+  const address = getTransactionSignerAddress(tx);
+  const [isInnerTx, isNotInnerTx] = [true, false].map(f => verify(getBufferToSign(tx, networkId, f), params.signatures[0], address));
+  if (!isInnerTx && !isNotInnerTx) throw new TransactionError('Can\'t verify signature');
+  return getExecutionCost(buildTx(params.encodedTx), {
+    ...(isInnerTx && {
+      innerTx: 'freeloader'
+    }),
+    ...options
+  });
+}
+
+/**
+ * Calculates the cost of signed and not signed transaction execution using node
+ * @param transaction - Transaction to calculate the cost of
+ * @param node - Node to use
+ * @param isMined - Is transaction already mined or not
+ * @param options - Options
+ */
+async function getExecutionCostUsingNode(transaction, node, {
+  isMined,
+  ...options
+} = {}) {
+  let params = unpackTx(transaction);
+  const isSignedTx = params.tag === Tag.SignedTx;
+  const txHash = isSignedTx && isMined === true && buildTxHash(transaction);
+  if (params.tag === Tag.SignedTx) params = params.encodedTx;
+
+  // TODO: set gasUsed for PayingForTx after solving https://github.com/aeternity/aeternity/issues/4087
+  if (options.gasUsed == null && txHash !== false && [Tag.ContractCreateTx, Tag.ContractCallTx, Tag.GaAttachTx, Tag.GaMetaTx].includes(params.tag)) {
+    const {
+      callInfo,
+      gaInfo
+    } = await node.getTransactionInfoByHash(txHash);
+    const combinedInfo = callInfo !== null && callInfo !== void 0 ? callInfo : gaInfo;
+    if (combinedInfo == null) {
+      throw new InternalError(`callInfo and gaInfo is not available for transaction ${txHash}`);
+    }
+    options.gasUsed = combinedInfo.gasUsed;
+  }
+  if (options.queryFee == null && Tag.OracleResponseTx === params.tag) {
+    options.queryFee = (await node.getOracleByPubkey(params.oracleId)).queryFee.toString();
+  }
+  if (options.isInitiator == null && Tag.ChannelSettleTx === params.tag && isMined !== true) {
+    const {
+      initiatorId
+    } = await node.getChannelByPubkey(params.channelId);
+    options.isInitiator = params.fromId === initiatorId;
+  }
+  return isSignedTx ? getExecutionCostBySignedTx(transaction, await node.getNetworkId(), options) : getExecutionCost(transaction, options);
+}
+;// CONCATENATED MODULE: ./src/tx/validator.ts
+
+
+
+
+
+
+
+
+
+
+
+const validators = [];
+async function verifyTransactionInternal(tx, node, parentTxTypes) {
+  const address = getTransactionSignerAddress(buildTx(tx));
+  const [account, {
+    height
+  }, {
+    consensusProtocolVersion,
+    nodeNetworkId
+  }] = await Promise.all([node.getAccountByPubkey(address).catch(error => {
+    if (!isAccountNotFoundError(error)) throw error;
+    return {
+      id: address,
+      balance: 0n,
+      nonce: 0
+    };
+  })
+  // TODO: remove after fixing https://github.com/aeternity/aepp-sdk-js/issues/1537
+  .then(acc => ({
+    ...acc,
+    id: acc.id
+  })), node.getCurrentKeyBlockHeight(), node.getNodeInfo()]);
+  return (await Promise.all(validators.map(async v => v(tx, {
+    node,
+    account,
+    height,
+    consensusProtocolVersion,
+    nodeNetworkId,
+    parentTxTypes
+  })))).flat();
+}
+
+/**
+ * Transaction Validator
+ * This function validates some transaction properties,
+ * to make sure it can be posted it to the chain
+ * @category transaction builder
+ * @param transaction - Base64Check-encoded transaction
+ * @param nodeNotCached - Node to validate transaction against
+ * @returns Array with verification errors
+ * @example const errors = await verifyTransaction(transaction, node)
+ */
+async function verifyTransaction(transaction, nodeNotCached) {
+  const node = new Node_Node(nodeNotCached.$host, {
+    ignoreVersion: true,
+    pipeline: nodeNotCached.pipeline.clone(),
+    additionalPolicies: [genAggressiveCacheGetResponsesPolicy()]
+  });
+  return verifyTransactionInternal(unpackTx(transaction), node, []);
+}
+validators.push((tx, {
+  account,
+  nodeNetworkId,
+  parentTxTypes
+}) => {
+  if (tx.tag !== Tag.SignedTx) return [];
+  const {
+    encodedTx,
+    signatures
+  } = tx;
+  if ((encodedTx !== null && encodedTx !== void 0 ? encodedTx : signatures) == null) return [];
+  if (signatures.length !== 1) return []; // TODO: Support multisignature like in state channels
+  const prefix = Buffer.from([nodeNetworkId, ...(parentTxTypes.includes(Tag.PayingForTx) ? ['inner_tx'] : [])].join('-'));
+  const txBinary = decode(buildTx(encodedTx));
+  const txWithNetworkId = concatBuffers([prefix, txBinary]);
+  const txHashWithNetworkId = concatBuffers([prefix, hash(txBinary)]);
+  if (verify(txWithNetworkId, signatures[0], account.id) || verify(txHashWithNetworkId, signatures[0], account.id)) return [];
+  return [{
+    message: 'Signature cannot be verified, please ensure that you transaction have' + ' the correct prefix and the correct private key for the sender address',
+    key: 'InvalidSignature',
+    checkedKeys: ['encodedTx', 'signatures']
+  }];
+}, async (tx, {
+  node,
+  parentTxTypes
+}) => {
+  let nestedTx;
+  if ('encodedTx' in tx) nestedTx = tx.encodedTx;
+  if ('tx' in tx) nestedTx = tx.tx;
+  if (nestedTx == null) return [];
+  return verifyTransactionInternal(nestedTx, node, [...parentTxTypes, tx.tag]);
+}, (tx, {
+  height
+}) => {
+  if (!('ttl' in tx)) return [];
+  if (tx.ttl === 0 || tx.ttl >= height) return [];
+  return [{
+    message: `TTL ${tx.ttl} is already expired, current height is ${height}`,
+    key: 'ExpiredTTL',
+    checkedKeys: ['ttl']
+  }];
+}, async (tx, {
+  account,
+  parentTxTypes,
+  node
+}) => {
+  if (parentTxTypes.length !== 0) return [];
+  const cost = await getExecutionCostUsingNode(buildTx(tx), node).catch(() => 0n);
+  if (cost <= account.balance) return [];
+  return [{
+    message: `Account balance ${account.balance} is not enough to execute the transaction that costs ${cost}`,
+    key: 'InsufficientBalance',
+    checkedKeys: ['amount', 'fee', 'nameFee', 'gasLimit', 'gasPrice']
+  }];
+}, (tx, {
   account
 }) => {
-  if (account == null) return [];
   let message;
-  if (tag === Tag.SignedTx && account.kind === 'generalized' && signatures.length !== 0) {
+  if (tx.tag === Tag.SignedTx && account.kind === 'generalized' && tx.signatures.length !== 0) {
     message = 'Generalized account can\'t be used to generate SignedTx with signatures';
   }
-  if (tag === Tag.GaMetaTx && account.kind === 'basic') {
+  if (tx.tag === Tag.GaMetaTx && account.kind === 'basic') {
     message = 'Basic account can\'t be used to generate GaMetaTx';
   }
   if (message == null) return [];
@@ -14014,46 +14751,24 @@ validators.push(({
     key: 'InvalidAccountType',
     checkedKeys: ['tag']
   }];
-}, ({
-  nonce
-}, {
-  account,
-  parentTxTypes
-}) => {
-  if (nonce == null || account == null || parentTxTypes.includes(Tag.GaMetaTx)) return [];
-  nonce = +nonce;
-  const validNonce = account.nonce + 1;
-  if (nonce === validNonce) return [];
-  return [{
-    ...(nonce < validNonce ? {
-      message: `Nonce ${nonce} is already used, valid nonce is ${validNonce}`,
-      key: 'NonceAlreadyUsed'
-    } : {
-      message: `Nonce ${nonce} is too high, valid nonce is ${validNonce}`,
-      key: 'NonceHigh'
-    }),
-    checkedKeys: ['nonce']
-  }];
-}, ({
-  ctVersion,
-  abiVersion,
-  tag
-}, {
+},
+// TODO: revert nonce check
+(tx, {
   consensusProtocolVersion
 }) => {
-  var _ref2, _ref3;
-  const oracleCall = Tag.Oracle === tag || Tag.OracleRegisterTx === tag;
-  const contractCreate = Tag.ContractCreateTx === tag || Tag.GaAttachTx === tag;
-  const contractCall = Tag.ContractCallTx === tag || Tag.GaMetaTx === tag;
-  const type = (_ref2 = (_ref3 = oracleCall ? 'oracle-call' : null) !== null && _ref3 !== void 0 ? _ref3 : contractCreate ? 'contract-create' : null) !== null && _ref2 !== void 0 ? _ref2 : contractCall ? 'contract-call' : null;
+  var _ref, _ref2;
+  const oracleCall = Tag.Oracle === tx.tag || Tag.OracleRegisterTx === tx.tag;
+  const contractCreate = Tag.ContractCreateTx === tx.tag || Tag.GaAttachTx === tx.tag;
+  const contractCall = Tag.ContractCallTx === tx.tag || Tag.GaMetaTx === tx.tag;
+  const type = (_ref = (_ref2 = oracleCall ? 'oracle-call' : null) !== null && _ref2 !== void 0 ? _ref2 : contractCreate ? 'contract-create' : null) !== null && _ref !== void 0 ? _ref : contractCall ? 'contract-call' : null;
   if (type == null) return [];
-  // TODO: remove assertion after fixing buildTx types
   const protocol = ProtocolToVmAbi[consensusProtocolVersion][type];
-
-  // If not contract create tx
-  if (ctVersion == null) ctVersion = {
-    abiVersion
+  let ctVersion;
+  if ('abiVersion' in tx) ctVersion = {
+    abiVersion: tx.abiVersion
   };
+  if ('ctVersion' in tx) ctVersion = tx.ctVersion;
+  if (ctVersion == null) throw new UnexpectedTsError();
   if (!protocol.abiVersion.includes(ctVersion.abiVersion) || contractCreate && !protocol.vmVersion.includes(ctVersion.vmVersion)) {
     return [{
       message: `ABI/VM version ${JSON.stringify(ctVersion)} is wrong, supported is: ${JSON.stringify(protocol)}`,
@@ -14062,21 +14777,17 @@ validators.push(({
     }];
   }
   return [];
-}, async ({
-  contractId,
-  tag
-}, {
+}, async (tx, {
   node
 }) => {
-  if (Tag.ContractCallTx !== tag) return [];
-  contractId = contractId;
+  if (Tag.ContractCallTx !== tx.tag) return [];
   try {
     const {
       active
-    } = await node.getContract(contractId);
+    } = await node.getContract(tx.contractId);
     if (active) return [];
     return [{
-      message: `Contract ${contractId} is not active`,
+      message: `Contract ${tx.contractId} is not active`,
       key: 'ContractNotActive',
       checkedKeys: ['contractId']
     }];
@@ -14091,22 +14802,8 @@ validators.push(({
   }
 });
 ;// CONCATENATED MODULE: ./src/chain.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
+
+
 
 
 
@@ -14246,25 +14943,36 @@ async function waitForTxConfirm(txHash, {
 }
 
 /**
- * Submit a signed transaction for mining
+ * Signs and submits transaction for mining
  * @category chain
- * @param tx - Transaction to submit
+ * @param txUnsigned - Transaction to sign and submit
  * @param options - Options
  * @param options.onNode - Node to use
  * @param options.onAccount - Account to use
- * @param options.verify - Verify transaction before sending
+ * @param options.verify - Verify transaction before broadcast, throw error if not
  * @param options.waitMined - Ensure that transaction get into block
  * @param options.confirm - Number of micro blocks that should be mined after tx get included
  * @returns Transaction details
  */
-async function sendTransaction(tx, {
+async function sendTransaction(txUnsigned, {
   onNode,
   onAccount,
   verify = true,
   waitMined = true,
   confirm,
+  innerTx,
   ...options
 }) {
+  const tx = await onAccount.signTransaction(txUnsigned, {
+    ...options,
+    onNode,
+    innerTx,
+    networkId: await onNode.getNetworkId()
+  });
+  if (innerTx === true) return {
+    hash: buildTxHash(tx),
+    rawTx: tx
+  };
   if (verify) {
     const validation = await verifyTransaction(tx, onNode);
     if (validation.length > 0) {
@@ -14358,9 +15066,10 @@ async function getBalance(address, {
   format = AE_AMOUNT_FORMATS.AETTOS,
   ...options
 }) {
+  const addr = address.startsWith('ok_') ? encode(decode(address), Encoding.AccountAddress) : address;
   const {
     balance
-  } = await getAccount(address, options).catch(error => {
+  } = await getAccount(addr, options).catch(error => {
     if (!isAccountNotFoundError(error)) throw error;
     return {
       balance: 0n
@@ -14744,121 +15453,6 @@ async function dump(name, password, privateKey, nonce = external_tweetnacl_defau
     }
   };
 }
-;// CONCATENATED MODULE: ./src/tx/index.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
-/**
- * Transaction methods
- *
- * This is implementation of [Tx](api/tx.md) relays
- * the creation of transactions to {@link Node}.
- * These methods provide ability to create native transactions.
- */
-
-
-
-
-
-// TODO: find a better name or rearrange methods
-/**
- * @category transaction builder
- */
-async function _buildTx(txType, {
-  denomination,
-  absoluteTtl,
-  strategy,
-  onNode,
-  ..._params
-}) {
-  var _params$nonce, _params$ttl;
-  // TODO: avoid this assertion
-  const params = _params;
-  let senderKey;
-  switch (txType) {
-    case Tag.SpendTx:
-    case Tag.OracleQueryTx:
-      senderKey = 'senderId';
-      break;
-    case Tag.NameClaimTx:
-    case Tag.NameUpdateTx:
-    case Tag.NameRevokeTx:
-    case Tag.NameTransferTx:
-    case Tag.NamePreclaimTx:
-    case Tag.OracleRegisterTx:
-      senderKey = 'accountId';
-      break;
-    case Tag.ContractCreateTx:
-    case Tag.GaAttachTx:
-      senderKey = 'ownerId';
-      break;
-    case Tag.GaMetaTx:
-      senderKey = 'gaId';
-      break;
-    case Tag.ContractCallTx:
-    case Tag.OracleExtendTx:
-    case Tag.OracleResponseTx:
-      senderKey = 'callerId';
-      break;
-    case Tag.ChannelCloseSoloTx:
-    case Tag.ChannelSlashTx:
-    case Tag.ChannelSettleTx:
-    case Tag.ChannelSnapshotSoloTx:
-      senderKey = 'fromId';
-      break;
-    case Tag.PayingForTx:
-      senderKey = 'payerId';
-      break;
-    default:
-      throw new ArgumentError('txType', 'valid transaction type', txType);
-  }
-  if (Object.keys(ConsensusProtocolVersion).length !== 2 && ((Tag.ContractCreateTx === txType || Tag.GaAttachTx === txType) && params.ctVersion == null || (Tag.ContractCallTx === txType || Tag.GaMetaTx === txType) && params.abiVersion == null)) {
-    const {
-      consensusProtocolVersion
-    } = await onNode.getNodeInfo();
-    // @ts-expect-error remove after fixing buildTx types
-    params.consensusProtocolVersion = consensusProtocolVersion;
-  }
-  if (txType === Tag.PayingForTx) {
-    params.tx = unpackTx(params.tx);
-  }
-  const senderId = params[senderKey];
-  // TODO: do this check on TypeScript level
-  if (senderId == null) throw new InvalidTxParamsError(`Transaction field ${senderKey} is missed`);
-  (_params$nonce = params.nonce) !== null && _params$nonce !== void 0 ? _params$nonce : params.nonce = (await onNode.getAccountNextNonce(senderId, {
-    strategy
-  }).catch(error => {
-    if (!isAccountNotFoundError(error)) throw error;
-    return {
-      nextNonce: 1
-    };
-  })).nextNonce;
-  (_params$ttl = params.ttl) !== null && _params$ttl !== void 0 ? _params$ttl : params.ttl = TX_TTL;
-  if (params.ttl !== 0) {
-    if (params.ttl < 0) throw new ArgumentError('ttl', 'greater or equal to 0', params.ttl);
-    params.ttl += absoluteTtl === true ? 0 : (await onNode.getCurrentKeyBlock()).height;
-  }
-  return buildTx({
-    ...params,
-    tag: txType
-  }, {
-    denomination
-  });
-}
 // EXTERNAL MODULE: external "tweetnacl-auth"
 var external_tweetnacl_auth_ = __webpack_require__(9882);
 // EXTERNAL MODULE: external "bip32-path"
@@ -15023,130 +15617,7 @@ const getHdWalletAccountFromSeed = (seed, accountIdx) => {
     idx: accountIdx
   };
 };
-;// CONCATENATED MODULE: ./src/spend.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
-
-
-
-
-
-/**
- * Sign and post a transaction to the chain
- * @category chain
- * @param tx - Transaction
- * @param options - Options
- * @param options.verify - Verify transaction before broadcast, throw error if not
- * valid
- * @returns Transaction
- */
-async function send(tx, options) {
-  const signed = await options.onAccount.signTransaction(tx, {
-    ...options,
-    networkId: await options.onNode.getNetworkId()
-  });
-  return options.innerTx === true ? {
-    hash: buildTxHash(signed),
-    rawTx: signed
-  } : sendTransaction(signed, options);
-}
-/**
- * Send coins to another account
- * @category chain
- * @param amount - Amount to spend
- * @param recipientIdOrName - Address or name of recipient account
- * @param options - Options
- * @returns Transaction
- */
-async function spend(amount, recipientIdOrName, options) {
-  return send(await _buildTx(Tag.SpendTx, {
-    ...options,
-    senderId: options.onAccount.address,
-    recipientId: await resolveName(recipientIdOrName, 'account_pubkey', options),
-    amount
-  }), options);
-}
-// TODO: Rename to spendFraction
-/**
- * Send a fraction of coin balance to another account
- * @category chain
- * @param fraction - Fraction of balance to spend (between 0 and 1)
- * @param recipientIdOrName - Address or name of recipient account
- * @param options - Options
- * @returns Transaction
- */
-async function transferFunds(fraction, recipientIdOrName, options) {
-  if (fraction < 0 || fraction > 1) {
-    throw new ArgumentError('fraction', 'a number between 0 and 1', fraction);
-  }
-  const recipientId = await resolveName(recipientIdOrName, 'account_pubkey', options);
-  const senderId = options.onAccount.address;
-  const balance = new (external_bignumber_js_default())(await getBalance.bind(options.onAccount)(senderId, options));
-  const desiredAmount = balance.times(fraction).integerValue((external_bignumber_js_default()).ROUND_HALF_UP);
-  const {
-    fee
-  } = unpackTx(await _buildTx(Tag.SpendTx, {
-    ...options,
-    senderId,
-    recipientId,
-    amount: desiredAmount
-  }), Tag.SpendTx);
-  // Reducing of the amount may reduce transaction fee, so this is not completely accurate
-  const amount = desiredAmount.plus(fee).gt(balance) ? balance.minus(fee) : desiredAmount;
-  return send(await _buildTx(Tag.SpendTx, {
-    ...options,
-    senderId,
-    recipientId,
-    amount
-  }), options);
-}
-/**
- * Submit transaction of another account paying for it (fee and gas)
- * @category chain
- * @param transaction - tx_<base64>-encoded transaction
- * @param options - Options
- * @returns Object Transaction
- */
-async function payForTransaction(transaction, options) {
-  return send(await _buildTx(Tag.PayingForTx, {
-    ...options,
-    payerId: options.onAccount.address,
-    tx: transaction
-  }), options);
-}
 ;// CONCATENATED MODULE: ./src/aens.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
 /**
  * Aens methods - routines to interact with the æternity naming system
  *
@@ -15161,7 +15632,6 @@ async function payForTransaction(transaction, options) {
 
 
 
-
 /**
  * Revoke a name
  * @category AENS
@@ -15184,12 +15654,13 @@ async function payForTransaction(transaction, options) {
  * ```
  */
 async function aensRevoke(name, options) {
-  const nameRevokeTx = await _buildTx(Tag.NameRevokeTx, {
+  const nameRevokeTx = await buildTxAsync({
     ...options,
+    tag: Tag.NameRevokeTx,
     nameId: name,
     accountId: options.onAccount.address
   });
-  return send(nameRevokeTx, options);
+  return sendTransaction(nameRevokeTx, options);
 }
 /**
  * Update a name
@@ -15231,10 +15702,11 @@ async function aensUpdate(name, pointers, {
     }) => [key, id]))),
     ...pointers
   };
-  const nameUpdateTx = await _buildTx(Tag.NameUpdateTx, {
+  const nameUpdateTx = await buildTxAsync({
     clientTtl: CLIENT_TTL,
     nameTtl: NAME_TTL,
     ...options,
+    tag: Tag.NameUpdateTx,
     nameId: name,
     accountId: options.onAccount.address,
     pointers: Object.entries(allPointers).map(([key, id]) => ({
@@ -15242,7 +15714,7 @@ async function aensUpdate(name, pointers, {
       id
     }))
   });
-  return send(nameUpdateTx, options);
+  return sendTransaction(nameUpdateTx, options);
 }
 /**
  * Transfer a domain to another account
@@ -15268,13 +15740,14 @@ async function aensUpdate(name, pointers, {
  * ```
  */
 async function aensTransfer(name, account, options) {
-  const nameTransferTx = await _buildTx(Tag.NameTransferTx, {
+  const nameTransferTx = await buildTxAsync({
     ...options,
+    tag: Tag.NameTransferTx,
     nameId: name,
     accountId: options.onAccount.address,
     recipientId: account
   });
-  return send(nameTransferTx, options);
+  return sendTransaction(nameTransferTx, options);
 }
 /**
  * Query the AENS name info from the node
@@ -15376,13 +15849,14 @@ async function aensQuery(name, opt) {
  * ```
  */
 async function aensClaim(name, salt, options) {
-  const claimTx = await _buildTx(Tag.NameClaimTx, {
+  const claimTx = await buildTxAsync({
     ...options,
+    tag: Tag.NameClaimTx,
     accountId: options.onAccount.address,
     nameSalt: salt,
     name
   });
-  const result = await send(claimTx, options);
+  const result = await sendTransaction(claimTx, options);
   if (!isAuctionName(name)) {
     const nameInter = result.blockHeight != null && result.blockHeight > 0 ? await aensQuery(name, options) : {};
     return Object.assign(result, nameInter);
@@ -15415,16 +15889,15 @@ async function aensClaim(name, salt, options) {
  */
 async function aensPreclaim(name, options) {
   const salt = genSalt();
-  const height = await getHeight(options);
   const commitmentId = commitmentHash(name, salt);
-  const preclaimTx = await _buildTx(Tag.NamePreclaimTx, {
+  const preclaimTx = await buildTxAsync({
     ...options,
+    tag: Tag.NamePreclaimTx,
     accountId: options.onAccount.address,
     commitmentId
   });
   return Object.freeze({
-    ...(await send(preclaimTx, options)),
-    height,
+    ...(await sendTransaction(preclaimTx, options)),
     salt,
     commitmentId,
     async claim(opts) {
@@ -15468,23 +15941,12 @@ async function aensBid(name, nameFee, options) {
 // EXTERNAL MODULE: external "@aeternity/aepp-calldata"
 var aepp_calldata_ = __webpack_require__(7946);
 ;// CONCATENATED MODULE: ./src/contract/Contract.ts
-/*
-* ISC License (ISC)
-* Copyright (c) 2022 aeternity developers
-*
-*  Permission to use, copy, modify, and/or distribute this software for any
-*  purpose with or without fee is hereby granted, provided that the above
-*  copyright notice and this permission notice appear in all copies.
-*
-*  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-*  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-*  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-*  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-*  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-*  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-*  PERFORMANCE OF THIS SOFTWARE.
-*/
 
+
+function Contract_classPrivateFieldInitSpec(obj, privateMap, value) { Contract_checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+function Contract_classPrivateMethodInitSpec(obj, privateSet) { Contract_checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
+function Contract_checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+function Contract_classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 /**
  * Contract module - routines to interact with the æternity contract
  *
@@ -15500,10 +15962,11 @@ var aepp_calldata_ = __webpack_require__(7946);
 
 
 
-
-
-
-
+var _getCallResult = /*#__PURE__*/new WeakSet();
+var _sendAndProcess = /*#__PURE__*/new WeakSet();
+var _getFunctionAci = /*#__PURE__*/new WeakSet();
+var _getContractNameByEvent = /*#__PURE__*/new WeakSet();
+var _aciContract = /*#__PURE__*/new WeakMap();
 /**
  * Generate contract ACI object with predefined js methods for contract usage - can be used for
  * creating a reference to already deployed contracts
@@ -15522,52 +15985,6 @@ var aepp_calldata_ = __webpack_require__(7946);
  * stateful or not
  */
 class Contract {
-  /**
-   * Helper to generate a signature to delegate
-   *  - pre-claim/claim/transfer/revoke of a name to a contract.
-   *  - register/extend/respond of an Oracle to a contract.
-   * @category contract
-   * @param ids - The list of id's to prepend
-   * @param _options - Options
-   * @param _options.omitAddress - Prepend delegation signature with an account address
-   * @param _options.onAccount - Account to use
-   * @returns Signature
-   * @example
-   * ```js
-   * const aeSdk = new AeSdk({ ... })
-   * const contract = await aeSdk.initializeContract({ address: 'ct_asd2ks...' })
-   * const aensName = 'example.chain'
-   * const onAccount = new MemoryAccount(...) // Sign with a specific account
-   * // Preclaim signature
-   * const preclaimSig = await contract.$createDelegationSignature([], { onAccount })
-   * // Claim, transfer and revoke signature
-   * const aensDelegationSig = await contract
-   *   .$createDelegationSignature([aensName], { onAccount })
-   * ```
-   * @example
-   * ```js
-   * const aeSdk = new AeSdk({ ... })
-   * const contract = await aeSdk.initializeContract({ address: 'ct_asd2ks...' })
-   * const oracleQueryId = 'oq_...'
-   * const onAccount = new MemoryAccount(...) // Sign with a specific account
-   * // Oracle register and extend signature
-   * const oracleDelegationSig = await contract.$createDelegationSignature([], { onAccount })
-   * // Oracle respond signature
-   * const respondSig = await contract
-   *   .$createDelegationSignature([oracleQueryId], { onAccount, omitAddress: true })
-   * ```
-   */
-  async $createDelegationSignature(ids = [], _options) {
-    const options = {
-      ...this.$options,
-      ..._options
-    };
-    const contractId = this.$options.address;
-    if (options.onAccount == null) throw new IllegalArgumentError('Can\'t create delegation signature without account');
-    if (contractId == null) throw new MissingContractAddressError('Can\'t create delegation signature without address');
-    return options.onAccount.sign(concatBuffers([Buffer.from(await options.onNode.getNetworkId()), ...(options.omitAddress === true ? [] : [decode(options.onAccount.address)]), ...ids.map(e => isNameValid(e) ? produceNameId(e) : e).map(e => decode(e)), decode(contractId)]), options);
-  }
-
   /**
    * Compile contract
    * @returns bytecode
@@ -15579,46 +15996,17 @@ class Contract {
     this.$options.bytecode = (await this.$options.onCompiler.compileBySourceCode(this.$options.sourceCode, this.$options.fileSystem)).bytecode;
     return this.$options.bytecode;
   }
-  _handleCallError({
-    returnType,
-    returnValue
-  }, transaction) {
-    let message;
-    switch (returnType) {
-      case 'ok':
-        return;
-      case 'revert':
-        message = this._calldata.decodeFateString(returnValue);
-        break;
-      case 'error':
-        message = decode(returnValue).toString();
-        break;
-      default:
-        throw new InternalError(`Unknown return type: ${returnType}`);
-    }
-    throw new NodeInvocationError(message, transaction);
-  }
-  async _sendAndProcess(tx, options) {
-    const txData = await send(tx, {
-      ...this.$options,
-      ...options
-    });
-    const result = {
-      hash: txData.hash,
-      tx: unpackTx(txData.rawTx),
-      txData,
-      rawTx: txData.rawTx
-    };
-    if (txData.blockHeight == null) return result;
+  async $getCallResultByTxHash(hash, fnName, options) {
     const {
       callInfo
-    } = await this.$options.onNode.getTransactionInfoByHash(txData.hash);
-    Object.assign(result.txData, callInfo); // TODO: don't duplicate data in result
-    // @ts-expect-error TODO api should be updated to match types
-    this._handleCallError(callInfo, tx);
+    } = await this.$options.onNode.getTransactionInfoByHash(hash);
+    if (callInfo == null) {
+      throw new ContractError(`callInfo is not available for transaction ${hash}`);
+    }
+    const callInfoTyped = callInfo;
     return {
-      ...result,
-      result: callInfo
+      ...Contract_classPrivateMethodGet(this, _getCallResult, _getCallResult2).call(this, callInfoTyped, fnName, undefined, options),
+      result: callInfoTyped
     };
   }
   async _estimateGas(name, params, options = {}) {
@@ -15660,8 +16048,9 @@ class Contract {
     if (opt.onAccount == null) throw new IllegalArgumentError('Can\'t deploy without account');
     const ownerId = opt.onAccount.address;
     if (this.$options.bytecode == null) throw new IllegalArgumentError('Can\'t deploy without bytecode');
-    const tx = await _buildTx(Tag.ContractCreateTx, {
+    const tx = await buildTxAsync({
       ...opt,
+      tag: Tag.ContractCreateTx,
       gasLimit: (_opt$gasLimit = opt.gasLimit) !== null && _opt$gasLimit !== void 0 ? _opt$gasLimit : await this._estimateGas('init', params, opt),
       callData: this._calldata.encode(this._name, 'init', params),
       code: this.$options.bytecode,
@@ -15671,7 +16060,7 @@ class Contract {
     const {
       hash,
       ...other
-    } = await this._sendAndProcess(tx, {
+    } = await Contract_classPrivateMethodGet(this, _sendAndProcess, _sendAndProcess2).call(this, tx, 'init', {
       ...opt,
       onAccount: opt.onAccount
     });
@@ -15691,16 +16080,6 @@ class Contract {
    * @param name - Function name
    * @returns function ACI
    */
-  _getFunctionACI(name) {
-    const fn = this._aci.encodedAci.contract.functions.find(f => f.name === name);
-    if (fn != null) {
-      return fn;
-    }
-    if (name === 'init') return {
-      payable: false
-    };
-    throw new NoSuchContractFunctionError(`Function ${name} doesn't exist in contract`);
-  }
 
   /**
    * Call contract function
@@ -15710,6 +16089,7 @@ class Contract {
    * @returns CallResult
    */
   async $call(fn, params, options = {}) {
+    var _opt$gasLimit2;
     const {
       callStatic,
       top,
@@ -15718,14 +16098,14 @@ class Contract {
       ...this.$options,
       ...options
     };
-    const fnACI = this._getFunctionACI(fn);
+    const fnAci = Contract_classPrivateMethodGet(this, _getFunctionAci, _getFunctionAci2).call(this, fn);
     const contractId = this.$options.address;
     const {
       onNode
     } = opt;
     if (fn == null) throw new MissingFunctionNameError();
     if (fn === 'init' && callStatic !== true) throw new InvalidMethodInvocationError('"init" can be called only via dryRun');
-    if (fn !== 'init' && opt.amount != null && opt.amount > 0 && fnACI.payable === false) {
+    if (fn !== 'init' && opt.amount != null && opt.amount > 0 && !fnAci.payable) {
       throw new NotPayableFunctionError(opt.amount, fn);
     }
     let callerId;
@@ -15738,7 +16118,6 @@ class Contract {
       callerId = DRY_RUN_ACCOUNT.pub;
     }
     const callData = this._calldata.encode(this._name, fn, params);
-    let res;
     if (callStatic === true) {
       if (opt.nonce == null && top != null) {
         const topKey = typeof top === 'number' ? 'height' : 'hash';
@@ -15755,15 +16134,17 @@ class Contract {
       let tx;
       if (fn === 'init') {
         if (this.$options.bytecode == null) throw new IllegalArgumentError('Can\'t dry-run "init" without bytecode');
-        tx = await _buildTx(Tag.ContractCreateTx, {
+        tx = await buildTxAsync({
           ...txOpt,
+          tag: Tag.ContractCreateTx,
           code: this.$options.bytecode,
           ownerId: callerId
         });
       } else {
         if (contractId == null) throw new MissingContractAddressError('Can\'t dry-run contract without address');
-        tx = await _buildTx(Tag.ContractCallTx, {
+        tx = await buildTxAsync({
           ...txOpt,
+          tag: Tag.ContractCallTx,
           callerId,
           contractId
         });
@@ -15775,38 +16156,35 @@ class Contract {
         ...opt,
         top
       });
-      if (callObj == null) throw new UnexpectedTsError();
-      this._handleCallError({
-        returnType: callObj.returnType,
-        returnValue: callObj.returnValue
-      }, tx);
-      res = {
+      if (callObj == null) {
+        throw new InternalError(`callObj is not available for transaction ${tx}`);
+      }
+      const callInfoTyped = callObj;
+      return {
         ...dryRunOther,
+        ...Contract_classPrivateMethodGet(this, _getCallResult, _getCallResult2).call(this, callInfoTyped, fn, tx, opt),
         tx: unpackTx(tx),
-        result: callObj
+        result: callInfoTyped,
+        rawTx: tx,
+        hash: buildTxHash(tx),
+        txData: undefined
       };
-    } else {
-      var _opt$gasLimit2;
-      if (top != null) throw new IllegalArgumentError('Can\'t handle `top` option in on-chain contract call');
-      if (contractId == null) throw new MissingContractAddressError('Can\'t call contract without address');
-      const tx = await _buildTx(Tag.ContractCallTx, {
-        ...opt,
-        gasLimit: (_opt$gasLimit2 = opt.gasLimit) !== null && _opt$gasLimit2 !== void 0 ? _opt$gasLimit2 : await this._estimateGas(fn, params, opt),
-        callerId,
-        contractId,
-        callData
-      });
-      if (opt.onAccount == null) throw new IllegalArgumentError('Can\'t call contract on chain without account');
-      res = await this._sendAndProcess(tx, {
-        ...opt,
-        onAccount: opt.onAccount
-      });
     }
-    if (callStatic === true || res.txData.blockHeight != null) {
-      res.decodedResult = fnACI.returns != null && fnACI.returns !== 'unit' && fn !== 'init' && this._calldata.decode(this._name, fn, res.result.returnValue);
-      res.decodedEvents = this.$decodeEvents(res.result.log, opt);
-    }
-    return res;
+    if (top != null) throw new IllegalArgumentError('Can\'t handle `top` option in on-chain contract call');
+    if (contractId == null) throw new MissingContractAddressError('Can\'t call contract without address');
+    const tx = await buildTxAsync({
+      ...opt,
+      tag: Tag.ContractCallTx,
+      gasLimit: (_opt$gasLimit2 = opt.gasLimit) !== null && _opt$gasLimit2 !== void 0 ? _opt$gasLimit2 : await this._estimateGas(fn, params, opt),
+      callerId,
+      contractId,
+      callData
+    });
+    if (opt.onAccount == null) throw new IllegalArgumentError('Can\'t call contract on chain without account');
+    return Contract_classPrivateMethodGet(this, _sendAndProcess, _sendAndProcess2).call(this, tx, fn, {
+      ...opt,
+      onAccount: opt.onAccount
+    });
   }
 
   /**
@@ -15817,31 +16195,6 @@ class Contract {
    * @throws {@link MissingEventDefinitionError}
    * @throws {@link AmbiguousEventDefinitionError}
    */
-  _getContractNameByEvent(ctAddress, nameHash, {
-    contractAddressToName
-  }) {
-    const addressToName = {
-      ...this.$options.contractAddressToName,
-      ...contractAddressToName
-    };
-    if (addressToName[ctAddress] != null) return addressToName[ctAddress];
-
-    // TODO: consider using a third-party library
-    const isEqual = (a, b) => JSON.stringify(a) === JSON.stringify(b);
-    const matchedEvents = [this._aci.encodedAci, ...this._aci.externalEncodedAci].filter(({
-      contract
-    }) => contract === null || contract === void 0 ? void 0 : contract.event).map(({
-      contract
-    }) => [contract.name, contract.event.variant]).map(([name, events]) => events.map(event => [name, Object.keys(event)[0], Object.values(event)[0]])).flat().filter(([, eventName]) => BigInt(`0x${hash(eventName).toString('hex')}`) === nameHash).filter(([,, type], idx, arr) => !arr.slice(0, idx).some(el => isEqual(el[2], type)));
-    switch (matchedEvents.length) {
-      case 0:
-        throw new MissingEventDefinitionError(nameHash.toString(), ctAddress);
-      case 1:
-        return matchedEvents[0][0];
-      default:
-        throw new AmbiguousEventDefinitionError(ctAddress, matchedEvents);
-    }
-  }
 
   /**
    * Decode Events
@@ -15857,7 +16210,7 @@ class Contract {
       const topics = event.topics.map(t => BigInt(t));
       let contractName;
       try {
-        contractName = this._getContractNameByEvent(event.address, topics[0], opt);
+        contractName = Contract_classPrivateMethodGet(this, _getContractNameByEvent, _getContractNameByEvent2).call(this, event.address, topics[0], opt);
       } catch (error) {
         if ((omitUnknown !== null && omitUnknown !== void 0 ? omitUnknown : false) && error instanceof MissingEventDefinitionError) return null;
         throw error;
@@ -15939,9 +16292,22 @@ class Contract {
     aci,
     ...otherOptions
   }) {
+    Contract_classPrivateMethodInitSpec(this, _getContractNameByEvent);
+    Contract_classPrivateMethodInitSpec(this, _getFunctionAci);
+    Contract_classPrivateMethodInitSpec(this, _sendAndProcess);
+    Contract_classPrivateMethodInitSpec(this, _getCallResult);
+    Contract_classPrivateFieldInitSpec(this, _aciContract, {
+      writable: true,
+      value: void 0
+    });
     this._aci = aci;
-    this._name = aci.encodedAci.contract.name;
-    this._calldata = new aepp_calldata_.Encoder([aci.encodedAci, ...aci.externalEncodedAci]);
+    const aciLast = aci[aci.length - 1];
+    if (aciLast.contract == null) {
+      throw new IllegalArgumentError(`The last 'aci' item should have 'contract' key, got ${Object.keys(aciLast)} keys instead`);
+    }
+    classPrivateFieldSet_default()(this, _aciContract, aciLast.contract);
+    this._name = classPrivateFieldGet_default()(this, _aciContract).name;
+    this._calldata = new aepp_calldata_.Encoder(aci);
     this.$options = otherOptions;
 
     /**
@@ -15958,7 +16324,7 @@ class Contract {
      * await contract.testFunction({ callStatic: false }) // send tx on-chain
      * ```
      */
-    Object.assign(this, Object.fromEntries(this._aci.encodedAci.contract.functions.map(({
+    Object.assign(this, Object.fromEntries(classPrivateFieldGet_default()(this, _aciContract).functions.map(({
       name,
       arguments: aciArgs,
       stateful
@@ -15979,27 +16345,89 @@ class Contract {
     })));
   }
 }
+function _getCallResult2({
+  returnType,
+  returnValue,
+  log
+}, fnName, transaction, options) {
+  let message;
+  switch (returnType) {
+    case 'ok':
+      {
+        const fnAci = Contract_classPrivateMethodGet(this, _getFunctionAci, _getFunctionAci2).call(this, fnName);
+        return {
+          decodedResult: this._calldata.decode(this._name, fnAci.name, returnValue),
+          decodedEvents: this.$decodeEvents(log, options)
+        };
+      }
+    case 'revert':
+      message = this._calldata.decodeFateString(returnValue);
+      break;
+    case 'error':
+      message = decode(returnValue).toString();
+      break;
+    default:
+      throw new InternalError(`Unknown return type: ${returnType}`);
+  }
+  throw new NodeInvocationError(message, transaction);
+}
+async function _sendAndProcess2(tx, fnName, options) {
+  const txData = await sendTransaction(tx, {
+    ...this.$options,
+    ...options
+  });
+  return {
+    hash: txData.hash,
+    tx: unpackTx(txData.rawTx),
+    txData,
+    rawTx: txData.rawTx,
+    ...(txData.blockHeight != null && (await this.$getCallResultByTxHash(txData.hash, fnName, options)))
+  };
+}
+function _getFunctionAci2(name) {
+  const fn = classPrivateFieldGet_default()(this, _aciContract).functions.find(f => f.name === name);
+  if (fn != null) {
+    return fn;
+  }
+  if (name === 'init') {
+    return {
+      arguments: [],
+      name: 'init',
+      payable: false,
+      returns: 'unit',
+      stateful: true
+    };
+  }
+  throw new NoSuchContractFunctionError(`Function ${name} doesn't exist in contract`);
+}
+function _getContractNameByEvent2(ctAddress, nameHash, {
+  contractAddressToName
+}) {
+  const addressToName = {
+    ...this.$options.contractAddressToName,
+    ...contractAddressToName
+  };
+  if (addressToName[ctAddress] != null) return addressToName[ctAddress];
+
+  // TODO: consider using a third-party library
+  const isEqual = (a, b) => JSON.stringify(a) === JSON.stringify(b);
+  const contracts = this._aci.map(({
+    contract
+  }) => contract).filter(contract => contract === null || contract === void 0 ? void 0 : contract.event);
+  const matchedEvents = contracts.map(contract => [contract.name, contract.event.variant]).map(([name, events]) => events.map(event => [name, Object.keys(event)[0], Object.values(event)[0]])).flat().filter(([, eventName]) => BigInt(`0x${hash(eventName).toString('hex')}`) === nameHash).filter(([,, type], idx, arr) => !arr.slice(0, idx).some(el => isEqual(el[2], type)));
+  switch (matchedEvents.length) {
+    case 0:
+      throw new MissingEventDefinitionError(nameHash.toString(), ctAddress);
+    case 1:
+      return matchedEvents[0][0];
+    default:
+      throw new AmbiguousEventDefinitionError(ctAddress, matchedEvents);
+  }
+}
 // eslint-disable-next-line @typescript-eslint/no-redeclare
 const ContractWithMethods = Contract;
 /* harmony default export */ const contract_Contract = (ContractWithMethods);
 ;// CONCATENATED MODULE: ./src/oracle.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
 /**
  * Oracle methods - routines to interact with the æternity oracle system
  *
@@ -16016,8 +16444,6 @@ const ContractWithMethods = Contract;
 
 
 
-
-
 /**
  * Poll for oracle queries
  * @category oracle
@@ -16041,10 +16467,10 @@ function pollForQueries(oracleId, onQuery, {
     const queries = ((_await$onNode$getOrac = (await onNode.getOracleQueriesByPubkey(oracleId)).oracleQueries) !== null && _await$onNode$getOrac !== void 0 ? _await$onNode$getOrac : []).filter(({
       id
     }) => !knownQueryIds.has(id));
-    queries.forEach(({
-      id
-    }) => knownQueryIds.add(id));
-    if (queries.length > 0) onQuery(queries);
+    queries.forEach(query => {
+      knownQueryIds.add(query.id);
+      onQuery(query);
+    });
   };
   let stopped = false;
 
@@ -16113,7 +16539,7 @@ async function getQueryObject(oracleId, queryId, options) {
     decodedResponse: decode(record.response).toString(),
     respond: async (response, opt) =>
     // eslint-disable-next-line @typescript-eslint/no-use-before-define
-    respondToQuery(oracleId, queryId, response, {
+    respondToQuery(queryId, response, {
       ...options,
       ...opt
     }),
@@ -16140,12 +16566,13 @@ async function postQueryToOracle(oracleId, query, options) {
   var _options$queryFee;
   (_options$queryFee = options.queryFee) !== null && _options$queryFee !== void 0 ? _options$queryFee : options.queryFee = (await options.onNode.getOracleByPubkey(oracleId)).queryFee.toString();
   const senderId = options.onAccount.address;
-  const oracleQueryTx = await _buildTx(Tag.OracleQueryTx, {
+  const oracleQueryTx = await buildTxAsync({
     queryTtlType: QUERY_TTL.type,
     queryTtlValue: QUERY_TTL.value,
     responseTtlType: RESPONSE_TTL.type,
     responseTtlValue: RESPONSE_TTL.value,
     ...options,
+    tag: Tag.OracleQueryTx,
     oracleId,
     senderId,
     query
@@ -16155,14 +16582,13 @@ async function postQueryToOracle(oracleId, query, options) {
   } = unpackTx(oracleQueryTx, Tag.OracleQueryTx);
   const queryId = oracleQueryId(senderId, nonce, oracleId);
   return {
-    ...(await send(oracleQueryTx, options)),
+    ...(await sendTransaction(oracleQueryTx, options)),
     ...(await getQueryObject(oracleId, queryId, options))
   };
 }
 /**
  * Extend oracle ttl
  * @category oracle
- * @param oracleId - Oracle public key
  * @param options - Options object
  * @param options.fee - fee Transaction fee
  * @param options.ttl - Transaction time to leave
@@ -16170,16 +16596,17 @@ async function postQueryToOracle(oracleId, query, options) {
  * @param options.oracleTtlValue - Oracle time to leave for extend
  * @returns Oracle object
  */
-async function extendOracleTtl(oracleId, options) {
-  const oracleExtendTx = await _buildTx(Tag.OracleExtendTx, {
+async function extendOracleTtl(options) {
+  const oracleId = encode(decode(options.onAccount.address), Encoding.OracleAddress);
+  const oracleExtendTx = await buildTxAsync({
     oracleTtlType: ORACLE_TTL.type,
     oracleTtlValue: ORACLE_TTL.value,
     ...options,
-    callerId: options.onAccount.address,
+    tag: Tag.OracleExtendTx,
     oracleId
   });
   return {
-    ...(await send(oracleExtendTx, options)),
+    ...(await sendTransaction(oracleExtendTx, options)),
     // eslint-disable-next-line @typescript-eslint/no-use-before-define
     ...(await getOracleObject(oracleId, options))
   };
@@ -16187,7 +16614,6 @@ async function extendOracleTtl(oracleId, options) {
 /**
  * Extend oracle ttl
  * @category oracle
- * @param oracleId - Oracle public key
  * @param queryId - Oracle query id
  * @param response - Oracle query response
  * @param options - Options object
@@ -16196,18 +16622,19 @@ async function extendOracleTtl(oracleId, options) {
  * @param options.ttl - Transaction time to leave
  * @returns Oracle object
  */
-async function respondToQuery(oracleId, queryId, response, options) {
-  const oracleRespondTx = await _buildTx(Tag.OracleResponseTx, {
+async function respondToQuery(queryId, response, options) {
+  const oracleId = encode(decode(options.onAccount.address), Encoding.OracleAddress);
+  const oracleRespondTx = await buildTxAsync({
     responseTtlType: RESPONSE_TTL.type,
     responseTtlValue: RESPONSE_TTL.value,
     ...options,
-    callerId: options.onAccount.address,
+    tag: Tag.OracleResponseTx,
     oracleId,
     queryId,
     response
   });
   return {
-    ...(await send(oracleRespondTx, options)),
+    ...(await sendTransaction(oracleRespondTx, options)),
     // eslint-disable-next-line @typescript-eslint/no-use-before-define
     ...(await getOracleObject(oracleId, options))
   };
@@ -16237,7 +16664,7 @@ async function getOracleObject(oracleId, options) {
           ...lastArg
         });
       } else args.push(options);
-      return handler(oracleId, ...args);
+      return handler(...(['extendOracle', 'respondToQuery'].includes(name) ? [] : [oracleId]), ...args);
     }])
   };
 }
@@ -16254,40 +16681,106 @@ async function getOracleObject(oracleId, options) {
  * @param options.ttl - Transaction time to leave
  * @returns Oracle object
  */
-async function registerOracle(queryFormat, responseFormat, options) {
-  const accountId = options.onAccount.address;
-  const oracleRegisterTx = await _buildTx(Tag.OracleRegisterTx, {
-    queryFee: QUERY_FEE,
-    oracleTtlValue: ORACLE_TTL.value,
-    oracleTtlType: ORACLE_TTL.type,
+async function registerOracle(queryFormat, responseFormat, options) {
+  const accountId = options.onAccount.address;
+  const oracleRegisterTx = await buildTxAsync({
+    oracleTtlValue: ORACLE_TTL.value,
+    oracleTtlType: ORACLE_TTL.type,
+    ...options,
+    tag: Tag.OracleRegisterTx,
+    accountId,
+    queryFormat,
+    responseFormat
+  });
+  return {
+    ...(await sendTransaction(oracleRegisterTx, options)),
+    ...(await getOracleObject(encode(decode(accountId), Encoding.OracleAddress), options))
+  };
+}
+;// CONCATENATED MODULE: ./src/spend.ts
+
+
+
+
+
+/**
+ * Send coins to another account
+ * @category chain
+ * @param amount - Amount to spend
+ * @param recipientIdOrName - Address or name of recipient account
+ * @param options - Options
+ * @returns Transaction
+ */
+async function spend(amount, recipientIdOrName, options) {
+  return sendTransaction(await buildTxAsync({
+    ...options,
+    tag: Tag.SpendTx,
+    senderId: options.onAccount.address,
+    recipientId: await resolveName(recipientIdOrName, 'account_pubkey', options),
+    amount
+  }), options);
+}
+// TODO: Rename to spendFraction
+/**
+ * Spend a fraction of coin balance to another account. Useful if needed to drain account balance
+ * completely, sending funds to another account (with fraction set to 1).
+ * @category chain
+ * @param fraction - Fraction of balance to spend (between 0 and 1)
+ * @param recipientIdOrName - Address or name of recipient account
+ * @param options - Options
+ * @example
+ * ```js
+ * // `fraction` * 100 = % of AE to be transferred (e.g. `0.42` for 42% or `1` for 100%)
+ * const { blockHeight } = await aeSdk.transferFunds(
+ *   0.42,
+ *   'ak_21A27UVVt3hDkBE5J7rhhqnH5YNb4Y1dqo4PnSybrH85pnWo7E',
+ * );
+ * console.log('Transaction mined at', blockHeight);
+ * ```
+ */
+async function transferFunds(fraction, recipientIdOrName, options) {
+  if (fraction < 0 || fraction > 1) {
+    throw new ArgumentError('fraction', 'a number between 0 and 1', fraction);
+  }
+  const recipientId = await resolveName(recipientIdOrName, 'account_pubkey', options);
+  const senderId = options.onAccount.address;
+  const balance = new (external_bignumber_js_default())(await getBalance.bind(options.onAccount)(senderId, options));
+  const desiredAmount = balance.times(fraction).integerValue((external_bignumber_js_default()).ROUND_HALF_UP);
+  const {
+    fee
+  } = unpackTx(await buildTxAsync({
+    ...options,
+    tag: Tag.SpendTx,
+    senderId,
+    recipientId,
+    amount: desiredAmount
+  }), Tag.SpendTx);
+  // Reducing of the amount may reduce transaction fee, so this is not completely accurate
+  const amount = desiredAmount.plus(fee).gt(balance) ? balance.minus(fee) : desiredAmount;
+  return sendTransaction(await buildTxAsync({
+    ...options,
+    tag: Tag.SpendTx,
+    senderId,
+    recipientId,
+    amount
+  }), options);
+}
+/**
+ * Submit transaction of another account paying for it (fee and gas)
+ * @category chain
+ * @param transaction - tx_<base64>-encoded transaction
+ * @param options - Options
+ * @returns Object Transaction
+ */
+async function payForTransaction(transaction, options) {
+  return sendTransaction(await buildTxAsync({
     ...options,
-    accountId,
-    queryFormat,
-    responseFormat
-  });
-  return {
-    ...(await send(oracleRegisterTx, options)),
-    ...(await getOracleObject(encode(decode(accountId), Encoding.OracleAddress), options))
-  };
+    tag: Tag.PayingForTx,
+    payerId: options.onAccount.address,
+    tx: transaction
+  }), options);
 }
 ;// CONCATENATED MODULE: ./src/contract/ga.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
 /**
  * Generalized Account module - routines to use generalized account
  */
@@ -16300,8 +16793,6 @@ async function registerOracle(queryFormat, responseFormat, options) {
 
 
 
-
-
 /**
  * Convert current account to GA
  * @category contract
@@ -16339,8 +16830,9 @@ async function createGeneralizedAccount(authFnName, args, {
     sourceCode,
     fileSystem
   });
-  const tx = await _buildTx(Tag.GaAttachTx, {
+  const tx = await buildTxAsync({
     ...options,
+    tag: Tag.GaAttachTx,
     onNode,
     code: await contract.$compile(),
     gasLimit: (_options$gasLimit = options.gasLimit) !== null && _options$gasLimit !== void 0 ? _options$gasLimit : await contract._estimateGas('init', args, options),
@@ -16352,7 +16844,7 @@ async function createGeneralizedAccount(authFnName, args, {
   const {
     hash: transaction,
     rawTx
-  } = await send(tx, {
+  } = await sendTransaction(tx, {
     onNode,
     onAccount,
     onCompiler,
@@ -16366,21 +16858,103 @@ async function createGeneralizedAccount(authFnName, args, {
   });
 }
 /**
- * Build a transaction hash the same as `Auth.tx_hash`
+ * Build a transaction hash the same as `Auth.tx_hash` by GaMetaTx payload
  * @category contract
  * @param transaction - tx-encoded transaction
  * @param options - Options
+ * @param options.fee - GaMetaTx fee, required in Ceres
+ * @param options.gasPrice - GaMetaTx gasPrice, required in Ceres
  * @param options.onNode - Node to use
  * @returns Transaction hash
  */
 async function buildAuthTxHash(transaction, {
+  fee,
+  gasPrice,
+  onNode
+}) {
+  const {
+    nodeNetworkId,
+    consensusProtocolVersion
+  } = await onNode.getNodeInfo();
+  let payload = hash(concatBuffers([Buffer.from(nodeNetworkId), decode(transaction)]));
+  if (consensusProtocolVersion === ConsensusProtocolVersion.Ceres) {
+    if (fee == null) throw new ArgumentError('fee', 'provided (in Ceres)', fee);
+    if (gasPrice == null) throw new ArgumentError('gasPrice', 'provided (in Ceres)', gasPrice);
+    payload = hash(decode(buildTx({
+      tag: Tag.GaMetaTxAuthData,
+      fee,
+      gasPrice,
+      txHash: encode(payload, Encoding.TxHash)
+    })));
+  }
+  return payload;
+}
+
+/**
+ * Build a transaction hash the same as `Auth.tx_hash` by GaMetaTx
+ * @category contract
+ * @param transaction - tx-encoded signed GaMeta transaction
+ * @param options - Options
+ * @param options.onNode - Node to use
+ * @returns Transaction hash
+ */
+async function buildAuthTxHashByGaMetaTx(transaction, {
   onNode
 }) {
-  return new Uint8Array(hash(concatBuffers([Buffer.from(await onNode.getNetworkId()), decode(transaction)])));
+  const txParams = unpackTx(transaction, Tag.SignedTx);
+  if (txParams.encodedTx.tag !== Tag.GaMetaTx) {
+    throw new ArgumentError('transaction', 'to include GaMetaTx', Tag[txParams.encodedTx.tag]);
+  }
+  return buildAuthTxHash(buildTx(txParams.encodedTx.tx.encodedTx), {
+    fee: txParams.encodedTx.fee,
+    gasPrice: txParams.encodedTx.gasPrice,
+    onNode
+  });
 }
 // EXTERNAL MODULE: ./node_modules/@babel/runtime-corejs3/helpers/defineProperty.js
 var defineProperty = __webpack_require__(1125);
 var defineProperty_default = /*#__PURE__*/__webpack_require__.n(defineProperty);
+;// CONCATENATED MODULE: ./src/contract/delegation-signature.ts
+
+
+
+/**
+ * Helper to generate a signature to delegate
+ *  - pre-claim/claim/transfer/revoke of a name to a contract.
+ *  - register/extend/respond of an Oracle to a contract.
+ * @category contract
+ * @param contractAddress - Address of contract to delegate access
+ * @param ids - The list of id's to prepend
+ * @param options - Options
+ * @param options.omitAddress - Prepend delegation signature with an account address
+ * @param options.onAccount - Account to use
+ * @param options.onNode - Node to use
+ * @returns Signature
+ * @example
+ * ```js
+ * const aeSdk = new AeSdk({ ... })
+ * const contractAddress = 'ct_asd2ks...'
+ * const aensName = 'example.chain'
+ * const onAccount = new MemoryAccount(...) // Sign with a specific account
+ * // Preclaim signature
+ * const preclaimSig = await aeSdk.createDelegationSignature(contractAddress, [], { onAccount })
+ * // Claim, transfer and revoke signature
+ * const aensDelegationSig = await aeSdk
+ *   .createDelegationSignature(contractAddress, [aensName], { onAccount })
+ *
+ * const oracleQueryId = 'oq_...'
+ * const onAccount = new MemoryAccount(...) // Sign with a specific account
+ * // Oracle register and extend signature
+ * const oracleDelegationSig = await aeSdk
+ *   .createDelegationSignature(contractAddress, [], { onAccount })
+ * // Oracle respond signature
+ * const respondSig = await aeSdk
+ *   .createDelegationSignature(contractAddress, [oracleQueryId], { onAccount, omitAddress: true })
+ * ```
+ */
+async function createDelegationSignature(contractAddress, ids, options) {
+  return options.onAccount.sign(concatBuffers([Buffer.from(await options.onNode.getNetworkId()), ...(options.omitAddress === true ? [] : [decode(options.onAccount.address)]), ...ids.map(e => isNameValid(e) ? produceNameId(e) : e).map(e => decode(e)), decode(contractAddress)]), options);
+}
 ;// CONCATENATED MODULE: ./src/AeSdkMethods.ts
 
 
@@ -16417,6 +16991,7 @@ const methods = {
   ...aens_namespaceObject,
   ...spend_namespaceObject,
   ...oracle_namespaceObject,
+  createDelegationSignature: createDelegationSignature,
   ...ga_namespaceObject
 };
 /**
@@ -16437,9 +17012,7 @@ class AeSdkMethods {
    * @param options - Options
    */
   constructor(options = {}) {
-    defineProperty_default()(this, "_options", {
-      denomination: AE_AMOUNT_FORMATS.AETTOS
-    });
+    defineProperty_default()(this, "_options", {});
     Object.assign(this._options, options);
   }
 
@@ -16459,9 +17032,8 @@ class AeSdkMethods {
       onAccount: getValueOrErrorProxy(() => this._resolveAccount())
     };
   }
-  async buildTx(txType, options) {
-    // @ts-expect-error TODO: need to figure out what's wrong here
-    return _buildTx(txType, {
+  async buildTx(options) {
+    return buildTxAsync({
       ...this._getOptions(),
       ...options
     });
@@ -16718,29 +17290,6 @@ class AeSdk extends AeSdkBase {
     this.selectedAddress = address;
   }
 }
-;// CONCATENATED MODULE: ./src/account/Base.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
-/**
- * Account is one of the three basic building blocks of an
- * {@link AeSdk} and provides access to a signing key pair.
- */
-class AccountBase {}
 ;// CONCATENATED MODULE: ./src/aepp-wallet-communication/schema.ts
 
 // eslint-disable-next-line max-classes-per-file
@@ -17025,6 +17574,10 @@ var _processResponse = /*#__PURE__*/new WeakSet();
  */
 class RpcClient {
   constructor(connection, onDisconnect, methods) {
+    /**
+     * Process response message
+     * @param msg - Message object
+     */
     RpcClient_classPrivateMethodInitSpec(this, _processResponse);
     RpcClient_classPrivateMethodInitSpec(this, _sendResponse);
     RpcClient_classPrivateMethodInitSpec(this, _sendRequest);
@@ -17069,11 +17622,6 @@ class RpcClient {
   notify(name, params) {
     RpcClient_classPrivateMethodGet(this, _sendRequest, _sendRequest2).call(this, undefined, name, params);
   }
-
-  /**
-   * Process response message
-   * @param msg - Message object
-   */
 }
 async function _handleMessage2(msg, origin) {
   if ((msg === null || msg === void 0 ? void 0 : msg.jsonrpc) !== '2.0') throw new InvalidRpcMessageError(JSON.stringify(msg));
@@ -17506,7 +18054,7 @@ class AeSdkWallet extends AeSdk {
           }
           try {
             return json_big.parse(json_big.stringify({
-              transactionHash: await this.send(tx, {
+              transactionHash: await this.sendTransaction(tx, {
                 ...parameters,
                 verify: false
               })
@@ -17578,105 +18126,11 @@ class AeSdkWallet extends AeSdk {
     };
   }
 }
-;// CONCATENATED MODULE: ./src/account/Memory.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
-
-
-
-
-
-
-const secretKeys = new WeakMap();
-
-/**
- * In-memory account class
- */
-class AccountMemory extends AccountBase {
-  /**
-   * @param secretKey - Secret key
-   */
-  constructor(secretKey) {
-    super();
-    secretKey = typeof secretKey === 'string' ? Buffer.from(secretKey, 'hex') : secretKey;
-    if (secretKey.length !== 64) {
-      throw new ArgumentError('secretKey', '64 bytes', secretKey.length);
-    }
-    secretKeys.set(this, secretKey);
-    this.address = encode(generateKeyPairFromSecret(secretKeys.get(this)).publicKey, Encoding.AccountAddress);
-  }
-
-  /**
-   * Generates a new AccountMemory using a random secret key
-   */
-  static generate() {
-    return new AccountMemory(generateKeyPair().secretKey);
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async sign(data, options) {
-    return sign(data, secretKeys.get(this));
-  }
-  async signTransaction(tx, {
-    innerTx,
-    networkId,
-    ...options
-  } = {}) {
-    if (networkId == null) {
-      throw new ArgumentError('networkId', 'provided', networkId);
-    }
-    const prefixes = [networkId];
-    if (innerTx === true) prefixes.push('inner_tx');
-    const rlpBinaryTx = decode(tx);
-    const txWithNetworkId = concatBuffers([Buffer.from(prefixes.join('-')), hash(rlpBinaryTx)]);
-    const signatures = [await this.sign(txWithNetworkId, options)];
-    return buildTx({
-      tag: Tag.SignedTx,
-      encodedTx: rlpBinaryTx,
-      signatures
-    });
-  }
-  async signMessage(message, options) {
-    return this.sign(messageToHash(message), options);
-  }
-}
 ;// CONCATENATED MODULE: ./src/account/Generalized.ts
 
 
 function Generalized_classPrivateFieldInitSpec(obj, privateMap, value) { Generalized_checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
 function Generalized_checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
 
 
 
@@ -17724,8 +18178,10 @@ class AccountGeneralized extends AccountBase {
       callData,
       sourceCode,
       args,
-      gasLimit
-    } = authData;
+      fee,
+      gasLimit,
+      gasPrice
+    } = typeof authData === 'function' ? await authData(tx) : authData;
     const authCallData = callData !== null && callData !== void 0 ? callData : await (async () => {
       if (classPrivateFieldGet_default()(this, _authFun) == null) {
         const account = await getAccount(this.address, {
@@ -17749,16 +18205,18 @@ class AccountGeneralized extends AccountBase {
       });
       return contract._calldata.encode(contract._name, classPrivateFieldGet_default()(this, _authFun), args);
     })();
-    const gaMetaTx = await _buildTx(Tag.GaMetaTx, {
-      tx: decode(buildTx({
+    const gaMetaTx = await buildTxAsync({
+      tag: Tag.GaMetaTx,
+      tx: {
         tag: Tag.SignedTx,
         encodedTx: decode(tx),
         signatures: []
-      })),
+      },
       gaId: this.address,
       authData: authCallData,
+      fee,
       gasLimit,
-      nonce: 0,
+      gasPrice,
       onNode
     });
     return buildTx({
@@ -18099,10 +18557,10 @@ const ErrorPos = {
     }
   }
 };
-const mappers_ByteCode = {
+const CompileResult = {
   type: {
     name: "Composite",
-    className: "ByteCode",
+    className: "CompileResult",
     modelProperties: {
       bytecode: {
         serializedName: "bytecode",
@@ -18110,6 +18568,23 @@ const mappers_ByteCode = {
         type: {
           name: "String"
         }
+      },
+      aci: {
+        serializedName: "aci",
+        required: true,
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Dictionary",
+              value: {
+                type: {
+                  name: "any"
+                }
+              }
+            }
+          }
+        }
       }
     }
   }
@@ -18583,7 +19058,6 @@ const body7 = {
 
 
 
-
 class Compiler extends core_client_.ServiceClient {
   /**
    * Initializes a new instance of the Compiler class.
@@ -18591,7 +19065,7 @@ class Compiler extends core_client_.ServiceClient {
    * @param options The parameter options
    */
   constructor($host, options) {
-    var _ref, _options$endpoint, _options;
+    var _ref, _options$endpoint;
     if ($host === undefined) {
       throw new Error("'$host' cannot be null");
     }
@@ -18611,24 +19085,9 @@ class Compiler extends core_client_.ServiceClient {
       userAgentOptions: {
         userAgentPrefix
       },
-      baseUri: (_ref = (_options$endpoint = options.endpoint) !== null && _options$endpoint !== void 0 ? _options$endpoint : options.baseUri) !== null && _ref !== void 0 ? _ref : "{$host}"
+      endpoint: (_ref = (_options$endpoint = options.endpoint) !== null && _options$endpoint !== void 0 ? _options$endpoint : options.baseUri) !== null && _ref !== void 0 ? _ref : "{$host}"
     };
     super(optionsWithDefaults);
-    if ((_options = options) !== null && _options !== void 0 && _options.pipeline && options.pipeline.getOrderedPolicies().length > 0) {
-      const pipelinePolicies = options.pipeline.getOrderedPolicies();
-      const bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(pipelinePolicy => pipelinePolicy.name === core_rest_pipeline_.bearerTokenAuthenticationPolicyName);
-      if (!bearerTokenAuthenticationPolicyFound) {
-        this.pipeline.removePolicy({
-          name: core_rest_pipeline_.bearerTokenAuthenticationPolicyName
-        });
-        this.pipeline.addPolicy(core_rest_pipeline_.bearerTokenAuthenticationPolicy({
-          scopes: `${optionsWithDefaults.baseUri}/.default`,
-          challengeCallbacks: {
-            authorizeRequestOnChallenge: core_client_.authorizeRequestOnClaimChallenge
-          }
-        }));
-      }
-    }
     // Parameter assignments
     this.$host = $host;
   }
@@ -18646,7 +19105,7 @@ class Compiler extends core_client_.ServiceClient {
   }
 
   /**
-   * Compile a sophia contract from source and return byte code
+   * Compile a sophia contract from source and return byte code and ACI
    * @param body contract code
    * @param options The options parameters.
    */
@@ -18818,7 +19277,7 @@ const compileContractOperationSpec = {
   httpMethod: "POST",
   responses: {
     200: {
-      bodyMapper: mappers_ByteCode
+      bodyMapper: CompileResult
     },
     400: {
       bodyMapper: {
@@ -19095,22 +19554,6 @@ const apiOperationSpec = {
   serializer: compiler_serializer
 };
 ;// CONCATENATED MODULE: ./src/contract/compiler/Http.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
 
 
 
@@ -19143,7 +19586,7 @@ class CompilerHttp extends CompilerBase {
           }${body.info != null ? ` (${JSON.stringify(body.info)})` : ''}`;
         }
         if (Array.isArray(body)) {
-          message += `\n${body.map(e => `${e.type}:${e.pos.line}:${e.pos.col}: ${e.message}${e.context != null ? `(${e.context})` : ''}`).join('\n')}`;
+          message += `\n${body.map(e => `${e.type}:${e.pos.line}:${e.pos.col}: ${e.message}${e.context != null ? ` (${e.context})` : ''}`).join('\n')}`;
         }
         return message;
       })]
@@ -19151,28 +19594,20 @@ class CompilerHttp extends CompilerBase {
     if (ignoreVersion !== true) {
       const versionPromise = this.api.apiVersion().then(({
         apiVersion
-      }) => apiVersion);
-      this.api.pipeline.addPolicy(genVersionCheckPolicy('compiler', '/api-version', versionPromise, '7.0.1', '8.0.0'));
+      }) => apiVersion, error => error);
+      this.api.pipeline.addPolicy(genVersionCheckPolicy('compiler', '/api-version', versionPromise, '7.1.1', '8.0.0'));
     }
   }
   async compileBySourceCode(sourceCode, fileSystem) {
     try {
-      const [bytecode, aci] = await Promise.all([this.api.compileContract({
-        code: sourceCode,
-        options: {
-          fileSystem
-        }
-      }).then(res => res.bytecode), this.api.generateACI({
+      const res = await this.api.compileContract({
         code: sourceCode,
         options: {
           fileSystem
         }
-      })]);
+      });
       // TODO: should be fixed when the compiledAci interface gets updated
-      return {
-        bytecode,
-        aci: aci
-      };
+      return res;
     } catch (error) {
       if (error instanceof core_rest_pipeline_.RestError && error.statusCode === 400) {
         throw new CompilerError(error.message.replace(/^aci error:/, 'compile error:'));
@@ -19209,23 +19644,6 @@ class CompilerHttp extends CompilerBase {
   }
 }
 ;// CONCATENATED MODULE: ./src/utils/string.ts
-/*
- * ISC License (ISC)
- * Copyright 2018 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
 /**
  * Convert string from snake_case to PascalCase
  * @param s - String to convert
@@ -19246,22 +19664,7 @@ function pascalToSnake(s) {
 // EXTERNAL MODULE: external "websocket"
 var external_websocket_ = __webpack_require__(8079);
 ;// CONCATENATED MODULE: ./src/channel/internal.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2018 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
+
 
 
 
@@ -19299,7 +19702,7 @@ function changeState(channel, newState) {
   channel._state = newState;
   emit(channel, 'stateChanged', newState);
 }
-function internal_send(channel, message) {
+function send(channel, message) {
   if (channel._options.debug) console.log('Send message: ', message);
   channel._websocket.send(json_big.stringify({
     jsonrpc: '2.0',
@@ -19307,7 +19710,7 @@ function internal_send(channel, message) {
   }));
 }
 function notify(channel, method, params = {}) {
-  internal_send(channel, {
+  send(channel, {
     method,
     params
   });
@@ -19345,11 +19748,23 @@ async function enqueueAction(channel, guard, action) {
   return promise;
 }
 async function handleMessage(channel, message) {
+  var _message$params, _message$params$data, _message$params$data$, _message$params$data$2;
   const {
     handler,
     state: st
   } = channel._fsm;
-  enterState(channel, await Promise.resolve(handler(channel, message, st)));
+  const nextState = await Promise.resolve(handler(channel, message, st));
+  enterState(channel, nextState);
+  // TODO: emit message and handler name (?) to move this code to Contract constructor
+  if ((message === null || message === void 0 ? void 0 : (_message$params = message.params) === null || _message$params === void 0 ? void 0 : (_message$params$data = _message$params.data) === null || _message$params$data === void 0 ? void 0 : (_message$params$data$ = _message$params$data.updates) === null || _message$params$data$ === void 0 ? void 0 : (_message$params$data$2 = _message$params$data$[0]) === null || _message$params$data$2 === void 0 ? void 0 : _message$params$data$2.op) === 'OffChainNewContract'
+  // if name is channelOpen, the contract was created by other participant
+  && (nextState === null || nextState === void 0 ? void 0 : nextState.handler.name) === 'channelOpen') {
+    var _message$params2, _message$params2$data, _message$params2$data2, _message$params2$data3;
+    const round = channel.round();
+    if (round == null) throw new UnexpectedTsError('Round is null');
+    const owner = message === null || message === void 0 ? void 0 : (_message$params2 = message.params) === null || _message$params2 === void 0 ? void 0 : (_message$params2$data = _message$params2.data) === null || _message$params2$data === void 0 ? void 0 : (_message$params2$data2 = _message$params2$data.updates) === null || _message$params2$data2 === void 0 ? void 0 : (_message$params2$data3 = _message$params2$data2[0]) === null || _message$params2$data3 === void 0 ? void 0 : _message$params2$data3.owner;
+    emit(channel, 'newContract', encodeContractAddress(owner, round + 1));
+  }
 }
 async function dequeueMessage(channel) {
   if (channel._isMessageQueueLocked) return;
@@ -19421,7 +19836,7 @@ async function call(channel, method, params) {
         reject(new ChannelCallError(message.error.message + details));
       } else resolve(message.result);
     });
-    internal_send(channel, {
+    send(channel, {
       method,
       id,
       params
@@ -19457,7 +19872,10 @@ async function initialize(channel, connectionHandler, openHandler, {
           const {
             signedTx
           } = await channel.state();
-          changeState(channel, signedTx);
+          if (signedTx == null) {
+            throw new ChannelError('`signedTx` missed in state while reconnection');
+          }
+          changeState(channel, buildTx(signedTx));
         }
         ping(channel);
       },
@@ -19472,22 +19890,6 @@ async function initialize(channel, connectionHandler, openHandler, {
   });
 }
 ;// CONCATENATED MODULE: ./src/channel/handlers.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2018 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
 /* eslint-disable consistent-return */
 /* eslint-disable default-case */
 /* eslint-disable @typescript-eslint/no-use-before-define */
@@ -19496,6 +19898,7 @@ async function initialize(channel, connectionHandler, openHandler, {
 
 
 
+
 async function appendSignature(tx, signFn) {
   const {
     signatures,
@@ -19615,7 +20018,10 @@ async function awaitingReconnection(channel, message, state) {
   if (message.method === 'channels.info') {
     if (message.params.data.event === 'fsm_up') {
       channel._fsmId = message.params.data.fsm_id;
-      changeState(channel, (await channel.state()).signedTx);
+      const {
+        signedTx
+      } = await channel.state();
+      changeState(channel, signedTx == null ? '' : buildTx(signedTx));
       return {
         handler: channelOpen
       };
@@ -19714,7 +20120,7 @@ async function channelOpen(channel, message, state) {
           //
           //       We should enter intermediate state where offchain transactions
           //       are blocked until channel is reestablished.
-          emit(channel, message.params.data.event);
+          emit(channel, snakeToPascal(message.params.data.event));
           return {
             handler: channelOpen
           };
@@ -19870,22 +20276,6 @@ function channelClosed(_channel, message, state) {
 var external_events_ = __webpack_require__(3735);
 ;// CONCATENATED MODULE: ./src/channel/Base.ts
 
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
 
 
 
@@ -19899,6 +20289,7 @@ function snakeToPascalObjKeys(obj) {
     [snakeToPascal(key)]: val
   }), {});
 }
+
 /**
  * Channel
  * @example
@@ -19930,6 +20321,7 @@ class Base_Channel {
     defineProperty_default()(this, "_actionQueue", []);
     defineProperty_default()(this, "_isActionQueueLocked", false);
     defineProperty_default()(this, "_status", 'disconnected');
+    defineProperty_default()(this, "_state", '');
   }
   /**
    * @param options - Channel params
@@ -19995,18 +20387,22 @@ class Base_Channel {
    * Possible events:
    *
    *   - "error"
+   *   - "stateChanged"
+   *   - "statusChanged"
+   *   - "message"
+   *   - "peerDisconnected"
    *   - "onChainTx"
    *   - "ownWithdrawLocked"
    *   - "withdrawLocked"
    *   - "ownDepositLocked"
    *   - "depositLocked"
+   *   - "channelReestablished"
+   *   - "newContract"
    *
-   * TODO: the event list looks outdated
    *
    * @param eventName - Event name
    * @param callback - Callback function
    */
-  // TODO define specific callback type depending on the event name
   on(eventName, callback) {
     this._eventEmitter.on(eventName, callback);
   }
@@ -20038,7 +20434,17 @@ class Base_Channel {
    * Get current state
    */
   async state() {
-    return snakeToPascalObjKeys(await call(this, 'channels.get.offchain_state', {}));
+    const res = snakeToPascalObjKeys(await call(this, 'channels.get.offchain_state', {}));
+    return {
+      calls: unpackTx(res.calls, Tag.CallsMtree),
+      ...(res.halfSignedTx !== '' && {
+        halfSignedTx: unpackTx(res.halfSignedTx, Tag.SignedTx)
+      }),
+      ...(res.signedTx !== '' && {
+        signedTx: unpackTx(res.signedTx, Tag.SignedTx)
+      }),
+      trees: unpackTx(res.trees, Tag.StateTrees)
+    };
   }
 
   /**
@@ -20048,20 +20454,17 @@ class Base_Channel {
    * it will return `null`.
    */
   round() {
-    if (this._state == null) {
+    if (this._state === '') {
       return null;
     }
-    const {
-      tag,
-      round
-    } = unpackTx(this._state, Tag.SignedTx).encodedTx;
-    switch (tag) {
+    const params = unpackTx(this._state, Tag.SignedTx).encodedTx;
+    switch (params.tag) {
       case Tag.ChannelCreateTx:
         return 1;
       case Tag.ChannelOffChainTx:
       case Tag.ChannelWithdrawTx:
       case Tag.ChannelDepositTx:
-        return round;
+        return params.round;
       default:
         return null;
     }
@@ -20156,23 +20559,6 @@ class Base_Channel {
   }
 }
 ;// CONCATENATED MODULE: ./src/channel/Spend.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
 
 
 
@@ -20538,23 +20924,6 @@ class ChannelSpend extends Base_Channel {
   }
 }
 ;// CONCATENATED MODULE: ./src/channel/Contract.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
 
 
 
@@ -20632,15 +21001,18 @@ class ChannelContract extends ChannelSpend {
           await signAndNotify(this, 'channels.update', message.params.data, async tx => state.sign(tx));
           return {
             handler: (_2, message2, state2) => awaitingCompletion(this, message2, state2, () => {
-              const {
-                round
-              } = unpackTx(message2.params.data.state, Tag.SignedTx).encodedTx;
+              const params = unpackTx(message2.params.data.state, Tag.SignedTx).encodedTx;
+              if (params.tag !== Tag.ChannelOffChainTx) {
+                throw new ChannelError(`Tag should be ${Tag[Tag.ChannelOffChainTx]}, got ${Tag[params.tag]} instead`);
+              }
               const addressKey = this._options.role === 'initiator' ? 'initiatorId' : 'responderId';
               const owner = this._options[addressKey];
               changeState(this, message2.params.data.state);
+              const address = encodeContractAddress(owner, params.round);
+              emit(this, 'newContract', address);
               state2.resolve({
                 accepted: true,
-                address: encodeContractAddress(owner, round),
+                address,
                 signedTx: message2.params.data.state
               });
               return {
@@ -20950,23 +21322,6 @@ class ChannelContract extends ChannelSpend {
   }
 }
 ;// CONCATENATED MODULE: ./src/aepp-wallet-communication/connection-proxy.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
 /**
  * Browser connection proxy
  * Provide functionality to easily forward messages from one connection to another and back
@@ -20984,23 +21339,6 @@ class ChannelContract extends ChannelSpend {
   };
 });
 ;// CONCATENATED MODULE: ./src/aepp-wallet-communication/connection/Browser.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
 
 
 /**
@@ -21058,23 +21396,6 @@ class BrowserConnection {
 
 function BrowserWindowMessage_classPrivateFieldInitSpec(obj, privateMap, value) { BrowserWindowMessage_checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
 function BrowserWindowMessage_checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
 
 
 
@@ -21169,23 +21490,6 @@ class BrowserWindowMessageConnection extends BrowserConnection {
   }
 }
 ;// CONCATENATED MODULE: ./src/aepp-wallet-communication/wallet-detector.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
 
 
 
@@ -21232,23 +21536,6 @@ class BrowserWindowMessageConnection extends BrowserConnection {
 
 function BrowserRuntime_classPrivateFieldInitSpec(obj, privateMap, value) { BrowserRuntime_checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
 function BrowserRuntime_checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
 
 
 
@@ -21298,22 +21585,7 @@ class BrowserRuntimeConnection extends BrowserConnection {
   }
 }
 ;// CONCATENATED MODULE: ./src/index-browser.ts
-/*
- * ISC License (ISC)
- * Copyright (c) 2022 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
+// TODO: avoid `export * from`
 
 
 
@@ -21321,6 +21593,7 @@ class BrowserRuntimeConnection extends BrowserConnection {
 
 
 
+// TODO: move to constants
 
 
 
@@ -21418,21 +21691,15 @@ class CompilerCli extends CompilerBase {
   }
   async compile(path) {
     await classPrivateFieldGet_default()(this, _ensureCompatibleVersion);
-    let bytecode;
-    let aciCli;
     try {
-      [bytecode, aciCli] = await Promise.all([Cli_classPrivateMethodGet(this, _run, _run2).call(this, path), Cli_classPrivateMethodGet(this, _run, _run2).call(this, '--create_json_aci', path).then(res => JSON.parse(res))]);
+      const [bytecode, aci] = await Promise.all([Cli_classPrivateMethodGet(this, _run, _run2).call(this, path), Cli_classPrivateMethodGet(this, _run, _run2).call(this, '--create_json_aci', path).then(res => JSON.parse(res))]);
+      return {
+        bytecode: bytecode.trimEnd(),
+        aci: aci
+      };
     } catch (error) {
       throw new CompilerError(error.message);
     }
-    const aci = {
-      encodedAci: aciCli[0],
-      externalEncodedAci: aciCli.slice(1)
-    };
-    return {
-      bytecode: bytecode.trimEnd(),
-      aci: aci
-    };
   }
   async compileBySourceCode(sourceCode, fileSystem) {
     const tmp = await Cli_classStaticPrivateMethodGet(CompilerCli, CompilerCli, _saveContractToTmpDir).call(CompilerCli, sourceCode, fileSystem);