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

package/es/contract/ga.d.ts

@@ -1,13 +1,14 @@
 /**
  * Generalized Account module - routines to use generalized account
  */
-import { Tag } from '../tx/builder/constants';
-import { BuildTxOptions } from '../tx';
+/// <reference types="node" />
+import { Int, Tag } from '../tx/builder/constants';
+import { BuildTxOptions } from '../tx/builder';
 import { Encoded } from '../utils/encoder';
 import AccountBase from '../account/Base';
 import Contract from './Contract';
-import { SendOptions } from '../spend';
 import Node from '../Node';
+import { SendTransactionOptions } from '../chain';
 import CompilerBase from './compiler/Base';
 /**
  * Convert current account to GA
@@ -24,21 +25,36 @@ export declare function createGeneralizedAccount(authFnName: string, args: any[]
     rawTx: Encoded.Transaction;
     gaContractId: Encoded.ContractAddress;
 }>>;
-interface CreateGeneralizedAccountOptions extends BuildTxOptions<Tag.GaAttachTx, 'authFun' | 'callData' | 'code' | 'ownerId' | 'gasLimit'>, SendOptions, Pick<Parameters<typeof Contract.initialize>[0], 'bytecode' | 'aci' | 'sourceCodePath' | 'sourceCode' | 'fileSystem'> {
+interface CreateGeneralizedAccountOptions extends BuildTxOptions<Tag.GaAttachTx, 'authFun' | 'callData' | 'code' | 'ownerId' | 'gasLimit'>, SendTransactionOptions, Pick<Parameters<typeof Contract.initialize>[0], 'bytecode' | 'aci' | 'sourceCodePath' | 'sourceCode' | 'fileSystem'> {
     onAccount: AccountBase;
     onCompiler: CompilerBase;
     onNode: Node;
     gasLimit?: number;
 }
 /**
- * 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
  */
-export declare function buildAuthTxHash(transaction: Encoded.Transaction, { onNode }: {
+export declare function buildAuthTxHash(transaction: Encoded.Transaction, { fee, gasPrice, onNode }: {
+    fee?: Int;
+    gasPrice?: Int;
     onNode: Node;
-}): Promise<Uint8Array>;
+}): Promise<Buffer>;
+/**
+ * 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
+ */
+export declare function buildAuthTxHashByGaMetaTx(transaction: Encoded.Transaction, { onNode }: {
+    onNode: Node;
+}): Promise<Buffer>;
 export {};

package/es/contract/ga.mjs

@@ -2,35 +2,17 @@ import _buffer from "buffer";
 const {
   Buffer: _Buffer
 } = _buffer;
-/*
- * 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
  */
-import { Tag } from "../tx/builder/constants.mjs";
-import { buildContractIdByContractTx } from "../tx/builder/index.mjs";
-import { _buildTx } from "../tx/index.mjs";
+import { ConsensusProtocolVersion, Tag } from "../tx/builder/constants.mjs";
+import { buildContractIdByContractTx, buildTx, buildTxAsync, unpackTx } from "../tx/builder/index.mjs";
 import { hash } from "../utils/crypto.mjs";
-import { decode } from "../utils/encoder.mjs";
-import { IllegalArgumentError } from "../utils/errors.mjs";
+import { decode, encode, Encoding } from "../utils/encoder.mjs";
+import { ArgumentError, IllegalArgumentError } from "../utils/errors.mjs";
 import { concatBuffers } from "../utils/other.mjs";
 import Contract from "./Contract.mjs";
-import { send } from "../spend.mjs";
-import { getAccount } from "../chain.mjs";
+import { sendTransaction, getAccount } from "../chain.mjs";
 /**
  * Convert current account to GA
  * @category contract
@@ -69,8 +51,9 @@ export async function createGeneralizedAccount(authFnName, args, _ref) {
     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),
@@ -82,7 +65,7 @@ export async function createGeneralizedAccount(authFnName, args, _ref) {
   const {
     hash: transaction,
     rawTx
-  } = await send(tx, {
+  } = await sendTransaction(tx, {
     onNode,
     onAccount,
     onCompiler,
@@ -96,17 +79,59 @@ export async function createGeneralizedAccount(authFnName, args, _ref) {
   });
 }
 /**
- * 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
  */
 export async function buildAuthTxHash(transaction, _ref2) {
   let {
+    fee,
+    gasPrice,
     onNode
   } = _ref2;
-  return new Uint8Array(hash(concatBuffers([_Buffer.from(await onNode.getNetworkId()), decode(transaction)])));
+  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
+ */
+export async function buildAuthTxHashByGaMetaTx(transaction, _ref3) {
+  let {
+    onNode
+  } = _ref3;
+  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
+  });
 }
 //# sourceMappingURL=ga.mjs.map

