starknet 3.5.0 → 3.5.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.5.1](https://github.com/seanjameshan/starknet.js/compare/v3.5.0...v3.5.1) (2022-03-11)
+
+### Bug Fixes
+
+- account detection ([b3b3ba7](https://github.com/seanjameshan/starknet.js/commit/b3b3ba74dde72027ba7f0e1234fed34a604fdcec))
+- contract interface ([696116d](https://github.com/seanjameshan/starknet.js/commit/696116d383ba16c587e7ed708f7b47d02610b9d9))
+
 # [3.5.0](https://github.com/seanjameshan/starknet.js/compare/v3.4.0...v3.5.0) (2022-03-11)
 
 ### Bug Fixes

package/contract/default.d.ts

@@ -1,5 +1,5 @@
-import { Account } from '../account';
-import { Provider } from '../provider';
+import { AccountInterface } from '../account';
+import { ProviderInterface } from '../provider';
 import {
   Abi,
   AbiEntry,
@@ -18,7 +18,7 @@ import { ContractInterface } from './interface';
 export declare class Contract implements ContractInterface {
   abi: Abi;
   address: string;
-  providerOrAccount: Provider | Account;
+  providerOrAccount: ProviderInterface | AccountInterface;
   deployTransactionHash?: string;
   protected readonly structs: {
     [name: string]: StructAbi;
@@ -43,7 +43,7 @@ export declare class Contract implements ContractInterface {
    * @param address (optional) - address to connect to
    * @param providerOrAccount (optional) - Provider or Account to attach to
    */
-  constructor(abi: Abi, address: string, providerOrAccount?: Provider | Account);
+  constructor(abi: Abi, address: string, providerOrAccount?: ProviderInterface | AccountInterface);
   /**
    * Saves the address of the contract deployed on network that will be used for interaction
    *
@@ -55,7 +55,7 @@ export declare class Contract implements ContractInterface {
    *
    * @param providerOrAccount - new Provider or Account to attach to
    */
-  connect(providerOrAccount: Provider | Account): void;
+  connect(providerOrAccount: ProviderInterface | AccountInterface): void;
   /**
    * Resolves when contract is deployed on the network or when no deployment transaction is found
    *

package/contract/default.js

@@ -187,7 +187,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 exports.Contract = void 0;
 var bn_js_1 = __importDefault(require('bn.js'));
 var minimalistic_assert_1 = __importDefault(require('minimalistic-assert'));
-var account_1 = require('../account');
 var provider_1 = require('../provider');
 var hash_1 = require('../utils/hash');
 var number_1 = require('../utils/number');
@@ -746,7 +745,7 @@ var Contract = /** @class */ (function () {
       calldata: calldata,
       entrypoint: method,
     };
-    if (this.providerOrAccount instanceof account_1.Account) {
+    if ('execute' in this.providerOrAccount) {
       return this.providerOrAccount.execute(invocation);
     }
     return this.providerOrAccount.invokeFunction(

package/contract/interface.d.ts

@@ -1,5 +1,5 @@
-import { Account } from '../account';
-import { Provider } from '../provider';
+import { AccountInterface } from '../account';
+import { ProviderInterface } from '../provider';
 import {
   Abi,
   AddTransactionResponse,
@@ -11,7 +11,7 @@ import {
 export declare abstract class ContractInterface {
   abstract abi: Abi;
   abstract address: string;
-  abstract providerOrAccount: Provider | Account;
+  abstract providerOrAccount: ProviderInterface | AccountInterface;
   abstract deployTransactionHash?: string;
   readonly functions: {
     [name: string]: AsyncContractFunction;
@@ -37,7 +37,7 @@ export declare abstract class ContractInterface {
    *
    * @param providerOrAccount - new Provider or Account to attach to
    */
-  abstract connect(providerOrAccount: Provider | Account): void;
+  abstract connect(providerOrAccount: ProviderInterface | AccountInterface): void;
   /**
    * Resolves when contract is deployed on the network or when no deployment transaction is found
    *

package/dist/contract/default.d.ts

@@ -1,12 +1,12 @@
-import { Account } from '../account';
-import { Provider } from '../provider';
+import { AccountInterface } from '../account';
+import { ProviderInterface } from '../provider';
 import { Abi, AbiEntry, AddTransactionResponse, Args, AsyncContractFunction, Calldata, ContractFunction, Invocation, ParsedStruct, Result, StructAbi } from '../types';
 import { BigNumberish } from '../utils/number';
 import { ContractInterface } from './interface';
 export declare class Contract implements ContractInterface {
     abi: Abi;
     address: string;
-    providerOrAccount: Provider | Account;
+    providerOrAccount: ProviderInterface | AccountInterface;
     deployTransactionHash?: string;
     protected readonly structs: {
         [name: string]: StructAbi;
@@ -31,7 +31,7 @@ export declare class Contract implements ContractInterface {
      * @param address (optional) - address to connect to
      * @param providerOrAccount (optional) - Provider or Account to attach to
      */
-    constructor(abi: Abi, address: string, providerOrAccount?: Provider | Account);
+    constructor(abi: Abi, address: string, providerOrAccount?: ProviderInterface | AccountInterface);
     /**
      * Saves the address of the contract deployed on network that will be used for interaction
      *
@@ -43,7 +43,7 @@ export declare class Contract implements ContractInterface {
      *
      * @param providerOrAccount - new Provider or Account to attach to
      */
-    connect(providerOrAccount: Provider | Account): void;
+    connect(providerOrAccount: ProviderInterface | AccountInterface): void;
     /**
      * Resolves when contract is deployed on the network or when no deployment transaction is found
      *

package/dist/contract/default.js

@@ -78,7 +78,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Contract = void 0;
 var bn_js_1 = __importDefault(require("bn.js"));
 var minimalistic_assert_1 = __importDefault(require("minimalistic-assert"));
-var account_1 = require("../account");
 var provider_1 = require("../provider");
 var hash_1 = require("../utils/hash");
 var number_1 = require("../utils/number");
@@ -579,7 +578,7 @@ var Contract = /** @class */ (function () {
             calldata: calldata,
             entrypoint: method,
         };
-        if (this.providerOrAccount instanceof account_1.Account) {
+        if ('execute' in this.providerOrAccount) {
             return this.providerOrAccount.execute(invocation);
         }
         return this.providerOrAccount.invokeFunction(__assign(__assign({}, invocation), { signature: signature }));

package/dist/contract/interface.d.ts

@@ -1,10 +1,10 @@
-import { Account } from '../account';
-import { Provider } from '../provider';
+import { AccountInterface } from '../account';
+import { ProviderInterface } from '../provider';
 import { Abi, AddTransactionResponse, AsyncContractFunction, ContractFunction, Invocation, Result } from '../types';
 export declare abstract class ContractInterface {
     abstract abi: Abi;
     abstract address: string;
-    abstract providerOrAccount: Provider | Account;
+    abstract providerOrAccount: ProviderInterface | AccountInterface;
     abstract deployTransactionHash?: string;
     readonly functions: {
         [name: string]: AsyncContractFunction;
@@ -30,7 +30,7 @@ export declare abstract class ContractInterface {
      *
      * @param providerOrAccount - new Provider or Account to attach to
      */
-    abstract connect(providerOrAccount: Provider | Account): void;
+    abstract connect(providerOrAccount: ProviderInterface | AccountInterface): void;
     /**
      * Resolves when contract is deployed on the network or when no deployment transaction is found
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starknet",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "JavaScript library for StarkNet",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/contract/default.ts

@@ -1,8 +1,8 @@
 import BN from 'bn.js';
 import assert from 'minimalistic-assert';
 
-import { Account } from '../account';
-import { Provider, defaultProvider } from '../provider';
+import { AccountInterface } from '../account';
+import { ProviderInterface, defaultProvider } from '../provider';
 import {
   Abi,
   AbiEntry,
@@ -85,7 +85,7 @@ export class Contract implements ContractInterface {
 
   address: string;
 
-  providerOrAccount: Provider | Account;
+  providerOrAccount: ProviderInterface | AccountInterface;
 
   deployTransactionHash?: string;
 
@@ -108,7 +108,11 @@ export class Contract implements ContractInterface {
    * @param address (optional) - address to connect to
    * @param providerOrAccount (optional) - Provider or Account to attach to
    */
-  constructor(abi: Abi, address: string, providerOrAccount: Provider | Account = defaultProvider) {
+  constructor(
+    abi: Abi,
+    address: string,
+    providerOrAccount: ProviderInterface | AccountInterface = defaultProvider
+  ) {
     this.address = address;
     this.providerOrAccount = providerOrAccount;
     this.abi = abi;
@@ -202,7 +206,7 @@ export class Contract implements ContractInterface {
    *
    * @param providerOrAccount - new Provider or Account to attach to
    */
-  public connect(providerOrAccount: Provider | Account) {
+  public connect(providerOrAccount: ProviderInterface | AccountInterface) {
     this.providerOrAccount = providerOrAccount;
   }
 
@@ -554,7 +558,7 @@ export class Contract implements ContractInterface {
       calldata,
       entrypoint: method,
     };
-    if (this.providerOrAccount instanceof Account) {
+    if ('execute' in this.providerOrAccount) {
       return this.providerOrAccount.execute(invocation);
     }
     return this.providerOrAccount.invokeFunction({

package/src/contract/interface.ts

@@ -1,5 +1,5 @@
-import { Account } from '../account';
-import { Provider } from '../provider';
+import { AccountInterface } from '../account';
+import { ProviderInterface } from '../provider';
 import {
   Abi,
   AddTransactionResponse,
@@ -14,7 +14,7 @@ export abstract class ContractInterface {
 
   public abstract address: string;
 
-  public abstract providerOrAccount: Provider | Account;
+  public abstract providerOrAccount: ProviderInterface | AccountInterface;
 
   public abstract deployTransactionHash?: string;
 
@@ -40,7 +40,7 @@ export abstract class ContractInterface {
    *
    * @param providerOrAccount - new Provider or Account to attach to
    */
-  public abstract connect(providerOrAccount: Provider | Account): void;
+  public abstract connect(providerOrAccount: ProviderInterface | AccountInterface): void;
 
   /**
    * Resolves when contract is deployed on the network or when no deployment transaction is found