Merge pull request #736 from eosnetworkfoundation/build_and_replace_wasm

[3.2] Update, Replace, and Check Validity of WASM files in mandel
AntelopeIO · Aug 3, 2022 · d2d7996 · d2d7996
2 parents 195face + 9d21b27
commit d2d7996
Show file tree

Hide file tree

Showing 40 changed files with 62 additions and 42 deletions.
diff --git a/unittests/api_tests.cpp b/unittests/api_tests.cpp
@@ -589,10 +589,8 @@ BOOST_AUTO_TEST_CASE(ram_billing_in_notify_tests) { try {
    fc::temp_directory tempdir;
    validating_tester chain( tempdir, true );
    chain.execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
-   const auto& pfm = chain.control->get_protocol_feature_manager();
-   const auto& d = pfm.get_builtin_digest(builtin_protocol_feature_t::action_return_value); // testapi requires this
-   BOOST_REQUIRE(d);
-   chain.preactivate_protocol_features( {*d} );
+   chain.preactivate_builtin_protocol_features( {builtin_protocol_feature_t::action_return_value} );
+   chain.preactivate_builtin_protocol_features( {builtin_protocol_feature_t::crypto_primitives} );
 
    chain.produce_blocks(2);
    chain.create_account( "testapi"_n );
@@ -1850,12 +1848,8 @@ BOOST_AUTO_TEST_CASE(more_deferred_transaction_tests) { try {
    fc::temp_directory tempdir;
    validating_tester chain( tempdir, true );
    chain.execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
-
-   const auto& pfm = chain.control->get_protocol_feature_manager();
-   auto d = pfm.get_builtin_digest( builtin_protocol_feature_t::replace_deferred );
-   BOOST_REQUIRE( d );
-
-   chain.preactivate_protocol_features( {*d} );
+   chain.preactivate_builtin_protocol_features( {builtin_protocol_feature_t::replace_deferred} );
+   chain.preactivate_builtin_protocol_features( {builtin_protocol_feature_t::crypto_primitives} );
    chain.produce_block();
 
    const auto& index = chain.control->db().get_index<generated_transaction_multi_index,by_id>();

diff --git a/unittests/protocol_feature_tests.cpp b/unittests/protocol_feature_tests.cpp
@@ -373,6 +373,8 @@ BOOST_AUTO_TEST_CASE( subjective_restrictions_test ) try {
 BOOST_AUTO_TEST_CASE( replace_deferred_test ) try {
    tester c( setup_policy::preactivate_feature_and_new_bios );
 
+   c.preactivate_builtin_protocol_features( {builtin_protocol_feature_t::crypto_primitives} );
+   c.produce_block();
    c.create_accounts( {"alice"_n, "bob"_n, "test"_n} );
    c.set_code( "test"_n, contracts::deferred_test_wasm() );
    c.set_abi( "test"_n, contracts::deferred_test_abi().data() );
@@ -511,6 +513,8 @@ BOOST_AUTO_TEST_CASE( no_duplicate_deferred_id_test ) try {
    tester c( setup_policy::preactivate_feature_and_new_bios );
    tester c2( setup_policy::none );
 
+   c.preactivate_builtin_protocol_features( {builtin_protocol_feature_t::crypto_primitives} );
+   c.produce_block();
    c.create_accounts( {"alice"_n, "test"_n} );
    c.set_code( "test"_n, contracts::deferred_test_wasm() );
    c.set_abi( "test"_n, contracts::deferred_test_abi().data() );

diff --git a/unittests/test-contracts/action_results/action_results.wasm b/unittests/test-contracts/action_results/action_results.wasm
diff --git a/unittests/test-contracts/asserter/asserter.abi b/unittests/test-contracts/asserter/asserter.abi
@@ -1,6 +1,6 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
-    "version": "eosio::abi/1.1",
+    "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
         {
@@ -37,5 +37,6 @@
     ],
     "tables": [],
     "ricardian_clauses": [],
-    "variants": []
+    "variants": [],
+    "action_results": []
 }
diff --git a/unittests/test-contracts/asserter/asserter.wasm b/unittests/test-contracts/asserter/asserter.wasm
diff --git a/unittests/test-contracts/crypto_primitives_test/crypto_primitives_test.abi b/unittests/test-contracts/crypto_primitives_test/crypto_primitives_test.abi
@@ -1,6 +1,6 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
-    "version": "eosio::abi/1.1",
+    "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
         {
@@ -220,5 +220,6 @@
     ],
     "tables": [],
     "ricardian_clauses": [],
-    "variants": []
-}
+    "variants": [],
+    "action_results": []
+}
diff --git a/unittests/test-contracts/crypto_primitives_test/crypto_primitives_test.wasm b/unittests/test-contracts/crypto_primitives_test/crypto_primitives_test.wasm
diff --git a/unittests/test-contracts/deferred_test/deferred_test.abi b/unittests/test-contracts/deferred_test/deferred_test.abi
@@ -1,6 +1,6 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
-    "version": "eosio::abi/1.1",
+    "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
         {
@@ -118,5 +118,6 @@
     ],
     "tables": [],
     "ricardian_clauses": [],
-    "variants": []
+    "variants": [],
+    "action_results": []
 }
diff --git a/unittests/test-contracts/deferred_test/deferred_test.wasm b/unittests/test-contracts/deferred_test/deferred_test.wasm
diff --git a/unittests/test-contracts/get_block_num_test/get_block_num_test.abi b/unittests/test-contracts/get_block_num_test/get_block_num_test.abi
@@ -1,6 +1,6 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
-    "version": "eosio::abi/1.1",
+    "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
         {
@@ -23,5 +23,6 @@
     ],
     "tables": [],
     "ricardian_clauses": [],
-    "variants": []
+    "variants": [],
+    "action_results": []
 }
diff --git a/unittests/test-contracts/get_block_num_test/get_block_num_test.wasm b/unittests/test-contracts/get_block_num_test/get_block_num_test.wasm
diff --git a/unittests/test-contracts/get_sender_test/get_sender_test.abi b/unittests/test-contracts/get_sender_test/get_sender_test.abi
@@ -1,6 +1,6 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
-    "version": "eosio::abi/1.1",
+    "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
         {
@@ -65,5 +65,6 @@
     ],
     "tables": [],
     "ricardian_clauses": [],
-    "variants": []
+    "variants": [],
+    "action_results": []
 }
diff --git a/unittests/test-contracts/get_sender_test/get_sender_test.wasm b/unittests/test-contracts/get_sender_test/get_sender_test.wasm
diff --git a/unittests/test-contracts/get_table_seckey_test/get_table_seckey_test.abi b/unittests/test-contracts/get_table_seckey_test/get_table_seckey_test.abi
@@ -64,7 +64,6 @@
             "key_types": []
         }
     ],
