@aeternity/aepp-sdk 13.2.1 → 13.3.0

package/src/account/Memory.ts

@@ -1,18 +1,20 @@
 import AccountBase from './Base';
 import {
-  generateKeyPairFromSecret, sign, generateKeyPair, hash, messageToHash,
+  generateKeyPairFromSecret, sign, generateKeyPair, hash, messageToHash, messagePrefixLength,
 } from '../utils/crypto';
-import { ArgumentError } from '../utils/errors';
+import { ArgumentError, UnexpectedTsError } from '../utils/errors';
 import {
   decode, encode, Encoded, Encoding,
 } from '../utils/encoder';
 import { concatBuffers } from '../utils/other';
 import { hashTypedData, AciValue } from '../utils/typed-data';
 import { buildTx } from '../tx/builder';
-import { Tag, AensName } from '../tx/builder/constants';
+import { Tag, AensName, ConsensusProtocolVersion } from '../tx/builder/constants';
 import { produceNameId } from '../tx/builder/helpers';
+import { DelegationTag } from '../tx/builder/delegation/schema';
+import { packDelegation } from '../tx/builder/delegation';
 
-const secretKeys = new WeakMap();
+const secretKeys = new WeakMap<AccountMemory, Uint8Array>();
 
 export function getBufferToSign(
   transaction: Encoded.Transaction,
@@ -42,7 +44,7 @@ export default class AccountMemory extends AccountBase {
     }
     secretKeys.set(this, secretKey);
     this.address = encode(
-      generateKeyPairFromSecret(secretKeys.get(this)).publicKey,
+      generateKeyPairFromSecret(secretKey).publicKey,
       Encoding.AccountAddress,
     );
   }
