Merge branch 'beta' into beta-merge

Author: rafaelcr

.env

@@ -9,6 +9,8 @@ PG_SSL=false
 # PG_IDLE_TIMEOUT=30
 # Max connection lifetime in seconds, defaults to 60
 # PG_MAX_LIFETIME=60
+# Seconds before force-ending running queries on connection close, defaults to 5
+# PG_CLOSE_TIMEOUT=5
 
 # Can be any string, use to specify a use case specific to a deployment
 PG_APPLICATION_NAME=stacks-blockchain-api
@@ -33,6 +35,7 @@ PG_APPLICATION_NAME=stacks-blockchain-api
 # PG_PRIMARY_SSL=
 # PG_PRIMARY_IDLE_TIMEOUT=
 # PG_PRIMARY_MAX_LIFETIME=
+# PG_PRIMARY_CLOSE_TIMEOUT=
 # The connection URI below can be used in place of the PG variables above,
 # but if enabled it must be defined without others or omitted.
 # PG_PRIMARY_CONNECTION_URI=
@@ -84,6 +87,9 @@ STACKS_CORE_RPC_PORT=20443
 ## configure the chainID/networkID; testnet: 0x80000000, mainnet: 0x00000001
 STACKS_CHAIN_ID=0x00000001
 
+# Seconds to allow API components to shut down gracefully before force-killing them, defaults to 60
+# STACKS_SHUTDOWN_FORCE_KILL_TIMEOUT=60
+
 BTC_RPC_HOST=http://127.0.0.1
 BTC_RPC_PORT=18443
 BTC_RPC_USER=btc

.github/workflows/ci.yml

@@ -563,11 +563,11 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
+          build-args: |
+            STACKS_API_VERSION=${{ github.head_ref || github.ref_name }}
           file: docker/stx-rosetta.Dockerfile
           tags: ${{ steps.meta_standalone.outputs.tags }}
           labels: ${{ steps.meta_standalone.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
           # Only push if (there's a new release on main branch, or if building a non-main branch) and (Only run on non-PR events or only PRs that aren't from forks)
           push: ${{ (github.ref != 'refs/heads/master' || steps.semantic.outputs.new_release_version != '') && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }}
 

CHANGELOG.md

@@ -1,10 +1,26 @@
+## [6.2.0-beta.1](https://github.com/hirosystems/stacks-blockchain-api/compare/v6.1.0...v6.2.0-beta.1) (2022-11-03)
+
+
+### Features
+
+* add ENV configs for DB close and API shutdown timeouts ([#1366](https://github.com/hirosystems/stacks-blockchain-api/issues/1366)) ([444f008](https://github.com/hirosystems/stacks-blockchain-api/commit/444f008fe2f188148ce14c519373a053a3fc8c89))
+
+### Bug Fixes
+
+* add memos to send-many-memo rosetta STX transfer operations ([#1389](https://github.com/hirosystems/stacks-blockchain-api/issues/1389)) ([0a552b8](https://github.com/hirosystems/stacks-blockchain-api/commit/0a552b8d8c193f64199e63b0956b1c070ce2c530))
+* catch cache controller db errors ([#1368](https://github.com/hirosystems/stacks-blockchain-api/issues/1368)) ([f15df41](https://github.com/hirosystems/stacks-blockchain-api/commit/f15df41fa98a171b5e20289240c391a847fd1460))
+* remove duplicate tx socket updates inside db transactions ([#1360](https://github.com/hirosystems/stacks-blockchain-api/issues/1360)) ([60c185d](https://github.com/hirosystems/stacks-blockchain-api/commit/60c185d83970fe7cf590075029cd5fd878da96fa))
+* sql transaction consistency ([#1410](https://github.com/hirosystems/stacks-blockchain-api/issues/1410)) ([01e26d9](https://github.com/hirosystems/stacks-blockchain-api/commit/01e26d9c89472c8e07ee9d44372d3de86ee0fdb0))
+
+
 ## [6.1.1](https://github.com/hirosystems/stacks-blockchain-api/compare/v6.1.0...v6.1.1) (2022-10-24)
 
 
 ### Bug Fixes
 
 * log PoisonMicroblock tx instead rather than throwing ([#1379](https://github.com/hirosystems/stacks-blockchain-api/issues/1379)) ([cee6352](https://github.com/hirosystems/stacks-blockchain-api/commit/cee63529b4785d9bedc8fcfd568a27aedef0914d))
 
+
 ## [6.1.0](https://github.com/hirosystems/stacks-blockchain-api/compare/v6.0.4...v6.1.0) (2022-10-13)
 
 

docker/stx-rosetta.Dockerfile

@@ -1,8 +1,8 @@
-ARG STACKS_API_VERSION=v0.71.2
+ARG STACKS_API_VERSION
 ARG STACKS_NODE_VERSION=2.05.0.4.0
-ARG STACKS_API_REPO=blockstack/stacks-blockchain-api
-ARG STACKS_NODE_REPO=blockstack/stacks-blockchain
-ARG PG_VERSION=12
+ARG STACKS_API_REPO=hirosystems/stacks-blockchain-api
+ARG STACKS_NODE_REPO=stacks-network/stacks-blockchain
+ARG PG_VERSION=14
 ARG STACKS_NETWORK=mainnet
 ARG STACKS_LOG_DIR=/var/log/stacks-node
 ARG STACKS_SVC_DIR=/etc/service
@@ -30,7 +30,7 @@ RUN apt-get update -y \
         jq \
         openjdk-11-jre-headless \
         cmake \
-    && git clone -b ${STACKS_API_VERSION} --depth 1 https://github.com/${STACKS_API_REPO} . \
+    && git clone -b ${STACKS_API_VERSION} https://github.com/${STACKS_API_REPO} . \
     && echo "GIT_TAG=$(git tag --points-at HEAD)" >> .env \
     && npm config set unsafe-perm true \
     && npm ci \

package-lock.json

@@ -56,12 +56,18 @@
   "engineStrict": true,
   "release": {
     "plugins": [
-      ["@semantic-release/commit-analyzer", {
-        "preset": "conventionalcommits"
-      }],
-      ["@semantic-release/release-notes-generator", {
-        "preset": "conventionalcommits"
-      }],
+      [
+        "@semantic-release/commit-analyzer",
+        {
+          "preset": "conventionalcommits"
+        }
+      ],
+      [
+        "@semantic-release/release-notes-generator",
+        {
+          "preset": "conventionalcommits"
+        }
+      ],
       [
         "@semantic-release/exec",
         {
@@ -137,7 +143,7 @@
     "pg": "8.7.1",
     "pg-copy-streams": "5.1.1",
     "pg-cursor": "2.7.1",
-    "postgres": "3.2.4",
+    "postgres": "3.3.1",
     "prom-client": "14.0.1",
     "rpc-bitcoin": "2.0.0",
     "socket.io": "4.4.0",

package.json

@@ -249,41 +249,58 @@ async function calculateETag(
 ): Promise<ETag | undefined> {
   switch (etagType) {
     case ETagType.chainTip:
-      const chainTip = await db.getUnanchoredChainTip();
-      if (!chainTip.found) {
-        // This should never happen unless the API is serving requests before it has synced any blocks.
+      try {
+        const chainTip = await db.getUnanchoredChainTip();
+        if (!chainTip.found) {
+          // This should never happen unless the API is serving requests before it has synced any
+          // blocks.
+          return;
+        }
+        return chainTip.result.microblockHash ?? chainTip.result.indexBlockHash;
+      } catch (error) {
+        logger.error(`Unable to calculate chain_tip ETag: ${error}`);
         return;
       }
-      return chainTip.result.microblockHash ?? chainTip.result.indexBlockHash;
 
     case ETagType.mempool:
-      const digest = await db.getMempoolTxDigest();
-      if (!digest.found) {
-        // This should never happen unless the API is serving requests before it has synced any blocks.
+      try {
+        const digest = await db.getMempoolTxDigest();
+        if (!digest.found) {
+          // This should never happen unless the API is serving requests before it has synced any
+          // blocks.
+          return;
+        }
+        if (digest.result.digest === null) {
+          // A `null` mempool digest means the `bit_xor` postgres function is unavailable.
+          return ETAG_EMPTY;
+        }
+        return digest.result.digest;
+      } catch (error) {
+        logger.error(`Unable to calculate mempool ETag: ${error}`);
         return;
       }
-      if (digest.result.digest === null) {
-        // A `null` mempool digest means the `bit_xor` postgres function is unavailable.
-        return ETAG_EMPTY;
-      }
-      return digest.result.digest;
 
     case ETagType.transaction:
-      const { tx_id } = req.params;
-      const normalizedTxId = normalizeHashString(tx_id);
-      if (normalizedTxId === false) {
-        return ETAG_EMPTY;
-      }
-      const status = await db.getTxStatus(normalizedTxId);
-      if (!status.found) {
-        return ETAG_EMPTY;
+      try {
+        const { tx_id } = req.params;
+        const normalizedTxId = normalizeHashString(tx_id);
+        if (normalizedTxId === false) {
+          return ETAG_EMPTY;
+        }
+        const status = await db.getTxStatus(normalizedTxId);
+        if (!status.found) {
+          return ETAG_EMPTY;
+        }
+        const elements: string[] = [
+          normalizedTxId,
+          status.result.index_block_hash ?? '',
+          status.result.microblock_hash ?? '',
+          status.result.status.toString(),
+        ];
+        return elements.join(':');
+      } catch (error) {
+        logger.error(`Unable to calculate transaction ETag: ${error}`);
+        return;
       }
-      const elements: string[] = [
-        normalizedTxId,
-        status.result.index_block_hash ?? '',
-        status.result.microblock_hash ?? '',
-        status.result.status.toString(),
-      ];
-      return elements.join(':');
   }
 }