add deploy Sc

api/middleware.go

@@ -23,7 +23,6 @@ func TopMiddleware(handler http.Handler) http.Handler {
 		if configDir == "" {
 			var err error
 			configDir, err = configuration.Path()
-
 			if err != nil {
 				logger.Warnf("TLS: unable to get CA root path: %s", err)
 			}

api/swagger/server/restapi/configure_massastation.go

@@ -92,7 +92,6 @@ func configureTLS(tlsConfig *tls.Config) {
 		if caPath == "" {
 			var err error
 			caPath, err = configuration.CertPath()
-
 			if err != nil {
 				logger.Warnf("TLS: unable to get CA root path: %s", err)
 			}

api/swagger/server/restapi/resource/swagger.yml

@@ -207,54 +207,50 @@ paths:
     post:
       description: Deploys the given smart contract to the blockchain network.
       operationId: cmdDeploySC
-      consumes:
-        - multipart/form-data
       parameters:
-        - in: formData
-          name: walletNickname
-          type: string
-          required: true
-          x-nullable: false
-          description: Name of the wallet used to deploy the smart contract.
-        - in: formData
-          name: smartContract
-          type: file
+        - in: body
+          name: body
           required: true
           x-nullable: false
-          description: Smart contract file in a Wasm format.
-        - in : formData
-          name : gasLimit
-          type : integer
-          format: uint64
-          minimum: 0
-          description: Maximum number of gas unit that a node will be able to consume.
-          default: 1000000000  # DefaultGasLimit
-        - in: formData
-          name : coins
-          type: integer
-          format: uint64
-          minimum: 0
-          description: Set the number of coins that will be sent along the deployment call.
-          default: 0
-        - in: formData
-          name : expiry
-          type : integer
-          format: uint64
-          minimum: 0
-          description: Set the expiry duration (in number of slots) of the transaction.
-          default: 2
-        - in: formData
-          name : fee
-          type : integer
-          minimum: 0
-          format: uint64
-          description: Set the fee amount (in nanoMassa) that will be given to the block creator.
-          default : 0
-        - in: formData
-          name: datastore
-          type: string
-          default: ""
-          description: b64 encoded datastore that will be sent along the smart contract.
+          schema:
+            type: object
+            required:
+              - nickname
+              - smartContract
+            properties:
+              nickname:
+                description: Account nickname used to sign the operation.
+                type: string
+                x-nullable: false
+              smartContract:  
+                description: Base64 encoded smart contract bytecode.
+                type: string
+                x-nullable: false
+              maxCoins:
+                description: Set the number of coins that will be sent along the deployment call.
+                type : integer
+                format: uint64
+                minimum: 0
+              coins:
+                description: Set the number of coins that will be sent along the deployment call.
+                type : integer
+                format: uint64
+                minimum: 0
+                default: 0
+              fee:
+                description: Set the fee amount (in nanoMassa) that will be given to the block creator.
+                type : integer
+                minimum: 0
+                format: uint64
+                default : 0
+              parameters:
+                description: Base64 encoded parameters that will be sent along the smart contract.
+                type: string
+                default: ""
+              description:
+                description: "Description of the operation"
+                type: string
+                default: ""
       produces:
         - application/json
       responses:

int/api/cmd/deploySC.go

@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"bytes"
+	_ "embed"
 	"encoding/base64"
 	"io"
 
@@ -13,6 +15,9 @@ import (
 	"github.com/massalabs/station/pkg/onchain"
 )
 
+//go:embed sc/deployer.wasm
+var deployerSCByteCode []byte
+
 func NewDeploySCHandler(config *config.NetworkInfos) operations.CmdDeploySCHandler {
 	return &deploySC{networkInfos: config}
 }
@@ -22,7 +27,9 @@ type deploySC struct {
 }
 
 func (d *deploySC) Handle(params operations.CmdDeploySCParams) middleware.Responder {
-	file, err := io.ReadAll(params.SmartContract)
+	_smartContractBytes, err := base64.StdEncoding.DecodeString(params.Body.SmartContract)
+	smartContractReader := bytes.NewReader(_smartContractBytes)
+	smartContractByteCode, err := io.ReadAll(smartContractReader)
 	if err != nil {
 		return operations.NewCmdDeploySCBadRequest().
 			WithPayload(
@@ -31,11 +38,10 @@ func (d *deploySC) Handle(params operations.CmdDeploySCParams) middleware.Respon
 					Message: err.Error(),
 				})
 	}
-	/* All the pointers below cannot be null as the swagger hydrate
-	each one with their default value defined in swagger.yml,
-	if no values are provided for these parameters.
-	*/
-	decodedDatastore, err := base64.StdEncoding.DecodeString(*params.Datastore)
+
+	_parameters, err := base64.StdEncoding.DecodeString(params.Body.Parameters)
+	parameterReader := bytes.NewReader(_parameters)
+	parameters, err := io.ReadAll(parameterReader)
 	if err != nil {
 		return operations.NewCmdDeploySCBadRequest().
 			WithPayload(
@@ -45,22 +51,18 @@ func (d *deploySC) Handle(params operations.CmdDeploySCParams) middleware.Respon
 				})
 	}
 
-	if len(decodedDatastore) == 0 {
-		decodedDatastore = nil
-	}
-
 	operationResponse, events, err := onchain.DeploySC(
 		d.networkInfos,
-		params.WalletNickname,
-		*params.GasLimit,
-		*params.Coins,
-		*params.Fee,
-		*params.Expiry,
-		file,
-		decodedDatastore,
-		sendoperation.OperationBatch{NewBatch: false, CorrelationID: ""},
+		params.Body.Nickname,
+		sendoperation.MaxGasAllowedExecuteSC, // default
+		*params.Body.MaxCoins,                // maxCoins
+		*params.Body.Coins,                   // smart contract deployment "fee"
+		sendoperation.DefaultExpiryInSlot,
+		parameters,
+		smartContractByteCode,
+		deployerSCByteCode,
 		&signer.WalletPlugin{},
-		"",
+		"Deploying contract "+params.Body.Description,
 	)
 	if err != nil {
 		return operations.NewCmdDeploySCInternalServerError().

int/api/cmd/execute_function.go

@@ -76,7 +76,6 @@ func (e *executeFunction) Handle(params operations.CmdExecuteFunctionParams) mid
 		uint64(params.Body.Coins),
 		expiry,
 		asyncReq,
-		sendOperation.OperationBatch{NewBatch: false, CorrelationID: ""},
 		&signer.WalletPlugin{},
 		params.Body.Description,
 	)

int/api/frontend.go

@@ -26,7 +26,6 @@ func MassaStationWebAppHandler(params operations.MassaStationWebAppParams) middl
 	if err != nil {
 		resourceName = "index.html"
 		resourceContent, err = contentReact.ReadFile(basePathReact + "massastation/" + resourceName)
-
 		if err != nil {
 			return operations.NewMassaStationWebAppNotFound()
 		}

int/api/myplugin/execute.go

@@ -53,7 +53,6 @@ func (e *execute) Handle(params operations.PluginManagerExecuteCommandParams) mi
 		}
 
 		err = plugin.Start()
-
 		if err != nil {
 			return executeFailed(cmd, status,
 				fmt.Sprintf("Error while restarting plugin %s: %s.\n", pluginName, err))

int/api/myplugin/register.go

@@ -45,7 +45,6 @@ func (r *register) Handle(param operations.PluginManagerRegisterParams) middlewa
 	}
 
 	err = wantedPlugin.SetInformation(urlPlugin)
-
 	if err != nil {
 		return operations.NewPluginManagerRegisterBadRequest().WithPayload(
 			&models.Error{Code: errorCodePluginRegisterInvalidData, Message: fmt.Sprintf("parsing Plugin URL: %s", err.Error())},
@@ -57,7 +56,6 @@ func (r *register) Handle(param operations.PluginManagerRegisterParams) middlewa
 	// Add alias for http requests.
 
 	err = r.manager.SetAlias(alias, param.Body.ID)
-
 	if err != nil {
 		logger.Debugf("setting plugin alias: %s", err)
 

pkg/certstore/store_windows.go

@@ -162,7 +162,6 @@ func (s *CertStore) AddCertificate(cert *x509.Certificate) error {
 		windows.CERT_STORE_ADD_NEW,
 		nil,
 	)
-
 	if err != nil {
 		return interpretError(err)
 	}

pkg/convert/byteConverter.go

@@ -13,7 +13,7 @@ const (
 )
 
 // Encode uint64 to byte array.
-func U64ToBytes(nb int) (bytes []byte) {
+func U64ToBytes(nb uint64) (bytes []byte) {
 	u64 := uint64(nb)
 	bytes = make([]byte, BytesPerUint64)
 	binary.LittleEndian.PutUint64(bytes, u64)
@@ -39,7 +39,7 @@ func I32ToBytes(nb int) (bytes []byte) {
 	return
 }
 
-func ToBytes(str string) []byte {
+func StrToBytes(str string) []byte {
 	return []byte(str)
 }
 

pkg/node/address.go

@@ -30,7 +30,6 @@ func Addresses(client *Client, addr []string) ([]Address, error) {
 
 	var content []Address
 	err = response.GetObject(&content)
-
 	if err != nil {
 		return nil, fmt.Errorf("parsing get_addresses jsonrpc response '%+v': %w", response, err)
 	}

pkg/node/sendoperation/executesc/executesc.go

@@ -60,10 +60,6 @@ func (e *ExecuteSC) Content() (interface{}, error) {
 	}, nil
 }
 
-// To date the datastore sent by the deploySC endpoint is always serialized.
-// However the web on chain features make use of a non-serialized, nil datastore.
-// Hence here we check that if datastore is not nil (and it means it comes from the deploySC endpoint)
-// we do not encode it further but rather send it as is to the node.
 func (e *ExecuteSC) Message() []byte {
 	msg := make([]byte, 0)
 	buf := make([]byte, binary.MaxVarintLen64)
@@ -84,25 +80,8 @@ func (e *ExecuteSC) Message() []byte {
 	msg = append(msg, buf[:nbBytes]...)
 	msg = append(msg, e.data...)
 
-	// datastore
-	// If the datastore is not nil, no need to serialize it.
-	if e.dataStore != nil {
-		msg = append(msg, e.dataStore...)
-
-		return msg
-	}
-
-	// If the datastore is nil, we need to serialize it.
-	// Number of entries in the datastore.
-	nbBytes = binary.PutUvarint(buf, uint64(len(e.dataStore)))
-	msg = append(msg, buf[:nbBytes]...)
 	msg = append(msg, e.dataStore...)
 
-	for key, value := range e.dataStore {
-		compactAndAppendBytes(&msg, key)
-		compactAndAppendBytes(&msg, value)
-	}
-
 	return msg
 }
 

pkg/node/sendoperation/sendoperation.go

@@ -5,10 +5,14 @@ import (
 	"context"
 	b64 "encoding/base64"
 	"encoding/binary"
+	"encoding/json"
 	"fmt"
+	"log"
 	"strconv"
 	"strings"
 
+	"github.com/massalabs/station/pkg/convert"
+	"github.com/massalabs/station/pkg/logger"
 	"github.com/massalabs/station/pkg/node"
 	"github.com/massalabs/station/pkg/node/base58"
 	"github.com/massalabs/station/pkg/node/sendoperation/signer"
@@ -42,11 +46,6 @@ type OperationResponse struct {
 	CorrelationID string
 }
 
-type OperationBatch struct {
-	NewBatch      bool
-	CorrelationID string
-}
-
 type JSONableSlice []uint8
 
 func (u JSONableSlice) MarshalJSON() ([]byte, error) {
@@ -69,7 +68,6 @@ func Call(
 	fee uint64,
 	operation Operation,
 	nickname string,
-	operationBatch OperationBatch,
 	signer signer.Signer,
 	description string,
 ) (*OperationResponse, error) {
@@ -78,7 +76,8 @@ func Call(
 		return nil, err
 	}
 
-	content := createOperationContent(operationBatch, description, msgB64, chainID)
+	content := createOperationContent(description, msgB64, chainID)
+	logger.Infof("json content: %v",content)
 
 	res, err := signer.Sign(nickname, []byte(content))
 	if err != nil {
@@ -105,24 +104,19 @@ func Call(
 	return &OperationResponse{CorrelationID: res.CorrelationID, OperationID: resp[0]}, nil
 }
 
-func createOperationContent(operationBatch OperationBatch, description string, msgB64 string, chainID uint64) string {
-	var content string
-
-	const descriptionLabel = `{"description": "`
+func createOperationContent(description string, msgB64 string, chainID uint64) string {
+	data := map[string]interface{}{
+		"description": description,
+		"operation":   msgB64,
+		"chainId":     strconv.FormatUint(chainID, 10),
+	}
 
-	switch {
-	case operationBatch.NewBatch:
-		content = descriptionLabel + description + `", "operation": "` + msgB64 + `",
-			"batch": true, "chainId": ` + strconv.FormatUint(chainID, 10) + `}`
-	case operationBatch.CorrelationID != "":
-		content = descriptionLabel + description + `", "operation": "` + msgB64 + `",
-			"correlationId": "` + operationBatch.CorrelationID + `", "chainId": ` + strconv.FormatUint(chainID, 10) + `}`
-	default:
-		content = descriptionLabel + description + `",
-			"operation": "` + msgB64 + `", "chainId": ` + strconv.FormatUint(chainID, 10) + `}`
+	content, err := json.Marshal(data)
+	if err != nil {
+		log.Fatalf("Error marshaling JSON: %v", err)
 	}
 
-	return content
+	return convert.ToString(content)
 }
 
 func MakeRPCCall(msg []byte, signature []byte, publicKey string, client *node.Client) ([]string, error) {

pkg/node/sendoperation/serializeaddress/serializeaddress.go

@@ -77,7 +77,6 @@ func DecodeAddress(buf *bytes.Reader) (string, error) {
 	addressBytes := make([]byte, publicKeyHashSize)
 
 	_, err = buf.Read(addressBytes)
-
 	if err != nil {
 		return "", fmt.Errorf("failed to read address portion: %w", err)
 	}

pkg/node/sendoperation/signer/signer.go

@@ -40,7 +40,6 @@ func (s *WalletPlugin) Sign(nickname string, operation []byte) (*SignOperationRe
 
 	res := SignOperationResponse{"", "", "", ""}
 	err = json.Unmarshal(httpRawResponse, &res)
-
 	if err != nil {
 		return nil, fmt.Errorf("unmarshalling '%s' JSON: %w", res, err)
 	}