package/es/contract/ga.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ga.mjs","names":["Tag","buildContractIdByContractTx","_buildTx","hash","decode","IllegalArgumentError","concatBuffers","Contract","send","getAccount","createGeneralizedAccount","authFnName","args","onAccount","onCompiler","onNode","bytecode","aci","sourceCodePath","sourceCode","fileSystem","options","ownerId","address","kind","contract","initialize","tx","GaAttachTx","code","$compile","gasLimit","_estimateGas","callData","_calldata","encode","_name","authFun","contractId","transaction","rawTx","Object","freeze","owner","gaContractId","buildAuthTxHash","Uint8Array","from","getNetworkId"],"sources":["../../src/contract/ga.ts"],"sourcesContent":["/*\n * ISC License (ISC)\n * Copyright (c) 2022 aeternity developers\n *\n *  Permission to use, copy, modify, and/or distribute this software for any\n *  purpose with or without fee is hereby granted, provided that the above\n *  copyright notice and this permission notice appear in all copies.\n *\n *  THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\n *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\n *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\n *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\n *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\n *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n *  PERFORMANCE OF THIS SOFTWARE.\n */\n\n/**\n * Generalized Account module - routines to use generalized account\n */\n\nimport { Tag } from '../tx/builder/constants';\nimport { buildContractIdByContractTx } from '../tx/builder';\nimport { _buildTx, BuildTxOptions } from '../tx';\nimport { hash } from '../utils/crypto';\nimport { decode, Encoded } from '../utils/encoder';\nimport { IllegalArgumentError } from '../utils/errors';\nimport { concatBuffers } from '../utils/other';\nimport AccountBase from '../account/Base';\nimport Contract from './Contract';\nimport { send, SendOptions } from '../spend';\nimport Node from '../Node';\nimport { getAccount } from '../chain';\nimport CompilerBase from './compiler/Base';\n\n/**\n * Convert current account to GA\n * @category contract\n * @param authFnName - Authorization function name\n * @param sourceCode - Auth contract source code\n * @param args - init arguments\n * @param options - Options\n * @returns General Account Object\n */\nexport async function createGeneralizedAccount(\n  authFnName: string,\n  args: any[],\n  {\n    onAccount, onCompiler, onNode, bytecode, aci, sourceCodePath, sourceCode, fileSystem, ...options\n  }: CreateGeneralizedAccountOptions,\n): Promise<Readonly<{\n    owner: Encoded.AccountAddress;\n    transaction: Encoded.TxHash;\n    rawTx: Encoded.Transaction;\n    gaContractId: Encoded.ContractAddress;\n  }>> {\n  const ownerId = onAccount.address;\n  if ((await getAccount(ownerId, { onNode })).kind === 'generalized') {\n    throw new IllegalArgumentError(`Account ${ownerId} is already GA`);\n  }\n\n  const contract = await Contract.initialize<{ init: (...a: any[]) => void }>({\n    onAccount, onCompiler, onNode, bytecode, aci, sourceCodePath, sourceCode, fileSystem,\n  });\n\n  const tx = await _buildTx(Tag.GaAttachTx, {\n    ...options,\n    onNode,\n    code: await contract.$compile(),\n    gasLimit: options.gasLimit ?? await contract._estimateGas('init', args, options),\n    ownerId,\n    callData: contract._calldata.encode(contract._name, 'init', args),\n    authFun: hash(authFnName),\n  });\n  const contractId = buildContractIdByContractTx(tx);\n  const { hash: transaction, rawTx } = await send(tx, {\n    onNode, onAccount, onCompiler, ...options,\n  });\n\n  return Object.freeze({\n    owner: ownerId,\n    transaction,\n    rawTx,\n    gaContractId: contractId,\n  });\n}\n\ninterface CreateGeneralizedAccountOptions extends\n  BuildTxOptions<Tag.GaAttachTx, 'authFun' | 'callData' | 'code' | 'ownerId' | 'gasLimit'>,\n  SendOptions,\n  Pick<\n  Parameters<typeof Contract.initialize>[0],\n  'bytecode' | 'aci' | 'sourceCodePath' | 'sourceCode' | 'fileSystem'\n  > {\n  onAccount: AccountBase;\n  onCompiler: CompilerBase;\n  onNode: Node;\n  gasLimit?: number;\n}\n\n/**\n * Build a transaction hash the same as `Auth.tx_hash`\n * @category contract\n * @param transaction - tx-encoded transaction\n * @param options - Options\n * @param options.onNode - Node to use\n * @returns Transaction hash\n */\nexport async function buildAuthTxHash(\n  transaction: Encoded.Transaction,\n  { onNode }: { onNode: Node },\n): Promise<Uint8Array> {\n  return new Uint8Array(hash(\n    concatBuffers([Buffer.from(await onNode.getNetworkId()), decode(transaction)]),\n  ));\n}\n"],"mappings":";;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAFA,SAISA,GAAG;AAAA,SACHC,2BAA2B;AAAA,SAC3BC,QAAQ;AAAA,SACRC,IAAI;AAAA,SACJC,MAAM;AAAA,SACNC,oBAAoB;AAAA,SACpBC,aAAa;AAAA,OAEfC,QAAQ;AAAA,SACNC,IAAI;AAAA,SAEJC,UAAU;AAGnB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,wBAAwB,CAC5CC,UAAkB,EAClBC,IAAW,QASP;EAAA;EAAA,IARJ;IACEC,SAAS;IAAEC,UAAU;IAAEC,MAAM;IAAEC,QAAQ;IAAEC,GAAG;IAAEC,cAAc;IAAEC,UAAU;IAAEC,UAAU;IAAE,GAAGC;EAC1D,CAAC;EAOlC,MAAMC,OAAO,GAAGT,SAAS,CAACU,OAAO;EACjC,IAAI,CAAC,MAAMd,UAAU,CAACa,OAAO,EAAE;IAAEP;EAAO,CAAC,CAAC,EAAES,IAAI,KAAK,aAAa,EAAE;IAClE,MAAM,IAAInB,oBAAoB,CAAE,WAAUiB,OAAQ,gBAAe,CAAC;EACpE;EAEA,MAAMG,QAAQ,GAAG,MAAMlB,QAAQ,CAACmB,UAAU,CAAkC;IAC1Eb,SAAS;IAAEC,UAAU;IAAEC,MAAM;IAAEC,QAAQ;IAAEC,GAAG;IAAEC,cAAc;IAAEC,UAAU;IAAEC;EAC5E,CAAC,CAAC;EAEF,MAAMO,EAAE,GAAG,MAAMzB,QAAQ,CAACF,GAAG,CAAC4B,UAAU,EAAE;IACxC,GAAGP,OAAO;IACVN,MAAM;IACNc,IAAI,EAAE,MAAMJ,QAAQ,CAACK,QAAQ,EAAE;IAC/BC,QAAQ,uBAAEV,OAAO,CAACU,QAAQ,iEAAI,MAAMN,QAAQ,CAACO,YAAY,CAAC,MAAM,EAAEpB,IAAI,EAAES,OAAO,CAAC;IAChFC,OAAO;IACPW,QAAQ,EAAER,QAAQ,CAACS,SAAS,CAACC,MAAM,CAACV,QAAQ,CAACW,KAAK,EAAE,MAAM,EAAExB,IAAI,CAAC;IACjEyB,OAAO,EAAElC,IAAI,CAACQ,UAAU;EAC1B,CAAC,CAAC;EACF,MAAM2B,UAAU,GAAGrC,2BAA2B,CAAC0B,EAAE,CAAC;EAClD,MAAM;IAAExB,IAAI,EAAEoC,WAAW;IAAEC;EAAM,CAAC,GAAG,MAAMhC,IAAI,CAACmB,EAAE,EAAE;IAClDZ,MAAM;IAAEF,SAAS;IAAEC,UAAU;IAAE,GAAGO;EACpC,CAAC,CAAC;EAEF,OAAOoB,MAAM,CAACC,MAAM,CAAC;IACnBC,KAAK,EAAErB,OAAO;IACdiB,WAAW;IACXC,KAAK;IACLI,YAAY,EAAEN;EAChB,CAAC,CAAC;AACJ;AAeA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeO,eAAe,CACnCN,WAAgC,SAEX;EAAA,IADrB;IAAExB;EAAyB,CAAC;EAE5B,OAAO,IAAI+B,UAAU,CAAC3C,IAAI,CACxBG,aAAa,CAAC,CAAC,QAAOyC,IAAI,CAAC,MAAMhC,MAAM,CAACiC,YAAY,EAAE,CAAC,EAAE5C,MAAM,CAACmC,WAAW,CAAC,CAAC,CAAC,CAC/E,CAAC;AACJ"}
+{"version":3,"file":"ga.mjs","names":["ConsensusProtocolVersion","Tag","buildContractIdByContractTx","buildTx","buildTxAsync","unpackTx","hash","decode","encode","Encoding","ArgumentError","IllegalArgumentError","concatBuffers","Contract","sendTransaction","getAccount","createGeneralizedAccount","authFnName","args","_ref","_options$gasLimit","onAccount","onCompiler","onNode","bytecode","aci","sourceCodePath","sourceCode","fileSystem","options","ownerId","address","kind","contract","initialize","tx","tag","GaAttachTx","code","$compile","gasLimit","_estimateGas","callData","_calldata","_name","authFun","contractId","transaction","rawTx","Object","freeze","owner","gaContractId","buildAuthTxHash","_ref2","fee","gasPrice","nodeNetworkId","consensusProtocolVersion","getNodeInfo","payload","_Buffer","from","Ceres","GaMetaTxAuthData","txHash","TxHash","buildAuthTxHashByGaMetaTx","_ref3","txParams","SignedTx","encodedTx","GaMetaTx"],"sources":["../../src/contract/ga.ts"],"sourcesContent":["/**\n * Generalized Account module - routines to use generalized account\n */\n\nimport { ConsensusProtocolVersion, Int, Tag } from '../tx/builder/constants';\nimport {\n  buildContractIdByContractTx, buildTx, buildTxAsync, BuildTxOptions, unpackTx,\n} from '../tx/builder';\nimport { hash } from '../utils/crypto';\nimport {\n  decode, encode, Encoded, Encoding,\n} from '../utils/encoder';\nimport { ArgumentError, IllegalArgumentError } from '../utils/errors';\nimport { concatBuffers } from '../utils/other';\nimport AccountBase from '../account/Base';\nimport Contract from './Contract';\nimport Node from '../Node';\nimport { sendTransaction, SendTransactionOptions, getAccount } from '../chain';\nimport CompilerBase from './compiler/Base';\n\n/**\n * Convert current account to GA\n * @category contract\n * @param authFnName - Authorization function name\n * @param sourceCode - Auth contract source code\n * @param args - init arguments\n * @param options - Options\n * @returns General Account Object\n */\nexport async function createGeneralizedAccount(\n  authFnName: string,\n  args: any[],\n  {\n    onAccount, onCompiler, onNode, bytecode, aci, sourceCodePath, sourceCode, fileSystem, ...options\n  }: CreateGeneralizedAccountOptions,\n): Promise<Readonly<{\n    owner: Encoded.AccountAddress;\n    transaction: Encoded.TxHash;\n    rawTx: Encoded.Transaction;\n    gaContractId: Encoded.ContractAddress;\n  }>> {\n  const ownerId = onAccount.address;\n  if ((await getAccount(ownerId, { onNode })).kind === 'generalized') {\n    throw new IllegalArgumentError(`Account ${ownerId} is already GA`);\n  }\n\n  const contract = await Contract.initialize<{ init: (...a: any[]) => void }>({\n    onAccount, onCompiler, onNode, bytecode, aci, sourceCodePath, sourceCode, fileSystem,\n  });\n\n  const tx = await buildTxAsync({\n    ...options,\n    tag: Tag.GaAttachTx,\n    onNode,\n    code: await contract.$compile(),\n    gasLimit: options.gasLimit ?? await contract._estimateGas('init', args, options),\n    ownerId,\n    callData: contract._calldata.encode(contract._name, 'init', args),\n    authFun: hash(authFnName),\n  });\n  const contractId = buildContractIdByContractTx(tx);\n  const { hash: transaction, rawTx } = await sendTransaction(tx, {\n    onNode, onAccount, onCompiler, ...options,\n  });\n\n  return Object.freeze({\n    owner: ownerId,\n    transaction,\n    rawTx,\n    gaContractId: contractId,\n  });\n}\n\ninterface CreateGeneralizedAccountOptions extends\n  BuildTxOptions<Tag.GaAttachTx, 'authFun' | 'callData' | 'code' | 'ownerId' | 'gasLimit'>,\n  SendTransactionOptions,\n  Pick<\n  Parameters<typeof Contract.initialize>[0],\n  'bytecode' | 'aci' | 'sourceCodePath' | 'sourceCode' | 'fileSystem'\n  > {\n  onAccount: AccountBase;\n  onCompiler: CompilerBase;\n  onNode: Node;\n  gasLimit?: number;\n}\n\n/**\n * Build a transaction hash the same as `Auth.tx_hash` by GaMetaTx payload\n * @category contract\n * @param transaction - tx-encoded transaction\n * @param options - Options\n * @param options.fee - GaMetaTx fee, required in Ceres\n * @param options.gasPrice - GaMetaTx gasPrice, required in Ceres\n * @param options.onNode - Node to use\n * @returns Transaction hash\n */\nexport async function buildAuthTxHash(\n  transaction: Encoded.Transaction,\n  { fee, gasPrice, onNode }: { fee?: Int; gasPrice?: Int; onNode: Node },\n): Promise<Buffer> {\n  const { nodeNetworkId, consensusProtocolVersion } = await onNode.getNodeInfo();\n  let payload = hash(concatBuffers([Buffer.from(nodeNetworkId), decode(transaction)]));\n  if (consensusProtocolVersion === ConsensusProtocolVersion.Ceres) {\n    if (fee == null) throw new ArgumentError('fee', 'provided (in Ceres)', fee);\n    if (gasPrice == null) throw new ArgumentError('gasPrice', 'provided (in Ceres)', gasPrice);\n    payload = hash(decode(buildTx({\n      tag: Tag.GaMetaTxAuthData,\n      fee,\n      gasPrice,\n      txHash: encode(payload, Encoding.TxHash),\n    })));\n  }\n  return payload;\n}\n\n/**\n * Build a transaction hash the same as `Auth.tx_hash` by GaMetaTx\n * @category contract\n * @param transaction - tx-encoded signed GaMeta transaction\n * @param options - Options\n * @param options.onNode - Node to use\n * @returns Transaction hash\n */\nexport async function buildAuthTxHashByGaMetaTx(\n  transaction: Encoded.Transaction,\n  { onNode }: { onNode: Node },\n): Promise<Buffer> {\n  const txParams = unpackTx(transaction, Tag.SignedTx);\n  if (txParams.encodedTx.tag !== Tag.GaMetaTx) {\n    throw new ArgumentError('transaction', 'to include GaMetaTx', Tag[txParams.encodedTx.tag]);\n  }\n  return buildAuthTxHash(buildTx(txParams.encodedTx.tx.encodedTx), {\n    fee: txParams.encodedTx.fee,\n    gasPrice: txParams.encodedTx.gasPrice,\n    onNode,\n  });\n}\n"],"mappings":"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"}

