@massalabs/wallet-provider 1.2.1-dev.20230810130757 → 1.2.1-dev.20230810193207

package/bundle.js

@@ -6602,7 +6602,6 @@ const bearby_js_1 = __webpack_require__(/*! @hicaru/bearby.js */ "./node_modules
 const RequestHandler_1 = __webpack_require__(/*! ../massaStation/RequestHandler */ "./src/massaStation/RequestHandler.ts");
 const jsonRpcMethods_1 = __webpack_require__(/*! ./jsonRpcMethods */ "./src/bearbyWallet/jsonRpcMethods.ts");
 const axios_1 = __webpack_require__(/*! axios */ "./node_modules/axios/index.js");
-const BearbyProvider_1 = __webpack_require__(/*! ./BearbyProvider */ "./src/bearbyWallet/BearbyProvider.ts");
 const Xbqcrypto_1 = __webpack_require__(/*! ./Xbqcrypto */ "./src/bearbyWallet/Xbqcrypto.ts");
 /**
  * The maximum allowed gas for a read operation
@@ -6653,8 +6652,17 @@ class BearbyAccount {
     providerName() {
         return this._providerName;
     }
+    async connect() {
+        try {
+            await bearby_js_1.web3.wallet.connect();
+        }
+        catch (ex) {
+            console.log('Bearby connection: ', ex);
+        }
+    }
     // needs testing
     async balance() {
+        await this.connect();
         // Not available on bearby. we have to manually call the api
         const body = {
             jsonrpc: '2.0',
@@ -6673,6 +6681,7 @@ class BearbyAccount {
     }
     // need testing
     async sign(data) {
+        await this.connect();
         const encoder = new TextEncoder();
         if (typeof data === 'string') {
             const signature = await bearby_js_1.web3.wallet.signMessage(data);
@@ -6689,6 +6698,7 @@ class BearbyAccount {
     }
     // need testing
     async buyRolls(amount, fee) {
+        await this.connect();
         const signedTx = await bearby_js_1.web3.wallet.signTransaction({
             type: OperationsType.RollBuy,
             amount: amount.toString(),
@@ -6701,6 +6711,7 @@ class BearbyAccount {
     }
     // need testing
     async sellRolls(amount, fee) {
+        await this.connect();
         const signedTx = await bearby_js_1.web3.wallet.signTransaction({
             type: OperationsType.RollSell,
             amount: amount.toString(),
@@ -6712,6 +6723,7 @@ class BearbyAccount {
         throw new Error('Method not implemented.');
     }
     async sendTransaction(amount, recipientAddress, fee) {
+        await this.connect();
         const signedTx = await bearby_js_1.web3.wallet.signTransaction({
             type: OperationsType.Payment,
             amount: amount.toString(),
@@ -6719,12 +6731,12 @@ class BearbyAccount {
             fee: fee.toString(),
             payload: '', // TODO: check how do we have to set it
         });
-        console.log(signedTx);
         return {
             operationId: '00',
         };
     }
     async callSC(contractAddress, functionName, parameter, amount, fee, maxGas, nonPersistentExecution = false) {
+        await this.connect();
         if (nonPersistentExecution) {
             return this.nonPersistentCallSC(contractAddress, functionName, parameter, amount, fee, maxGas);
         }
@@ -6742,69 +6754,19 @@ class BearbyAccount {
             });
         }
         catch (ex) {
-            throw new Error(
-            /* eslint-disable-next-line max-len */
-            'Bearby wallet does not support Uint8Array, serializable and serializableObjectArray. To use them switch to MassaStation');
+            throw new Error(`
+      Bearby wallet does not support Uint8Array, serializable, and serializableObjectArray. 
+      To use them switch to MassaStation`);
         }
