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

package/src/account/Base.ts

@@ -1,22 +1,16 @@
-/*
- * 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 { Encoded } from '../utils/encoder';
 import Node from '../Node';
-import CompilerHttp from '../contract/CompilerHttp';
+import CompilerBase from '../contract/compiler/Base';
+import { Int } from '../tx/builder/constants';
+
+interface AuthData {
+  fee?: Int;
+  gasLimit?: number;
+  gasPrice?: Int;
+  callData?: Encoded.ContractBytearray;
+  sourceCode?: string;
+  args?: any[];
+}
 
 /**
  * Account is one of the three basic building blocks of an
@@ -36,14 +30,9 @@ export default abstract class AccountBase {
     options: {
       innerTx?: boolean;
       networkId?: string;
-      authData?: {
-        gasLimit?: number;
-        callData?: Encoded.ContractBytearray;
-        sourceCode?: string;
-        args?: any[];
-      };
+      authData?: AuthData | ((tx: Encoded.Transaction) => Promise<AuthData>);
       onNode?: Node;
-      onCompiler?: CompilerHttp;
+      onCompiler?: CompilerBase;
       aeppOrigin?: string;
       aeppRpcClientId?: string;
     },

package/src/account/Generalized.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 AccountBase from './Base';
 import {
   ArgumentError,
@@ -24,9 +8,8 @@ import {
 import { decode, Encoded } from '../utils/encoder';
 import { getAccount } from '../chain';
 import Contract from '../contract/Contract';
-import { _buildTx } from '../tx';
+import { buildTxAsync, buildTx } from '../tx/builder';
 import { Tag } from '../tx/builder/constants';
-import { buildTx } from '../tx/builder';
 
 /**
  * Generalized account class
@@ -63,8 +46,8 @@ export default class AccountGeneralized extends AccountBase {
       throw new ArgumentError('authData, onCompiler, onNode', 'provided', null);
     }
     const {
-      callData, sourceCode, args, gasLimit,
-    } = authData;
+      callData, sourceCode, args, fee, gasLimit, gasPrice,
+    } = typeof authData === 'function' ? await authData(tx) : authData;
 
     const authCallData = callData ?? await (async () => {
       if (this.#authFun == null) {
@@ -85,14 +68,16 @@ export default class AccountGeneralized extends AccountBase {
       return contract._calldata.encode(contract._name, this.#authFun, args);
     })();
 
-    const gaMetaTx = await _buildTx(Tag.GaMetaTx, {
-      tx: buildTx({ encodedTx: decode(tx), signatures: [] }, Tag.SignedTx).rlpEncoded,
+    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({ encodedTx: decode(gaMetaTx), signatures: [] }, Tag.SignedTx).tx;
+    return buildTx({ tag: Tag.SignedTx, encodedTx: decode(gaMetaTx), signatures: [] });
   }
 }

package/src/account/Ledger.ts

@@ -91,7 +91,7 @@ export default class AccountLedger extends AccountBase {
     );
     const signatures = [response.subarray(0, 64)];
 
-    return buildTx({ encodedTx: rawTx, signatures }, Tag.SignedTx).tx;
+    return buildTx({ tag: Tag.SignedTx, encodedTx: rawTx, signatures });
   }
 
   override async signMessage(messageStr: string): Promise<Uint8Array> {

package/src/account/Memory.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 AccountBase from './Base';
 import {
   generateKeyPairFromSecret, sign, generateKeyPair, hash, messageToHash,
@@ -28,6 +12,17 @@ import { Tag } from '../tx/builder/constants';
 
 const secretKeys = new WeakMap();
 
+export function getBufferToSign(
+  transaction: Encoded.Transaction,
+  networkId: string,
+  innerTx: boolean,
+): Uint8Array {
+  const prefixes = [networkId];
+  if (innerTx) prefixes.push('inner_tx');
+  const rlpBinaryTx = decode(transaction);
+  return concatBuffers([Buffer.from(prefixes.join('-')), hash(rlpBinaryTx)]);
+}
+
 /**
  * In-memory account class
  */
