Merge branch 'develop' of https://github.com/stacks-network/stacks-core into feat/signer-state-conflict-resolution-strategies

Author: jferrant

.github/workflows/ci.yml

@@ -102,22 +102,6 @@ jobs:
       signer_docker_tag: ${{ needs.check-release.outputs.signer_docker_tag }}
       is_node_release: ${{ needs.check-release.outputs.is_node_release }}
       is_signer_release: ${{ needs.check-release.outputs.is_signer_release }}
-    secrets: inherit
-
-  ## Build and push Debian image built from source
-  ##
-  ## Runs when:
-  ##  - it is not a node or signer-only release run
-  docker-image:
-    if: |
-      needs.check-release.outputs.is_node_release != 'true' ||
-      needs.check-release.outputs.is_signer_release != 'true'
-    name: Docker Image (Source)
-    uses: ./.github/workflows/image-build-source.yml
-    needs:
-      - rustfmt
-      - check-release
-    secrets: inherit
 
   ## Create a reusable cache for tests
   ##

.github/workflows/github-release.yml

@@ -29,9 +29,6 @@ on:
         description: "True if it is a signer release"
         required: true
         type: string
-    secrets:
-      GH_TOKEN:
-        required: true
 
 concurrency:
   group: github-release-${{ github.head_ref || github.ref }}
@@ -41,6 +38,21 @@ concurrency:
 run-name: ${{ inputs.node_tag || inputs.signer_tag }}
 
 jobs:
+  ## This job's sole purpose is trigger a secondary approval outside of the matrix jobs below. 
+  ##   - If this job isn't approved to run, then the subsequent jobs will also not run - for this reason, we always exit 0
+  ##   - `andon-cord` requires the repo environment "Build Release", which will trigger a secondary approval step before running this workflow.  
+  andon-cord:
+    if: |
+      inputs.node_tag != '' ||
+      inputs.signer_tag != ''
+    name: Andon Cord
+    runs-on: ubuntu-latest
+    environment: "Build Release"
+    steps:
+      - name: Check Approval
+        id: check
+        run: |
+          exit 0
   ## Build arch dependent binaries from source
   ##
   ## Runs when the following is true:
@@ -51,7 +63,8 @@ jobs:
       inputs.signer_tag != ''
     name: Build Binaries
     runs-on: ubuntu-latest
-    environment: "Build Release"
+    needs:
+      - andon-cord
     strategy:
       ## Run a maximum of 10 builds concurrently, using the matrix defined in inputs.arch
       max-parallel: 10
@@ -94,7 +107,10 @@ jobs:
     name: Create Release
     runs-on: ubuntu-latest
     needs:
+      - andon-cord
       - build-binaries
+    permissions:
+      contents: write
     steps:
       ## Creates releases
       - name: Create Release
