Skip to content

Commit 35feba9

Browse files
committed
Merge branch 'develop' into fix/v2-stackerdb-metrics-identifier
2 parents 0e1baba + 6168284 commit 35feba9

File tree

184 files changed

+21666
-2087
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+21666
-2087
lines changed

.github/workflows/stacks-core-tests.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,15 @@ jobs:
6161
name: OpenAPI Validation
6262
runs-on: ubuntu-latest
6363
steps:
64-
- name: OpenAPI
64+
- name: Generate OpenAPI documentation
6565
id: openapi
6666
uses: stacks-network/actions/openapi@main
6767
with:
68-
input: ./docs/rpc/openapi.yaml
69-
output: ./open-api-docs.html
68+
input: "./docs/rpc/openapi.yaml"
69+
output: "./openapi-docs.html"
70+
config: "./docs/rpc/redocly.yaml"
71+
validate: "true"
72+
redocly-version: "1.34"
7073

7174
## Disabled
7275
## - this test can take several hours to run
@@ -130,7 +133,7 @@ jobs:
130133
id: clarinet_unit_test_v1
131134
uses: docker://hirosystems/clarinet:1.7.1
132135
with:
133-
args: test --manifest-path=./contrib/core-contract-tests/Clarinet.toml contrib/core-contract-tests/tests/bns/name_register_test.ts
136+
args: test --manifest-path=./contrib/core-contract-tests/Clarinet-v1.toml contrib/core-contract-tests/tests/bns/name_register_test.ts --deployment-plan-path=./deployments/v1.simnet-plan.yaml
134137

135138
check-tests:
136139
name: Check Tests

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,24 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to the versioning scheme outlined in the [README.md](README.md).
77

8-
## Unreleased
8+
## [3.2.0.0.0]
99

1010
### Added
1111

12+
- Added the `clarity-serialization` crate: A lightweight crate for serializing and deserializing Clarity values. This crate decouples core data types from the Clarity VM, making it easier to build off-chain tooling, and other applications that interact with Clarity data. It includes support for `wasm32-unknown-unknown` targets via the `wasm-web` and `wasm-deterministic` features.
1213
- Added `/v3/contracts/fast-call-read/:principal/:contract_name/:func_name` api endpoint. It allows to run read-only calls faster by disabling the cost and memory trackers. This endpoint requires authentication.
14+
- **SIP-031 consensus rules, activating in epoch 3.2 at block 907_740**
1315

1416
### Changed
1517

1618
- The HTTP `Date` header in responses now strictly follows RFC7231.
1719
- When a previous block commit is unable to be RBFed, the miner will now just wait for it to be confirmed instead of submitting a new block commit which breaks the miner's UTXO chain.
20+
- When mining, only log new block proposal responses, not duplicates.
1821

1922
### Fixed
2023