@@ -56,7 +58,9 @@ export default class AccountMemory extends AccountBase {
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   override async sign(data: string | Uint8Array, options?: any): Promise<Uint8Array> {
-    return sign(data, secretKeys.get(this));
+    const secretKey = secretKeys.get(this);
+    if (secretKey == null) throw new UnexpectedTsError();
+    return sign(data, secretKey);
   }
 
   override async signTransaction(
@@ -93,8 +97,24 @@ export default class AccountMemory extends AccountBase {
 
   override async signDelegationToContract(
     contractAddress: Encoded.ContractAddress,
-    { networkId }: { networkId?: string } = {},
+    { networkId, consensusProtocolVersion, isOracle }: {
+      networkId?: string;
+      consensusProtocolVersion?: ConsensusProtocolVersion;
+      isOracle?: boolean;
+    } = {},
   ): Promise<Encoded.Signature> {
+    if (isOracle == null) {
+      const protocol = (consensusProtocolVersion != null) ? ConsensusProtocolVersion[consensusProtocolVersion] : 'unknown';
+      console.warn(`AccountMemory:signDelegationToContract: isOracle is not set. By default, sdk would generate an AENS preclaim delegation signature, but it won't be the same as the oracle delegation signature in Ceres (current protocol is ${protocol}).`);
+    }
+    if (consensusProtocolVersion === ConsensusProtocolVersion.Ceres) {
+      const delegation = packDelegation({
+        tag: isOracle === true ? DelegationTag.Oracle : DelegationTag.AensPreclaim,
+        accountAddress: this.address,
+        contractAddress,
+      });
+      return this.signDelegation(delegation, { networkId });
+    }
     if (networkId == null) throw new ArgumentError('networkId', 'provided', networkId);
     const payload = concatBuffers([
       Buffer.from(networkId),
@@ -108,8 +128,17 @@ export default class AccountMemory extends AccountBase {
   override async signNameDelegationToContract(
     contractAddress: Encoded.ContractAddress,
     name: AensName,
-    { networkId }: { networkId?: string } = {},
+    { networkId, consensusProtocolVersion }: {
+      networkId?: string;
+      consensusProtocolVersion?: ConsensusProtocolVersion;
+    } = {},
   ): Promise<Encoded.Signature> {
+    if (consensusProtocolVersion === ConsensusProtocolVersion.Ceres) {
+      const delegation = packDelegation({
+        tag: DelegationTag.AensName, accountAddress: this.address, contractAddress, nameId: name,
+      });
+      return this.signDelegation(delegation, { networkId });
+    }
     if (networkId == null) throw new ArgumentError('networkId', 'provided', networkId);
     const payload = concatBuffers([
       Buffer.from(networkId),
@@ -121,11 +150,44 @@ export default class AccountMemory extends AccountBase {
     return encode(signature, Encoding.Signature);
   }
 
+  override async signAllNamesDelegationToContract(
+    contractAddress: Encoded.ContractAddress,
+    { networkId, consensusProtocolVersion }: {
+      networkId?: string;
+      consensusProtocolVersion?: ConsensusProtocolVersion;
+    } = {},
+  ): Promise<Encoded.Signature> {
+    if (consensusProtocolVersion === ConsensusProtocolVersion.Ceres) {
+      const delegation = packDelegation({
+        tag: DelegationTag.AensWildcard, accountAddress: this.address, contractAddress,
+      });
+      return this.signDelegation(delegation, { networkId });
+    }
+    if (networkId == null) throw new ArgumentError('networkId', 'provided', networkId);
+    const payload = concatBuffers([
+      Buffer.from(networkId),
+      decode(this.address),
+      Buffer.from('AENS'),
+      decode(contractAddress),
+    ]);
+    const signature = await this.sign(payload);
+    return encode(signature, Encoding.Signature);
+  }
+
   override async signOracleQueryDelegationToContract(
     contractAddress: Encoded.ContractAddress,
     oracleQueryId: Encoded.OracleQueryId,
-    { networkId }: { networkId?: string } = {},
+    { networkId, consensusProtocolVersion }: {
+      networkId?: string;
+      consensusProtocolVersion?: ConsensusProtocolVersion;
+    } = {},
   ): Promise<Encoded.Signature> {
+    if (consensusProtocolVersion === ConsensusProtocolVersion.Ceres) {
+      const delegation = packDelegation({
+        tag: DelegationTag.OracleResponse, queryId: oracleQueryId, contractAddress,
+      });
+      return this.signDelegation(delegation, { networkId });
+    }
     const oracleQueryIdDecoded = decode(oracleQueryId);
     const addressDecoded = decode(this.address);
     // TODO: remove after fixing https://github.com/aeternity/aesophia/issues/475
@@ -141,4 +203,16 @@ export default class AccountMemory extends AccountBase {
     const signature = await this.sign(payload);
     return encode(signature, Encoding.Signature);
   }
+
+  override async signDelegation(
+    delegation: Encoded.Bytearray,
+    { networkId }: { networkId?: string } = {},
+  ): Promise<Encoded.Signature> {
+    if (networkId == null) throw new ArgumentError('networkId', 'provided', networkId);
+    const payload = concatBuffers([
+      messagePrefixLength, new Uint8Array([1]), Buffer.from(networkId), decode(delegation),
+    ]);
+    const signature = await this.sign(payload);
+    return encode(signature, Encoding.Signature);
+  }
 }

package/src/account/Rpc.ts

@@ -1,10 +1,14 @@
 import AccountBase from './Base';
 import { METHODS } from '../aepp-wallet-communication/schema';
-import { ArgumentError, NotImplementedError, UnsupportedProtocolError } from '../utils/errors';
-import { Encoded } from '../utils/encoder';
+import { ArgumentError, UnsupportedProtocolError } from '../utils/errors';
+import {
+  Encoded, Encoding, decode, encode,
+} from '../utils/encoder';
 import RpcClient from '../aepp-wallet-communication/rpc/RpcClient';
 import { AeppApi, WalletApi } from '../aepp-wallet-communication/rpc/types';
-import { AensName } from '../tx/builder/constants';
+import { AensName, ConsensusProtocolVersion } from '../tx/builder/constants';
+import { packDelegation } from '../tx/builder/delegation';
+import { DelegationTag } from '../tx/builder/delegation/schema';
 
 /**
  * Account provided by wallet
@@ -24,9 +28,11 @@ export default class AccountRpc extends AccountBase {
     this.address = address;
   }
 
-  // eslint-disable-next-line class-methods-use-this
-  async sign(): Promise<Uint8Array> {
-    throw new NotImplementedError('RAW signing using wallet');
+  async sign(dataRaw: string | Uint8Array): Promise<Uint8Array> {
+    const data = encode(Buffer.from(dataRaw), Encoding.Bytearray);
+    const { signature } = await this._rpcClient
+      .request(METHODS.unsafeSign, { onAccount: this.address, data });
+    return decode(signature);
   }
 
   override async signTransaction(
@@ -73,10 +79,27 @@ export default class AccountRpc extends AccountBase {
 
   override async signDelegationToContract(
     contractAddress: Encoded.ContractAddress,
+    { consensusProtocolVersion, isOracle }: {
+      consensusProtocolVersion?: ConsensusProtocolVersion;
+      isOracle?: boolean;
+    } = {},
   ): Promise<Encoded.Signature> {
+    if (isOracle == null) {
+      const protocol = (consensusProtocolVersion != null) ? ConsensusProtocolVersion[consensusProtocolVersion] : 'unknown';
+      console.warn(`AccountRpc:signDelegationToContract: isOracle is not set. By default, sdk would generate an AENS preclaim delegation signature, but it won't be the same as the oracle delegation signature in Ceres (current protocol is ${protocol}).`);
+    }
+    if (consensusProtocolVersion === ConsensusProtocolVersion.Ceres) {
+      const delegation = packDelegation({
+        tag: isOracle === true ? DelegationTag.Oracle : DelegationTag.AensPreclaim,
+        accountAddress: this.address,
+        contractAddress,
+      });
+      return this.signDelegation(delegation);
+    }
     const { signature } = await this._rpcClient.request(METHODS.signDelegationToContract, {
       onAccount: this.address,
       contractAddress,
+      isOracle,
     });
     return signature;
   }
@@ -84,7 +107,14 @@ export default class AccountRpc extends AccountBase {
   override async signNameDelegationToContract(
     contractAddress: Encoded.ContractAddress,
     name: AensName,
+    { consensusProtocolVersion }: { consensusProtocolVersion?: ConsensusProtocolVersion } = {},
   ): Promise<Encoded.Signature> {
+    if (consensusProtocolVersion === ConsensusProtocolVersion.Ceres) {
+      const delegation = packDelegation({
+        tag: DelegationTag.AensName, accountAddress: this.address, contractAddress, nameId: name,
+      });
+      return this.signDelegation(delegation);
+    }
     const { signature } = await this._rpcClient.request(METHODS.signDelegationToContract, {
       onAccount: this.address,
       contractAddress,
@@ -93,10 +123,35 @@ export default class AccountRpc extends AccountBase {
     return signature;
   }
 
+  override async signAllNamesDelegationToContract(
+    contractAddress: Encoded.ContractAddress,
+    { consensusProtocolVersion }: { consensusProtocolVersion?: ConsensusProtocolVersion } = {},
+  ): Promise<Encoded.Signature> {
+    if (consensusProtocolVersion === ConsensusProtocolVersion.Ceres) {
+      const delegation = packDelegation({
+        tag: DelegationTag.AensWildcard, accountAddress: this.address, contractAddress,
+      });
+      return this.signDelegation(delegation);
+    }
+    const { signature } = await this._rpcClient.request(METHODS.signDelegationToContract, {
+      onAccount: this.address,
+      contractAddress,
+      allNames: true,
+    });
+    return signature;
+  }
+
   override async signOracleQueryDelegationToContract(
     contractAddress: Encoded.ContractAddress,
     oracleQueryId: Encoded.OracleQueryId,
+    { consensusProtocolVersion }: { consensusProtocolVersion?: ConsensusProtocolVersion } = {},
   ): Promise<Encoded.Signature> {
+    if (consensusProtocolVersion === ConsensusProtocolVersion.Ceres) {
+      const delegation = packDelegation({
+        tag: DelegationTag.OracleResponse, queryId: oracleQueryId, contractAddress,
+      });
+      return this.signDelegation(delegation);
+    }
     const { signature } = await this._rpcClient.request(METHODS.signDelegationToContract, {
       onAccount: this.address,
       contractAddress,
@@ -104,4 +159,12 @@ export default class AccountRpc extends AccountBase {
     });
     return signature;
   }
+
+  override async signDelegation(delegation: Encoded.Bytearray): Promise<Encoded.Signature> {
+    const { signature } = await this._rpcClient.request(
+      METHODS.signDelegation,
+      { delegation, onAccount: this.address },
+    );
+    return signature;
+  }
 }

package/src/aens.ts

@@ -7,14 +7,13 @@
  */
 
 import BigNumber from 'bignumber.js';
-import { genSalt } from './utils/crypto';
+import { genSalt, isAddressValid } from './utils/crypto';
 import { commitmentHash, isAuctionName } from './tx/builder/helpers';
-import {
-  CLIENT_TTL, NAME_TTL, Tag, AensName,
-} from './tx/builder/constants';
-import { ArgumentError } from './utils/errors';
-import { Encoded } from './utils/encoder';
-import { sendTransaction, SendTransactionOptions, getName } from './chain';
+import { Tag, AensName, ConsensusProtocolVersion } from './tx/builder/constants';
+import { Encoded, Encoding } from './utils/encoder';
+import { UnsupportedProtocolError } from './utils/errors';
+import { getName } from './chain';
+import { sendTransaction, SendTransactionOptions } from './send-transaction';
 import { buildTxAsync, BuildTxOptions } from './tx/builder';
 import { TransformNodeType } from './Node';
 import { NameEntry, NamePointer } from './apis/node';
@@ -22,7 +21,7 @@ import AccountBase from './account/Base';
 import { AddressEncodings } from './tx/builder/field-types/address';
 
 interface KeyPointers {
-  [key: string]: Encoded.Generic<AddressEncodings>;
+  [key: string]: Encoded.Generic<AddressEncodings | Encoding.Bytearray>;
 }
 
 /**
@@ -30,11 +29,6 @@ interface KeyPointers {
  * @category AENS
  * @param name - Name hash
  * @param options - Options
- * @param options.onAccount - Make operation on specific account from sdk (you pass
- * publickKey) or using provided KeyPair(Can be keypair object or MemoryAccount)
- * @param options.fee - fee
- * @param options.ttl - ttl
- * @param options.nonce - nonce
  * @returns Transaction result
  * @example
  * ```js
@@ -51,6 +45,7 @@ export async function aensRevoke(
   options: AensRevokeOptions,
 ): ReturnType<typeof sendTransaction> {
   const nameRevokeTx = await buildTxAsync({
+    _isInternalBuild: true,
     ...options,
     tag: Tag.NameRevokeTx,
     nameId: name,
@@ -69,17 +64,6 @@ interface AensRevokeOptions extends
  * @param name - AENS name
  * @param pointers - Map of pointer keys to corresponding addresses
  * @param options - Options
- * @param options.extendPointers - Get the pointers from the node and merge with provided
- * ones. Pointers with the same type will be overwritten
- * @param options.onAccount - Make operation on specific account from sdk (you
- * pass publickKey) or using provided KeyPair(Can be keypair object or MemoryAccount)
- * @param options.fee - fee
- * @param options.ttl - ttl
- * @param options.nonce - nonce
- * @param options.nameTtl - Name ttl represented in number of
- * blocks (Max value is 50000 blocks)
- * @param options.clientTtl=84600 a suggestion as to how long any
- * clients should cache this information
  * @throws Invalid pointer array error
  * @example
  * ```js
@@ -104,11 +88,19 @@ export async function aensUpdate(
     ...pointers,
   };
 
+  const hasRawPointers = Object.values(allPointers)
+    .some((v) => isAddressValid(v, Encoding.Bytearray));
+  const isIris = (await options.onNode.getNodeInfo())
+    .consensusProtocolVersion === ConsensusProtocolVersion.Iris;
+  if (hasRawPointers && isIris) {
+    throw new UnsupportedProtocolError('Raw pointers are available only in Ceres, the current protocol is Iris');
+  }
+
   const nameUpdateTx = await buildTxAsync({
-    clientTtl: CLIENT_TTL,
-    nameTtl: NAME_TTL,
+    _isInternalBuild: true,
     ...options,
     tag: Tag.NameUpdateTx,
+    version: hasRawPointers ? 2 : 1,
     nameId: name,
     accountId: options.onAccount.address,
     pointers: Object.entries(allPointers)
@@ -121,8 +113,18 @@ export async function aensUpdate(
 interface AensUpdateOptions extends
   BuildTxOptions<Tag.NameUpdateTx, 'nameId' | 'accountId' | 'pointers' | 'clientTtl' | 'nameTtl' | 'onNode'>,
   SendTransactionOptions {
+  /**
+   * Get the pointers from the node and merge with provided ones. Pointers with the same key will be
+   * overwritten.
+   */
   extendPointers?: boolean;
+  /**
+   * a suggestion as to how long any clients should cache this information
+   */
   clientTtl?: number;
+  /**
+   * Name ttl represented in number of blocks (Max value is 50000 blocks)
+   */
   nameTtl?: number;
 }
 
@@ -132,11 +134,6 @@ interface AensUpdateOptions extends
  * @param name - AENS name
  * @param account - Recipient account publick key
  * @param options - Options
- * @param options.onAccount - Make operation on specific account from sdk (you pass
- * publickKey) or using provided KeyPair(Can be keypair object or MemoryAccount)
- * @param options.fee - fee
- * @param options.ttl - ttl
- * @param options.nonce - nonce
  * @returns Transaction result
  * @example
  * ```js
@@ -155,6 +152,7 @@ export async function aensTransfer(
   options: AensTransferOptions,
 ): ReturnType<typeof sendTransaction> {
   const nameTransferTx = await buildTxAsync({
+    _isInternalBuild: true,
     ...options,
     tag: Tag.NameTransferTx,
     nameId: name,
@@ -175,7 +173,6 @@ interface AensTransferOptions extends
  * @category AENS
  * @param name - AENS name
  * @param opt - Options
- * @returns
  * @example
  * ```js
  * const nameObject = sdkInstance.aensQuery('test.chain')
@@ -215,7 +212,7 @@ export async function aensQuery(
     }
     ) => ReturnType<typeof aensRevoke>;
     extendTtl: (
-      nameTtl: number,
+      nameTtl?: number,
       options?: Omit<Parameters<typeof aensQuery>[1], 'onNode' | 'onCompiler' | 'onAccount'>
     ) => ReturnType<typeof aensUpdate> & ReturnType<typeof aensQuery>;
   }
@@ -240,11 +237,7 @@ export async function aensQuery(
     async revoke(options) {
       return aensRevoke(name, { ...opt, ...options });
     },
-    async extendTtl(nameTtl = NAME_TTL, options = {}) {
-      if (nameTtl > NAME_TTL || nameTtl <= 0) {
-        throw new ArgumentError('nameTtl', `a number between 1 and ${NAME_TTL} blocks`, nameTtl);
-      }
-
+    async extendTtl(nameTtl, options = {}) {
       return {
         ...await aensUpdate(name, {}, {
           ...opt, ...options, nameTtl, extendPointers: true,
@@ -260,15 +253,9 @@ export async function aensQuery(
  * preclaim step
  * @category AENS
  * @param name - AENS name
- * @param salt - Salt from pre-claim, or 0 if it's a bid
+ * @param salt - Salt from pre-claim, or 0 if it's a bid or claiming without preclaim (in Ceres)
  * @param options - options
- * @param options.onAccount - Make operation on specific account from sdk (you pass
- * publickKey) or using provided KeyPair(Can be keypair object or MemoryAccount)
- * @param options.fee - fee
- * @param options.ttl - ttl
- * @param options.nonce - nonce
- * @param options.nameFee - Name Fee (By default calculated by sdk)
- * @returns the result of the claim
+ * @returns Transaction result
  * @example
  * ```js
  * const name = 'test.chain'
@@ -283,6 +270,7 @@ export async function aensClaim(
   options: AensClaimOptions,
 ): Promise<AensClaimReturnType> {
   const claimTx = await buildTxAsync({
+    _isInternalBuild: true,
     ...options,
     tag: Tag.NameClaimTx,
     accountId: options.onAccount.address,
@@ -312,11 +300,6 @@ interface AensClaimReturnType extends
  * @category AENS
  * @param name - AENS name
  * @param options - Options
- * @param options.onAccount - Make operation on specific account from sdk (you pass
- * publickKey) or using provided KeyPair(Can be keypair object or MemoryAccount)
- * @param options.fee - fee
- * @param options.ttl - ttl
- * @param options.nonce - nonce
  * @example
  * ```js
  * const name = 'test.chain'
@@ -342,6 +325,7 @@ Awaited<ReturnType<typeof sendTransaction>> & {
   const commitmentId = commitmentHash(name, salt);
 
   const preclaimTx = await buildTxAsync({
+    _isInternalBuild: true,
     ...options,
     tag: Tag.NamePreclaimTx,
     accountId: options.onAccount.address,
@@ -370,11 +354,6 @@ interface AensPreclaimOptions extends
  * @param name - Domain name
  * @param nameFee - Name fee (bid fee)
  * @param options - Options
- * @param options.onAccount - Make operation on specific account from sdk (you pass
- * publickKey) or using provided KeyPair(Can be keypair object or MemoryAccount)
- * @param options.fee - fee
- * @param options.ttl - ttl
- * @param options.nonce - nonce
  * @returns Transaction result
  * @example
  * ```js

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

@@ -12,6 +12,9 @@ export default class BrowserRuntimeConnection extends BrowserConnection {
 
   #listeners?: [(message: any, port: Runtime.Port) => void, () => void];
 
+  /**
+   * @param options - Options
+   */
   constructor({ port, ...options }: { port: Runtime.Port; debug: boolean }) {
     super(options);
     this.port = port;

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

@@ -19,9 +19,9 @@ export default class BrowserWindowMessageConnection extends BrowserConnection {
 
   #onDisconnect?: () => void;
 
-  #target?: ImplPostMessage;
+  readonly #target?: ImplPostMessage;
 
-  #self: ImplPostMessage;
+  readonly #self: ImplPostMessage;
 
   /**
    * @param options - Options

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

@@ -40,11 +40,13 @@ export default class RpcClient <
 > {
   connection: BrowserConnection;
 
-  #callbacks = new Map<number, { resolve: (v: any) => void; reject: (e: Error) => void }>();
+  readonly #callbacks = (
+    new Map<number, { resolve: (v: any) => void; reject: (e: Error) => void }>()
+  );
 
   #messageId = 0;
 
-  #methods: WithOrigin<LocalApi>;
+  readonly #methods: WithOrigin<LocalApi>;
 
   constructor(
     connection: BrowserConnection,

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

@@ -9,7 +9,7 @@ export interface WalletInfo {
   id: string;
   name: string;
   networkId: string;
-  origin: string;
+  origin: string; // TODO: origin needs to be provided by transport
   type: WALLET_TYPE;
 }
 
@@ -46,6 +46,10 @@ export interface WalletApi {
 
   [METHODS.address]: () => Promise<Encoded.AccountAddress[]>;
 
+  [METHODS.unsafeSign]: (
+    p: { data: Encoded.Bytearray; onAccount: Encoded.AccountAddress }
+  ) => Promise<{ signature: Encoded.Signature }>;
+
   [METHODS.sign]: ((
     p: {
       tx: Encoded.Transaction;
@@ -89,6 +93,15 @@ export interface WalletApi {
       contractAddress: Encoded.ContractAddress;
       name?: AensName;
       oracleQueryId?: Encoded.OracleQueryId;
+      allNames?: boolean;
+      isOracle?: boolean;
+      onAccount: Encoded.AccountAddress;
+    },
+  ) => Promise<{ signature: Encoded.Signature }>;
+
+  [METHODS.signDelegation]: (
+    p: {
+      delegation: Encoded.Bytearray;
       onAccount: Encoded.AccountAddress;
     },
   ) => Promise<{ signature: Encoded.Signature }>;

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

@@ -34,10 +34,12 @@ export const enum METHODS {
   updateAddress = 'address.update',
   address = 'address.get',
   connect = 'connection.open',
+  unsafeSign = 'data.unsafeSign',
   sign = 'transaction.sign',
   signMessage = 'message.sign',
   signTypedData = 'typedData.sign',
   signDelegationToContract = 'delegationToContract.sign',
+  signDelegation = 'delegation.sign',
   subscribeAddress = 'address.subscribe',
   updateNetwork = 'networkId.update',
   closeConnection = 'connection.close',

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

@@ -1,14 +1,11 @@
 import BrowserConnection from './connection/Browser';
 import BrowserWindowMessageConnection from './connection/BrowserWindowMessage';
 import { MESSAGE_DIRECTION, METHODS } from './schema';
+import { WalletInfo } from './rpc/types';
 import { UnsupportedPlatformError } from '../utils/errors';
 
 interface Wallet {
-  info: {
-    id: string;
-    type: string;
-    origin: string;
-  };
+  info: WalletInfo;
   getConnection: () => BrowserWindowMessageConnection;
 }
 interface Wallets { [key: string]: Wallet }
@@ -28,7 +25,7 @@ export default (
   const wallets: Wallets = {};
 
   connection.connect((
-    { method, params }: { method: string; params: Wallet['info'] },
+    { method, params }: { method: string; params: WalletInfo },
     origin: string,
     source: Window,
   ) => {
@@ -37,12 +34,15 @@ export default (
     const wallet = {
       info: params,
       getConnection() {
-        const isExtension = params.type === 'extension';
         return new BrowserWindowMessageConnection({
-          sendDirection: isExtension ? MESSAGE_DIRECTION.to_waellet : undefined,
-          receiveDirection: isExtension ? MESSAGE_DIRECTION.to_aepp : undefined,
           target: source,
-          origin: isExtension ? window.origin : params.origin,
+          ...params.type === 'extension' ? {
+            sendDirection: MESSAGE_DIRECTION.to_waellet,
+            receiveDirection: MESSAGE_DIRECTION.to_aepp,
+            ...window.origin !== 'null' && { origin: window.origin },
+          } : {
+            origin: params.origin,
+          },
         });
       },
     };