@@ -106,8 +122,7 @@ jobs:
           signer_docker_tag: ${{ inputs.signer_docker_tag }}
           is_node_release: ${{ inputs.is_node_release }}
           is_signer_release: ${{ inputs.is_signer_release }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   ## Builds arch dependent Docker images from binaries
   ##
@@ -121,6 +136,7 @@ jobs:
     name: Docker Image (Binary)
     runs-on: ubuntu-latest
     needs:
+      - andon-cord
       - build-binaries
       - create-release
     strategy:
@@ -153,12 +169,15 @@ jobs:
     name: Create Downstream PR (${{ github.ref_name }})
     runs-on: ubuntu-latest
     needs:
+      - andon-cord
       - build-binaries
       - create-release
       - docker-image
+    permissions:
+      pull-requests: write
     steps:
       - name: Open Downstream PR
         id: create-pr
         uses: stacks-network/actions/stacks-core/release/downstream-pr@main
         with:
-          token: ${{ secrets.GH_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/image-build-source.yml

@@ -21,6 +21,8 @@ jobs:
   image:
     name: Build Image
     runs-on: ubuntu-latest
+    ## Requires the repo environment "Push to Docker", which will trigger a secondary approval step before running this workflow.
+    environment: "Push to Docker"
     steps:
       ## Setup Docker for the builds
       - name: Docker setup

.gitmodules

@@ -13,6 +13,7 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 - Add `max_execution_time_secs` to miner config for limiting duration of contract calls
 - When a miner's config file is updated (ie with a new fee rate), a new block commit is issued using
   the new values ([#5924](https://github.com/stacks-network/stacks-core/pull/5924))
+- Add `txindex` configuration option enabling the storage (and querying via api) of transactions. Note: the old STACKS_TRANSACTION_LOG environment var configuration is no longer available.
 
 ### Changed
 

CHANGELOG.md

@@ -195,7 +195,7 @@ start_replay() {
             starting_block=0 # for the block counter, start at this block
             ## use these values if `--testing` arg is provided (only replay 1_000 blocks) Note:  2.5 epoch is at 153106
             ${TESTING} && total_blocks=153000
-            ${TESTING} && starting_block=15200
+            ${TESTING} && starting_block=152000
             ;;
     esac
     local block_diff=$((total_blocks - starting_block)) ## how many blocks are being replayed

Cargo.lock

@@ -578,3 +578,20 @@ tenure, `tip_block_id` identifies the highest-known block in this tenure, and
 Get number of blocks signed by signer during a given reward cycle
 
 Returns a non-negative integer
+
+### GET /v3/transaction/[Transaction ID]
+
+Returns the index_block_hash, the transaction body (as hex) and the result given the TXID.
+
+```json
+{
+  "index_block_hash": "e0b6c25b1dac0c0e1c75e41ab46bd6d70d9a2d02ffed8f2c0733b6e686289c38",
+  "tx": "(ok true)",
+  "result": "808000000004008bc5147525b8f477f0bc4522a88c8339b2494db5000000000000001a0000000000000000010123eab800bc9f639c5aa05d154148a981c89fd21064a6f8cafd8649800a56c9ea77e2e46bed8bd9ef0f173b19b20d6c43e2a9f37b078df5c74b9e6f9be75b650e01020000000007588687edeb02248d402c316ed33e22ea0e73af8703ce5011f3e25f5ce12f00f903ca504742117ee0588687edeb02248d402c316ed33e22ea0e73af87c54e0d94e4dd298cf19778352906a2fcf0af74582b07dfb57c710288874f71ca00000001006bc51b33e9f3626944eb879147e18111581f8f9b"
+}
+```
+
+This feature requires enabling of transaction indexing by setting the `txindex` node option.
+
+This will return 404 if the transaction does not exist and 501 (Not Implemented) if
+transaction indexing is not enabled.

contrib/tools/block-replay.sh

@@ -0,0 +1,5 @@
+{
+  "index_block_hash": "e0b6c25b1dac0c0e1c75e41ab46bd6d70d9a2d02ffed8f2c0733b6e686289c38",
+  "result": "(ok true)",
+  "tx": "808000000004008bc5147525b8f477f0bc4522a88c8339b2494db5000000000000001a0000000000000000010123eab800bc9f639c5aa05d154148a981c89fd21064a6f8cafd8649800a56c9ea77e2e46bed8bd9ef0f173b19b20d6c43e2a9f37b078df5c74b9e6f9be75b650e01020000000007588687edeb02248d402c316ed33e22ea0e73af8703ce5011f3e25f5ce12f00f903ca504742117ee0588687edeb02248d402c316ed33e22ea0e73af87c54e0d94e4dd298cf19778352906a2fcf0af74582b07dfb57c710288874f71ca00000001006bc51b33e9f3626944eb879147e18111581f8f9b"
+}

docs/rpc-endpoints.md

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "ReadOnlyFunctionArgs",
-  "description": "Describes representation of a Type-0 Stacks 2.0 transaction. https://github.com/blockstack/stacks-blockchain/blob/master/sip/sip-005-blocks-and-transactions.md#type-0-transferring-an-asset",
+  "description": "Describes representation of a Type-0 Stacks 2.0 transaction. https://github.com/stacksgov/sips/blob/main/sips/sip-005/sip-005-blocks-and-transactions.md#type-0-transferring-an-asset",
   "type": "object",
   "required": ["sender", "arguments"],
   "properties": {