add MS deploySc

massalabs · Dec 2, 2024 · 16fba9f · 16fba9f
1 parent 6e1ffb6
commit 16fba9f
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/bearbyWallet/BearbyAccount.ts b/src/bearbyWallet/BearbyAccount.ts
@@ -257,6 +257,7 @@ export class BearbyAccount implements Provider {
       maxGas: params.maxGas || MAX_GAS_DEPLOYMENT,
       coins: params.coins,
       fee: fee,
+      gasPrice: 10000n,
       contractDataBase64: uint8ArrayToBase64(params.byteCode),
       deployerBase64: uint8ArrayToBase64(DEPLOYER_BYTECODE),
     };

diff --git a/src/massaStation/MassaStationAccount.ts b/src/massaStation/MassaStationAccount.ts
@@ -6,6 +6,7 @@ import {
 import { argsToBase64, uint8ArrayToBase64 } from '../utils/argsToBase64';
 import bs58check from 'bs58check';
 import {
+  DeploySCFunctionBody,
   ExecuteFunctionBody,
   MSAccountSignPayload,
   MSAccountSignResp,
@@ -34,6 +35,7 @@ import {
   SCEvent,
   SignedData,
   SmartContract,
+  StorageCost,
   strToBytes,
 } from '@massalabs/massa-web3';
 import { getClient, networkInfos } from './utils/network';
@@ -238,18 +240,30 @@ export class MassaStationAccount implements Provider {
   }
 
   public async deploySC(params: DeploySCParams): Promise<SmartContract> {
-    console.log(params);
-    // const body: DeploySCFunctionBody = {
-    //   nickname: this.accountName,
-    //   smartContract: params.byteCode
-    // };
+    const parameters = params.parameter as Uint8Array; // Args to based64 is not supported
+    const totalCost =
+      StorageCost.smartContract(params.byteCode.length) + params.coins;
 
-    // const res = await postRequest<MSSendOperationResp>(
-    //   `${MASSA_STATION_URL}cmd/deploySC`,
-    //   body,
-    // );
+    const body: DeploySCFunctionBody = {
+      nickname: this.accountName,
+      smartContract: uint8ArrayToBase64(params.byteCode),
+      maxCoins: Number(totalCost),
+      coins: Number(params.coins), // SmartContract deployment costs
+      parameters: uint8ArrayToBase64(parameters),
+      fee: Number(params.fee || (await this.minimalFee())),
+    };
 
-    throw new Error('Method not implemented.');
+    const res = await postRequest<MSSendOperationResp>(
+      `${MASSA_STATION_URL}cmd/deploySC`,
+      body,
+    );
+    const operationId = res.result?.operationId;
+    const operation = new Operation(this, operationId);
+    const deployedAddress = await operation.getDeployedAddress(
+      params.waitFinalExecution,
+    );
+
+    return new SmartContract(this, deployedAddress);
   }
 
   public async getOperationStatus(opId: string): Promise<OperationStatus> {

diff --git a/src/massaStation/RequestHandler.ts b/src/massaStation/RequestHandler.ts
@@ -72,7 +72,6 @@ export async function postRequest<T>(
     const resp = await axios.post<unknown, AxiosResponse, object>(url, body, {
       headers: requestHeaders,
     });
-
     return { isError: false, result: resp.data };
   } catch (error) {
     return {

diff --git a/src/massaStation/types.ts b/src/massaStation/types.ts
@@ -13,12 +13,11 @@ export type ExecuteFunctionBody = {
 
 export type DeploySCFunctionBody = {
   nickname: string;
-  smartContract: File;
-  gasLimit: number;
+  smartContract: string;
+  maxCoins: number;
   coins: number;
-  expiry: number;
+  parameters: string;
   fee: number;
-  datastore: string;
 };
 
 export type PluginInfo = {
@@ -95,4 +94,5 @@ export type MSAccountSignResp = {
 
 export type MSSendOperationResp = {
   operationId: string;
+  events: any[];
 };