2124
- Fixed tenure downloader logic on reward cycle boundaries (#6234).
25+
- Do not send events to event observers for stale StackerDB chunks.
2226

2327
## [3.1.0.0.13]
2428

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ members = [
1212
"stacks-node",
1313
"contrib/tools/config-docs-generator"]
1414

15+
exclude = ["contrib/clarity-serialization"]
16+
1517
# Dependencies we want to keep the same between workspace members
1618
[workspace.dependencies]
1719
ed25519-dalek = { version = "2.1.1", default-features = false }

clarity/src/vm/analysis/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ pub fn run_analysis(
152152
| StacksEpochId::Epoch24
153153
| StacksEpochId::Epoch25
154154
| StacksEpochId::Epoch30
155-
| StacksEpochId::Epoch31 => {
155+
| StacksEpochId::Epoch31
156+
| StacksEpochId::Epoch32 => {
156157
TypeChecker2_1::run_pass(&epoch, &mut contract_analysis, db, build_type_map)
157158
}
158159
StacksEpochId::Epoch10 => {

clarity/src/vm/analysis/type_checker/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ impl FunctionType {
4545
| StacksEpochId::Epoch24
4646
| StacksEpochId::Epoch25
4747
| StacksEpochId::Epoch30
48-
| StacksEpochId::Epoch31 => self.check_args_2_1(accounting, args, clarity_version),
48+
| StacksEpochId::Epoch31
49+
| StacksEpochId::Epoch32 => self.check_args_2_1(accounting, args, clarity_version),
4950
StacksEpochId::Epoch10 => {
5051
Err(CheckErrors::Expects("Epoch10 is not supported".into()).into())
5152
}
@@ -69,7 +70,8 @@ impl FunctionType {
6970
| StacksEpochId::Epoch24
7071
| StacksEpochId::Epoch25
7172
| StacksEpochId::Epoch30
72-
| StacksEpochId::Epoch31 => {
73+
| StacksEpochId::Epoch31
74+
| StacksEpochId::Epoch32 => {
7375
self.check_args_by_allowing_trait_cast_2_1(db, clarity_version, func_args)
7476
}
7577
StacksEpochId::Epoch10 => {

clarity/src/vm/costs/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,8 @@ impl LimitedCostTracker {
876876
| StacksEpochId::Epoch24
877877
| StacksEpochId::Epoch25
878878
| StacksEpochId::Epoch30
879-
| StacksEpochId::Epoch31 => COSTS_3_NAME.to_string(),
879+
| StacksEpochId::Epoch31
880+
| StacksEpochId::Epoch32 => COSTS_3_NAME.to_string(),
880881
};
881882
Ok(result)
882883
}

clarity/src/vm/functions/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ macro_rules! switch_on_global_epoch {
5656
StacksEpochId::Epoch30 => $Epoch205Version(args, env, context),
5757
// Note: We reuse 2.05 for 3.1.
5858
StacksEpochId::Epoch31 => $Epoch205Version(args, env, context),
59+
// Note: We reuse 2.05 for 3.2.
60+
StacksEpochId::Epoch32 => $Epoch205Version(args, env, context),
5961
}
6062
}
6163
};

clarity/src/vm/test_util/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ pub fn generate_test_burn_state_db(epoch_id: StacksEpochId) -> UnitTestBurnState
5353
| StacksEpochId::Epoch24
5454
| StacksEpochId::Epoch25
5555
| StacksEpochId::Epoch30
56-
| StacksEpochId::Epoch31 => UnitTestBurnStateDB {
56+
| StacksEpochId::Epoch31
57+
| StacksEpochId::Epoch32 => UnitTestBurnStateDB {
5758
epoch_id,
5859
ast_rules: ASTRules::PrecheckSize,
5960
},

clarity/src/vm/tests/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ epochs_template! {
125125
Epoch25,
126126
Epoch30,
127127
Epoch31,
128+
Epoch32,
128129
}
129130

130131
clarity_template! {
@@ -146,6 +147,9 @@ clarity_template! {
146147
(Epoch31, Clarity1),
147148
(Epoch31, Clarity2),
148149
(Epoch31, Clarity3),
150+
(Epoch32, Clarity1),
151+
(Epoch32, Clarity2),
152+
(Epoch32, Clarity3),
149153
}
150154

151155
#[cfg(test)]

clarity/src/vm/types/signatures.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,8 @@ impl TypeSignature {
585585
| StacksEpochId::Epoch24
586586
| StacksEpochId::Epoch25
587587
| StacksEpochId::Epoch30
588-
| StacksEpochId::Epoch31 => self.admits_type_v2_1(other),
588+
| StacksEpochId::Epoch31
589+
| StacksEpochId::Epoch32 => self.admits_type_v2_1(other),
589590
StacksEpochId::Epoch10 => Err(CheckErrors::Expects("epoch 1.0 not supported".into())),
590591
}
591592
}
@@ -793,7 +794,8 @@ impl TypeSignature {
793794
| StacksEpochId::Epoch24
794795
| StacksEpochId::Epoch25
795796
| StacksEpochId::Epoch30
796-
| StacksEpochId::Epoch31 => self.canonicalize_v2_1(),
797+
| StacksEpochId::Epoch31
798+
| StacksEpochId::Epoch32 => self.canonicalize_v2_1(),
797799
}
798800
}
799801

@@ -1152,7 +1154,8 @@ impl TypeSignature {
11521154
| StacksEpochId::Epoch24
11531155
| StacksEpochId::Epoch25
11541156
| StacksEpochId::Epoch30
1155-
| StacksEpochId::Epoch31 => Self::least_supertype_v2_1(a, b),
1157+
| StacksEpochId::Epoch31
1158+
| StacksEpochId::Epoch32 => Self::least_supertype_v2_1(a, b),
11561159
StacksEpochId::Epoch10 => Err(CheckErrors::Expects("epoch 1.0 not supported".into())),
11571160
}
11581161
}

0 commit comments

Comments
 (0)