Merge branch 'main' into testnet

massalabs · Feb 2, 2023 · 99a796d · 99a796d
2 parents 2931535 + 61f7bb9
commit 99a796d
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 68 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -126,7 +126,7 @@ jobs:
 
   # Maybe launch it only in testnet branches
   gas-costs-check:
-    if: github.ref != 'refs/heads/staging'
+    if: github.ref != 'refs/heads/staging' && github.ref != 'refs/heads/main'
     runs-on: ubuntu-latest
     steps: 
       - uses: actions/checkout@v3

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/massa-models/src/config/constants.rs b/massa-models/src/config/constants.rs
@@ -45,7 +45,7 @@ lazy_static::lazy_static! {
                 .saturating_add(MassaTime::from_millis(1000 * 10))
         )
     } else {
-        1675296001000.into()  // Thursday, February 02, 2022 00:00:01 AM UTC
+        1675346400000.into()  // Thursday, February 02, 2022 14:00:00 AM UTC
     };
 
     /// TESTNET: time when the blockclique is ended.
@@ -64,7 +64,7 @@ lazy_static::lazy_static! {
         if cfg!(feature = "sandbox") {
             "SAND.0.0"
         } else {
-            "TEST.19.0"
+            "TEST.19.1"
         }
         .parse()
         .unwrap()

diff --git a/massa-models/src/version.rs b/massa-models/src/version.rs
@@ -189,7 +189,7 @@ impl Deserializer<Version> for VersionDeserializer {
 impl Version {
     /// true if instance and major are the same
     pub fn is_compatible(&self, other: &Version) -> bool {
-        self.instance == other.instance && self.major == other.major
+        self.instance == other.instance && self.major == other.major && other.minor >= 1
     }
 }
 

diff --git a/massa-node/base_config/openrpc.json b/massa-node/base_config/openrpc.json
@@ -2,7 +2,7 @@
     "openrpc": "1.2.4",
     "info": {
         "title": "Massa OpenRPC Specification",
-        "version": "TEST.19.0",
+        "version": "TEST.19.1",
         "description": "Massa OpenRPC Specification document. Find more information on https://docs.massa.net/en/latest/technical-doc/api.html",
         "termsOfService": "https://open-rpc.org",
         "contact": {