-    "kv_tables": {},
     "ricardian_clauses": [],
     "variants": [],
     "action_results": []

diff --git a/unittests/test-contracts/get_table_seckey_test/get_table_seckey_test.wasm b/unittests/test-contracts/get_table_seckey_test/get_table_seckey_test.wasm
diff --git a/unittests/test-contracts/get_table_test/get_table_test.wasm b/unittests/test-contracts/get_table_test/get_table_test.wasm
diff --git a/unittests/test-contracts/integration_test/integration_test.abi b/unittests/test-contracts/integration_test/integration_test.abi
@@ -1,6 +1,6 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
-    "version": "eosio::abi/1.1",
+    "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
         {
@@ -53,5 +53,6 @@
         }
     ],
     "ricardian_clauses": [],
-    "variants": []
+    "variants": [],
+    "action_results": []
 }
diff --git a/unittests/test-contracts/integration_test/integration_test.wasm b/unittests/test-contracts/integration_test/integration_test.wasm
diff --git a/unittests/test-contracts/noop/noop.abi b/unittests/test-contracts/noop/noop.abi
@@ -1,6 +1,6 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
-    "version": "eosio::abi/1.1",
+    "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
         {
@@ -31,5 +31,6 @@
     ],
     "tables": [],
     "ricardian_clauses": [],
-    "variants": []
+    "variants": [],
+    "action_results": []
 }
