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

package/src/contract/Contract.ts

@@ -132,11 +132,19 @@ class Contract<M extends ContractMethodsBase> {
    */
   async $compile(): Promise<Encoded.ContractBytearray> {
     if (this.$options.bytecode != null) return this.$options.bytecode;
-    if (this.$options.sourceCode == null) throw new IllegalArgumentError('Can\'t compile without source code');
     if (this.$options.onCompiler == null) throw new IllegalArgumentError('Can\'t compile without compiler');
-    this.$options.bytecode = (await this.$options.onCompiler
-      .compileBySourceCode(this.$options.sourceCode, this.$options.fileSystem)
-    ).bytecode;
+    if (this.$options.sourceCode != null) {
+      const { bytecode } = await this.$options.onCompiler
+        .compileBySourceCode(this.$options.sourceCode, this.$options.fileSystem);
+      this.$options.bytecode = bytecode;
+    }
+    if (this.$options.sourceCodePath != null) {
+      const { bytecode } = await this.$options.onCompiler.compile(this.$options.sourceCodePath);
+      this.$options.bytecode = bytecode;
+    }
+    if (this.$options.bytecode == null) {
+      throw new IllegalArgumentError('Can\'t compile without sourceCode and sourceCodePath');
+    }
     return this.$options.bytecode;
   }
 
@@ -478,7 +486,7 @@ class Contract<M extends ContractMethodsBase> {
       ) as Encoded.ContractAddress;
     }
 
-    if (address == null && sourceCode == null && bytecode == null) {
+    if (address == null && sourceCode == null && sourceCodePath == null && bytecode == null) {
       throw new MissingContractAddressError('Can\'t create instance by ACI without address');
     }
 
@@ -495,12 +503,25 @@ class Contract<M extends ContractMethodsBase> {
       else if (sourceCode != null) {
         if (onCompiler == null) throw new IllegalArgumentError('Can\'t validate bytecode without compiler');
         isValid = await onCompiler.validateBySourceCode(onChanBytecode, sourceCode, fileSystem);
+      } else if (sourceCodePath != null) {
+        if (onCompiler == null) throw new IllegalArgumentError('Can\'t validate bytecode without compiler');
+        isValid = await onCompiler.validate(onChanBytecode, sourceCodePath);
+      }
+      if (!isValid) {
+        throw new BytecodeMismatchError((sourceCode ?? sourceCodePath) != null ? 'source code' : 'bytecode');
       }
-      if (!isValid) throw new BytecodeMismatchError(sourceCode != null ? 'source code' : 'bytecode');
     }
 
     return new ContractWithMethods<M>({
-      onCompiler, onNode, sourceCode, bytecode, aci, address, fileSystem, ...otherOptions,
+      onCompiler,
+      onNode,
+      sourceCode,
+      sourceCodePath,
+      bytecode,
+      aci,
+      address,
+      fileSystem,
+      ...otherOptions,
     });
   }
 

package/src/contract/compiler/Base.ts

@@ -13,6 +13,9 @@ export type Aci = Array<{
     name: string;
     event?: any;
     functions: FunctionAci[];
+    kind: string; // known values: 'contract_main'
+    payable: boolean;
+    typedefs: any[];
   };
 }>;
 

package/src/index-browser.ts

@@ -18,7 +18,9 @@ export {
 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/src/utils/errors.ts

@@ -488,7 +488,7 @@ export class MissingContractAddressError extends ContractError {
  */
 export class MissingContractDefError extends ContractError {
   constructor() {
-    super('Either ACI or source code is required');
+    super('Either ACI or sourceCode or sourceCodePath is required');
     this.name = 'MissingContractDefError';
   }
 }

package/types-legacy/ts4.2/AeSdkAepp.d.ts

@@ -2,7 +2,7 @@ import AeSdkBase from './AeSdkBase';
 import { OnAccount } from './AeSdkMethods';
 import AccountBase from './account/Base';
 import { Encoded } from './utils/encoder';
-import { Accounts, WalletInfo, Network, WalletApi, AeppApi } from './aepp-wallet-communication/rpc/types';
+import { Accounts, WalletInfo, Network, WalletApi, AeppApi, Node as NodeRpc } from './aepp-wallet-communication/rpc/types';
 import RpcClient from './aepp-wallet-communication/rpc/RpcClient';
 import { METHODS, SUBSCRIPTION_TYPES } from './aepp-wallet-communication/schema';
 import BrowserConnection from './aepp-wallet-communication/connection/Browser';
@@ -41,11 +41,12 @@ export default class AeSdkAepp extends AeSdkBase {
      * @param options.name - Node name
      * @param options.select - Select this node as current
      */
-    connectToWallet(connection: BrowserConnection, { connectNode, name, select }?: {
+    connectToWallet(connection: BrowserConnection, { connectNode, name }?: {
         connectNode?: boolean;
         name?: string;
-        select?: boolean;
-    }): Promise<WalletInfo>;
+    }): Promise<WalletInfo & {
+        node?: NodeRpc;
+    }>;
     /**
      * Disconnect from wallet
      */

package/types-legacy/ts4.2/contract/compiler/Base.d.ts

@@ -11,6 +11,9 @@ export type Aci = Array<{
         name: string;
         event?: any;
         functions: FunctionAci[];
+        kind: string;
+        payable: boolean;
+        typedefs: any[];
     };
 }>;
 /**

package/types-legacy/ts4.2/index-browser.d.ts

@@ -10,7 +10,7 @@ export { getExecutionCost, getExecutionCostBySignedTx, getExecutionCostUsingNode
 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/types-legacy/ts4.5/AeSdkAepp.d.ts

@@ -2,7 +2,7 @@ import AeSdkBase from './AeSdkBase';
 import { OnAccount } from './AeSdkMethods';
 import AccountBase from './account/Base';
 import { Encoded } from './utils/encoder';
-import { Accounts, WalletInfo, Network, WalletApi, AeppApi } from './aepp-wallet-communication/rpc/types';
+import { Accounts, WalletInfo, Network, WalletApi, AeppApi, Node as NodeRpc } from './aepp-wallet-communication/rpc/types';
 import RpcClient from './aepp-wallet-communication/rpc/RpcClient';
 import { METHODS, SUBSCRIPTION_TYPES } from './aepp-wallet-communication/schema';
 import BrowserConnection from './aepp-wallet-communication/connection/Browser';
@@ -41,11 +41,12 @@ export default class AeSdkAepp extends AeSdkBase {
      * @param options.name - Node name
      * @param options.select - Select this node as current
      */
-    connectToWallet(connection: BrowserConnection, { connectNode, name, select }?: {
+    connectToWallet(connection: BrowserConnection, { connectNode, name }?: {
         connectNode?: boolean;
         name?: string;
-        select?: boolean;
-    }): Promise<WalletInfo>;
+    }): Promise<WalletInfo & {
+        node?: NodeRpc;
+    }>;
     /**
      * Disconnect from wallet
      */

package/types-legacy/ts4.5/contract/compiler/Base.d.ts

@@ -11,6 +11,9 @@ export type Aci = Array<{
         name: string;
         event?: any;
         functions: FunctionAci[];
+        kind: string;
+        payable: boolean;
+        typedefs: any[];
     };
 }>;
 /**

package/types-legacy/ts4.5/index-browser.d.ts

@@ -10,7 +10,7 @@ export { getExecutionCost, getExecutionCostBySignedTx, getExecutionCostUsingNode
 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';