@massalabs/wallet-provider 1.0.0 → 1.0.1-dev.20230727122300

package/bundle.js

@@ -118,8 +118,8 @@ class Account {
     /**
      * This method aims to transfer MAS on behalf of the sender to a recipient.
      *
-     * @param amount - The amount of MAS to be transferred.
-     * @param fee - The fee to be paid for the transaction execution by the node..
+     * @param amount - The amount of MAS (in the smallest unit) to be transferred.
+     * @param fee - The fee to be paid for the transaction execution (in the smallest unit).
      * @returns An ITransactionDetails object. It contains the operationId on the network.
      */
     async sendTransaction(amount, recipientAddress, fee) {
@@ -136,20 +136,26 @@ class Account {
         });
     }
     /**
-     * This method aims to interact with a smart contract deployed on the massa blockchain on behalf of the sender.
+     * This method aims to interact with a smart contract deployed on the MASSA blockchain.
+     *
+     * @remarks
+     * If dryRun.dryRun is true, the method will dry run the smart contract call and return an
+     * IContractReadOperationResponse object which contains all the information about the dry run
+     * (state changes, gas used, etc.)
      *
      * @param contractAddress - The address of the smart contract.
      * @param functionName - The name of the function to be called.
      * @param parameter - The parameters as an Args object to be passed to the function.
-     * @param amount - The amount of MASSA coins to be sent to the block creator.
+     * @param amount - The amount of MASSA coins to be sent to the contract (in the smallest unit).
+     * @param fee - The fee to be paid for the transaction execution (in the smallest unit).
+     * @param maxGas - The maximum amount of gas to be used for the transaction execution.
+     * @param nonPersistentExecution - The dryRun object to be passed to the function.
+     *
+     * @returns if 'nonPersistentExecution' is true, it returns an IContractReadOperationResponse object.
+     * Otherwise, it returns an ITransactionDetails object which contains the operationId on the network.
      *
-     * @returns An ITransactionDetails object.
-     * - It contains the first event emitted by the contract.
-     * - If the contract does not emit any event, it contains "Function called successfully but no event generated"
      */
