Savanna IBC tests improvements

libraries/chain/include/eosio/chain/trace.hpp

@@ -46,6 +46,20 @@ namespace eosio::chain {
       std::optional<uint64_t>         error_code;
       std::vector<char>               return_value;
 
+      //savanna_witness_hash can be computed separately, since it is not relevant to IBC action proofs
+      digest_type savanna_witness_hash() const {
+         assert(!!receipt);
+         const action_receipt& r = *receipt;
+
+         digest_type::encoder e;
+         fc::raw::pack(e, r.global_sequence);
+         fc::raw::pack(e, r.auth_sequence);
+         fc::raw::pack(e, r.code_sequence);
+         fc::raw::pack(e, r.abi_sequence);
+
+         return e.result();
+      }
+
       digest_type digest_savanna() const {
          assert(!!receipt);
          const action_receipt& r = *receipt;
@@ -56,15 +70,8 @@ namespace eosio::chain {
          fc::raw::pack(e, act.account);
          fc::raw::pack(e, act.name);
          fc::raw::pack(e, r.act_digest);
+         fc::raw::pack(e, savanna_witness_hash());
 
-         {
-            digest_type::encoder e2;
-            fc::raw::pack(e2, r.global_sequence);
-            fc::raw::pack(e2, r.auth_sequence);
-            fc::raw::pack(e2, r.code_sequence);
-            fc::raw::pack(e2, r.abi_sequence);
-            fc::raw::pack(e, e2.result());
-         }
          return e.result();
       }
 

unittests/finality_test_cluster.hpp

@@ -196,6 +196,13 @@ class finality_test_cluster {
       return b;
    }
 
+   eosio::testing::produce_block_result_t produce_and_push_block_ex() {
+      auto b = node0.produce_block_ex();
+      for (size_t i=1; i<nodes.size(); ++i)
+         nodes[i].push_block(b.block);
+      return b;
+   }
+
    // Produces a number of blocks and returns true if LIB is advancing.
    // This function can be only used at the end of a test as it clears
    // node1 to nodeN votes when starting.

unittests/test-contracts/svnn_ibc/svnn_ibc.abi

@@ -3,21 +3,57 @@
     "version": "eosio::abi/1.2",
     "types": [],
     "structs": [
+        {
+            "name": "action",
+            "base": "action_base",
+            "fields": [
+                {
+                    "name": "data",
+                    "type": "bytes"
+                },
+                {
+                    "name": "return_value",
+                    "type": "bytes"
+                }
+            ]
+        },
+        {
+            "name": "action_base",
+            "base": "",
+            "fields": [
+                {
+                    "name": "account",
+                    "type": "name"
+                },
+                {
+                    "name": "name",
+                    "type": "name"
+                },
+                {
+                    "name": "authorization",
+                    "type": "permission_level[]"
+                }
+            ]
+        },
         {
             "name": "action_data",
             "base": "",
             "fields": [
                 {
                     "name": "action",
-                    "type": "r_action"
+                    "type": "action"
                 },
                 {
-                    "name": "action_receipt_digest",
-                    "type": "checksum256"
+                    "name": "receiver",
+                    "type": "name"
                 },
                 {
-                    "name": "return_value",
-                    "type": "bytes"
+                    "name": "recv_sequence",
+                    "type": "uint64"
+                },
+                {
+                    "name": "witness_hash",
+                    "type": "checksum256"
                 }
             ]
         },
@@ -74,8 +110,8 @@
                     "type": "uint32"
                 },
                 {
-                    "name": "active_finalizer_policy",
-                    "type": "fpolicy?"
+                    "name": "new_finalizer_policy",
+                    "type": "finalizer_policy_input?"
                 },
                 {
                     "name": "witness_hash",
@@ -116,6 +152,10 @@
                 {
                     "name": "proof",
                     "type": "proof"
+                },
+                {
+                    "name": "assert",
+                    "type": "bool"
                 }
             ]
         },
@@ -152,7 +192,7 @@
             ]
         },
         {
-            "name": "finalizer_authority",
+            "name": "finalizer_authority_input",
             "base": "",
             "fields": [
                 {
@@ -170,7 +210,7 @@
             ]
         },
         {
-            "name": "fpolicy",
+            "name": "finalizer_policy_input",
             "base": "",
             "fields": [
                 {
@@ -183,7 +223,7 @@
                 },
                 {
                     "name": "finalizers",
-                    "type": "finalizer_authority[]"
+                    "type": "finalizer_authority_input[]"
                 }
             ]
         },
@@ -247,45 +287,13 @@
                 }
             ]
         },
