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

package/src/apis/compiler/models/mappers.ts

@@ -146,10 +146,10 @@ export const ErrorPos: coreClient.CompositeMapper = {
   }
 };
 
-export const ByteCode: coreClient.CompositeMapper = {
+export const CompileResult: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ByteCode",
+    className: "CompileResult",
     modelProperties: {
       bytecode: {
         serializedName: "bytecode",
@@ -157,6 +157,19 @@ export const ByteCode: coreClient.CompositeMapper = {
         type: {
           name: "String"
         }
+      },
+      aci: {
+        serializedName: "aci",
+        required: true,
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Dictionary",
+              value: { type: { name: "any" } }
+            }
+          }
+        }
       }
     }
   }

package/src/apis/node/models/index.ts

@@ -112,7 +112,7 @@ export interface SignedTx {
 /** A mix of all transaction types. */
 export interface Tx {
   /** Polymorphic discriminator, which specifies the different types this object can be */
-  type: "undefined";
+  type: "Tx";
   /** Base58Check encoded tagged pubkey */
   recipientId?: string;
   amount?: string;
@@ -900,7 +900,7 @@ export interface CheckTxInPoolResponse {
   status: string;
 }
 
-export type OffChainTransfer = OffChainUpdate & {
+export interface OffChainTransfer extends OffChainUpdate {
   /** Polymorphic discriminator, which specifies the different types this object can be */
   op: "OffChainTransfer";
   /** Base58Check encoded tagged pubkey */
@@ -908,25 +908,25 @@ export type OffChainTransfer = OffChainUpdate & {
   /** Base58Check encoded tagged pubkey */
   to: string;
   amount: string;
-};
+}
 
-export type OffChainWithdrawal = OffChainUpdate & {
+export interface OffChainWithdrawal extends OffChainUpdate {
   /** Polymorphic discriminator, which specifies the different types this object can be */
   op: "OffChainWithdrawal";
   /** Base58Check encoded tagged pubkey */
   to: string;
   amount: string;
-};
+}
 
-export type OffChainDeposit = OffChainUpdate & {
+export interface OffChainDeposit extends OffChainUpdate {
   /** Polymorphic discriminator, which specifies the different types this object can be */
   op: "OffChainDeposit";
   /** Base58Check encoded tagged pubkey */
   from: string;
   amount: string;
-};
+}
 
-export type OffChainNewContract = OffChainUpdate & {
+export interface OffChainNewContract extends OffChainUpdate {
   /** Polymorphic discriminator, which specifies the different types this object can be */
   op: "OffChainNewContract";
   /** Base58Check encoded tagged pubkey */
@@ -937,9 +937,9 @@ export type OffChainNewContract = OffChainUpdate & {
   deposit: string;
   /** Base64Check encoded tagged byte array */
   callData: string;
-};
+}
 
-export type OffChainCallContract = OffChainUpdate & {
+export interface OffChainCallContract extends OffChainUpdate {
   /** Polymorphic discriminator, which specifies the different types this object can be */
   op: "OffChainCallContract";
   /** Base58Check encoded tagged pubkey */
@@ -952,12 +952,13 @@ export type OffChainCallContract = OffChainUpdate & {
   gasPrice: string;
   /** Base64Check encoded tagged byte array */
   callData: string;
-};
+}
 
-export type CreateContractUnsignedTx = UnsignedTx & {
+export interface CreateContractUnsignedTx extends UnsignedTx {
   /** Base58Check encoded tagged pubkey */
   contractId: string;
-};
+}
+
 /** Defines values for TTLType. */
 export type TTLType = "delta" | "block";
 /** Defines values for TxType. */
@@ -1194,11 +1195,11 @@ export type GetOracleByPubkeyResponse = RegisteredOracle;
 export interface GetOracleQueriesByPubkeyOptionalParams
   extends coreClient.OperationOptions {
   /** Last query id in previous page */
-  fromParam?: string;
+  from?: string;
   /** Max number of oracle queries */
   limit?: number;
   /** The type of a query: open, closed or all */
-  typeParam?: OracleQueryType;
+  type?: OracleQueryType;
 }
 
 /** Contains response data for the getOracleQueriesByPubkey operation. */

package/src/apis/node/models/mappers.ts

@@ -427,6 +427,7 @@ export const SignedTx: coreClient.CompositeMapper = {
 };
 
 export const Tx: coreClient.CompositeMapper = {
+  serializedName: "Tx",
   type: {
     name: "Composite",
     className: "Tx",
@@ -4270,7 +4271,7 @@ export const CreateContractUnsignedTx: coreClient.CompositeMapper = {
 };
 
 export let discriminators = {
-  "Tx.undefined": Tx,
+  "Tx.Tx": Tx,
   OffChainUpdate: OffChainUpdate,
   "OffChainUpdate.OffChainTransfer": OffChainTransfer,
   "OffChainUpdate.OffChainWithdrawal": OffChainWithdrawal,

package/src/apis/node/models/parameters.ts

@@ -128,7 +128,7 @@ export const body1: OperationParameter = {
   mapper: EncodedTxMapper
 };
 
-export const fromParam: OperationQueryParameter = {
+export const from: OperationQueryParameter = {
   parameterPath: ["options", "from"],
   mapper: {
     serializedName: "from",
@@ -153,7 +153,7 @@ export const limit: OperationQueryParameter = {
   }
 };
 
-export const typeParam: OperationQueryParameter = {
+export const type: OperationQueryParameter = {
   parameterPath: ["options", "type"],
   mapper: {
     defaultValue: "all",

package/src/apis/node/node.ts

@@ -1,5 +1,4 @@
 import * as coreClient from "@azure/core-client";
-import * as coreRestPipeline from "@azure/core-rest-pipeline";
 import * as Parameters from "./models/parameters";
 import * as Mappers from "./models/mappers";
 import {
@@ -110,32 +109,9 @@ export class Node extends coreClient.ServiceClient {
       userAgentOptions: {
         userAgentPrefix
       },
-      baseUri: options.endpoint ?? options.baseUri ?? "{$host}"
+      endpoint: options.endpoint ?? options.baseUri ?? "{$host}"
     };
     super(optionsWithDefaults);
-
-    if (options?.pipeline && options.pipeline.getOrderedPolicies().length > 0) {
-      const pipelinePolicies: coreRestPipeline.PipelinePolicy[] = options.pipeline.getOrderedPolicies();
-      const bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
-        (pipelinePolicy) =>
-          pipelinePolicy.name ===
-          coreRestPipeline.bearerTokenAuthenticationPolicyName
-      );
-      if (!bearerTokenAuthenticationPolicyFound) {
-        this.pipeline.removePolicy({
-          name: coreRestPipeline.bearerTokenAuthenticationPolicyName
-        });
-        this.pipeline.addPolicy(
-          coreRestPipeline.bearerTokenAuthenticationPolicy({
-            scopes: `${optionsWithDefaults.baseUri}/.default`,
-            challengeCallbacks: {
-              authorizeRequestOnChallenge:
-                coreClient.authorizeRequestOnClaimChallenge
-            }
-          })
-        );
-      }
-    }
     // Parameter assignments
     this.$host = $host;
   }
@@ -1185,9 +1161,9 @@ const getOracleQueriesByPubkeyOperationSpec: coreClient.OperationSpec = {
   },
   queryParameters: [
     Parameters.intAsString,
-    Parameters.fromParam,
+    Parameters.from,
     Parameters.limit,
-    Parameters.typeParam
+    Parameters.type
   ],
   urlParameters: [Parameters.$host, Parameters.pubkey],
   headerParameters: [Parameters.accept],

package/src/chain.ts

@@ -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.
- */
 import { AE_AMOUNT_FORMATS, formatAmount } from './utils/amount-formatter';
 import verifyTransaction, { ValidatorResult } from './tx/validator';
 import { isAccountNotFoundError, pause } from './utils/other';
@@ -29,8 +13,11 @@ import {
   Account as AccountNode, ByteCode, ContractObject, DryRunResult, DryRunResults,
   Generation, KeyBlock, MicroBlockHeader, NameEntry, SignedTx,
 } from './apis/node';
-import { decode, Encoded, Encoding } from './utils/encoder';
+import {
+  decode, encode, Encoded, Encoding,
+} from './utils/encoder';
 import AccountBase from './account/Base';
+import { buildTxHash } from './tx/builder';
 
 /**
  * @category chain
@@ -154,24 +141,33 @@ export async function waitForTxConfirm(
 }
 
 /**
- * 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
  */
 export async function sendTransaction(
-  tx: Encoded.Transaction,
+  txUnsigned: Encoded.Transaction,
   {
-    onNode, onAccount, verify = true, waitMined = true, confirm, ...options
+    onNode, onAccount, verify = true, waitMined = true, confirm, innerTx, ...options
   }:
   SendTransactionOptions,
 ): Promise<SendTransactionReturnType> {
+  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) {
@@ -221,12 +217,13 @@ export async function sendTransaction(
 
 type SendTransactionOptionsType = {
   onNode: Node;
-  onAccount?: AccountBase;
+  onAccount: AccountBase;
   verify?: boolean;
   waitMined?: boolean;
   confirm?: boolean | number;
-} & Parameters<typeof poll>[1] & Omit<Parameters<typeof waitForTxConfirm>[1], 'confirm'>;
-interface SendTransactionOptions extends SendTransactionOptionsType {}
+} & Parameters<typeof poll>[1] & Omit<Parameters<typeof waitForTxConfirm>[1], 'confirm'>
+& Parameters<AccountBase['signTransaction']>[1];
+export interface SendTransactionOptions extends SendTransactionOptionsType {}
 interface SendTransactionReturnType extends Partial<TransformNodeType<SignedTx>> {
   hash: Encoded.TxHash;
   rawTx: Encoded.Transaction;
@@ -263,11 +260,15 @@ export async function getAccount(
  * @param options.hash - The block hash on which to obtain the balance for (default: top of chain)
  */
 export async function getBalance(
-  address: Encoded.AccountAddress | Encoded.ContractAddress,
+  address: Encoded.AccountAddress | Encoded.ContractAddress | Encoded.OracleAddress,
   { format = AE_AMOUNT_FORMATS.AETTOS, ...options }:
   { format?: AE_AMOUNT_FORMATS } & Parameters<typeof getAccount>[1],
 ): Promise<string> {
-  const { balance } = await getAccount(address, options).catch((error) => {
+  const addr = address.startsWith('ok_')
+    ? encode(decode(address), Encoding.AccountAddress)
+    : address as Encoded.AccountAddress | Encoded.ContractAddress;
+
+  const { balance } = await getAccount(addr, options).catch((error) => {
     if (!isAccountNotFoundError(error)) throw error;
     return { balance: 0n };
   });
@@ -353,7 +354,7 @@ export async function getMicroBlockHeader(
 interface TxDryRunArguments {
   tx: Encoded.Transaction;
   accountAddress: Encoded.AccountAddress;
-  top?: number;
+  top?: number | Encoded.KeyBlockHash | Encoded.MicroBlockHash;
   txEvents?: any;
   resolve: Function;
   reject: Function;
@@ -367,8 +368,10 @@ async function txDryRunHandler(key: string, onNode: Node): Promise<void> {
 
   let dryRunRes;
   try {
+    const top = typeof rs[0].top === 'number'
+      ? (await getKeyBlock(rs[0].top, { onNode })).hash : rs[0].top;
     dryRunRes = await onNode.protectedDryRunTxs({
-      top: rs[0].top,
+      top,
       txEvents: rs[0].txEvents,
       txs: rs.map((req) => ({ tx: req.tx })),
       accounts: Array.from(new Set(rs.map((req) => req.accountAddress)))
@@ -406,7 +409,7 @@ export async function txDryRun(
   {
     top, txEvents, combine, onNode,
   }:
-  { top?: number; txEvents?: boolean; combine?: boolean; onNode: Node },
+  { top?: TxDryRunArguments['top']; txEvents?: boolean; combine?: boolean; onNode: Node },
 ): Promise<{
     txEvents?: TransformNodeType<DryRunResults['txEvents']>;
   } & TransformNodeType<DryRunResult>> {

package/src/channel/Base.ts

@@ -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.
- */
 import { EventEmitter } from 'events';
 import { w3cwebsocket as W3CWebSocket } from 'websocket';
 import { snakeToPascal } from '../utils/string';
@@ -33,9 +17,12 @@ import {
   ChannelAction,
   ChannelStatus,
   ChannelFsm,
+  ChannelMessage,
+  ChannelEvents,
 } from './internal';
 import { ChannelError } from '../utils/errors';
 import { Encoded } from '../utils/encoder';
+import { TxUnpacked } from '../tx/builder/schema.generated';
 
 function snakeToPascalObjKeys<Type>(obj: object): Type {
   return Object.entries(obj).reduce((result, [key, val]) => ({
@@ -44,8 +31,6 @@ function snakeToPascalObjKeys<Type>(obj: object): Type {
   }), {}) as Type;
 }
 
-type EventCallback = (...args: any[]) => void;
-
 /**
  * Channel
  * @example
@@ -78,7 +63,7 @@ export default class Channel {
 
   _fsmId?: Encoded.Bytearray;
 
-  _messageQueue: object[] = [];
+  _messageQueue: ChannelMessage[] = [];
 
   _isMessageQueueLocked = false;
 
@@ -92,7 +77,7 @@ export default class Channel {
 
   _websocket: W3CWebSocket;
 
-  _state?: Encoded.Transaction;
+  _state: Encoded.Transaction | '' = '';
 
   _options: ChannelOptions;
 
@@ -168,19 +153,23 @@ export default class 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: string, callback: EventCallback): void {
+  on<E extends keyof ChannelEvents>(eventName: E, callback: ChannelEvents[E]): void {
     this._eventEmitter.on(eventName, callback);
   }
 
@@ -189,7 +178,7 @@ export default class Channel {
    * @param eventName - Event name
    * @param callback - Callback function
    */
-  off(eventName: string, callback: EventCallback): void {
+  off<E extends keyof ChannelEvents>(eventName: E, callback: ChannelEvents[E]): void {
     this._eventEmitter.removeListener(eventName, callback);
   }
 
@@ -210,8 +199,24 @@ export default class Channel {
   /**
    * Get current state
    */
-  async state(): Promise<ChannelState> {
-    return snakeToPascalObjKeys(await call(this, 'channels.get.offchain_state', {}));
+  async state(): Promise<{
+    calls: TxUnpacked & { tag: Tag.CallsMtree };
+    halfSignedTx?: TxUnpacked & { tag: Tag.SignedTx };
+    signedTx?: TxUnpacked & { tag: Tag.SignedTx };
+    trees: TxUnpacked & { tag: Tag.StateTrees };
+  }> {
+    const res = snakeToPascalObjKeys<{
+      calls: Encoded.CallStateTree;
+      halfSignedTx: Encoded.Transaction | '';
+      signedTx: Encoded.Transaction | '';
+      trees: Encoded.StateTrees;
+    }>(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),
+    };
   }
 
   /**
@@ -221,17 +226,17 @@ export default class Channel {
    * it will return `null`.
    */
   round(): number | null {
-    if (this._state == null) {
+    if (this._state === '') {
       return null;
     }
-    const { txType, tx } = unpackTx(this._state, Tag.SignedTx).tx.encodedTx;
-    switch (txType) {
+    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 tx.round;
+        return params.round;
       default:
         return null;
     }
@@ -321,7 +326,10 @@ export default class Channel {
 
     return Channel.initialize({
       ...options,
-      reconnectTx: await sign('reconnect', buildTx(txParams, Tag.ChannelClientReconnectTx).tx),
+      reconnectTx: await sign(
+        'reconnect',
+        buildTx({ ...txParams, tag: Tag.ChannelClientReconnectTx }),
+      ),
     });
   }
 }

package/src/channel/Contract.ts

@@ -1,22 +1,8 @@
-/*
- * 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.
- */
 import BigNumber from 'bignumber.js';
 import { snakeToPascal } from '../utils/string';
-import { MIN_GAS_PRICE, Tag } from '../tx/builder/constants';
+import {
+  MIN_GAS_PRICE, Tag, AbiVersion, VmVersion,
+} from '../tx/builder/constants';
 import {
   signAndNotify,
   awaitingCompletion,
@@ -32,7 +18,7 @@ import { ContractCallReturnType } from '../apis/node';
 import { ContractCallObject } from '../contract/Contract';
 import Channel from './Base';
 import ChannelSpend from './Spend';
-import { UnexpectedChannelMessageError } from '../utils/errors';
+import { ChannelError, UnexpectedChannelMessageError } from '../utils/errors';
 import { unpackTx } from '../tx/builder';
 import { encodeContractAddress } from '../utils/crypto';
 
@@ -46,7 +32,7 @@ function snakeToPascalObjKeys<Type>(obj: object): Type {
 interface CallContractOptions {
   amount?: number | BigNumber;
   callData?: Encoded.ContractBytearray;
-  abiVersion?: number;
+  abiVersion?: AbiVersion;
   contract?: Encoded.ContractAddress;
   returnValue?: any;
   gasUsed?: number | BigNumber;
@@ -58,13 +44,13 @@ interface CallContractOptions {
 }
 
 interface Contract {
-  abiVersion: number;
+  abiVersion: AbiVersion;
   active: boolean;
   deposit: number | BigNumber;
   id: string;
   ownerId: string;
   referrerIds: string[];
-  vmVersion: number;
+  vmVersion: VmVersion;
 }
 
 export default class ChannelContract extends ChannelSpend {
@@ -113,8 +99,8 @@ export default class ChannelContract extends ChannelSpend {
       code: Encoded.ContractBytearray;
       callData: Encoded.ContractBytearray;
       deposit: number | BigNumber;
-      vmVersion: number;
-      abiVersion: number;
+      vmVersion: VmVersion;
+      abiVersion: AbiVersion;
     },
     sign: SignTx,
   ): Promise<{
@@ -150,17 +136,17 @@ export default class ChannelContract extends ChannelSpend {
               state2: ChannelState,
             ): ChannelFsm => (
               awaitingCompletion(this, message2, state2, () => {
-                const { round } = unpackTx(message2.params.data.state, Tag.SignedTx)
-                  .tx.encodedTx.tx;
+                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);
-                state2.resolve({
-                  accepted: true,
-                  address: encodeContractAddress(owner, round),
-                  signedTx: message2.params.data.state,
-                });
+                const address = encodeContractAddress(owner, params.round);
+                emit(this, 'newContract', address);
+                state2.resolve({ accepted: true, address, signedTx: message2.params.data.state });
                 return { handler: channelOpen };
               })
             ),
@@ -294,7 +280,7 @@ export default class ChannelContract extends ChannelSpend {
       amount: number;
       callData: Encoded.ContractBytearray;
       contract: Encoded.ContractAddress;
-      abiVersion: number;
+      abiVersion: AbiVersion;
       gasLimit?: number;
       gasPrice?: number;
     },
@@ -390,7 +376,7 @@ export default class ChannelContract extends ChannelSpend {
       amount: number;
       callData: Encoded.ContractBytearray;
       contract: Encoded.ContractAddress;
-      abiVersion: number;
+      abiVersion: AbiVersion;
     },
   ): Promise<CallContractOptions> {
     return snakeToPascalObjKeys(await call(this, 'channels.dry_run.call_contract', {

package/src/channel/Spend.ts

@@ -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.
- */
 import BigNumber from 'bignumber.js';
 import {
   notify, call, SignTx, ChannelState, ChannelMessage, ChannelFsm, changeState,
@@ -25,6 +9,9 @@ import { ChannelConnectionError } from '../utils/errors';
 import {
   awaitingCompletion, channelOpen, handleUnexpectedMessage, signAndNotify,
 } from './handlers';
+import { unpackTx } from '../tx/builder';
+import { Tag } from '../tx/builder/constants';
+import { TxUnpacked } from '../tx/builder/schema.generated';
 
 export default class ChannelSpend extends Channel {
   /**
@@ -133,8 +120,11 @@ export default class ChannelSpend extends Channel {
       accounts: Encoded.AccountAddress[];
       contracts?: Encoded.ContractAddress[];
     },
-  ): Promise<Encoded.Poi> {
-    return (await call(this, 'channels.get.poi', { accounts, contracts })).poi;
+  ): Promise<TxUnpacked & { tag: Tag.TreesPoi }> {
+    return unpackTx(
+      (await call(this, 'channels.get.poi', { accounts, contracts })).poi,
+      Tag.TreesPoi,
+    );
   }
 
   /**