-        return await bearby_js_1.web3.contract.call({
+        const operationId = await bearby_js_1.web3.contract.call({
             maxGas: Number(maxGas),
             coins: Number(amount),
             fee: Number(fee),
             targetAddress: contractAddress,
             functionName: functionName,
-            parameters: params,
+            parameters: params.slice(1),
         });
-        // // convert parameter to an array of numbers
-        // let argumentArray: Array<number> = [];
-        // if (parameter instanceof Uint8Array) {
-        //   argumentArray = Array.from(parameter);
-        // } else {
-        //   argumentArray = Array.from(parameter.serialize());
-        // }
-        // const callData = {
-        //   fee: fee,
-        //   maxGas: maxGas,
-        //   coins: amount,
-        //   targetAddress: contractAddress,
-        //   functionName: functionName,
-        //   parameter: argumentArray,
-        // } as ICallData;
-        // // get next period info to set the expiry period
-        // const nodeStatusInfo: NodeStatus = await this.getNodeStatus();
-        // // 5 is the default value used in massa-web3 for expiry period
-        // const expiryPeriod: number = nodeStatusInfo.next_slot.period + 5;
-        // // bytes compaction
-        // const bytesCompact: Buffer = compactBytesForOperation(
-        //   callData,
-        //   OperationTypeId.CallSC,
-        //   expiryPeriod,
-        // );
-        // // We need the public key but bearby doesn't allow us to get it directly.
-        // // We have to sign a message and get the public key from the signature
-        // const pubKey = (await this.sign('nothing')).publicKey;
-        // // sign payload
-        // const bytesPublicKey: Uint8Array = getBytesPublicKey(pubKey);
-        // // get the signature and encode it to base58
-        // const signatureUInt8Array = (
-        //   await this.sign(Buffer.concat([bytesPublicKey, bytesCompact]))
-        // ).signature;
-        // const signature = base58Encode(signatureUInt8Array);
-        // // request data
-        // const data = {
-        //   serialized_content: Array.prototype.slice.call(bytesCompact),
-        //   creator_public_key: pubKey,
-        //   signature: signature,
-        // };
-        // // returns operation ids
-        // let opIds: Array<string> = [];
-        // const jsonRpcRequestMethod = JSON_RPC_REQUEST_METHOD.SEND_OPERATIONS;
-        // opIds = await this.sendJsonRPCRequest(jsonRpcRequestMethod, [[data]]);
-        // if (opIds.length <= 0) {
-        //   throw new Error(
-        //     `Call smart contract operation bad response. No results array in json rpc response. Inspect smart contract`,
-        //   );
-        // }
-        // return opIds[0];
+        return { operationId };
     }
     /**
      * Retrieves the node's status.
@@ -6886,54 +6848,6 @@ class BearbyAccount {
             error: null,
         };
     }
-    /**
-     * Find provider for a concrete rpc method
-     *
-     * @remarks
-     * This method chooses the provider to use for a given rpc method.
-     *  - If the rpc method is about getting or sending data to the blockchain,
-     *    it will choose a public provider.
-     *  - If the rpc method is meant to be used by the node itself, it will choose a private provider.
-     *  - An error is thrown if no provider is found for the rpc method.
-     *
-     * @param requestMethod - The rpc method to find the provider for.
-     *
-     * @returns The provider for the rpc method.
-     */
-    getProviderForRpcMethod(requestMethod) {
-        switch (requestMethod) {
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.GET_ADDRESSES:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.GET_STATUS:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.SEND_OPERATIONS:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.GET_OPERATIONS:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.GET_BLOCKS:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.GET_ENDORSEMENTS:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.GET_CLIQUES:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.GET_STAKERS:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.GET_FILTERED_SC_OUTPUT_EVENT:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.EXECUTE_READ_ONLY_BYTECODE:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.EXECUTE_READ_ONLY_CALL:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.GET_DATASTORE_ENTRIES:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.GET_BLOCKCLIQUE_BLOCK_BY_SLOT:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.GET_GRAPH_INTERVAL: {
-                return new BearbyProvider_1.BearbyProvider('Bearby');
-            }
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.STOP_NODE:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.NODE_BAN_BY_ID:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.NODE_BAN_BY_IP:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.NODE_UNBAN_BY_ID:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.NODE_UNBAN_BY_IP:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.GET_STAKING_ADDRESSES:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.REMOVE_STAKING_ADDRESSES:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.ADD_STAKING_PRIVATE_KEYS:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.NODE_SIGN_MESSAGE:
-            case jsonRpcMethods_1.JSON_RPC_REQUEST_METHOD.NODE_REMOVE_FROM_WHITELIST: {
-                return new BearbyProvider_1.BearbyProvider('Bearby');
-            }
-            default:
-                throw new Error(`Unknown Json rpc method: ${requestMethod}`);
-        }
-    }
     async nonPersistentCallSC(contractAddress, functionName, parameter, amount, fee, maxGas) {
         // not clean but bearby doesn't allow us to get its node urls
         const node = exports.PUBLIC_NODE_RPC;
@@ -7560,10 +7474,9 @@ async function providers(retry = true, timeout = 3000, pollInterval = 500) {
         return [];
     }
     await Connector_1.connector.startMassaStationDiscovery();
-    // Look for Bearby
-    let p;
-    if ((0, BearbyConnect_1.detectBearby)()) {
-        p = new BearbyProvider_1.BearbyProvider('Bearby');
+    let bearby;
+    if (await (0, BearbyConnect_1.detectBearby)()) {
+        bearby = new BearbyProvider_1.BearbyProvider('Bearby');
     }
     return new Promise((resolve) => {
         let provider = [];
@@ -7578,8 +7491,8 @@ async function providers(retry = true, timeout = 3000, pollInterval = 500) {
             }
         }
         // Look for Bearby
-        if (p) {
-            provider.push(p);
+        if (bearby) {
+            provider.push(bearby);
         }
         // If no providers are available, wait and try again
         if (retry && provider.length === 0) {
@@ -9700,7 +9613,7 @@ const web3 = main();
 /******/ 	// Load entry module and return exports
 /******/ 	// This entry module is referenced by other modules so it can't be inlined
 /******/ 	var __webpack_exports__ = __webpack_require__("./src/index.ts");
-/******/ 	window.massa = __webpack_exports__;
+/******/ 	window.massaWallet = __webpack_exports__;
 /******/ 	
 /******/ })()
 ;