@@ -63,19 +58,17 @@ export default class AccountMemory extends AccountBase {
   }
 
   override async signTransaction(
-    tx: Encoded.Transaction,
+    transaction: Encoded.Transaction,
     { innerTx, networkId, ...options }: { innerTx?: boolean; networkId?: string } = {},
   ): Promise<Encoded.Transaction> {
     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 rlpBinaryTx = decode(transaction);
+    const txWithNetworkId = getBufferToSign(transaction, networkId, innerTx === true);
 
     const signatures = [await this.sign(txWithNetworkId, options)];
-    return buildTx({ encodedTx: rlpBinaryTx, signatures }, Tag.SignedTx).tx;
+    return buildTx({ tag: Tag.SignedTx, encodedTx: rlpBinaryTx, signatures });
   }
 
   override async signMessage(message: string, options?: any): Promise<Uint8Array> {

package/src/aens.ts

@@ -1,20 +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.
- */
-
 /**
  * Aens methods - routines to interact with the æternity naming system
  *
@@ -31,9 +14,8 @@ import {
 } from './tx/builder/constants';
 import { ArgumentError } from './utils/errors';
 import { Encoded } from './utils/encoder';
-import { send, SendOptions } from './spend';
-import { getName, getHeight } from './chain';
-import { _buildTx, BuildTxOptions } from './tx';
+import { sendTransaction, SendTransactionOptions, getName } from './chain';
+import { buildTxAsync, BuildTxOptions } from './tx/builder';
 import { TransformNodeType } from './Node';
 import { NameEntry, NamePointer } from './apis/node';
 import AccountBase from './account/Base';
@@ -67,18 +49,19 @@ interface KeyPointers {
 export async function aensRevoke(
   name: AensName,
   options: AensRevokeOptions,
-): ReturnType<typeof send> {
-  const nameRevokeTx = await _buildTx(Tag.NameRevokeTx, {
+): ReturnType<typeof sendTransaction> {
+  const nameRevokeTx = await buildTxAsync({
     ...options,
+    tag: Tag.NameRevokeTx,
     nameId: name,
     accountId: options.onAccount.address,
   });
-  return send(nameRevokeTx, options);
+  return sendTransaction(nameRevokeTx, options);
 }
 
 interface AensRevokeOptions extends
-  BuildTxOptions<Tag.NameRevokeTx, 'nameId' | 'accountId'>,
-  SendOptions {}
+  BuildTxOptions<Tag.NameRevokeTx, 'nameId' | 'accountId' | 'onNode'>,
+  SendTransactionOptions {}
 
 /**
  * Update a name
@@ -113,7 +96,7 @@ export async function aensUpdate(
   name: AensName,
   pointers: KeyPointers,
   { extendPointers, ...options }: AensUpdateOptions,
-): ReturnType<typeof send> {
+): ReturnType<typeof sendTransaction> {
   const allPointers = {
     ...extendPointers === true && Object.fromEntries(
       (await getName(name, options)).pointers.map(({ key, id }) => [key, id]),
@@ -121,22 +104,23 @@ export async function aensUpdate(
     ...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]: [string, Encoded.Generic<AddressEncodings>]) => ({ key, id })),
   });
 
-  return send(nameUpdateTx, options);
+  return sendTransaction(nameUpdateTx, options);
 }
 
 interface AensUpdateOptions extends
-  BuildTxOptions<Tag.NameUpdateTx, 'nameId' | 'accountId' | 'pointers' | 'clientTtl' | 'nameTtl'>,
-  SendOptions {
+  BuildTxOptions<Tag.NameUpdateTx, 'nameId' | 'accountId' | 'pointers' | 'clientTtl' | 'nameTtl' | 'onNode'>,
+  SendTransactionOptions {
   extendPointers?: boolean;
   clientTtl?: number;
   nameTtl?: number;
@@ -169,20 +153,21 @@ export async function aensTransfer(
   name: AensName,
   account: Encoded.AccountAddress,
   options: AensTransferOptions,
-): ReturnType<typeof send> {
-  const nameTransferTx = await _buildTx(Tag.NameTransferTx, {
+): ReturnType<typeof sendTransaction> {
+  const nameTransferTx = await buildTxAsync({
     ...options,
+    tag: Tag.NameTransferTx,
     nameId: name,
     accountId: options.onAccount.address,
     recipientId: account,
   });
 
-  return send(nameTransferTx, options);
+  return sendTransaction(nameTransferTx, options);
 }
 
 interface AensTransferOptions extends
-  BuildTxOptions<Tag.NameTransferTx, 'nameId' | 'accountId' | 'recipientId'>,
-  SendOptions {}
+  BuildTxOptions<Tag.NameTransferTx, 'nameId' | 'accountId' | 'recipientId' | 'onNode'>,
+  SendTransactionOptions {}
 
 /**
  * Query the AENS name info from the node
@@ -297,14 +282,15 @@ export async function aensClaim(
   salt: number,
   options: AensClaimOptions,
 ): Promise<AensClaimReturnType> {
-  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)
@@ -315,10 +301,10 @@ export async function aensClaim(
 }
 
 type AensClaimOptionsType = BuildTxOptions<Tag.NameClaimTx, 'accountId' | 'nameSalt' | 'name'>
-& SendOptions & Parameters<typeof aensQuery>[1];
+& SendTransactionOptions & Parameters<typeof aensQuery>[1];
 interface AensClaimOptions extends AensClaimOptionsType {}
 interface AensClaimReturnType extends
-  Awaited<ReturnType<typeof send>>,
+  Awaited<ReturnType<typeof sendTransaction>>,
   Partial<Awaited<ReturnType<typeof aensQuery>>> {}
 
 /**
@@ -346,38 +332,37 @@ interface AensClaimReturnType extends
  * ```
  */
 export async function aensPreclaim(name: AensName, options: AensPreclaimOptions): Promise<Readonly<
-Awaited<ReturnType<typeof send>> & {
-  height: number;
+Awaited<ReturnType<typeof sendTransaction>> & {
   salt: number;
   commitmentId: string;
   claim: (opts?: Parameters<typeof aensClaim>[2]) => ReturnType<typeof aensClaim>;
 }
 >> {
   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?: Parameters<typeof aensClaim>[2]) {
-      return aensClaim(name, salt, { ...options, ...opts });
+      const { version, ...otherOptions } = options;
+      return aensClaim(name, salt, { ...otherOptions, ...opts });
     },
   });
 }
 
 interface AensPreclaimOptions extends