package/es/index-browser.d.ts

@@ -2,14 +2,15 @@ export * from './chain';
 export * from './utils/crypto';
 export * from './utils/keystore';
 export * from './utils/bytes';
-export * from './tx';
-export * from './tx/builder';
+export { buildTx, buildTxAsync, buildTxHash, unpackTx, buildContractIdByContractTx, } from './tx/builder';
 export * from './tx/builder/helpers';
 export * from './tx/builder/constants';
-export * from './tx/builder/schema';
+export { ORACLE_TTL_TYPES, ORACLE_TTL, QUERY_TTL, RESPONSE_TTL, DRY_RUN_ACCOUNT, CallReturnType, } from './tx/builder/schema';
+export { getExecutionCost, getExecutionCostBySignedTx, getExecutionCostUsingNode, } from './tx/execution-cost';
+export { default as getTransactionSignerAddress } from './tx/transaction-signer';
 export * from './utils/amount-formatter';
 export * from './utils/hd-wallet';
-export { encode, decode, Encoding } from './utils/encoder';
+export { encode, decode, Encoding, Encoded, } from './utils/encoder';
 export * from './aens';
 export { default as Contract } from './contract/Contract';
 export type { ContractMethodsBase } from './contract/Contract';

package/es/index-browser.mjs

@@ -1,31 +1,17 @@
-/*
- * 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`
 export * from "./chain.mjs";
 export * from "./utils/crypto.mjs";
 export * from "./utils/keystore.mjs";
 export * from "./utils/bytes.mjs";
-export * from "./tx/index.mjs";
-export * from "./tx/builder/index.mjs";
+export { buildTx, buildTxAsync, buildTxHash, unpackTx, buildContractIdByContractTx } from "./tx/builder/index.mjs";
 export * from "./tx/builder/helpers.mjs";
-export * from "./tx/builder/constants.mjs";
-export * from "./tx/builder/schema.mjs";
+export * from "./tx/builder/constants.mjs"; // TODO: move to constants
+export { ORACLE_TTL_TYPES, ORACLE_TTL, QUERY_TTL, RESPONSE_TTL, DRY_RUN_ACCOUNT, CallReturnType } from "./tx/builder/schema.mjs";
+export { getExecutionCost, getExecutionCostBySignedTx, getExecutionCostUsingNode } from "./tx/execution-cost.mjs";
+export { default as getTransactionSignerAddress } from "./tx/transaction-signer.mjs";
 export * from "./utils/amount-formatter.mjs";
 export * from "./utils/hd-wallet.mjs";
-export { encode, decode, Encoding } from "./utils/encoder.mjs";
+export { encode, decode, Encoding, Encoded } from "./utils/encoder.mjs";
 export * from "./aens.mjs";
 export { default as Contract } from "./contract/Contract.mjs";
 export * from "./oracle.mjs";

package/es/index-browser.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index-browser.mjs","names":["encode","decode","Encoding","default","Contract","AeSdkMethods","AeSdkBase","AeSdk","AeSdkAepp","AeSdkWallet","Node","verifyTransaction","AccountBase","MemoryAccount","AccountGeneralized","AccountLedger","AccountLedgerFactory","CompilerBase","CompilerHttp","Channel","connectionProxy","walletDetector","BrowserRuntimeConnection","BrowserWindowMessageConnection"],"sources":["../src/index-browser.ts"],"sourcesContent":["/*\n * ISC License (ISC)\n * Copyright (c) 2022 aeternity developers\n *\n *  Permission to use, copy, modify, and/or distribute this software for any\n *  purpose with or without fee is hereby granted, provided that the above\n *  copyright notice and this permission notice appear in all copies.\n *\n *  THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\n *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\n *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\n *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\n *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\n *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n *  PERFORMANCE OF THIS SOFTWARE.\n */\n\nexport * from './chain';\nexport * from './utils/crypto';\nexport * from './utils/keystore';\nexport * from './utils/bytes';\nexport * from './tx';\nexport * from './tx/builder';\nexport * from './tx/builder/helpers';\nexport * from './tx/builder/constants';\nexport * from './tx/builder/schema';\nexport * from './utils/amount-formatter';\nexport * from './utils/hd-wallet';\nexport { encode, decode, Encoding } from './utils/encoder';\nexport * from './aens';\nexport { default as Contract } from './contract/Contract';\nexport type { ContractMethodsBase } from './contract/Contract';\nexport * from './oracle';\nexport * from './spend';\nexport * from './contract/ga';\n\nexport { default as AeSdkMethods } from './AeSdkMethods';\nexport { default as AeSdkBase } from './AeSdkBase';\nexport { default as AeSdk } from './AeSdk';\nexport { default as AeSdkAepp } from './AeSdkAepp';\nexport { default as AeSdkWallet } from './AeSdkWallet';\nexport { default as Node } from './Node';\nexport { default as verifyTransaction } from './tx/validator';\nexport { default as AccountBase } from './account/Base';\nexport { default as MemoryAccount } from './account/Memory';\nexport { default as AccountGeneralized } from './account/Generalized';\nexport { default as AccountLedger } from './account/Ledger';\nexport { default as AccountLedgerFactory } from './account/LedgerFactory';\nexport { default as CompilerBase } from './contract/compiler/Base';\nexport { default as CompilerHttp } from './contract/compiler/Http';\nexport { default as Channel } from './channel/Contract';\n\nexport { default as connectionProxy } from './aepp-wallet-communication/connection-proxy';\nexport * from './aepp-wallet-communication/schema';\nexport { default as walletDetector } from './aepp-wallet-communication/wallet-detector';\nexport { default as BrowserRuntimeConnection } from './aepp-wallet-communication/connection/BrowserRuntime';\nexport { default as BrowserWindowMessageConnection } from './aepp-wallet-communication/connection/BrowserWindowMessage';\nexport * from './utils/errors';\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAfA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,SA4BSA,MAAM,EAAEC,MAAM,EAAEC,QAAQ;AAAA;AAAA,SAExBC,OAAO,IAAIC,QAAQ;AAAA;AAAA;AAAA;AAAA,SAMnBD,OAAO,IAAIE,YAAY;AAAA,SACvBF,OAAO,IAAIG,SAAS;AAAA,SACpBH,OAAO,IAAII,KAAK;AAAA,SAChBJ,OAAO,IAAIK,SAAS;AAAA,SACpBL,OAAO,IAAIM,WAAW;AAAA,SACtBN,OAAO,IAAIO,IAAI;AAAA,SACfP,OAAO,IAAIQ,iBAAiB;AAAA,SAC5BR,OAAO,IAAIS,WAAW;AAAA,SACtBT,OAAO,IAAIU,aAAa;AAAA,SACxBV,OAAO,IAAIW,kBAAkB;AAAA,SAC7BX,OAAO,IAAIY,aAAa;AAAA,SACxBZ,OAAO,IAAIa,oBAAoB;AAAA,SAC/Bb,OAAO,IAAIc,YAAY;AAAA,SACvBd,OAAO,IAAIe,YAAY;AAAA,SACvBf,OAAO,IAAIgB,OAAO;AAAA,SAElBhB,OAAO,IAAIiB,eAAe;AAAA;AAAA,SAE1BjB,OAAO,IAAIkB,cAAc;AAAA,SACzBlB,OAAO,IAAImB,wBAAwB;AAAA,SACnCnB,OAAO,IAAIoB,8BAA8B;AAAA"}
+{"version":3,"file":"index-browser.mjs","names":["buildTx","buildTxAsync","buildTxHash","unpackTx","buildContractIdByContractTx","ORACLE_TTL_TYPES","ORACLE_TTL","QUERY_TTL","RESPONSE_TTL","DRY_RUN_ACCOUNT","CallReturnType","getExecutionCost","getExecutionCostBySignedTx","getExecutionCostUsingNode","default","getTransactionSignerAddress","encode","decode","Encoding","Encoded","Contract","AeSdkMethods","AeSdkBase","AeSdk","AeSdkAepp","AeSdkWallet","Node","verifyTransaction","AccountBase","MemoryAccount","AccountGeneralized","AccountLedger","AccountLedgerFactory","CompilerBase","CompilerHttp","Channel","connectionProxy","walletDetector","BrowserRuntimeConnection","BrowserWindowMessageConnection"],"sources":["../src/index-browser.ts"],"sourcesContent":["// TODO: avoid `export * from`\nexport * from './chain';\nexport * from './utils/crypto';\nexport * from './utils/keystore';\nexport * from './utils/bytes';\nexport {\n  buildTx, buildTxAsync, buildTxHash, unpackTx, buildContractIdByContractTx,\n} from './tx/builder';\nexport * from './tx/builder/helpers';\nexport * from './tx/builder/constants';\n// TODO: move to constants\nexport {\n  ORACLE_TTL_TYPES, ORACLE_TTL, QUERY_TTL, RESPONSE_TTL, DRY_RUN_ACCOUNT, CallReturnType,\n} from './tx/builder/schema';\nexport {\n  getExecutionCost, getExecutionCostBySignedTx, getExecutionCostUsingNode,\n} from './tx/execution-cost';\nexport { default as getTransactionSignerAddress } from './tx/transaction-signer';\nexport * from './utils/amount-formatter';\nexport * from './utils/hd-wallet';\nexport {\n  encode, decode, Encoding, Encoded,\n} from './utils/encoder';\nexport * from './aens';\nexport { default as Contract } from './contract/Contract';\nexport type { ContractMethodsBase } from './contract/Contract';\nexport * from './oracle';\nexport * from './spend';\nexport * from './contract/ga';\n\nexport { default as AeSdkMethods } from './AeSdkMethods';\nexport { default as AeSdkBase } from './AeSdkBase';\nexport { default as AeSdk } from './AeSdk';\nexport { default as AeSdkAepp } from './AeSdkAepp';\nexport { default as AeSdkWallet } from './AeSdkWallet';\nexport { default as Node } from './Node';\nexport { default as verifyTransaction } from './tx/validator';\nexport { default as AccountBase } from './account/Base';\nexport { default as MemoryAccount } from './account/Memory';\nexport { default as AccountGeneralized } from './account/Generalized';\nexport { default as AccountLedger } from './account/Ledger';\nexport { default as AccountLedgerFactory } from './account/LedgerFactory';\nexport { default as CompilerBase } from './contract/compiler/Base';\nexport { default as CompilerHttp } from './contract/compiler/Http';\nexport { default as Channel } from './channel/Contract';\n\nexport { default as connectionProxy } from './aepp-wallet-communication/connection-proxy';\nexport * from './aepp-wallet-communication/schema';\nexport { default as walletDetector } from './aepp-wallet-communication/wallet-detector';\nexport { default as BrowserRuntimeConnection } from './aepp-wallet-communication/connection/BrowserRuntime';\nexport { default as BrowserWindowMessageConnection } from './aepp-wallet-communication/connection/BrowserWindowMessage';\nexport * from './utils/errors';\n"],"mappings":"AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,SAMEA,OAAO,EAAEC,YAAY,EAAEC,WAAW,EAAEC,QAAQ,EAAEC,2BAA2B;AAAA;AAAA,4CAI3E;AAAA,SAEEC,gBAAgB,EAAEC,UAAU,EAAEC,SAAS,EAAEC,YAAY,EAAEC,eAAe,EAAEC,cAAc;AAAA,SAGtFC,gBAAgB,EAAEC,0BAA0B,EAAEC,yBAAyB;AAAA,SAEhEC,OAAO,IAAIC,2BAA2B;AAAA;AAAA;AAAA,SAI7CC,MAAM,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,OAAO;AAAA;AAAA,SAG1BL,OAAO,IAAIM,QAAQ;AAAA;AAAA;AAAA;AAAA,SAMnBN,OAAO,IAAIO,YAAY;AAAA,SACvBP,OAAO,IAAIQ,SAAS;AAAA,SACpBR,OAAO,IAAIS,KAAK;AAAA,SAChBT,OAAO,IAAIU,SAAS;AAAA,SACpBV,OAAO,IAAIW,WAAW;AAAA,SACtBX,OAAO,IAAIY,IAAI;AAAA,SACfZ,OAAO,IAAIa,iBAAiB;AAAA,SAC5Bb,OAAO,IAAIc,WAAW;AAAA,SACtBd,OAAO,IAAIe,aAAa;AAAA,SACxBf,OAAO,IAAIgB,kBAAkB;AAAA,SAC7BhB,OAAO,IAAIiB,aAAa;AAAA,SACxBjB,OAAO,IAAIkB,oBAAoB;AAAA,SAC/BlB,OAAO,IAAImB,YAAY;AAAA,SACvBnB,OAAO,IAAIoB,YAAY;AAAA,SACvBpB,OAAO,IAAIqB,OAAO;AAAA,SAElBrB,OAAO,IAAIsB,eAAe;AAAA;AAAA,SAE1BtB,OAAO,IAAIuB,cAAc;AAAA,SACzBvB,OAAO,IAAIwB,wBAAwB;AAAA,SACnCxB,OAAO,IAAIyB,8BAA8B;AAAA"}