diff --git a/unittests/test-contracts/noop/noop.wasm b/unittests/test-contracts/noop/noop.wasm
diff --git a/unittests/test-contracts/params_test/params_test.wasm b/unittests/test-contracts/params_test/params_test.wasm
diff --git a/unittests/test-contracts/payloadless/payloadless.abi b/unittests/test-contracts/payloadless/payloadless.abi
@@ -1,6 +1,6 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
-    "version": "eosio::abi/1.1",
+    "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
         {
@@ -18,5 +18,6 @@
     ],
     "tables": [],
     "ricardian_clauses": [],
-    "variants": []
+    "variants": [],
+    "action_results": []
 }
diff --git a/unittests/test-contracts/payloadless/payloadless.wasm b/unittests/test-contracts/payloadless/payloadless.wasm
diff --git a/unittests/test-contracts/proxy/proxy.abi b/unittests/test-contracts/proxy/proxy.abi
@@ -1,6 +1,6 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
-    "version": "eosio::abi/1.1",
+    "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
         {
@@ -53,5 +53,6 @@
         }
     ],
     "ricardian_clauses": [],
-    "variants": []
+    "variants": [],
+    "action_results": []
 }
diff --git a/unittests/test-contracts/proxy/proxy.wasm b/unittests/test-contracts/proxy/proxy.wasm
diff --git a/unittests/test-contracts/ram_restrictions_test/ram_restrictions_test.abi b/unittests/test-contracts/ram_restrictions_test/ram_restrictions_test.abi
@@ -1,6 +1,6 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
-    "version": "eosio::abi/1.1",
+    "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
         {
@@ -139,5 +139,6 @@
         }
     ],
     "ricardian_clauses": [],
-    "variants": []
+    "variants": [],
+    "action_results": []
 }
diff --git a/unittests/test-contracts/ram_restrictions_test/ram_restrictions_test.wasm b/unittests/test-contracts/ram_restrictions_test/ram_restrictions_test.wasm
diff --git a/unittests/test-contracts/reject_all/reject_all.wasm b/unittests/test-contracts/reject_all/reject_all.wasm
diff --git a/unittests/test-contracts/restrict_action_test/restrict_action_test.abi b/unittests/test-contracts/restrict_action_test/restrict_action_test.abi
@@ -1,6 +1,6 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
-    "version": "eosio::abi/1.1",
+    "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
         {
@@ -94,5 +94,6 @@
     ],
     "tables": [],
     "ricardian_clauses": [],
-    "variants": []
+    "variants": [],
+    "action_results": []
 }
diff --git a/unittests/test-contracts/restrict_action_test/restrict_action_test.wasm b/unittests/test-contracts/restrict_action_test/restrict_action_test.wasm
diff --git a/unittests/test-contracts/snapshot_test/snapshot_test.abi b/unittests/test-contracts/snapshot_test/snapshot_test.abi
@@ -1,6 +1,6 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
-    "version": "eosio::abi/1.1",
+    "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
         {
@@ -61,5 +61,6 @@
         }
     ],
     "ricardian_clauses": [],
-    "variants": []
+    "variants": [],
+    "action_results": []
 }
diff --git a/unittests/test-contracts/snapshot_test/snapshot_test.wasm b/unittests/test-contracts/snapshot_test/snapshot_test.wasm
diff --git a/unittests/test-contracts/test_api/test_api.wasm b/unittests/test-contracts/test_api/test_api.wasm
diff --git a/unittests/test-contracts/test_api_db/test_api_db.abi b/unittests/test-contracts/test_api_db/test_api_db.abi
@@ -1,6 +1,6 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
-    "version": "eosio::abi/1.1",
+    "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
         {
@@ -140,5 +140,6 @@
     ],
     "tables": [],
     "ricardian_clauses": [],
-    "variants": []
+    "variants": [],
+    "action_results": []
 }
diff --git a/unittests/test-contracts/test_api_db/test_api_db.wasm b/unittests/test-contracts/test_api_db/test_api_db.wasm
diff --git a/unittests/test-contracts/test_api_multi_index/test_api_multi_index.abi b/unittests/test-contracts/test_api_multi_index/test_api_multi_index.abi
@@ -1,6 +1,6 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
-    "version": "eosio::abi/1.1",
+    "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
         {
@@ -328,5 +328,6 @@
     ],
     "tables": [],
     "ricardian_clauses": [],
