From 2f792a567b0c64735487d17724f9d83686b6c36b Mon Sep 17 00:00:00 2001 From: tri Date: Sun, 26 May 2024 20:48:14 -0700 Subject: [PATCH] fix mac build --- .github/workflows/build.yaml | 7 ++++--- src/consensus/tx_verify.cpp | 11 +++-------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 56843f70db..0eb45cdcec 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -331,9 +331,9 @@ jobs: report_paths: 'unit_test_results.xml' build-macos: - name: macOS 11 Build + name: macOS 13 Build needs: get-version - runs-on: macos-11 + runs-on: macos-13 steps: - name: Checkout @@ -341,8 +341,9 @@ jobs: - name: Install Required Packages run: | - brew install automake libtool pkg-config miniupnpc librsvg libnatpmp zeromq python + brew install automake libtool pkg-config librsvg libnatpmp python pip3 install ds_store mac_alias + pip3 install -U pip setuptools - name: Build Depends run: | diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp index c5d86bdd14..4bd0bf5635 100644 --- a/src/consensus/tx_verify.cpp +++ b/src/consensus/tx_verify.cpp @@ -231,15 +231,10 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state, int nHeig { if (txout.nValue < 0) return state.DoS(100, false, REJECT_INVALID, "bad-txns-vout-negative"); - if(isV17active){ - if (txout.nValue > MAX_MONEY) - return state.DoS(100, false, REJECT_INVALID, "bad-txns-vout-toolarge"); - }else{ - if (txout.nValue > OLD_MAX_MONEY) - return state.DoS(100, false, REJECT_INVALID, "bad-txns-vout-toolarge"); - } + if (txout.nValue > MAX_MONEY) + return state.DoS(100, false, REJECT_INVALID, "bad-txns-vout-toolarge"); nValueOut += txout.nValue; - if (!MoneyRange(nValueOut, isV17active)) + if (!MoneyRange(nValueOut)) return state.DoS(100, false, REJECT_INVALID, "bad-txns-txouttotal-toolarge"); }