Skip to content

Commit 4f3676f

Browse files
wileyjwileyj
authored
Merge branch 'release/3.2.0.0.0-rc1' into develop
2 parents a10d4c9 + e6457d2 commit 4f3676f

File tree

39 files changed

+7985
-178
lines changed

39 files changed

+7985
-178
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
id: clarinet_unit_test_v1
134134
uses: docker://hirosystems/clarinet:1.7.1
135135
with:
136-
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
137137

138138
check-tests:
139139
name: Check Tests

‎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
}

‎clarity/src/vm/version.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ impl ClarityVersion {
4141
StacksEpochId::Epoch25 => ClarityVersion::Clarity2,
4242
StacksEpochId::Epoch30 => ClarityVersion::Clarity3,
4343
StacksEpochId::Epoch31 => ClarityVersion::Clarity3,
44+
StacksEpochId::Epoch32 => ClarityVersion::Clarity3,
4445
}
4546
}
4647
}

‎contrib/core-contract-tests/Clarigen.toml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
clarinet = "./Clarinet.toml"
2+
3+
# Set where you'd like TypeScript types output.
4+
[types]
5+
output = "tests/clarigen-types.ts"
6+
7+
# `types.after` - script to run after TypeScript types are generated.
8+
after = "npx prettier -w ./tests/clarigen-types.ts"
9+
10+
watch_folders = [
11+
"../../stackslib/src/chainstate/stacks/boot"
12+
]
13+
14+
# Set where you'd like generated contract docs
15+
# Generate docs by running `clarigen docs`
16+
[docs]
17+
output = "docs"
18+
19+
# `docs.after` - script to run after docs are generated.
20+
after = "npx -y prettier -w ./docs"

0 commit comments

Comments
 (0)