-    "variants": []
+    "variants": [],
+    "action_results": []
 }
diff --git a/unittests/test-contracts/test_api_multi_index/test_api_multi_index.wasm b/unittests/test-contracts/test_api_multi_index/test_api_multi_index.wasm
diff --git a/unittests/test-contracts/wasm_config_bios/wasm_config_bios.abi b/unittests/test-contracts/wasm_config_bios/wasm_config_bios.abi
@@ -1,6 +1,6 @@
 {
     "____comment": "This file was generated with eosio-abigen. DO NOT EDIT ",
-    "version": "eosio::abi/1.1",
+    "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
         {
@@ -73,5 +73,6 @@
     ],
     "tables": [],
     "ricardian_clauses": [],
-    "variants": []
+    "variants": [],
+    "action_results": []
 }
diff --git a/unittests/test-contracts/wasm_config_bios/wasm_config_bios.wasm b/unittests/test-contracts/wasm_config_bios/wasm_config_bios.wasm
diff --git a/unittests/whitelist_blacklist_tests.cpp b/unittests/whitelist_blacklist_tests.cpp
@@ -333,6 +333,8 @@ BOOST_AUTO_TEST_CASE( blacklist_eosio ) { try {
 BOOST_AUTO_TEST_CASE( deferred_blacklist_failure ) { try {
    whitelist_blacklist_tester<tester> tester1;
    tester1.init();
+   tester1.chain->execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
+   tester1.chain->preactivate_builtin_protocol_features( {builtin_protocol_feature_t::crypto_primitives} );
    tester1.chain->produce_blocks();
    tester1.chain->set_code( "bob"_n, contracts::deferred_test_wasm() );
    tester1.chain->set_abi( "bob"_n,  contracts::deferred_test_abi().data() );
@@ -384,6 +386,8 @@ BOOST_AUTO_TEST_CASE( deferred_blacklist_failure ) { try {
 BOOST_AUTO_TEST_CASE( blacklist_onerror ) { try {
    whitelist_blacklist_tester<TESTER> tester1;
    tester1.init();
+   tester1.chain->execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
+   tester1.chain->preactivate_builtin_protocol_features( {builtin_protocol_feature_t::crypto_primitives} );
    tester1.chain->produce_blocks();
    tester1.chain->set_code( "bob"_n, contracts::deferred_test_wasm() );
    tester1.chain->set_abi( "bob"_n,  contracts::deferred_test_abi().data() );
@@ -420,6 +424,8 @@ BOOST_AUTO_TEST_CASE( blacklist_onerror ) { try {
 BOOST_AUTO_TEST_CASE( actor_blacklist_inline_deferred ) { try {
    whitelist_blacklist_tester<tester> tester1;
    tester1.init();
+   tester1.chain->execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
+   tester1.chain->preactivate_builtin_protocol_features( {builtin_protocol_feature_t::crypto_primitives} );
    tester1.chain->produce_blocks();
    tester1.chain->set_code( "alice"_n, contracts::deferred_test_wasm() );
    tester1.chain->set_abi( "alice"_n,  contracts::deferred_test_abi().data() );
@@ -564,6 +570,8 @@ BOOST_AUTO_TEST_CASE( actor_blacklist_inline_deferred ) { try {
 BOOST_AUTO_TEST_CASE( blacklist_sender_bypass ) { try {
    whitelist_blacklist_tester<tester> tester1;
    tester1.init();
+   tester1.chain->execute_setup_policy( setup_policy::preactivate_feature_and_new_bios );
+   tester1.chain->preactivate_builtin_protocol_features( {builtin_protocol_feature_t::crypto_primitives} );
    tester1.chain->produce_blocks();
    tester1.chain->set_code( "alice"_n, contracts::deferred_test_wasm() );
    tester1.chain->set_abi( "alice"_n,  contracts::deferred_test_abi().data() );