Skip to content

Comments

CHAINS-6848 Merge upstream/master for btc testnet4 changes#11

Merged
rahul-aravind-opti merged 171 commits intomasterfrom
fetch-upstream-11-10-2025
Nov 10, 2025
Merged

CHAINS-6848 Merge upstream/master for btc testnet4 changes#11
rahul-aravind-opti merged 171 commits intomasterfrom
fetch-upstream-11-10-2025

Conversation

@rahul-aravind-opti
Copy link

@rahul-aravind-opti rahul-aravind-opti commented Nov 10, 2025

Steps:

git remote add upstream https://github.com/btcsuite/btcd.git
git remote -v
git checkout -b fetch-upstream-11-10-2025
git fetch upstream
git merge upstream/master

Fixed the merge conflicts with claude

 1. .gitignore: Kept both the Goland .idea entry and added the new .DS_Store and .aider* entries from upstream
  2. rpcclient/infrastructure.go: Merged both changes by:
    - Keeping the ParseAddressString logic from upstream for Unix socket support
    - Keeping the ObservingTransport wrapper from your branch for response capture
    - Keeping the defaultHTTPTimeout from upstream
Update(.gitignore)
  ⎿  Updated .gitignore with 1 addition and 3 removals
       56    /findcheckpoint
       57    /gencerts
       58
       59 -  <<<<<<< HEAD
       59    #Goland
       60    .idea
       61 -  =======
       61 +
       62    .DS_Store
       63    .aider*
       64 -  >>>>>>> upstream/master

⏺ Update(rpcclient/infrastructure.go)
  ⎿  Updated rpcclient/infrastructure.go with 4 additions and 11 removals
       1373        }
       1374      }
       1375
       1376 -  <<<<<<< HEAD
       1377 -    transport := &ObservingTransport{
       1378 -      Base: &http.Transport{
       1379 -  =======
       1376      parsedDialAddr, err := ParseAddressString(config.Host)
       1377      if err != nil {
       1378        return nil, err
       1379      }
       1380 -    client := http.Client{
       1381 -      Transport: &http.Transport{
       1382 -  >>>>>>> upstream/master
       1380 +
       1381 +    transport := &ObservingTransport{
       1382 +      Base: &http.Transport{
       1383          Proxy:           proxyFunc,
       1384          TLSClientConfig: tlsConfig,
       1385          DialContext: func(ctx context.Context, _,
     ...
       1396            )
       1397          },
       1398        },
       1399 -  <<<<<<< HEAD
       1399        // Wrap with response capturing if callback provided
       1400        OnResponseCapture: config.OnResponseCapture,
       1401      }
       1402
       1403      client := http.Client{
       1404        Transport: transport,
       1405 -  =======
       1406 -      Timeout: defaultHTTPTimeout,
       1407 -  >>>>>>> upstream/master
       1405 +      Timeout:   defaultHTTPTimeout,
       1406      }
       1407
       1408      return &client, nil

guggero and others added 30 commits June 25, 2024 16:03
Fixes btcsuite#2199.

Previous to this fix the keytype was only interpreted as a single byte,
even though BIP-0174 states it is to be parsed as a CompactSize/VarInt.
This commit updates the error str to match the same error returned from
`btcd` for both pre-0.24.2 and post-0.24.2.
Sending RPC requests through unix sockets
commit 0b2998b
Author: cec489 <173723251+cec489@users.noreply.github.com>
Date:   Mon Jun 24 20:01:13 2024 +0000

    A cleaner fix is to set the startTime in the server Start() function
    which is where the server is actually started.

commit ae6c125
Author: cec489 <173723251+cec489@users.noreply.github.com>
Date:   Mon Jun 24 19:15:23 2024 +0000

    Fix the btcctl uptime command by moving the setting of startupTime
This change lets us test that we don't attempt to delete open files with
unit tests.  On Windows this behavior is not allowed which results in an
error but on linux and osx it's allowed. To better test Windows
compatibilty adding this explicit check in is useful.
This check let's us ensure that attempting to delete open files are
caught during unit tests.
The existing file close code is refactored out into it's own method
closeFile() so that it can be reused elsewhere.
The block files may be open when deleteFile is called.  This resulted in
files not being deleted and erroring out on windows.  Properly closing
the files closing the files avoids this error.
Signed-off-by: linghuying <1599935829@qq.com>
mod+rpcserver: bump to latest version of btcec
It is undefined behavior if we directly use the value from a Get
call after the transaction has completed.
blockchain: copy utxo status bytes to avoid UB
Signed-off-by: lencap <techgeek@189.cn>
…marx-cve

Updated btcd dependency of btcutil to address CVE-2024-34478
wire: check TXID length before creating outpoint
Fixes btcsuite#2224 and lightningnetwork/lnd#9053.

Depending on the version of Bitcoin Core, the "warnings" field in the
response to getnetworkinfo is either a single string value or an array
of strings.
We can easily parse those two variants with a custom type that
implements an UnmarshalJSON method.
btcjson: turn warnings into StringOrArray type
Signed-off-by: huochexizhan <huochexizhan@outlook.com>
yyforyongyu and others added 27 commits July 16, 2025 17:32
wire: optimize parsing for CFCheckpkt message, reduce allocs by 96%
Align hash function count with bloom filter capacity
btcjson: add stubs for SubmitPackage
Fixes btcsuite#2404.
If different versions of bitcoind return different error strings, we
need a way to match those as well.
rpcclient: add bitcoind version dependent error matching
Co-authored-by: Oliver Gugger <gugger@gmail.com>
…ATH-bin-dir

Makefile+workflows: fallback to `GOPATH/bin` on non-existent `GOBIN`
build: bump version to v0.25.0-beta.rc1
This commit adds a new function to musig2.Session, which allows the caller
to add an external aggregated nonce to the session.
…once

musig2: add WithExternalCombinedNonce option to Sign
Ensure that the dial phase of rpcclient's HTTP posts respects the http.Client's Timeout. It was instead falling back to the OS settings.
…correct-dialcontext

rpcclient: ensure http dial respects timeout
Resolved merge conflicts:
- .gitignore: Combined Goland settings with upstream .DS_Store and .aider* entries
- rpcclient/infrastructure.go: Merged ObservingTransport wrapper with ParseAddressString Unix socket support and HTTP timeout

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
@rahul-aravind-opti rahul-aravind-opti merged commit 9f4d937 into master Nov 10, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.