Merge pull request #2680 from patricklodder/1.14.6-cfgac-format

trivial: fix spacing issues in configure.ac

.github/workflows/ci.yml

@@ -21,6 +21,7 @@ jobs:
       CCACHE_TEMPDIR: /tmp/.ccache-temp
       CCACHE_COMPRESS: "1"
       PYTHON_DEBUG: "1"
+      CACHE_NONCE: "1"
       WINEDEBUG: fixme-all
       SDK_URL: https://bitcoincore.org/depends-sources/sdks
 
@@ -182,7 +183,7 @@ jobs:
           cache-name: depends
         with:
           path: ./depends/built
-          key: ${{ matrix.name }}-${{ env.cache-name }}-${{ hashFiles('depends/packages/*') }}
+          key: ${{ matrix.name }}-${{ env.cache-name }}-${{ hashFiles('depends/packages/*', '.github/workflows/ci.yml') }}
 
       - name: Build depends
         run: |
@@ -194,7 +195,7 @@ jobs:
           cache-name: ccache
         with:
           path: ~/.ccache
-          key: ${{ matrix.name }}-${{ env.cache-name }}-${{ hashFiles('**/configure.ac') }}
+          key: ${{ matrix.name }}-${{ env.cache-name }}-${{ hashFiles('**/configure.ac', '.github/workflows/ci.yml') }}
 
       - name: Build Dogecoin
         run: |

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ on:
     paths-ignore:
       - '**/*.md'
       - '**/*.txt'
-      - 'contrib'
-      - 'doc'
-      - 'share'
-      - 'qa'
+      - 'contrib/**'
+      - 'doc/**'
+      - 'share/**'
+      - 'qa/**'
 
 jobs:
   analyze:

configure.ac

@@ -2,9 +2,9 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 14)
-define(_CLIENT_VERSION_REVISION, 5)
+define(_CLIENT_VERSION_REVISION, 6)
 define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_IS_RELEASE, true)
+define(_CLIENT_VERSION_IS_RELEASE, false)
 define(_COPYRIGHT_YEAR, 2021)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core and Dogecoin Core]])
@@ -1186,7 +1186,7 @@ case ${OS} in
    ;;
 esac
 
-echo 
+echo
 echo "Options used to compile and link:"
 echo "  with wallet   = $enable_wallet"
 echo "  with gui / qt = $bitcoin_enable_qt"
@@ -1200,7 +1200,7 @@ echo "  with bench    = $use_bench"
 echo "  with upnp     = $use_upnp"
 echo "  debug enabled = $enable_debug"
 echo "  werror        = $enable_werror"
-echo 
+echo
 echo "  target os     = $TARGET_OS"
 echo "  build os      = $BUILD_OS"
 echo
@@ -1210,4 +1210,4 @@ echo "  CPPFLAGS      = $CPPFLAGS"
 echo "  CXX           = $CXX"
 echo "  CXXFLAGS      = $CXXFLAGS"
 echo "  LDFLAGS       = $LDFLAGS"
-echo 
+echo

contrib/gitian-keys/abcsxyz-key.pgp

@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+7/X3KW3m
+=mRSZ
+-----END PGP PUBLIC KEY BLOCK-----

contrib/gitian-keys/fdov-key.pgp

@@ -0,0 +1,51 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=JHKJ
+-----END PGP PUBLIC KEY BLOCK-----

contrib/gitian-keys/xanimo-key.pgp

@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+lk1JNhkoKyF8dw==
+=hBpM
+-----END PGP PUBLIC KEY BLOCK-----

qa/rpc-tests/p2p-policy.py

@@ -37,6 +37,14 @@ class TestNode(NodeConnCB):
     def on_reject(self, conn, message):
         self.rejects.append(message)
 
+    # wait for a rejection message
+    def wait_for_reject(self, num_rejects=None):
+        if num_rejects is None:
+            num_rejects = len(self.rejects)
+        def reject_received():
+            return len(self.rejects) > num_rejects
+        return wait_until(reject_received, timeout=10)
+
     # wait for verack to make sure the node accepts our connection attempt
     def wait_for_verack(self):
         def veracked():
@@ -175,8 +183,8 @@ class P2PPolicyTests(BitcoinTestFramework):
             assert_equal(self.recvNode.wait_for_tx_inv(tx.hash), True)
             assert_equal(len(self.sendNode.rejects), num_rejects)
         else:
-            # test that there was a rejection received with the correct code
-            assert_greater_than(len(self.sendNode.rejects), num_rejects)
+            # wait until there was a rejection received with the correct code
+            assert_equal(self.sendNode.wait_for_reject(num_rejects), True)
             assert_equal(self.sendNode.rejects[-1].code, expected_reject_code)
 
         return tx

src/clientversion.h

@@ -16,11 +16,11 @@
 //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 14
-#define CLIENT_VERSION_REVISION 5
+#define CLIENT_VERSION_REVISION 6
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build
-#define CLIENT_VERSION_IS_RELEASE true
+#define CLIENT_VERSION_IS_RELEASE false
 
 /**
  * Copyright year (2009-this)