Update dependencies and fix migration to massa v27

massalabs · Nov 16, 2023 · 4f9153d · 4f9153d
1 parent 4d148bd
commit 4f9153d
Show file tree

Hide file tree

Showing 8 changed files with 5,696 additions and 24,067 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/sc-deployer/package.json b/packages/sc-deployer/package.json
@@ -15,7 +15,7 @@
     "@massalabs/as-types": "^1.0.1",
     "@massalabs/massa-as-sdk": "^2.4.0",
     "@massalabs/massa-sc-compiler": "^0.0.4-dev",
-    "@massalabs/massa-web3": "^2.2.1",
+    "@massalabs/massa-web3": "^1.24.3",
     "@types/node": "^18.11.10",
     "assemblyscript": "^0.25.2",
     "rimraf": "^5.0.1",

diff --git a/packages/sc-deployer/src/index.ts b/packages/sc-deployer/src/index.ts
@@ -105,7 +105,7 @@ async function awaitOperationFinalization(
       .smartContracts()
       .awaitRequiredOperationStatus(
         operationId,
-        EOperationStatus.FINAL_SUCCESS,
+        EOperationStatus.SPECULATIVE_SUCCESS,
       );
     console.log(
       `Transaction with Operation ID ${operationId} has reached finality!`,
@@ -116,7 +116,7 @@ async function awaitOperationFinalization(
     throw ex;
   }
 
-  if (status !== EOperationStatus.FINAL_SUCCESS) {
+  if (status !== EOperationStatus.SPECULATIVE_SUCCESS) {
     let msg = `Transaction ${operationId} did not reach finality after considerable amount of time.`;
     msg +=
       'Please review the transaction logs to identify potential issues or try redeploying a new contract';

diff --git a/packages/sc-deployer/src/utils/maxCoins.ts b/packages/sc-deployer/src/utils/maxCoins.ts
@@ -1,9 +1,8 @@
-import { fromMAS } from '@massalabs/massa-web3';
 import { ISCData } from '../interfaces';
-
-const BASE_ACOUNT_CREATION_COST = fromMAS(0.001);
-const PRICE_PER_BYTE = fromMAS(0.0001);
-
+import {
+  BASE_ACCOUNT_CREATION_COST,
+  STORAGE_BYTE_COST,
+} from '@massalabs/massa-web3';
 /**
  * Estimates the value of the maxCoins maximum number of coins to that should be used while deploying a smart contract.
  *
@@ -17,8 +16,8 @@ export function calculateMaxCoins(
   coinsSent: bigint,
 ) {
   return (
-    BASE_ACOUNT_CREATION_COST +
-    contractByteCodeSize * PRICE_PER_BYTE +
+    BASE_ACCOUNT_CREATION_COST +
+    contractByteCodeSize * STORAGE_BYTE_COST +
     coinsSent
   );
 }