Skip to content

Commit 8a26a8f

Browse files
committed
Merge branch 'develop' of https://github.com/stacks-network/stacks-core into feat/signer-two-phase-commit-impl
2 parents a31dc85 + 1b00198 commit 8a26a8f

File tree

22 files changed

+1686
-26
lines changed

22 files changed

+1686
-26
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,15 @@ jobs:
7171
validate: "true"
7272
redocly-version: "1.34"
7373

74+
## Generate and upload node configuration documentation
75+
node-config-docsgen:
76+
name: Node Configuration Documentation
77+
runs-on: ubuntu-latest
78+
steps:
79+
- name: Generate Node Configuration Documentation
80+
id: node_config_docsgen
81+
uses: stacks-network/actions/stacks-core/node-config-docsgen@main
82+
7483
## Disabled
7584
## - this test can take several hours to run
7685
nettest:
@@ -141,6 +150,7 @@ jobs:
141150
if: always()
142151
needs:
143152
- open-api-validation
153+
- node-config-docsgen
144154
- core-contracts-clarinet-test
145155
steps:
146156
- name: Check Tests Status

contrib/core-contract-tests/contracts/sip-031-indirect.clar

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@
77
)
88
)
99

10+
;; WARNING: This is for testing purposes only.
11+
;; This is not a safe way to call `update-recipient` from an external contract,
12+
;; as it does not perform the necessary authorization checks.
13+
(define-public (update-recipient-as-contract (new-recipient principal))
14+
(as-contract (contract-call? 'ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM.sip-031
15+
update-recipient new-recipient
16+
))
17+
)
18+
19+
;; WARNING: This is for testing purposes only.
20+
;; This is not a safe way to call `claim` from an external contract,
21+
;; as it does not perform the necessary authorization checks.
22+
(define-public (claim-as-contract)
23+
(as-contract (contract-call? 'ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM.sip-031 claim))
24+
)
25+
1026
;; Helper function to transfer STX within tests
1127
(define-public (transfer-stx
1228
(amount uint)

contrib/core-contract-tests/deployments/default.simnet-plan.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ genesis:
1212
address: ST1SJ3DTE5DN7X54YDH5D64R3BCB6A2AG2ZQ8YPD5
1313
balance: "100000000000000"
1414
sbtc-balance: "1000000000"
15+
- name: wallet_10
16+
address: ST3FFKYTTB975A3JC3F99MM7TXZJ406R3GKE6JV56
17+
balance: "200000000000000"
18+
sbtc-balance: "1000000000"
1519
- name: wallet_2
1620
address: ST2CY5V39NHDPWSXMW9QDT3HC3GD6Q6XX4CFRK9AG
1721
balance: "100000000000000"

contrib/core-contract-tests/package-lock.json

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

contrib/core-contract-tests/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"@clarigen/test": "2.1.3",
1717
"@hirosystems/clarinet-sdk": "2.16.0",
1818
"@stacks/clarunit": "0.0.1",
19+
"@stacks/rendezvous": "^0.7.4",
1920
"@stacks/stacking": "^6.13.2",
2021
"@stacks/transactions": "^6.13.0",
2122
"chokidar-cli": "^3.0.0",

contrib/core-contract-tests/settings/Devnet.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,9 @@ balance = 100_000_000_000_000
7171
# stx_address: STNHKEPYEPJ8ET55ZZ0M5A34J0R3N5FM2CMMMAZ6
7272
# btc_address: mjSrB3wS4xab3kYqFktwBzfTdPg367ZJ2d
7373

74+
[accounts.wallet_10]
75+
mnemonic = "kiss denial decade slide spawn medal twist lamp evidence economy torch alter witness paper rule snack cushion hill sugar fury public innocent almost divide"
76+
balance = 200_000_000_000_000
77+
# secret_key: 5b897659452b9f3642be69aee75dc3cc84b2386d55ece1312affdbb80a3b2a7d01
78+
# stx_address: ST3FFKYTTB975A3JC3F99MM7TXZJ406R3GKE6JV56
79+
# btc_address: n1qwmgbzf1YeHDW6cTxxEwuqnjbqauvKJ1

contrib/core-contract-tests/tests/clarigen-types.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4687,6 +4687,12 @@ export const contracts = {
46874687
},
46884688
sip031Indirect: {
46894689
functions: {
4690+
claimAsContract: {
4691+
name: 'claim-as-contract',
4692+
access: 'public',
4693+
args: [],
4694+
outputs: { type: { response: { ok: 'uint128', error: 'uint128' } } },
4695+
} as TypedAbiFunction<[], Response<bigint, bigint>>,
46904696
transferStx: {
46914697
name: 'transfer-stx',
46924698
access: 'public',
@@ -4711,6 +4717,15 @@ export const contracts = {
47114717
[newRecipient: TypedAbiArg<string, 'newRecipient'>],
47124718
Response<boolean, bigint>
47134719
>,
4720+
updateRecipientAsContract: {
4721+
name: 'update-recipient-as-contract',
4722+
access: 'public',
4723+
args: [{ name: 'new-recipient', type: 'principal' }],
4724+
outputs: { type: { response: { ok: 'bool', error: 'uint128' } } },
4725+
} as TypedAbiFunction<
4726+
[newRecipient: TypedAbiArg<string, 'newRecipient'>],
4727+
Response<boolean, bigint>
4728+
>,
47144729
getBalance: {
47154730
name: 'get-balance',
47164731
access: 'read_only',

0 commit comments

Comments
 (0)