Skip to content

Conversation

@geo2a
Copy link
Contributor

@geo2a geo2a commented Dec 24, 2025

This PR:

  • integrates the Network packages up to the release of ouroboros-netowork-24 and a little bit beyond.
  • Integrates kes-agent-1.1. Removes the s-r-p on kes-agent repository.

@geo2a geo2a force-pushed the geo2a/10.7-integration-network branch 3 times, most recently from f020af8 to 49cd4cb Compare January 2, 2026 10:14
@geo2a geo2a force-pushed the geo2a/10.7-integration-network branch 2 times, most recently from 2f2d063 to 2e1436c Compare January 9, 2026 12:17
@geo2a geo2a force-pushed the geo2a/10.7-integration-network branch 3 times, most recently from 2ca3ec3 to 956b131 Compare January 26, 2026 14:04
@geo2a geo2a force-pushed the geo2a/10.7-integration-network branch 3 times, most recently from 46a5db2 to 4614065 Compare January 27, 2026 11:01
@geo2a geo2a self-assigned this Jan 27, 2026
@geo2a geo2a force-pushed the geo2a/10.7-integration-network branch 6 times, most recently from fb37549 to 432f587 Compare January 28, 2026 09:24
@geo2a
Copy link
Contributor Author

geo2a commented Jan 28, 2026

@copilot review the changes per package and compose changelog items for every package.

Copy link

Copilot AI commented Jan 28, 2026

@geo2a I've opened a new pull request, #1843, to work on those changes. Once the pull request is ready, I'll request review from you.

@geo2a geo2a changed the title [DO NOT MERGE] Network intergration for cardano-node 10.7 Network intergration for cardano-node 10.7 Jan 28, 2026
@geo2a geo2a marked this pull request as ready for review January 28, 2026 10:00
@geo2a geo2a force-pushed the geo2a/10.7-integration-network branch from 432f587 to c9a1aae Compare January 28, 2026 10:40
Comment on lines 21 to 22
- New `CardanoNodeToClientVersion19`
- New `ShelleyNodeToClientVersion15`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe make this a bit more verbose, I wrote it that way to just give a skeleton but I didn't mean to write it this succint in the changelog 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've looked at other similar items and updated this one accordingly.

GenesisPoint -> k (pure Nothing)
(BlockPoint targetSlot (SomeHashableBlock _ targetHash)) -> do
case (cast targetHash :: Maybe (HeaderHash blk)) of
Nothing -> error "impossible! Distinct (HeaderHash blk) types"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need an existential for SomeHashableBlock?

@geo2a geo2a force-pushed the geo2a/10.7-integration-network branch from bbbdefc to 9962633 Compare January 29, 2026 15:38
@geo2a geo2a force-pushed the geo2a/10.7-integration-network branch from f9f7f24 to 9e9fadd Compare January 30, 2026 08:13
Comment on lines 42 to 43
, testProperty "GenTx.txWireSize.txSubmission" (prop_txWireSize_txSubmission testCodecCfg)
, testProperty "GenTx.txWireSize.tight" (prop_txWireSize (const Nothing) testCodecCfg)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as others 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done


- Added `txLogicTracer` and `txCountersTrace` to `Tracers'`.
- Added `rnTxSubmissionLogicVersion` and `rnTxSubmissionInitDelay` fields to `RunNodeArgs`.
- Added new `getTxChannelsVar`, `getSharedTxStateVar` and `getTxMempoolSem` variables to `NodeKernel`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- Added new `getTxChannelsVar`, `getSharedTxStateVar` and `getTxMempoolSem` variables to `NodeKernel`.
- Added new `getTxChannelsVar`, `getSharedTxStateVar` and `getTxMempoolSem` fields to `NodeKernel`.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addressed

, blockFetchPipeliningMax = 10
, txSubmissionMaxUnacked = 1000 -- TODO ?
, txDecisionPolicy =
defaultTxDecisionPolicy{maxUnacknowledgedTxIds = 1000} -- TODO ?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Who introduced this TODO? Is it still relevant?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@coot do you think it would be OK to remove this TODO?

@jasagredo
Copy link
Contributor

Please apply this patch that modifes the build-depends to remove the unnecessary curly braces
0001-Cleanup-cabal-build-depends.patch

@geo2a geo2a force-pushed the geo2a/10.7-integration-network branch from ac06030 to ce178b5 Compare January 30, 2026 15:20
crocodile-dentist and others added 19 commits January 30, 2026 16:22
The new method leverages a corresponding method recently exposed by
ledger side to provide encoded transaction sizes to eg. diffusion layer.

- Integrate new tx submission protocol
- txWireSize: Byron txs overhead

We need to add 2 bytes overhead for `EncCBOR (AMempoolPayload
ByteString)`. See:
https://github.com/IntersectMBO/cardano-ledger/blob/cardano-ledger-byron-1.1.0.0/eras/byron/ledger/impl/src/Cardano/Chain/MempoolPayload.hs#L73-L81

- txWireSize: wrapCBORinCBOR overhead for Shelley txs
- Take into account the overhead of `wrapCBORinCBOR`.
- txWireSize: added overhead for HardFork txs
- Added HFC overhead.  This overestimates it, if the HFC is disabled.
- txWireSize: added tests
- Use txWireSize when computing tx-sizes for ouroboros-network

Co-Author: Armando Santos <[email protected]>
Co-Author: Marcin Szamotulski <[email protected]>
Co-Author: Marcin Wójtowicz <[email protected]>
[wip] bump network
@geo2a geo2a force-pushed the geo2a/10.7-integration-network branch from ce178b5 to ff3072d Compare January 30, 2026 15:23
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.

5 participants