package/es/oracle.d.ts

@@ -5,13 +5,11 @@
  * https://github.com/aeternity/protocol/blob/master/ORACLE.md in the protocol
  * repository.
  */
-import BigNumber from 'bignumber.js';
-import { send, SendOptions } from './spend';
+import { BuildTxOptions } from './tx/builder';
 import { ORACLE_TTL_TYPES } from './tx/builder/schema';
 import { Tag } from './tx/builder/constants';
 import { Encoded } from './utils/encoder';
-import { _getPollInterval } from './chain';
-import { BuildTxOptions } from './tx';
+import { _getPollInterval, sendTransaction, SendTransactionOptions } from './chain';
 import Node from './Node';
 import AccountBase from './account/Base';
 type OracleQueries = Awaited<ReturnType<Node['getOracleQueriesByPubkey']>>['oracleQueries'];
@@ -25,7 +23,7 @@ type OracleQueries = Awaited<ReturnType<Node['getOracleQueriesByPubkey']>>['orac
  * @param options.onNode - Node to use
  * @returns Callback to stop polling function
  */
-export declare function pollForQueries(oracleId: Encoded.OracleAddress, onQuery: (queries: OracleQueries) => void, { interval, onNode, ...options }: {
+export declare function pollForQueries(oracleId: Encoded.OracleAddress, onQuery: (query: OracleQueries[number]) => void, { interval, onNode, ...options }: {
     interval?: number;
     onNode: Node;
 } & Parameters<typeof _getPollInterval>[1]): () => void;
@@ -55,7 +53,7 @@ export declare function getQueryObject(oracleId: Encoded.OracleAddress, queryId:
 interface GetQueryObjectReturnType extends Awaited<ReturnType<Node['getOracleQueryByPubkeyAndQueryId']>> {
     decodedQuery: string;
     decodedResponse: string;
-    respond: (response: string, options?: Parameters<typeof respondToQuery>[3]) => ReturnType<typeof respondToQuery>;
+    respond: (response: string, options?: Parameters<typeof respondToQuery>[2]) => ReturnType<typeof respondToQuery>;
     pollForResponse: (options?: Parameters<typeof pollForQueryResponse>[2]) => ReturnType<typeof pollForQueryResponse>;
 }
 /**
@@ -71,8 +69,8 @@ interface GetQueryObjectReturnType extends Awaited<ReturnType<Node['getOracleQue
  * @param options.ttl - Transaction time to leave
  * @returns Query object
  */
-export declare function postQueryToOracle(oracleId: Encoded.OracleAddress, query: string, options: PostQueryToOracleOptions): Promise<Awaited<ReturnType<typeof send>> & Awaited<ReturnType<typeof getQueryObject>>>;
-type PostQueryToOracleOptionsType = Parameters<typeof send>[1] & Parameters<typeof getQueryObject>[2] & BuildTxOptions<Tag.OracleQueryTx, 'oracleId' | 'senderId' | 'query' | 'queryTtlType' | 'queryTtlValue' | 'responseTtlType' | 'responseTtlValue'> & {
+export declare function postQueryToOracle(oracleId: Encoded.OracleAddress, query: string, options: PostQueryToOracleOptions): Promise<Awaited<ReturnType<typeof sendTransaction>> & Awaited<ReturnType<typeof getQueryObject>>>;
+type PostQueryToOracleOptionsType = Parameters<typeof sendTransaction>[1] & Parameters<typeof getQueryObject>[2] & BuildTxOptions<Tag.OracleQueryTx, 'oracleId' | 'senderId' | 'query' | 'queryTtlType' | 'queryTtlValue' | 'responseTtlType' | 'responseTtlValue'> & {
     queryTtlType?: ORACLE_TTL_TYPES;
     queryTtlValue?: number;
     responseTtlType?: ORACLE_TTL_TYPES;
@@ -83,7 +81,6 @@ interface PostQueryToOracleOptions extends PostQueryToOracleOptionsType {
 /**
  * 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
@@ -91,8 +88,8 @@ interface PostQueryToOracleOptions extends PostQueryToOracleOptionsType {
  * @param options.oracleTtlValue - Oracle time to leave for extend
  * @returns Oracle object
  */
-export declare function extendOracleTtl(oracleId: Encoded.OracleAddress, options: ExtendOracleTtlOptions): Promise<Awaited<ReturnType<typeof send>> & Awaited<ReturnType<typeof getOracleObject>>>;
-type ExtendOracleTtlOptionsType = SendOptions & Parameters<typeof getOracleObject>[1] & BuildTxOptions<Tag.OracleExtendTx, 'oracleTtlType' | 'oracleTtlValue' | 'callerId' | 'oracleId'> & {
+export declare function extendOracleTtl(options: ExtendOracleTtlOptions): Promise<Awaited<ReturnType<typeof sendTransaction>> & Awaited<ReturnType<typeof getOracleObject>>>;
+type ExtendOracleTtlOptionsType = SendTransactionOptions & Parameters<typeof getOracleObject>[1] & BuildTxOptions<Tag.OracleExtendTx, 'oracleTtlType' | 'oracleTtlValue' | 'callerId' | 'oracleId'> & {
     oracleTtlType?: ORACLE_TTL_TYPES;
     oracleTtlValue?: number;
 };
@@ -101,7 +98,6 @@ interface ExtendOracleTtlOptions extends ExtendOracleTtlOptionsType {
 /**
  * Extend oracle ttl
  * @category oracle
- * @param oracleId - Oracle public key
  * @param queryId - Oracle query id
  * @param response - Oracle query response
  * @param options - Options object
@@ -110,8 +106,8 @@ interface ExtendOracleTtlOptions extends ExtendOracleTtlOptionsType {
  * @param options.ttl - Transaction time to leave
  * @returns Oracle object
  */
-export declare function respondToQuery(oracleId: Encoded.OracleAddress, queryId: Encoded.OracleQueryId, response: string, options: RespondToQueryOptions): Promise<Awaited<ReturnType<typeof send>> & Awaited<ReturnType<typeof getOracleObject>>>;
-type RespondToQueryOptionsType = SendOptions & Parameters<typeof getOracleObject>[1] & BuildTxOptions<Tag.OracleResponseTx, 'callerId' | 'oracleId' | 'queryId' | 'response' | 'responseTtlType' | 'responseTtlValue'> & {
+export declare function respondToQuery(queryId: Encoded.OracleQueryId, response: string, options: RespondToQueryOptions): Promise<Awaited<ReturnType<typeof sendTransaction>> & Awaited<ReturnType<typeof getOracleObject>>>;
+type RespondToQueryOptionsType = SendTransactionOptions & Parameters<typeof getOracleObject>[1] & BuildTxOptions<Tag.OracleResponseTx, 'callerId' | 'oracleId' | 'queryId' | 'response' | 'responseTtlType' | 'responseTtlValue'> & {
     responseTtlType?: ORACLE_TTL_TYPES;
     responseTtlValue?: number;
 };
@@ -150,9 +146,8 @@ interface GetOracleObjectReturnType extends Awaited<ReturnType<Node['getOracleBy
  * @param options.ttl - Transaction time to leave
  * @returns Oracle object
  */
-export declare function registerOracle(queryFormat: string, responseFormat: string, options: RegisterOracleOptions): Promise<Awaited<ReturnType<typeof send>> & Awaited<ReturnType<typeof getOracleObject>>>;
-type RegisterOracleOptionsType = SendOptions & Parameters<typeof getOracleObject>[1] & BuildTxOptions<Tag.OracleRegisterTx, 'accountId' | 'queryFormat' | 'responseFormat' | 'queryFee' | 'oracleTtlType' | 'oracleTtlValue'> & {
-    queryFee?: number | string | BigNumber;
+export declare function registerOracle(queryFormat: string, responseFormat: string, options: RegisterOracleOptions): Promise<Awaited<ReturnType<typeof sendTransaction>> & Awaited<ReturnType<typeof getOracleObject>>>;
+type RegisterOracleOptionsType = SendTransactionOptions & Parameters<typeof getOracleObject>[1] & BuildTxOptions<Tag.OracleRegisterTx, 'accountId' | 'queryFormat' | 'responseFormat' | 'oracleTtlType' | 'oracleTtlValue'> & {
     oracleTtlType?: ORACLE_TTL_TYPES;
     oracleTtlValue?: number;
 };

package/es/oracle.mjs

@@ -1,19 +1,3 @@
-/*
- * 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
  *
@@ -21,16 +5,14 @@
  * https://github.com/aeternity/protocol/blob/master/ORACLE.md in the protocol
  * repository.
  */
-import { send } from "./spend.mjs";
 import { mapObject, pause } from "./utils/other.mjs";
 import { oracleQueryId } from "./tx/builder/helpers.mjs";
-import { unpackTx } from "./tx/builder/index.mjs";
-import { ORACLE_TTL, QUERY_FEE, QUERY_TTL, RESPONSE_TTL } from "./tx/builder/schema.mjs";
+import { unpackTx, buildTxAsync } from "./tx/builder/index.mjs";
+import { ORACLE_TTL, QUERY_TTL, RESPONSE_TTL } from "./tx/builder/schema.mjs";
 import { Tag } from "./tx/builder/constants.mjs";
 import { RequestTimedOutError } from "./utils/errors.mjs";
 import { decode, encode, Encoding } from "./utils/encoder.mjs";
-import { _getPollInterval, getHeight } from "./chain.mjs";
-import { _buildTx } from "./tx/index.mjs";
+import { _getPollInterval, getHeight, sendTransaction } from "./chain.mjs";
 /**
  * Poll for oracle queries
  * @category oracle
@@ -58,13 +40,10 @@ export function pollForQueries(oracleId, onQuery, _ref) {
       } = _ref2;
       return !knownQueryIds.has(id);
     });
-    queries.forEach(_ref3 => {
-      let {
-        id
-      } = _ref3;
-      return knownQueryIds.add(id);
+    queries.forEach(query => {
+      knownQueryIds.add(query.id);
+      onQuery(query);
     });
-    if (queries.length > 0) onQuery(queries);
   };
   let stopped = false;
 
@@ -92,13 +71,13 @@ export function pollForQueries(oracleId, onQuery, _ref) {
  * @param options.onNode - Node to use
  * @returns OracleQuery object
  */
-export async function pollForQueryResponse(oracleId, queryId, _ref4) {
+export async function pollForQueryResponse(oracleId, queryId, _ref3) {
   var _interval2;
   let {
     interval,
     onNode,
     ...options
-  } = _ref4;
+  } = _ref3;
   (_interval2 = interval) !== null && _interval2 !== void 0 ? _interval2 : interval = _getPollInterval('microblock', options);
   let height;
   let ttl;
@@ -134,7 +113,7 @@ export 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
     }),
@@ -161,12 +140,13 @@ export 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
@@ -176,14 +156,13 @@ export 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
@@ -191,16 +170,17 @@ export async function postQueryToOracle(oracleId, query, options) {
  * @param options.oracleTtlValue - Oracle time to leave for extend
  * @returns Oracle object
  */
-export async function extendOracleTtl(oracleId, options) {
-  const oracleExtendTx = await _buildTx(Tag.OracleExtendTx, {
+export 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))
   };
@@ -208,7 +188,6 @@ export 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
@@ -217,18 +196,19 @@ export async function extendOracleTtl(oracleId, options) {
  * @param options.ttl - Transaction time to leave
  * @returns Oracle object
  */
-export async function respondToQuery(oracleId, queryId, response, options) {
-  const oracleRespondTx = await _buildTx(Tag.OracleResponseTx, {
+export 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))
   };
@@ -250,8 +230,8 @@ export async function getOracleObject(oracleId, options) {
       respondToQuery,
       extendOracle: extendOracleTtl,
       getQuery: getQueryObject
-    }, _ref5 => {
-      let [name, handler] = _ref5;
+    }, _ref4 => {
+      let [name, handler] = _ref4;
       return [name, function () {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];
@@ -263,7 +243,7 @@ export async function getOracleObject(oracleId, options) {
             ...lastArg
           });
         } else args.push(options);
-        return handler(oracleId, ...args);
+        return handler(...(['extendOracle', 'respondToQuery'].includes(name) ? [] : [oracleId]), ...args);
       }];
     })
   };
@@ -283,17 +263,17 @@ export async function getOracleObject(oracleId, options) {
  */
 export async function registerOracle(queryFormat, responseFormat, options) {
   const accountId = options.onAccount.address;
-  const oracleRegisterTx = await _buildTx(Tag.OracleRegisterTx, {
-    queryFee: QUERY_FEE,
+  const oracleRegisterTx = await buildTxAsync({
     oracleTtlValue: ORACLE_TTL.value,
     oracleTtlType: ORACLE_TTL.type,
     ...options,
+    tag: Tag.OracleRegisterTx,
     accountId,
     queryFormat,
     responseFormat
   });
   return {
-    ...(await send(oracleRegisterTx, options)),
+    ...(await sendTransaction(oracleRegisterTx, options)),
     ...(await getOracleObject(encode(decode(accountId), Encoding.OracleAddress), options))
   };
 }