-        {
-            "name": "r_action",
-            "base": "r_action_base",
-            "fields": [
-                {
-                    "name": "data",
-                    "type": "bytes"
-                },
-                {
-                    "name": "returnvalue",
-                    "type": "bytes"
-                }
-            ]
-        },
-        {
-            "name": "r_action_base",
-            "base": "",
-            "fields": [
-                {
-                    "name": "account",
-                    "type": "name"
-                },
-                {
-                    "name": "name",
-                    "type": "name"
-                },
-                {
-                    "name": "authorization",
-                    "type": "permission_level[]"
-                }
-            ]
-        },
         {
             "name": "setfpolicy",
             "base": "",
             "fields": [
                 {
                     "name": "policy",
-                    "type": "fpolicy"
+                    "type": "finalizer_policy_input"
                 },
                 {
                     "name": "from_block_num",
@@ -295,7 +303,7 @@
         },
         {
             "name": "storedpolicy",
-            "base": "fpolicy",
+            "base": "finalizer_policy_input",
             "fields": [
                 {
                     "name": "last_block_num",

unittests/test-contracts/svnn_ibc/svnn_ibc.cpp

@@ -7,7 +7,7 @@ bls_g1 svnn_ibc::_g1add(const bls_g1& op1, const bls_g1& op2) {
    return r;
 }
 
-void svnn_ibc::_maybe_set_finalizer_policy(const fpolicy& policy, const uint32_t from_block_num){
+void svnn_ibc::_maybe_set_finalizer_policy(const finalizer_policy_input& policy, const uint32_t from_block_num){
     policies_table _policies_table(get_self(), get_self().value);
     auto itr = _policies_table.rbegin();
     //if the new policy is more recent than the most recent we are aware of, we record the new one
@@ -86,7 +86,7 @@ void svnn_ibc::_maybe_remove_from_cache(){
 
 //verify that a signature over a given message has been generated with the private key matching the public key
 void svnn_ibc::_verify(const std::string& public_key, const std::string& signature, const std::string& message){
-    check(bls_signature_verify(decode_bls_public_key_to_g1(public_key), decode_bls_signature_to_g2(signature), message), "signature verify failed");
+    check(bls_signature_verify(decode_bls_public_key_to_g1(public_key), decode_bls_signature_to_g2(signature), message), "signature verification failed");
 }
 
 //verify that the quorum certificate over the finality digest is valid
@@ -149,8 +149,8 @@ void svnn_ibc::_check_target_block_proof_of_inclusion(const block_proof_of_inclu
         check(itr!= merkle_index.end(), "cannot link proof to proven merkle root");
     }
     //block_data target_block = std::get<svnn_ibc::block_data>(proof.target);
-    if (proof.target.finality_data.active_finalizer_policy.has_value()){
-        _maybe_set_finalizer_policy(proof.target.finality_data.active_finalizer_policy.value(), proof.target.dynamic_data.block_num);
+    if (proof.target.finality_data.new_finalizer_policy.has_value()){
+        _maybe_set_finalizer_policy(proof.target.finality_data.new_finalizer_policy.value(), proof.target.dynamic_data.block_num);
     }
 }
 
@@ -167,24 +167,25 @@ void svnn_ibc::_check_finality_proof(const finality_proof& finality_proof, const
     _maybe_add_proven_root(target_block_proof_of_inclusion.target.dynamic_data.block_num + offset, finality_proof.qc_block.finality_mroot);
 }
 
-ACTION svnn_ibc::setfpolicy(const fpolicy& policy, const uint32_t from_block_num){
+ACTION svnn_ibc::setfpolicy(const finalizer_policy_input& policy, const uint32_t from_block_num){
 
     //can only be called with account authority
     require_auth(get_self());
 
     policies_table _policies_table(get_self(), get_self().value);
 
     //can only be used once for the initilization of the contract
-    check(_policies_table.begin() == _policies_table.end(), "can only set finalizer policy manually for initialization");
+    //check(_policies_table.begin() == _policies_table.end(), "can only set finalizer policy manually for initialization");
 
     _maybe_set_finalizer_policy(policy, from_block_num);
 
     //clean up if necessary
     _maybe_remove_from_cache<policies_table>();
     _maybe_remove_from_cache<proofs_table>();
+
 }
 
-ACTION svnn_ibc::checkproof(const proof& proof){
+ACTION svnn_ibc::checkproof(const proof& proof, const bool assert){
 
     //if we have a finality proof, we execute the "heavy" code path
     if (proof.finality_proof.has_value()){
@@ -199,4 +200,6 @@ ACTION svnn_ibc::checkproof(const proof& proof){
     _maybe_remove_from_cache<policies_table>();
     _maybe_remove_from_cache<proofs_table>();
 
+    check(!assert, "expected");
+
 }