From 11d64dbb7d8cbf466c5a65dffd816d79e591bab9 Mon Sep 17 00:00:00 2001
From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com>
Date: Mon, 9 Dec 2024 09:08:58 -0800
Subject: [PATCH 1/2] [CLIENT-3205] Multi record transactions: support correct
 server error codes for MRTs (#701)

- [CLIENT-3199] Do not close/delete MRT monitor record on abort/commit when a write command in that MRT fails and is in doubt
- [CLIENT-3212] Raise TranactionFailed exception instead of BatchFailed exception when batch MRT verify fails.
- Always unlock macOS keychain on self-hosted macOS runners to prevent workflow from failing
---
 .github/workflows/build-wheels.yml | 3 ++-
 aerospike-client-c                 | 2 +-
 src/main/exception.c               | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
index 37f8b7ae0..334f82dc8 100644
--- a/.github/workflows/build-wheels.yml
+++ b/.github/workflows/build-wheels.yml
@@ -325,7 +325,8 @@ jobs:
           ref: ${{ env.COMMIT_SHA_TO_BUILD_AND_TEST }}
 
       # Need to be able to save Docker Hub credentials to keychain
-      - if: ${{ inputs.platform-tag == 'macosx_arm64' && inputs.use-server-rc }}
+      # Unable to do this via the ansible script for self hosted mac m1 runners
+      - if: ${{ inputs.platform-tag == 'macosx_arm64' }}
         run: security unlock-keychain -p ${{ secrets.MAC_M1_SELF_HOSTED_RUNNER_PW }}
 
       - uses: ./.github/actions/run-ee-server
diff --git a/aerospike-client-c b/aerospike-client-c
index 886306eee..5bffa81cc 160000
--- a/aerospike-client-c
+++ b/aerospike-client-c
@@ -1 +1 @@
-Subproject commit 886306eeea9869190cae9c0a7782eee83e1c345d
+Subproject commit 5bffa81ccf98f36951cf3d638bacea463dd27580
diff --git a/src/main/exception.c b/src/main/exception.c
index c0884ec81..4c681131e 100644
--- a/src/main/exception.c
+++ b/src/main/exception.c
@@ -111,6 +111,8 @@ struct exception_def exception_defs[] = {
                   AEROSPIKE_ERR_ASYNC_CONNECTION, NULL),
     EXCEPTION_DEF("ClientAbortError", CLIENT_ERR_EXCEPTION_NAME,
                   AEROSPIKE_ERR_CLIENT_ABORT, NULL),
+    EXCEPTION_DEF("TranactionFailed", CLIENT_ERR_EXCEPTION_NAME,
+                  AEROSPIKE_TXN_FAILED, NULL),
     // Server errors
     EXCEPTION_DEF("InvalidRequest", SERVER_ERR_EXCEPTION_NAME,
                   AEROSPIKE_ERR_REQUEST_INVALID, NULL),

From d5bc2d691b39cf44d2fcdddb5171ed48b16ee25d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2024 17:09:40 +0000
Subject: [PATCH 2/2] Auto-bump version to 16.0.0rc3.dev2 [skip ci]

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 0a903f20d..e60378d5e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.0.0rc3.dev1
+16.0.0rc3.dev2