-    async callSC(contractAddress, functionName, parameter, amount, nonPersistentExecution = {
-        isNPE: false,
-    }) {
+    async callSC(contractAddress, functionName, parameter, amount, fee, maxGas, nonPersistentExecution = false) {
         return new Promise((resolve, reject) => {
             Connector_1.connector.sendMessageToContentScript(this._providerName, __1.AvailableCommands.AccountCallSC, {
                 nickname: this._name,
@@ -157,11 +163,13 @@ class Account {
                 at: contractAddress,
                 args: parameter,
                 coins: amount,
+                fee: fee,
+                maxGas: maxGas,
                 nonPersistentExecution: nonPersistentExecution,
             }, (result, err) => {
                 if (err)
                     return reject(err);
-                return resolve(nonPersistentExecution?.isNPE
+                return resolve(nonPersistentExecution
                     ? result
                     : result);
             });
@@ -595,12 +603,29 @@ class MassaStationAccount {
     /**
      * This method aims to transfer MAS on behalf of the sender to a recipient.
      *
-     * @param amount - The amount of MAS to be transferred.
-     * @param fee - The fee to be paid for the transaction execution by the node.
+     * @param amount - The amount of MAS (in the smallest unit) to be transferred.
+     * @param fee - The fee to be paid for the transaction execution (in the smallest unit).
      * @returns An ITransactionDetails object. It contains the operationId on the network.
      */
-    sendTransaction(amount, recipientAddress, fee) {
-        throw new Error('Method not implemented.');
+    async sendTransaction(amount, recipientAddress, fee) {
+        let sendTxOpResponse = null;
+        const url = `${MassaStationProvider_1.MASSA_STATION_ACCOUNTS_URL}/${this._name}/transfer`;
+        const body = {
+            fee: fee.toString(),
+            amount: amount.toString(),
+            recipientAddress: recipientAddress,
+        };
+        try {
+            sendTxOpResponse = await (0, RequestHandler_1.postRequest)(url, body);
+        }
+        catch (ex) {
+            console.error(`MassaStation account: error while sending transaction: ${ex}`);
+            throw ex;
+        }
+        if (sendTxOpResponse.isError || sendTxOpResponse.error) {
+            throw sendTxOpResponse.error;
+        }
+        return sendTxOpResponse.result;
     }
     /**
      * This method aims to interact with a smart contract deployed on the MASSA blockchain.
@@ -613,19 +638,18 @@ class MassaStationAccount {
      * @param contractAddress - The address of the smart contract.
      * @param functionName - The name of the function to be called.
      * @param parameter - The parameters as an Args object to be passed to the function.
-     * @param amount - The amount of MASSA coins to be sent to the block creator.
-     * @param dryRun - The dryRun object to be passed to the function.
+     * @param amount - The amount of MASSA coins to be sent to the contract (in the smallest unit).
+     * @param fee - The fee to be paid for the transaction execution (in the smallest unit).
+     * @param maxGas - The maximum amount of gas to be used for the transaction execution.
+     * @param nonPersistentExecution - The dryRun object to be passed to the function.
      *
-     * @returns if dryRun.dryRun is true, it returns an IContractReadOperationResponse object. Otherwise,
-     * it returns an ITransactionDetails object which contains the first event emitted by the contract.
-     * If the contract does not emit any event, it returns "Function called successfully but no event generated"
+     * @returns if 'nonPersistentExecution' is true, it returns an IContractReadOperationResponse object.
+     * Otherwise, it returns an ITransactionDetails object which contains the operationId on the network.
      *
      */
-    async callSC(contractAddress, functionName, parameter, amount, nonPersistentExecution = {
-        isNPE: false,
-    }) {
-        if (nonPersistentExecution?.isNPE) {
-            return this.nonPersistentCallSC(contractAddress, functionName, parameter, nonPersistentExecution);
+    async callSC(contractAddress, functionName, parameter, amount, fee, maxGas, nonPersistentExecution = false) {
+        if (nonPersistentExecution) {
+            return this.nonPersistentCallSC(contractAddress, functionName, parameter, amount, fee, maxGas);
         }
         // convert parameter to base64
         let args = '';
@@ -674,15 +698,12 @@ class MassaStationAccount {
         }
         return node;
     }
-    async nonPersistentCallSC(contractAddress, functionName, parameter, dryRun) {
+    async nonPersistentCallSC(contractAddress, functionName, parameter, amount, fee, maxGas) {
         const node = await this.getNodeUrlFromMassaStation();
         // Gas amount check
-        if (!dryRun.maxGas) {
-            dryRun.maxGas = MAX_READ_BLOCK_GAS;
-        }
-        if (dryRun.maxGas > MAX_READ_BLOCK_GAS) {
+        if (maxGas > MAX_READ_BLOCK_GAS) {
             throw new Error(`
-        The gas submitted ${dryRun.maxGas.toString()} exceeds the max. allowed block gas of 
+        The gas submitted ${maxGas.toString()} exceeds the max. allowed block gas of 
         ${MAX_READ_BLOCK_GAS.toString()}
         `);
         }
@@ -696,7 +717,7 @@ class MassaStationAccount {
         }
         // setup the request body
         const data = {
-            max_gas: Number(dryRun.maxGas),
+            max_gas: Number(maxGas),
             target_address: contractAddress,
             target_function: functionName,
             parameter: argumentArray,

package/dist/account/Account.d.ts

@@ -3,7 +3,6 @@ import { IAccountSignResponse } from './AccountSign';
 import { IAccountDetails } from './IAccountDetails';
 import { ITransactionDetails } from '..';
 import { IAccount } from './IAccount';
-import { NonPersistentExecution } from './INonPersistentExecution';
 import { Args, IContractReadOperationResponse } from '@massalabs/massa-web3';
 /**
  * This module contains the Account class. It is responsible for representing an account in the wallet.
@@ -74,23 +73,31 @@ export declare class Account implements IAccount {
     /**
      * This method aims to transfer MAS on behalf of the sender to a recipient.
      *
-     * @param amount - The amount of MAS to be transferred.
-     * @param fee - The fee to be paid for the transaction execution by the node..
+     * @param amount - The amount of MAS (in the smallest unit) to be transferred.
+     * @param fee - The fee to be paid for the transaction execution (in the smallest unit).
      * @returns An ITransactionDetails object. It contains the operationId on the network.
      */
     sendTransaction(amount: bigint, recipientAddress: string, fee: bigint): Promise<ITransactionDetails>;
     /**
-     * This method aims to interact with a smart contract deployed on the massa blockchain on behalf of the sender.
+     * This method aims to interact with a smart contract deployed on the MASSA blockchain.
+     *
+     * @remarks
+     * If dryRun.dryRun is true, the method will dry run the smart contract call and return an
+     * IContractReadOperationResponse object which contains all the information about the dry run
+     * (state changes, gas used, etc.)
      *
      * @param contractAddress - The address of the smart contract.
      * @param functionName - The name of the function to be called.
      * @param parameter - The parameters as an Args object to be passed to the function.
-     * @param amount - The amount of MASSA coins to be sent to the block creator.
+     * @param amount - The amount of MASSA coins to be sent to the contract (in the smallest unit).
+     * @param fee - The fee to be paid for the transaction execution (in the smallest unit).
+     * @param maxGas - The maximum amount of gas to be used for the transaction execution.
+     * @param nonPersistentExecution - The dryRun object to be passed to the function.
+     *
+     * @returns if 'nonPersistentExecution' is true, it returns an IContractReadOperationResponse object.
+     * Otherwise, it returns an ITransactionDetails object which contains the operationId on the network.
      *
-     * @returns An ITransactionDetails object.
-     * - It contains the first event emitted by the contract.
-     * - If the contract does not emit any event, it contains "Function called successfully but no event generated"
      */
-    callSC(contractAddress: string, functionName: string, parameter: Uint8Array | Args, amount: bigint, nonPersistentExecution?: NonPersistentExecution): Promise<ITransactionDetails | IContractReadOperationResponse>;
+    callSC(contractAddress: string, functionName: string, parameter: Uint8Array | Args, amount: bigint, fee: bigint, maxGas: bigint, nonPersistentExecution?: boolean): Promise<ITransactionDetails | IContractReadOperationResponse>;
 }
 //# sourceMappingURL=Account.d.ts.map

package/dist/account/Account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../../src/account/Account.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,uBAAuB,EACxB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAuB,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAqB,mBAAmB,EAAE,MAAM,IAAI,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAItC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,8BAA8B,EAAE,MAAM,uBAAuB,CAAC;AAE7E;;;;;;GAMG;AACH,qBAAa,OAAQ,YAAW,QAAQ;IACtC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,KAAK,CAAS;IAEtB;;;;;;;;;;;;OAYG;gBACgB,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM;IAM3E;;OAEG;IACI,OAAO,IAAI,MAAM;IAIxB;;OAEG;IACI,IAAI,IAAI,MAAM;IAIrB;;OAEG;IACI,YAAY,IAAI,MAAM;IAI7B;;;;OAIG;IACU,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAcxD;;;;;OAKG;IACU,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAclE;;;;;;OAMG;IACU,QAAQ,CACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,mBAAmB,CAAC;IAiB/B;;;;;;OAMG;IACU,SAAS,CACpB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,mBAAmB,CAAC;IAiB/B;;;;;;OAMG;IACU,eAAe,CAC1B,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,MAAM,EACxB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,mBAAmB,CAAC;IAkB/B;;;;;;;;;;;OAWG;IACU,MAAM,CACjB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,MAAM,EAAE,MAAM,EACd,sBAAsB,yBAEK,GAC1B,OAAO,CAAC,mBAAmB,GAAG,8BAA8B,CAAC;CAwBjE"}
+{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../../src/account/Account.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,uBAAuB,EACxB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAuB,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAqB,mBAAmB,EAAE,MAAM,IAAI,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAItC,OAAO,EAAE,IAAI,EAAE,8BAA8B,EAAE,MAAM,uBAAuB,CAAC;AAE7E;;;;;;GAMG;AACH,qBAAa,OAAQ,YAAW,QAAQ;IACtC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,KAAK,CAAS;IAEtB;;;;;;;;;;;;OAYG;gBACgB,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM;IAM3E;;OAEG;IACI,OAAO,IAAI,MAAM;IAIxB;;OAEG;IACI,IAAI,IAAI,MAAM;IAIrB;;OAEG;IACI,YAAY,IAAI,MAAM;IAI7B;;;;OAIG;IACU,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAcxD;;;;;OAKG;IACU,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAclE;;;;;;OAMG;IACU,QAAQ,CACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,mBAAmB,CAAC;IAiB/B;;;;;;OAMG;IACU,SAAS,CACpB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,mBAAmB,CAAC;IAiB/B;;;;;;OAMG;IACU,eAAe,CAC1B,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,MAAM,EACxB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,mBAAmB,CAAC;IAkB/B;;;;;;;;;;;;;;;;;;;OAmBG;IACU,MAAM,CACjB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,sBAAsB,UAAQ,GAC7B,OAAO,CAAC,mBAAmB,GAAG,8BAA8B,CAAC;CA0BjE"}

package/dist/account/Account.js

@@ -117,8 +117,8 @@ class Account {
     /**
      * This method aims to transfer MAS on behalf of the sender to a recipient.
      *
-     * @param amount - The amount of MAS to be transferred.
-     * @param fee - The fee to be paid for the transaction execution by the node..
+     * @param amount - The amount of MAS (in the smallest unit) to be transferred.
+     * @param fee - The fee to be paid for the transaction execution (in the smallest unit).
      * @returns An ITransactionDetails object. It contains the operationId on the network.
      */
     async sendTransaction(amount, recipientAddress, fee) {
@@ -135,20 +135,26 @@ class Account {
         });
     }
     /**
-     * This method aims to interact with a smart contract deployed on the massa blockchain on behalf of the sender.
+     * This method aims to interact with a smart contract deployed on the MASSA blockchain.
+     *
+     * @remarks
+     * If dryRun.dryRun is true, the method will dry run the smart contract call and return an
+     * IContractReadOperationResponse object which contains all the information about the dry run
+     * (state changes, gas used, etc.)
      *
      * @param contractAddress - The address of the smart contract.
      * @param functionName - The name of the function to be called.
      * @param parameter - The parameters as an Args object to be passed to the function.
-     * @param amount - The amount of MASSA coins to be sent to the block creator.
+     * @param amount - The amount of MASSA coins to be sent to the contract (in the smallest unit).
+     * @param fee - The fee to be paid for the transaction execution (in the smallest unit).
+     * @param maxGas - The maximum amount of gas to be used for the transaction execution.
+     * @param nonPersistentExecution - The dryRun object to be passed to the function.
+     *
+     * @returns if 'nonPersistentExecution' is true, it returns an IContractReadOperationResponse object.
+     * Otherwise, it returns an ITransactionDetails object which contains the operationId on the network.
      *
-     * @returns An ITransactionDetails object.
-     * - It contains the first event emitted by the contract.
-     * - If the contract does not emit any event, it contains "Function called successfully but no event generated"
      */
-    async callSC(contractAddress, functionName, parameter, amount, nonPersistentExecution = {
-        isNPE: false,
-    }) {
+    async callSC(contractAddress, functionName, parameter, amount, fee, maxGas, nonPersistentExecution = false) {
         return new Promise((resolve, reject) => {
             Connector_1.connector.sendMessageToContentScript(this._providerName, __1.AvailableCommands.AccountCallSC, {
                 nickname: this._name,
@@ -156,11 +162,13 @@ class Account {
                 at: contractAddress,
                 args: parameter,
                 coins: amount,
+                fee: fee,
+                maxGas: maxGas,
                 nonPersistentExecution: nonPersistentExecution,
             }, (result, err) => {
                 if (err)
                     return reject(err);
-                return resolve(nonPersistentExecution?.isNPE
+                return resolve(nonPersistentExecution
                     ? result
                     : result);
             });

package/dist/account/IAccount.d.ts

@@ -2,7 +2,6 @@ import { ITransactionDetails } from '..';
 import { IAccountBalanceResponse } from './AccountBalance';
 import { IAccountSignResponse } from './AccountSign';
 import { Args } from '@massalabs/massa-web3';
-import { NonPersistentExecution } from './INonPersistentExecution';
 /**
  * This interface represents an Account object.
  *
@@ -16,6 +15,6 @@ export interface IAccount {
     buyRolls(amount: bigint, fee: bigint): Promise<ITransactionDetails>;
     sellRolls(amount: bigint, fee: bigint): Promise<ITransactionDetails>;
     sendTransaction(amount: bigint, recipientAddress: string, fee: bigint): Promise<ITransactionDetails>;
-    callSC(contractAddress: string, functionName: string, parameter: Uint8Array | Args, amount: bigint, nonPersistentExecution?: NonPersistentExecution): any;
+    callSC(contractAddress: string, functionName: string, parameter: Uint8Array | Args, amount: bigint, fee: bigint, maxGas: bigint, nonPersistentExecution?: boolean): any;
 }
 //# sourceMappingURL=IAccount.d.ts.map

package/dist/account/IAccount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IAccount.d.ts","sourceRoot":"","sources":["../../src/account/IAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,IAAI,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE;;;GAGG;AACH,MAAM,WAAW,QAAQ;IACvB,OAAO,IAAI,MAAM,CAAC;IAClB,IAAI,IAAI,MAAM,CAAC;IACf,YAAY,IAAI,MAAM,CAAC;IACvB,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC5C,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC/D,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACpE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACrE,eAAe,CACb,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,MAAM,EACxB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAChC,MAAM,CACJ,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,MAAM,EAAE,MAAM,EACd,sBAAsB,CAAC,EAAE,sBAAsB,OAC/C;CACH"}
+{"version":3,"file":"IAccount.d.ts","sourceRoot":"","sources":["../../src/account/IAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,IAAI,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAE7C;;;GAGG;AACH,MAAM,WAAW,QAAQ;IACvB,OAAO,IAAI,MAAM,CAAC;IAClB,IAAI,IAAI,MAAM,CAAC;IACf,YAAY,IAAI,MAAM,CAAC;IACvB,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC5C,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC/D,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACpE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACrE,eAAe,CACb,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,MAAM,EACxB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAChC,MAAM,CACJ,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,sBAAsB,CAAC,EAAE,OAAO,OAChC;CACH"}

package/dist/account/IAccountCallSCRequest.d.ts

@@ -1,5 +1,4 @@
 import { Args } from '@massalabs/massa-web3';
-import { NonPersistentExecution } from './INonPersistentExecution';
 /**
  * This interface represents the request object to send to the content script to
  * interact with a deployed smart contract.
@@ -20,6 +19,7 @@ export interface IAccountCallSCRequest {
     at: string;
     args: Args;
     coins: bigint;
-    nonPersistentExecution: NonPersistentExecution;
+    fee: bigint;
+    nonPersistentExecution: boolean;
 }
 //# sourceMappingURL=IAccountCallSCRequest.d.ts.map

package/dist/account/IAccountCallSCRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IAccountCallSCRequest.d.ts","sourceRoot":"","sources":["../../src/account/IAccountCallSCRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,IAAI,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,sBAAsB,EAAE,sBAAsB,CAAC;CAChD"}
+{"version":3,"file":"IAccountCallSCRequest.d.ts","sourceRoot":"","sources":["../../src/account/IAccountCallSCRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAE7C;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,IAAI,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,sBAAsB,EAAE,OAAO,CAAC;CACjC"}

package/dist/massaStation/MassaStationAccount.d.ts

@@ -1,7 +1,6 @@
 import { IAccountBalanceResponse, IAccountDetails, IAccountSignResponse, ITransactionDetails } from '..';
 import { IAccount } from '../account/IAccount';
 import { Args, IContractReadOperationResponse } from '@massalabs/massa-web3';
-import { NonPersistentExecution } from '../account/INonPersistentExecution';
 /**
  * This module contains the MassaStationAccount class. It is responsible for representing an account in
  * the MassaStation wallet.
@@ -72,8 +71,8 @@ export declare class MassaStationAccount implements IAccount {
     /**
      * This method aims to transfer MAS on behalf of the sender to a recipient.
      *
-     * @param amount - The amount of MAS to be transferred.
-     * @param fee - The fee to be paid for the transaction execution by the node.
+     * @param amount - The amount of MAS (in the smallest unit) to be transferred.
+     * @param fee - The fee to be paid for the transaction execution (in the smallest unit).
      * @returns An ITransactionDetails object. It contains the operationId on the network.
      */
     sendTransaction(amount: bigint, recipientAddress: string, fee: bigint): Promise<ITransactionDetails>;
@@ -88,16 +87,17 @@ export declare class MassaStationAccount implements IAccount {
      * @param contractAddress - The address of the smart contract.
      * @param functionName - The name of the function to be called.
      * @param parameter - The parameters as an Args object to be passed to the function.
-     * @param amount - The amount of MASSA coins to be sent to the block creator.
-     * @param dryRun - The dryRun object to be passed to the function.
+     * @param amount - The amount of MASSA coins to be sent to the contract (in the smallest unit).
+     * @param fee - The fee to be paid for the transaction execution (in the smallest unit).
+     * @param maxGas - The maximum amount of gas to be used for the transaction execution.
+     * @param nonPersistentExecution - The dryRun object to be passed to the function.
      *
-     * @returns if dryRun.dryRun is true, it returns an IContractReadOperationResponse object. Otherwise,
-     * it returns an ITransactionDetails object which contains the first event emitted by the contract.
-     * If the contract does not emit any event, it returns "Function called successfully but no event generated"
+     * @returns if 'nonPersistentExecution' is true, it returns an IContractReadOperationResponse object.
+     * Otherwise, it returns an ITransactionDetails object which contains the operationId on the network.
      *
      */
-    callSC(contractAddress: string, functionName: string, parameter: Uint8Array | Args, amount: bigint, nonPersistentExecution?: NonPersistentExecution): Promise<ITransactionDetails | IContractReadOperationResponse>;
+    callSC(contractAddress: string, functionName: string, parameter: Uint8Array | Args, amount: bigint, fee: bigint, maxGas: bigint, nonPersistentExecution?: boolean): Promise<ITransactionDetails | IContractReadOperationResponse>;
     getNodeUrlFromMassaStation(): Promise<string>;
-    nonPersistentCallSC(contractAddress: string, functionName: string, parameter: Uint8Array | Args, dryRun: NonPersistentExecution): Promise<IContractReadOperationResponse>;
+    nonPersistentCallSC(contractAddress: string, functionName: string, parameter: Uint8Array | Args, amount: bigint, fee: bigint, maxGas: bigint): Promise<IContractReadOperationResponse>;
 }
 //# sourceMappingURL=MassaStationAccount.d.ts.map

package/dist/massaStation/MassaStationAccount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MassaStationAccount.d.ts","sourceRoot":"","sources":["../../src/massaStation/MassaStationAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAM/C,OAAO,EACL,IAAI,EACJ,8BAA8B,EAE/B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAkC5E;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,QAAQ;IAClD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,KAAK,CAAS;IAEtB;;;;;;;;;;;;OAYG;gBACgB,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM;IAM3E;;OAEG;IACI,OAAO,IAAI,MAAM;IAIxB;;OAEG;IACI,IAAI,IAAI,MAAM;IAIrB;;OAEG;IACI,YAAY,IAAI,MAAM;IAI7B;;;;OAIG;IACU,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAqBxD;;;;;OAKG;IACU,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAoB3E;;;;;;OAMG;IACU,QAAQ,CACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,mBAAmB,CAAC;IAoB/B;;;;;;OAMG;IACU,SAAS,CACpB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,mBAAmB,CAAC;IAoB/B;;;;;;OAMG;IACH,eAAe,CACb,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,MAAM,EACxB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,mBAAmB,CAAC;IAI/B;;;;;;;;;;;;;;;;;;OAkBG;IACU,MAAM,CACjB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,MAAM,EAAE,MAAM,EACd,sBAAsB,yBAEK,GAC1B,OAAO,CAAC,mBAAmB,GAAG,8BAA8B,CAAC;IAuCnD,0BAA0B,IAAI,OAAO,CAAC,MAAM,CAAC;IAoB7C,mBAAmB,CAC9B,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,MAAM,EAAE,sBAAsB,GAC7B,OAAO,CAAC,8BAA8B,CAAC;CAmE3C"}
+{"version":3,"file":"MassaStationAccount.d.ts","sourceRoot":"","sources":["../../src/massaStation/MassaStationAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAM/C,OAAO,EACL,IAAI,EACJ,8BAA8B,EAE/B,MAAM,uBAAuB,CAAC;AAmC/B;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,QAAQ;IAClD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,KAAK,CAAS;IAEtB;;;;;;;;;;;;OAYG;gBACgB,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM;IAM3E;;OAEG;IACI,OAAO,IAAI,MAAM;IAIxB;;OAEG;IACI,IAAI,IAAI,MAAM;IAIrB;;OAEG;IACI,YAAY,IAAI,MAAM;IAI7B;;;;OAIG;IACU,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAqBxD;;;;;OAKG;IACU,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAoB3E;;;;;;OAMG;IACU,QAAQ,CACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,mBAAmB,CAAC;IAoB/B;;;;;;OAMG;IACU,SAAS,CACpB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,mBAAmB,CAAC;IAoB/B;;;;;;OAMG;IACG,eAAe,CACnB,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,MAAM,EACxB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,mBAAmB,CAAC;IAsB/B;;;;;;;;;;;;;;;;;;;OAmBG;IACU,MAAM,CACjB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,sBAAsB,UAAQ,GAC7B,OAAO,CAAC,mBAAmB,GAAG,8BAA8B,CAAC;IAyCnD,0BAA0B,IAAI,OAAO,CAAC,MAAM,CAAC;IAoB7C,mBAAmB,CAC9B,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,8BAA8B,CAAC;CAgE3C"}

package/dist/massaStation/MassaStationAccount.js

@@ -156,12 +156,29 @@ class MassaStationAccount {
     /**
      * This method aims to transfer MAS on behalf of the sender to a recipient.
      *
-     * @param amount - The amount of MAS to be transferred.
-     * @param fee - The fee to be paid for the transaction execution by the node.
+     * @param amount - The amount of MAS (in the smallest unit) to be transferred.
+     * @param fee - The fee to be paid for the transaction execution (in the smallest unit).
      * @returns An ITransactionDetails object. It contains the operationId on the network.
      */
-    sendTransaction(amount, recipientAddress, fee) {
-        throw new Error('Method not implemented.');
+    async sendTransaction(amount, recipientAddress, fee) {
+        let sendTxOpResponse = null;
+        const url = `${MassaStationProvider_1.MASSA_STATION_ACCOUNTS_URL}/${this._name}/transfer`;
+        const body = {
+            fee: fee.toString(),
+            amount: amount.toString(),
+            recipientAddress: recipientAddress,
+        };
+        try {
+            sendTxOpResponse = await (0, RequestHandler_1.postRequest)(url, body);
+        }
+        catch (ex) {
+            console.error(`MassaStation account: error while sending transaction: ${ex}`);
+            throw ex;
+        }
+        if (sendTxOpResponse.isError || sendTxOpResponse.error) {
+            throw sendTxOpResponse.error;
+        }
+        return sendTxOpResponse.result;
     }
     /**
      * This method aims to interact with a smart contract deployed on the MASSA blockchain.
@@ -174,19 +191,18 @@ class MassaStationAccount {
      * @param contractAddress - The address of the smart contract.
      * @param functionName - The name of the function to be called.
      * @param parameter - The parameters as an Args object to be passed to the function.
-     * @param amount - The amount of MASSA coins to be sent to the block creator.
-     * @param dryRun - The dryRun object to be passed to the function.
+     * @param amount - The amount of MASSA coins to be sent to the contract (in the smallest unit).
+     * @param fee - The fee to be paid for the transaction execution (in the smallest unit).
+     * @param maxGas - The maximum amount of gas to be used for the transaction execution.
+     * @param nonPersistentExecution - The dryRun object to be passed to the function.
      *
-     * @returns if dryRun.dryRun is true, it returns an IContractReadOperationResponse object. Otherwise,
-     * it returns an ITransactionDetails object which contains the first event emitted by the contract.
-     * If the contract does not emit any event, it returns "Function called successfully but no event generated"
+     * @returns if 'nonPersistentExecution' is true, it returns an IContractReadOperationResponse object.
+     * Otherwise, it returns an ITransactionDetails object which contains the operationId on the network.
      *
      */
-    async callSC(contractAddress, functionName, parameter, amount, nonPersistentExecution = {
-        isNPE: false,
-    }) {
-        if (nonPersistentExecution?.isNPE) {
-            return this.nonPersistentCallSC(contractAddress, functionName, parameter, nonPersistentExecution);
+    async callSC(contractAddress, functionName, parameter, amount, fee, maxGas, nonPersistentExecution = false) {
+        if (nonPersistentExecution) {
+            return this.nonPersistentCallSC(contractAddress, functionName, parameter, amount, fee, maxGas);
         }
         // convert parameter to base64
         let args = '';
@@ -235,15 +251,12 @@ class MassaStationAccount {
         }
         return node;
     }
-    async nonPersistentCallSC(contractAddress, functionName, parameter, dryRun) {
+    async nonPersistentCallSC(contractAddress, functionName, parameter, amount, fee, maxGas) {
         const node = await this.getNodeUrlFromMassaStation();
         // Gas amount check
-        if (!dryRun.maxGas) {
-            dryRun.maxGas = MAX_READ_BLOCK_GAS;
-        }
-        if (dryRun.maxGas > MAX_READ_BLOCK_GAS) {
+        if (maxGas > MAX_READ_BLOCK_GAS) {
             throw new Error(`
-        The gas submitted ${dryRun.maxGas.toString()} exceeds the max. allowed block gas of 
+        The gas submitted ${maxGas.toString()} exceeds the max. allowed block gas of 
         ${MAX_READ_BLOCK_GAS.toString()}
         `);
         }
@@ -257,7 +270,7 @@ class MassaStationAccount {
         }
         // setup the request body
         const data = {
-            max_gas: Number(dryRun.maxGas),
+            max_gas: Number(maxGas),
             target_address: contractAddress,
             target_function: functionName,
             parameter: argumentArray,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@massalabs/wallet-provider",
-    "version": "1.0.0",
+    "version": "1.0.1-dev.20230727122300",
     "description": "massa's wallet provider",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

package/dist/account/INonPersistentExecution.d.ts

@@ -1,11 +0,0 @@
-/**
- * This interface defines specific data that are used to perform a dry run.
- *
- * @see dryRun - Wether or not to perform a dry run
- * @see maxGas - The maximum amount of gas to be used in the dry run
- */
-export interface NonPersistentExecution {
-    isNPE: boolean;
-    maxGas?: bigint;
-}
-//# sourceMappingURL=INonPersistentExecution.d.ts.map

package/dist/account/INonPersistentExecution.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"INonPersistentExecution.d.ts","sourceRoot":"","sources":["../../src/account/INonPersistentExecution.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB"}

package/dist/account/INonPersistentExecution.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });