From aeaac524380a7f6f55ba445e7f0b543fcd0f2c38 Mon Sep 17 00:00:00 2001
From: Rafael Cardenas <rafael@rafaelcr.com>
Date: Mon, 5 Aug 2024 10:18:26 -0600
Subject: [PATCH 1/3] fix: batch insert length assertion

---
 src/datastore/pg-write-store.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/datastore/pg-write-store.ts b/src/datastore/pg-write-store.ts
index bbd15368e..32badbeb7 100644
--- a/src/datastore/pg-write-store.ts
+++ b/src/datastore/pg-write-store.ts
@@ -1074,7 +1074,7 @@ export class PgWriteStore extends PgStore {
         DO UPDATE
         SET balance = ft_balances.balance + EXCLUDED.balance
       `;
-      assert(res.count === values.length, `Expecting ${values.length} inserts, got ${res.count}`);
+      assert(res.count === batch.length, `Expecting ${batch.length} inserts, got ${res.count}`);
     }
   }
 
@@ -1119,7 +1119,7 @@ export class PgWriteStore extends PgStore {
         DO UPDATE
         SET balance = ft_balances.balance + EXCLUDED.balance
       `;
-      assert(res.count === values.length, `Expecting ${values.length} inserts, got ${res.count}`);
+      assert(res.count === batch.length, `Expecting ${batch.length} inserts, got ${res.count}`);
     }
   }
 

From 6a64f0643591ef37bb82d081f2a94fa0bbc122fe Mon Sep 17 00:00:00 2001
From: Rafael Cardenas <rafael@rafaelcr.com>
Date: Mon, 5 Aug 2024 10:38:05 -0600
Subject: [PATCH 2/3] build: upgrade docker-compose

---
 package-lock.json | 22 +++++++++++++++++-----
 package.json      |  2 +-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1f1b57ef6..c964d36b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -100,7 +100,7 @@
         "@typescript-eslint/eslint-plugin": "5.46.1",
         "@typescript-eslint/parser": "5.51.0",
         "concurrently": "7.3.0",
-        "docker-compose": "0.23.14",
+        "docker-compose": "0.24.8",
         "eslint": "8.29.0",
         "eslint-plugin-prettier": "4.2.1",
         "eslint-plugin-tsdoc": "0.2.17",
@@ -6038,17 +6038,29 @@
       }
     },
     "node_modules/docker-compose": {
-      "version": "0.23.14",
-      "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.23.14.tgz",
-      "integrity": "sha512-n4y10yvZEGtwW4EvpDpiWal2elr6D14Bt8oP3nvlLAxryblEVub689lYhpu8lr54OlTiW9X64BH9SLd9AqljNw==",
+      "version": "0.24.8",
+      "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.8.tgz",
+      "integrity": "sha512-plizRs/Vf15H+GCVxq2EUvyPK7ei9b/cVesHvjnX4xaXjM9spHe2Ytq0BitndFgvTJ3E3NljPNUEl7BAN43iZw==",
       "dev": true,
       "dependencies": {
-        "yaml": "^1.10.2"
+        "yaml": "^2.2.2"
       },
       "engines": {
         "node": ">= 6.0.0"
       }
     },
+    "node_modules/docker-compose/node_modules/yaml": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz",
+      "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==",
+      "dev": true,
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
diff --git a/package.json b/package.json
index e8916aa6c..988e4c89c 100644
--- a/package.json
+++ b/package.json
@@ -175,7 +175,7 @@
     "@typescript-eslint/eslint-plugin": "5.46.1",
     "@typescript-eslint/parser": "5.51.0",
     "concurrently": "7.3.0",
-    "docker-compose": "0.23.14",
+    "docker-compose": "0.24.8",
     "eslint": "8.29.0",
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-tsdoc": "0.2.17",

From b36b16584215da041409c89be2b9622a29bbb102 Mon Sep 17 00:00:00 2001
From: Rafael Cardenas <rafael@rafaelcr.com>
Date: Mon, 5 Aug 2024 10:43:33 -0600
Subject: [PATCH 3/3] build: use docker compose

---
 src/tests-rosetta-cli-construction/validate-construction.ts | 2 +-
 src/tests-rosetta-cli-data/validate-rosetta.ts              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tests-rosetta-cli-construction/validate-construction.ts b/src/tests-rosetta-cli-construction/validate-construction.ts
index 0bcea2fe9..34312da44 100644
--- a/src/tests-rosetta-cli-construction/validate-construction.ts
+++ b/src/tests-rosetta-cli-construction/validate-construction.ts
@@ -11,7 +11,7 @@ import {
 import { StacksTestnet } from '@stacks/network';
 import * as fs from 'fs';
 import { StacksCoreRpcClient, getCoreNodeEndpoint } from '../core-rpc/client';
-import * as compose from 'docker-compose';
+import { v2 as compose } from 'docker-compose';
 import * as path from 'path';
 import { PgWriteStore } from '../datastore/pg-write-store';
 import { NonceJar, migrate, standByForTxSuccess } from '../test-utils/test-helpers';
diff --git a/src/tests-rosetta-cli-data/validate-rosetta.ts b/src/tests-rosetta-cli-data/validate-rosetta.ts
index 1ae844e2e..fb3e77e19 100644
--- a/src/tests-rosetta-cli-data/validate-rosetta.ts
+++ b/src/tests-rosetta-cli-data/validate-rosetta.ts
@@ -17,7 +17,7 @@ import { StacksTestnet } from '@stacks/network';
 import * as fs from 'fs';
 import { StacksCoreRpcClient, getCoreNodeEndpoint } from '../core-rpc/client';
 import { unwrapOptional } from '../helpers';
-import * as compose from 'docker-compose';
+import { v2 as compose } from 'docker-compose';
 import * as path from 'path';
 import { PgWriteStore } from '../datastore/pg-write-store';
 import { EventStreamServer, startEventServer } from '../event-stream/event-server';