-  BuildTxOptions<Tag.NamePreclaimTx, 'accountId' | 'commitmentId'>,
-  SendOptions,
-  AensClaimOptions {}
+  BuildTxOptions<Tag.NamePreclaimTx, 'accountId' | 'commitmentId' | 'onNode'>,
+  SendTransactionOptions,
+  Omit<AensClaimOptions, 'version'> {}
 
 /**
  * Bid to name auction

package/src/aepp-wallet-communication/connection/Browser.ts

@@ -1,20 +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 { AlreadyConnectedError, NoWalletConnectedError } from '../../utils/errors';
 
 /**

package/src/aepp-wallet-communication/connection/BrowserRuntime.ts

@@ -1,22 +1,6 @@
-/*
- * 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 { Runtime } from 'webextension-polyfill';
 import BrowserConnection from './Browser';
+import { UnexpectedTsError } from '../../utils/errors';
 
 /**
  * BrowserRuntimeConnection
@@ -26,6 +10,8 @@ import BrowserConnection from './Browser';
 export default class BrowserRuntimeConnection extends BrowserConnection {
   port: Runtime.Port;
 
+  #listeners?: [(message: any, port: Runtime.Port) => void, () => void];
+
   constructor({ port, ...options }: { port: Runtime.Port; debug: boolean }) {
     super(options);
     this.port = port;
@@ -34,6 +20,10 @@ export default class BrowserRuntimeConnection extends BrowserConnection {
   override disconnect(): void {
     super.disconnect();
     this.port.disconnect();
+    if (this.#listeners == null) throw new UnexpectedTsError();
+    this.port.onMessage.removeListener(this.#listeners[0]);
+    this.port.onDisconnect.removeListener(this.#listeners[1]);
+    this.#listeners = undefined;
   }
 
   override connect(
@@ -41,12 +31,16 @@ export default class BrowserRuntimeConnection extends BrowserConnection {
     onDisconnect: () => void,
   ): void {
     super.connect(onMessage, onDisconnect);
-    this.port.onMessage.addListener((message, port) => {
-      this.receiveMessage(message);
-      // TODO: make `origin` optional because sender url is not available on aepp side
-      onMessage(message, port.sender?.url ?? '', port);
-    });
-    this.port.onDisconnect.addListener(onDisconnect);
+    this.#listeners = [
+      (message, port) => {
+        this.receiveMessage(message);
+        // TODO: make `origin` optional because sender url is not available on aepp side
+        onMessage(message, port.sender?.url ?? '', port);
+      },
+      onDisconnect,
+    ];
+    this.port.onMessage.addListener(this.#listeners[0]);
+    this.port.onDisconnect.addListener(this.#listeners[1]);
   }
 
   override sendMessage(message: any): void {
@@ -55,6 +49,6 @@ export default class BrowserRuntimeConnection extends BrowserConnection {
   }
 
   isConnected(): boolean {
-    return this.port.onMessage.hasListeners();
+    return this.#listeners != null;
   }
 }

package/src/aepp-wallet-communication/connection/BrowserWindowMessage.ts

@@ -1,20 +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 BrowserConnection from './Browser';
 import { MESSAGE_DIRECTION } from '../schema';
 import { InternalError, RpcConnectionError } from '../../utils/errors';

package/src/aepp-wallet-communication/connection-proxy.ts

@@ -1,20 +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 BrowserConnection from './connection/Browser';
 
 /**

package/src/aepp-wallet-communication/rpc/RpcClient.ts

@@ -94,13 +94,13 @@ export default class RpcClient <
     id: number,
     method: keyof RemoteApi | keyof LocalApi, // TODO: remove as far it is not required in JSON RPC
     result?: any,
-    error?: any,
+    error?: RpcError,
   ): void {
     this.connection.sendMessage({
       jsonrpc: '2.0',
       id,
       method,
-      ...error != null ? { error } : { result },
+      ...error != null ? { error: error.toJSON() } : { result },
     });
   }
 

package/src/aepp-wallet-communication/rpc/types.ts

@@ -1,6 +1,7 @@
-import { send } from '../../spend';
 import { Encoded } from '../../utils/encoder';
 import { METHODS, SUBSCRIPTION_TYPES, WALLET_TYPE } from '../schema';
+import { TransformNodeType } from '../../Node';
+import { SignedTx } from '../../apis/node';
 
 export interface WalletInfo {
   id: string;
@@ -59,7 +60,10 @@ export interface WalletApi {
      * @deprecated this is not a hash at all, will be removed later at the same time
      * as dropping ability to broadcast transaction by wallet
      */
-    transactionHash?: Awaited<ReturnType<typeof send>>;
+    transactionHash?: Partial<TransformNodeType<SignedTx>> & {
+      hash: Encoded.TxHash;
+      rawTx: Encoded.Transaction;
+    };
     signedTransaction?: Encoded.Transaction;
   }>);
 

package/src/aepp-wallet-communication/wallet-detector.ts

@@ -1,20 +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 BrowserConnection from './connection/Browser';
 import BrowserWindowMessageConnection from './connection/BrowserWindowMessage';
 import { MESSAGE_DIRECTION, METHODS } from './schema';

package/src/apis/compiler/compiler.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 {
@@ -72,32 +71,9 @@ export class Compiler 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;
   }
@@ -118,7 +94,7 @@ export class Compiler extends coreClient.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.
    */
@@ -307,7 +283,7 @@ const compileContractOperationSpec: coreClient.OperationSpec = {
   httpMethod: "POST",
   responses: {
     200: {
-      bodyMapper: Mappers.ByteCode
+      bodyMapper: Mappers.CompileResult
     },
     400: {
       bodyMapper: {

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

@@ -32,9 +32,10 @@ export interface ErrorPos {
   col: number;
 }
 
-export interface ByteCode {
+export interface CompileResult {
   /** Prefixed (cb_) Base64Check encoded byte array */
   bytecode: string;
+  aci: Record<string, unknown>[];
 }
 
 export interface SophiaCallResultInput {
@@ -157,7 +158,7 @@ export interface CompileContractOptionalParams
   extends coreClient.OperationOptions {}
 
 /** Contains response data for the compileContract operation. */
-export type CompileContractResponse = ByteCode;
+export type CompileContractResponse = CompileResult;
 
 /** Optional parameters. */
 export interface DecodeCallResultOptionalParams