eosnetworkfoundation · ndcgundlach · Aug 5, 2022 · Sep 8, 2021 · Jul 22, 2022 · Jul 22, 2022
diff --git a/libraries/chain/abi_serializer.cpp b/libraries/chain/abi_serializer.cpp
@@ -412,10 +412,8 @@ namespace eosio { namespace chain {
          for( decltype(size.value) i = 0; i < size; ++i ) {
             ctx.set_array_index_of_path_back(i);
             auto v = _binary_to_variant(ftype, stream, ctx);
-            // QUESTION: Is it actually desired behavior to require the returned variant to not be null?
-            //           This would disallow arrays of optionals in general (though if all optionals in the array were present it would be allowed).
-            //           Is there any scenario in which the returned variant would be null other than in the case of an empty optional?
-            EOS_ASSERT( !v.is_null(), unpack_exception, "Invalid packed array '${p}'", ("p", ctx.get_path_string()) );
+            // The exception below is commented out to allow array of optional as input data
+            //EOS_ASSERT( !v.is_null(), unpack_exception, "Invalid packed array '${p}'", ("p", ctx.get_path_string()) );
             vars.emplace_back(std::move(v));
          }
          // QUESTION: Why would the assert below ever fail?

diff --git a/libraries/testing/contracts.hpp.in b/libraries/testing/contracts.hpp.in
@@ -68,6 +68,8 @@ namespace eosio {
          MAKE_READ_WASM_ABI(params_test,           params_test,           test-contracts)
          MAKE_READ_WASM_ABI(crypto_primitives_test,crypto_primitives_test,test-contracts)
          MAKE_READ_WASM_ABI(get_block_num_test,    get_block_num_test,    test-contracts)
+         MAKE_READ_WASM_ABI(nested_container_multi_index,   nested_container_multi_index,   test-contracts)
+
       };
    } /// eosio::testing
 }  /// eosio
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -67,6 +67,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_contrl_c_test.py ${CMAKE_CURRE
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resource_monitor_plugin_test.py ${CMAKE_CURRENT_BINARY_DIR}/resource_monitor_plugin_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/light_validation_sync_test.py ${CMAKE_CURRENT_BINARY_DIR}/light_validation_sync_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/trace_plugin_test.py ${CMAKE_CURRENT_BINARY_DIR}/trace_plugin_test.py COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nested_container_multi_index_test.py ${CMAKE_CURRENT_BINARY_DIR}/nested_container_multi_index_test.py COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/large-lib-test.py ${CMAKE_CURRENT_BINARY_DIR}/large-lib-test.py COPYONLY)
+
 
 #To run plugin_test with all log from blockchain displayed, put --verbose after --, i.e. plugin_test -- --verbose
 add_test(NAME plugin_test COMMAND plugin_test --report_level=detailed --color_output)
@@ -147,6 +150,8 @@ set_tests_properties(db_modes_test PROPERTIES COST 6000)
 add_test(NAME release-build-test COMMAND tests/release-build.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 add_test(NAME version-label-test COMMAND tests/version-label.sh "v${VERSION_FULL}" WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 add_test(NAME full-version-label-test COMMAND tests/full-version-label.sh "v${VERSION_FULL}" ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+add_test(NAME nested_container_multi_index_test COMMAND tests/nested_container_multi_index_test.py WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+set_property(TEST nested_container_multi_index_test PROPERTY LABELS nonparallelizable_tests)
 
 # Long running tests
 add_test(NAME nodeos_sanity_lr_test COMMAND tests/nodeos_run_test.py -v --sanity-test --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})

diff --git a/tests/nested_container_multi_index_test.py b/tests/nested_container_multi_index_test.py
diff --git a/unittests/abi_tests.cpp b/unittests/abi_tests.cpp
@@ -2812,8 +2812,13 @@ BOOST_AUTO_TEST_CASE(abi_deserialize_detailed_error_messages)
       ],
    })";
 
+   // Some details here: c::variant("030101000103") represents an array of std::optional {1,null,3}, and 
+   // fc::variant("0400000000") represents an array of 4 nulls. Also fc::variant("030001af013a") represents {null, 0xAF, 0x3A}.
+   // Test to verify that array of optinal doesn't throw exception
+   abi_serializer abis( fc::json::from_string(abi).as<abi_def>(), abi_serializer::create_yield_function( max_serialization_time ) );
+   BOOST_CHECK_NO_THROW( abis.binary_to_variant("s4", fc::variant("030101000103").as<bytes>(), abi_serializer::create_yield_function( max_serialization_time )) );
+
    try {
-      abi_serializer abis( fc::json::from_string(abi).as<abi_def>(), abi_serializer::create_yield_function( max_serialization_time ) );
 
       BOOST_CHECK_EXCEPTION( abis.binary_to_variant("s2", fc::variant("020102").as<bytes>(), abi_serializer::create_yield_function( max_serialization_time )),
                              unpack_exception, fc_exception_message_is("Stream unexpectedly ended; unable to unpack field 'f1' of struct 's2'") );
@@ -2830,12 +2835,6 @@ BOOST_AUTO_TEST_CASE(abi_deserialize_detailed_error_messages)
       BOOST_CHECK_EXCEPTION( abis.binary_to_variant("s3", fc::variant("02010304").as<bytes>(), abi_serializer::create_yield_function( max_serialization_time )),
                              abi_exception, fc_exception_message_is("Encountered field 'i5' without binary extension designation while processing struct 's3'") );
 
-      // This check actually points to a problem with the current abi_serializer.
-      // An array of optionals (which is unfortunately not rejected in validation) leads to an unpack_exception here because one of the optional elements is not present.
-      // However, abis.binary_to_variant("s4", fc::variant("03010101020103").as<bytes>(), max_serialization_time) would work just fine!
-      BOOST_CHECK_EXCEPTION( abis.binary_to_variant("s4", fc::variant("030101000103").as<bytes>(), abi_serializer::create_yield_function( max_serialization_time )),
-                             unpack_exception, fc_exception_message_is("Invalid packed array 's4.f0[1]'") );
-
       BOOST_CHECK_EXCEPTION( abis.binary_to_variant("s4", fc::variant("020101").as<bytes>(), abi_serializer::create_yield_function( max_serialization_time )),
                              unpack_exception, fc_exception_message_is("Unable to unpack optional of built-in type 'int8' while processing 's4.f0[1]'") );
 

diff --git a/unittests/test-contracts/CMakeLists.txt b/unittests/test-contracts/CMakeLists.txt
@@ -39,3 +39,4 @@ add_subdirectory( wasm_config_bios )
 add_subdirectory( params_test )
 add_subdirectory( crypto_primitives_test )
 add_subdirectory( get_block_num_test )
+add_subdirectory( nested_container_multi_index )
diff --git a/unittests/test-contracts/nested_container_multi_index/CMakeLists.txt b/unittests/test-contracts/nested_container_multi_index/CMakeLists.txt
@@ -0,0 +1,6 @@
+if( EOSIO_COMPILE_TEST_CONTRACTS )
+   add_contract( nested_container_multi_index nested_container_multi_index nested_container_multi_index.cpp )
+else()
+   configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/nested_container_multi_index.wasm ${CMAKE_CURRENT_BINARY_DIR}/nested_container_multi_index.wasm COPYONLY )
+   configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/nested_container_multi_index.abi  ${CMAKE_CURRENT_BINARY_DIR}/nested_container_multi_index.abi  COPYONLY )
+endif()