Skip to content

Commit 61f7bb9

Browse files
Merge #3490
3490: Update new version with fix of runtime and incompatibilities. r=AurelienFT a=AurelienFT Co-authored-by: AurelienFT <aurelien.foucault@epitech.eu>
2 parents dd828cf + 0d4f379 commit 61f7bb9

File tree

5 files changed

+72
-68
lines changed

5 files changed

+72
-68
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126

127127
# Maybe launch it only in testnet branches
128128
gas-costs-check:
129-
if: github.ref != 'refs/heads/staging'
129+
if: github.ref != 'refs/heads/staging' && github.ref != 'refs/heads/main'
130130
runs-on: ubuntu-latest
131131
steps:
132132
- uses: actions/checkout@v3

Cargo.lock

Lines changed: 67 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

massa-models/src/config/constants.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ lazy_static::lazy_static! {
4545
.saturating_add(MassaTime::from_millis(1000 * 10))
4646
)
4747
} else {
48-
1675296001000.into() // Thursday, February 02, 2022 00:00:01 AM UTC
48+
1675346400000.into() // Thursday, February 02, 2022 14:00:00 AM UTC
4949
};
5050

5151
/// TESTNET: time when the blockclique is ended.
@@ -64,7 +64,7 @@ lazy_static::lazy_static! {
6464
if cfg!(feature = "sandbox") {
6565
"SAND.0.0"
6666
} else {
67-
"TEST.19.0"
67+
"TEST.19.1"
6868
}
6969
.parse()
7070
.unwrap()

massa-models/src/version.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ impl Deserializer<Version> for VersionDeserializer {
189189
impl Version {
190190
/// true if instance and major are the same
191191
pub fn is_compatible(&self, other: &Version) -> bool {
192-
self.instance == other.instance && self.major == other.major
192+
self.instance == other.instance && self.major == other.major && other.minor >= 1
193193
}
194194
}
195195

massa-node/base_config/openrpc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"openrpc": "1.2.4",
33
"info": {
44
"title": "Massa OpenRPC Specification",
5-
"version": "TEST.19.0",
5+
"version": "TEST.19.1",
66
"description": "Massa OpenRPC Specification document. Find more information on https://docs.massa.net/en/latest/technical-doc/api.html",
77
"termsOfService": "https://open-rpc.org",
88
"contact": {

0 commit comments

Comments
 (0)