set testnet 26 as default

massalabs · Oct 19, 2023 · d3344f0 · d3344f0
1 parent 11e73b7
commit d3344f0
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 9 deletions.
diff --git a/api/test/robot_tests/cmd/cmd.robot b/api/test/robot_tests/cmd/cmd.robot
@@ -13,7 +13,9 @@ Suite Setup         Suite Setup
 *** Test Cases ***
 POST a Smart Contract
     ${sc}=    Get File For Streaming Upload    ${CURDIR}/../../testSC/build/main-testSC.wasm
-    ${data}=    Create Dictionary    walletNickname=${WALLET_NICKNAME}
+    ${data}=    Create Dictionary
+    ...    walletNickname=${WALLET_NICKNAME}
+    ...    coins=3000000000
     ${file}=    Create Dictionary    smartContract=${sc}
     ${response}=    POST    ${API_URL}/cmd/deploySC    data=${data}    files=${file}    expected_status=any
     Log To Console    json response: ${response.json()}    # Print the response content to the test log for debugging

diff --git a/api/test/robot_tests/event_manager/keywords.resource b/api/test/robot_tests/event_manager/keywords.resource
@@ -13,7 +13,9 @@ Suite Setup
 
 Deploy testSC
     ${sc}=    Get File For Streaming Upload    ${CURDIR}/../../testSC/build/main-testSC.wasm
-    ${data}=    Create Dictionary    walletNickname=${WALLET_NICKNAME}
+    ${data}=    Create Dictionary
+    ...    walletNickname=${WALLET_NICKNAME}
+    ...    coins=3000000000
     ${file}=    Create Dictionary    smartContract=${sc}
     ${response}=    POST    ${API_URL}/cmd/deploySC    data=${data}    files=${file}    expected_status=${STATUS_OK}
     Should Contain    ${response.json()['firstEvent']['data']}    TestSC is deployed at :

diff --git a/int/config/config_network.yaml b/int/config/config_network.yaml
@@ -1,13 +1,13 @@
 testnet:
-  DNS: AS12MGDGVB3xNDqzGidJM5fcAbjF1ZP5XAecm5ww4RU7sfQd4cMKk
+  DNS: AS12dCHtafNAiQMDFMoiyPqU1kX1S1Nn4PdAGvW9ffBueDW7JmLMP
   URLs:
-    - https://test.massa.net/api/v2
+    - http://81.49.155.238:33035
+  Default: true
 
 buildnet:
   DNS: AS1pzpVk79cubdM7Zk9pNdg1JR4qKooVa6usyquiCEQhPeRWD9k7
   URLs:
     - https://buildnet.massa.net/api/v2
-  Default: true
 
 labnet:
   DNS: AS1PV17jWkbUs7mfXsn8Xfs9AK6tHiJoxuGu7RySFMV8GYdMeUSh

diff --git a/int/config/network.go b/int/config/network.go
@@ -4,6 +4,7 @@ import (
 	"embed"
 	"fmt"
 	"regexp"
+	"strconv"
 	"sync"
 
 	"github.com/massalabs/station/pkg/logger"

diff --git a/pkg/node/events.go b/pkg/node/events.go
@@ -131,5 +131,6 @@ func ListenEvents(
 	}
 
 	return nil,
-		fmt.Errorf("listening events for: opId %s, caller %s, emitter %s: Timeout", *operationID, *caller, *emitter)
+		// fmt.Errorf("listening events for: opId %s, caller %s, emitter %s: Timeout", *operationID, *caller, *emitter)
+		fmt.Errorf("timeout while listening events")
 }
diff --git a/pkg/onchain/website/sc/websiteDeployer_v26.wasm b/pkg/onchain/website/sc/websiteDeployer_v26.wasm
diff --git a/pkg/onchain/website/sc/websiteStorer_v26.wasm b/pkg/onchain/website/sc/websiteStorer_v26.wasm
diff --git a/pkg/onchain/website/uploader.go b/pkg/onchain/website/uploader.go
@@ -36,19 +36,31 @@ func PrepareForUpload(
 
 	basePath := "sc/"
 
-	websiteDeployer, err := content.ReadFile(basePath + "websiteDeployer.wasm")
+	var scSuffix string = ".wasm"
+	versionFloat, err := strconv.ParseFloat(network.Version, 64)
+	if err != nil {
+		return "", "", fmt.Errorf("failed to parse nodeversion %s: %w", network.Version, err)
+	}
+
+	//nolint:gomnd
+	if versionFloat >= 26 {
+		// current version is higher than 26.0
+		scSuffix = "_v26.wasm"
+	}
+
+	websiteDeployer, err := content.ReadFile(basePath + "websiteDeployer" + scSuffix)
 	if err != nil {
 		return "", "", fmt.Errorf("websiteDeployer contract not found: %w", err)
 	}
 
-	websiteStorer, err := content.ReadFile(basePath + "websiteStorer.wasm")
+	websiteStorer, err := content.ReadFile(basePath + "websiteStorer" + scSuffix)
 	if err != nil {
 		return "", "", fmt.Errorf("websiteStorer contract not found: %w", err)
 	}
 
 	// webSiteInitCost correspond to the cost of owner initialization
 	//nolint:lll,gomnd
-	webSiteInitCost, err := sendOperation.StorageCostForEntry(network.Version, len([]byte(ownerKey)), 53 /*owner Addr max byteLenght*/)
+	webSiteInitCost, err := sendOperation.StorageCostForEntry(network.Version /*len([]byte(ownerKey))*/, 100, 10*53 /*owner Addr max byteLenght*/)
 	if err != nil {
 		return "", "", fmt.Errorf("unable to compute storage cost for website init: %w", err)
 	}
@@ -63,6 +75,10 @@ func PrepareForUpload(
 		return "", "", fmt.Errorf("unable to compute storage cost for account creation: %w", err)
 	}
 
+	logger.Debug("deployCost: ", deployCost)
+	logger.Debug("webSiteInitCost: ", webSiteInitCost)
+	logger.Debug("accountCreationCost: ", accountCreationCost)
+
 	totalStorageCost := webSiteInitCost + deployCost + accountCreationCost
 
 	logger.Debug("Website deployment cost estimation: ", totalStorageCost)
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ import ( @@
     	"embed"
     	"fmt"
     	"regexp"
+    	"strconv"
     	"sync"
     	"github.com/massalabs/station/pkg/logger"
@@ Expand Down @@