Merge pull request #1941 from hirosystems/develop

Release v7.10.0 stable

Author: zone117x

.env

@@ -178,4 +178,4 @@ STACKS_NODE_TYPE=L1
 # IBD_MODE_UNTIL_BLOCK=
 
 # Folder with events to be imported by the event-replay.
-STACKS_EVENTS_DIR=./eventssds
+STACKS_EVENTS_DIR=./events

.github/workflows/ci.yml

@@ -855,7 +855,6 @@ jobs:
       - lint
       - lint-docs
       - test
-      - test-2_5
       - test-bns
       - test-rosetta
       - test-rosetta-cli-construction

.gitpod.yml

@@ -12,7 +12,7 @@ tasks:
   - init: npm ci
     command: npm run dev
   - openMode: split-right
-    command: stacks-node start --config=stacks-blockchain/Stacks-dev.toml
+    command: stacks-node start --config stacks-blockchain/Stacks-dev.toml
 
 github:
   prebuilds:

.vscode/launch.json

@@ -55,6 +55,7 @@
       "skipFiles": [
         "<node_internals>/**"
       ],
+      "runtimeVersion": "20",
       "runtimeArgs": ["-r", "ts-node/register/transpile-only", "-r", "tsconfig-paths/register"],
       "args": ["${workspaceFolder}/src/index.ts"],
       "outputCapture": "std",

client/src/generated/models/RosettaOptions.ts

@@ -2,7 +2,7 @@
 /* eslint-disable */
 /**
  * Stacks Blockchain API
- * Welcome to the API reference overview for the <a href=\"https://docs.hiro.so/get-started/stacks-blockchain-api\">Stacks Blockchain API</a>.  <a href=\"https://hirosystems.github.io/stacks-blockchain-api/collection.json\" download=\"stacks-api-collection.json\">Download Postman collection</a> 
+ * Welcome to the API reference overview for the [Stacks Blockchain API](https://docs.hiro.so/get-started/stacks-blockchain-api).  [Download Postman collection](https://hirosystems.github.io/stacks-blockchain-api/collection.json) 
  *
  * The version of the OpenAPI document: STACKS_API_VERSION
  * 
@@ -139,6 +139,12 @@ export interface RosettaOptions {
      * @memberof RosettaOptions
      */
     pox_addr?: string;
+    /**
+     * The hex-encoded signer key (buff 33) for PoX.
+     * @type {string}
+     * @memberof RosettaOptions
+     */
+    signer_key?: string;
 }
 
 export function RosettaOptionsFromJSON(json: any): RosettaOptions {
@@ -171,6 +177,7 @@ export function RosettaOptionsFromJSONTyped(json: any, ignoreDiscriminator: bool
         'burn_block_height': !exists(json, 'burn_block_height') ? undefined : json['burn_block_height'],
         'delegate_to': !exists(json, 'delegate_to') ? undefined : json['delegate_to'],
         'pox_addr': !exists(json, 'pox_addr') ? undefined : json['pox_addr'],
+        'signer_key': !exists(json, 'signer_key') ? undefined : json['signer_key'],
     };
 }
 
@@ -203,6 +210,7 @@ export function RosettaOptionsToJSON(value?: RosettaOptions | null): any {
         'burn_block_height': value.burn_block_height,
         'delegate_to': value.delegate_to,
         'pox_addr': value.pox_addr,
+        'signer_key': value.signer_key,
     };
 }
 

docker/docker-compose.dev.stacks-blockchain-follower.yml

@@ -3,7 +3,7 @@ services:
   stacks-blockchain:
     build:
       context: ../stacks-blockchain/docker
-    command: stacks-node start --config=/app/config/Stacks-follower.toml
+    command: stacks-node start --config /app/config/Stacks-follower.toml
     restart: on-failure
     environment:
       STACKS_EVENT_OBSERVER: host.docker.internal:3700

docker/docker-compose.dev.stacks-blockchain.yml

@@ -1,17 +1,17 @@
 version: '3.7'
 services:
   stacks-blockchain:
-    image: "hirosystems/stacks-api-e2e:stacks3.0-800259e"
+    image: 'hirosystems/stacks-api-e2e:stacks3.0-4d11d85'
     restart: on-failure
     environment:
       STACKS_EVENT_OBSERVER: host.docker.internal:3700
       BLOCKSTACK_USE_TEST_GENESIS_CHAINSTATE: 1
       NOP_BLOCKSTACK_DEBUG: 1
     ports:
-      - "20443:20443"
-      - "20444:20444"
+      - '20443:20443'
+      - '20444:20444'
     volumes:
       - ../stacks-blockchain/:/app/config
       - ../stacks-blockchain/.chaindata:/tmp/stacks-blockchain-data
     extra_hosts:
-      - "host.docker.internal:host-gateway" # fixes `host.docker.internal` on linux hosts
+      - 'host.docker.internal:host-gateway' # fixes `host.docker.internal` on linux hosts

docker/docker-compose.dev.stacks-krypton.yml

@@ -1,16 +1,16 @@
 version: '3.7'
 services:
   stacks-blockchain:
-    image: "hirosystems/stacks-api-e2e:stacks3.0-800259e"
+    image: 'hirosystems/stacks-api-e2e:stacks3.0-4d11d85'
     ports:
-      - "18443:18443" # bitcoin regtest JSON-RPC interface
-      - "18444:18444" # bitcoin regtest p2p
-      - "20443:20443" # stacks-node RPC interface
-      - "20444:20444" # stacks-node p2p
+      - '18443:18443' # bitcoin regtest JSON-RPC interface
+      - '18444:18444' # bitcoin regtest p2p
+      - '20443:20443' # stacks-node RPC interface
+      - '20444:20444' # stacks-node p2p
     environment:
       MINE_INTERVAL: 0.1s
       STACKS_EVENT_OBSERVER: host.docker.internal:3700
       # STACKS_LOG_TRACE: 1
       # STACKS_LOG_DEBUG: 1
     extra_hosts:
-      - "host.docker.internal:host-gateway" # fixes `host.docker.internal` on linux hosts
+      - 'host.docker.internal:host-gateway' # fixes `host.docker.internal` on linux hosts

docker/docker-compose.dev.subnets.yml

@@ -22,7 +22,7 @@ services:
     image: "hirosystems/stacks-subnets:7012d22"
     # build:
     #   dockerfile: ./subnet-node.Dockerfile
-    command: subnet-node start --config=/app/config/Stacks-subnet.toml
+    command: subnet-node start --config /app/config/Stacks-subnet.toml
     ports:
       - "30443:30443" # subnet-node RPC interface
       - "30444:30444" # subnet-node p2p

docker/docker-compose.override.yml

@@ -1,4 +1,4 @@
 version: '3.7'
 services:
   stacks-blockchain:
-    command: stacks-node start --config=/app/config/Stacks-mocknet.toml
+    command: stacks-node start --config /app/config/Stacks-mocknet.toml