11#!/usr/bin/env python3
22"""Actual old/new settlement ABI pairings. Compile and link; NEVER run callers.
33
4- Requires separately prepared real e60 R2, 0e R3, v13, v14 and frozen-v15 archives. No Git/network/build fallback
4+ Requires separately prepared real e60 R2, 0e R3, v13, v14, frozen-v15 and frozen-v16 archives. No Git/network/build fallback
55is performed by this CTest-time checker. Existing native/script ABI guards stay
66separate and mandatory, including their old epoch and sanitizer RTTI controls.
77"""
@@ -741,6 +741,8 @@ def main() -> int:
741741 parser .add_argument ('--v14-receipt' , type = Path , help = 'prepared real f736676 epoch 14 provider; mandatory in full matrix' )
742742 parser .add_argument ('--v15-frozen-receipt' , type = Path ,
743743 help = 'prepared real e7cdf052 frozen epoch 15 provider; mandatory in full matrix' )
744+ parser .add_argument ('--v16-frozen-receipt' , type = Path ,
745+ help = 'prepared real ab9714b frozen epoch 16 provider; mandatory in full matrix' )
744746 parser .add_argument ('--base-generated-include' , type = Path )
745747 parser .add_argument ('--extra-flag' , action = 'append' , default = [])
746748 parser .add_argument ('--receipt' , type = Path , required = True )
@@ -826,6 +828,21 @@ def main() -> int:
826828 v15_frozen_members ,v15_frozen_shape = frozen_shape (
827829 v15_frozen_include ,include ,selected = True )
828830 report ['v15FrozenShape' ]= v15_frozen_shape
831+ v16_frozen_library ,v16_frozen_include ,v16_frozen_generated ,v16_frozen_receipt = load_provider (
832+ args ,scratch / 'v16-frozen' ,cache ,args .v16_frozen_receipt ,PROVIDERS ['v16-frozen' ],
833+ # R4-C relocated the source-only private helpers out of
834+ # BacktestEngine before this v16 capture. The frozen
835+ # provider must expose the complete generic settlement
836+ # surface, but must not be mislabeled as a v15 base that
837+ # still owns `add_to_pyramid_market`-style source helpers.
838+ expect_present = (* OLD_METHODS ,* NEW_METHODS ,* REVERSAL_METHODS ),
839+ expect_absent = ())
840+ report ['v16Frozen' ]= {'receiptSha256' :identity (args .v16_frozen_receipt )['sha256' ],
841+ 'archiveSha256' :identity (v16_frozen_library )['sha256' ],
842+ 'commit' :v16_frozen_receipt ['commit' ],'tree' :v16_frozen_receipt ['tree' ]}
843+ v16_frozen_members ,v16_frozen_shape = frozen_shape (
844+ v16_frozen_include ,include ,selected = True )
845+ report ['v16FrozenShape' ]= v16_frozen_shape
829846
830847 def compile_tu (name ,text ,headers ,generated ):
831848 # Each caller must name its actual header epoch, including return-only APIs.
@@ -856,11 +873,18 @@ def link(name,obj,runtime,missing=(),domain=None,engine=ENGINE, symbol_missing=N
856873
857874 def compare_layout (name ,headers ,generated ,layout_members ,shape ,* ,selected = False ):
858875 relocation_layout = bool (shape ['relocationLayout' ])
876+ # Spell PendingOrder according to *each* provider's genuine
877+ # ownership. Pre-v16 archives have the engine type; v15 and
878+ # the frozen/live same-epoch v16 pair own it in source/.
879+ # `relocation_layout` independently controls which engine
880+ # storage words are compared across the reviewed bridge.
881+ old_source_pending = (headers / 'pineforge/source/pine_pending_intent.hpp' ).is_file ()
882+ current_source_pending = (include / 'pineforge/source/pine_pending_intent.hpp' ).is_file ()
859883 old_text ,word_count = layout_source (
860884 layout_members , selected = selected ,
861- relocation_layout = relocation_layout )
885+ source_pending = old_source_pending , relocation_layout = relocation_layout )
862886 current_text ,current_word_count = layout_source (
863- layout_members , selected = selected , source_pending = relocation_layout ,
887+ layout_members , selected = selected , source_pending = current_source_pending ,
864888 relocation_layout = relocation_layout )
865889 if current_word_count != word_count :
866890 raise RuntimeError ('v15/v16 source-layout rows have different widths' )
@@ -890,6 +914,9 @@ def compare_layout(name,headers,generated,layout_members,shape,*,selected=False)
890914 report ['v15FrozenLayout' ]= compare_layout (
891915 'v15-frozen' ,v15_frozen_include ,v15_frozen_generated ,
892916 v15_frozen_members ,v15_frozen_shape ,selected = True )
917+ report ['v16FrozenLayout' ]= compare_layout (
918+ 'v16-frozen' ,v16_frozen_include ,v16_frozen_generated ,
919+ v16_frozen_members ,v16_frozen_shape ,selected = True )
893920 if not args .base_only :
894921 current_header = clean ((include / 'pineforge/engine.hpp' ).read_text ())
895922 for method in (* NEW_METHODS ,* (REVERSAL_METHODS if full_matrix else ())):
@@ -941,6 +968,7 @@ def compare_layout(name,headers,generated,layout_members,shape,*,selected=False)
941968 'v13' : (v13_library , v13_include , v13_generated ),
942969 'v14' : (v14_library , v14_include , v14_generated ),
943970 'v15-frozen' : (v15_frozen_library , v15_frozen_include , v15_frozen_generated ),
971+ 'v16-frozen' : (v16_frozen_library , v16_frozen_include , v16_frozen_generated ),
944972 current_label : (library , include , args .generated_include ),
945973 }
946974 report ['archiveProviders' ] = {
@@ -968,7 +996,7 @@ def compare_layout(name,headers,generated,layout_members,shape,*,selected=False)
968996 link (caller + '-' + name + '-' + provider + ('-real' if positive else '-rejected' ),
969997 obj ,runtime ,engine = 'pineforge::' + engine_epoch (native_providers [caller ][1 ])+ '::BacktestEngine::' ,
970998 symbol_missing = None if positive else needle )
971- for caller in ('v14' , current_label ):
999+ for caller in ('v14' , 'v16-frozen' , current_label ):
9721000 _ ,headers ,generated = native_providers [caller ]
9731001 epoch = engine_epoch (headers )
9741002 caller_engine = 'pineforge::' + epoch + '::BacktestEngine::'
@@ -1005,7 +1033,7 @@ def compare_layout(name,headers,generated,layout_members,shape,*,selected=False)
10051033 }
10061034 engine_objects = {current_label : {
10071035 'selected' :new , 'reversal' :reversal }}
1008- for caller in ('v13' ,'v14' ,'v15-frozen' ):
1036+ for caller in ('v13' ,'v14' ,'v15-frozen' , 'v16-frozen' ):
10091037 _ ,headers ,generated = native_providers [caller ]
10101038 engine_objects [caller ] = {name :compile_tu (caller + '-engine-' + name ,text ,headers ,generated )
10111039 for name ,text in engine_callers .items ()}
@@ -1022,10 +1050,13 @@ def compare_layout(name,headers,generated,layout_members,shape,*,selected=False)
10221050 required_v15_v16_rows = {
10231051 'v15-frozen-engine-old-api-' + current_label + '-rejected' ,
10241052 current_label + '-engine-selected-v15-frozen-rejected' ,
1053+ 'v16-frozen-host-' + current_label + '-real' ,
1054+ current_label + '-engine-selected-v16-frozen-real' ,
1055+ 'v16-frozen-engine-selected-' + current_label + '-real' ,
10251056 }
10261057 actual_rows = {entry ['name' ] for entry in report ['links' ]}
10271058 if not required_v15_v16_rows <= actual_rows :
1028- raise RuntimeError ('v15/v16 rejection pairs are missing from the ABI matrix' )
1059+ raise RuntimeError ('required v15/v16 rejection or same-epoch v16 pairs are missing from the ABI matrix' )
10291060 link ('old-api-old-real' ,old ,old_library )
10301061 link ('old-private-old-real' ,private_old ,old_library )
10311062 link ('old-events-old-real' ,old_events ,old_library )
0 commit comments