Merge pull request #99 from XuJiandong/fix-since

fix: Enhance multisig handling for optional since value

Author: zhangsoledad

build.rs

@@ -27,7 +27,7 @@ const BINARIES: &[(&str, &str)] = &[
     ),
     (
         "secp256k1_blake160_multisig_all",
-        "50c8623ef5112510ccdf2d8e480d02d0de7288eb9968f8b019817340c3991145",
+        "36c971b8d41fbd94aabca77dc75e826729ac98447b46f91e00796155dddb0d29",
     ),
 ];
 

c/secp256k1_blake160_multisig_all.c

@@ -114,9 +114,13 @@ int main() {
     return ERROR_ARGUMENTS_LEN;
   }
   // Extract optional since value.
-  uint64_t since = 0;
   if (args_bytes_seg.size == BLAKE160_SIZE + sizeof(uint64_t)) {
-    since = *(uint64_t *)&args_bytes_seg.ptr[BLAKE160_SIZE];
+    uint64_t since = *(uint64_t *)&args_bytes_seg.ptr[BLAKE160_SIZE];
+    // Check lock period logic, we have prepared a handy utility function for this.
+    ret = check_since(since);
+    if (ret != CKB_SUCCESS) {
+      return ret;
+    }
   }
 
   // Load the first witness, or the witness of the same index as the first input using
@@ -195,12 +199,6 @@ int main() {
     return ERROR_MULTSIG_SCRIPT_HASH;
   }
 
-  // Check lock period logic, we have prepared a handy utility function for this.
-  ret = check_since(since);
-  if (ret != CKB_SUCCESS) {
-    return ret;
-  }
-
   // Load the current transaction hash.
   unsigned char tx_hash[BLAKE2B_BLOCK_SIZE];
   len = BLAKE2B_BLOCK_SIZE;

docs/c/secp256k1_blake160_multisig_all.html

@@ -270,10 +270,8 @@ <h1 id="secp256k1-blake160-multisig-all">secp256k1-blake160-multisig-all</h1>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre>  <span class="hljs-type">uint64_t</span> since = <span class="hljs-number">0</span>;
-  <span class="hljs-keyword">if</span> (args_bytes_seg.size == BLAKE160_SIZE + <span class="hljs-keyword">sizeof</span>(<span class="hljs-type">uint64_t</span>)) {
-    since = *(<span class="hljs-type">uint64_t</span> *)&amp;args_bytes_seg.ptr[BLAKE160_SIZE];
-  }</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  <span class="hljs-keyword">if</span> (args_bytes_seg.size == BLAKE160_SIZE + <span class="hljs-keyword">sizeof</span>(<span class="hljs-type">uint64_t</span>)) {
+    <span class="hljs-type">uint64_t</span> since = *(<span class="hljs-type">uint64_t</span> *)&amp;args_bytes_seg.ptr[BLAKE160_SIZE];</pre></div></div>
 
         </li>
 
@@ -284,6 +282,25 @@ <h1 id="secp256k1-blake160-multisig-all">secp256k1-blake160-multisig-all</h1>
               <div class="sswrap ">
                 <a class="ss" href="#section-11">&#x00a7;</a>
               </div>
+              <p>Check lock period logic, we have prepared a handy utility function for this.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>    ret = check_since(since);
+    <span class="hljs-keyword">if</span> (ret != CKB_SUCCESS) {
+      <span class="hljs-keyword">return</span> ret;
+    }
+  }</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-12">
+            <div class="annotation">
+              
+              <div class="sswrap ">
+                <a class="ss" href="#section-12">&#x00a7;</a>
+              </div>
               <p>Load the first witness, or the witness of the same index as the first input using
 current script.</p>
 
@@ -302,11 +319,11 @@ <h1 id="secp256k1-blake160-multisig-all">secp256k1-blake160-multisig-all</h1>
         </li>
 
 
-        <li id="section-12">
+        <li id="section-13">
             <div class="annotation">
 
               <div class="sswrap ">
-                <a class="ss" href="#section-12">&#x00a7;</a>
+                <a class="ss" href="#section-13">&#x00a7;</a>
               </div>
               <p>We will treat the first witness as WitnessArgs object, and extract the lock field
 from the object.</p>
@@ -326,11 +343,11 @@ <h1 id="secp256k1-blake160-multisig-all">secp256k1-blake160-multisig-all</h1>
         </li>
 
 
-        <li id="section-13">
+        <li id="section-14">
             <div class="annotation">
 
               <div class="sswrap ">
-                <a class="ss" href="#section-13">&#x00a7;</a>
+                <a class="ss" href="#section-14">&#x00a7;</a>
               </div>
               <p>This is more of a safe guard, since lock is a field in witness, it
 cannot exceed the maximum size of the enclosing witness, this way
@@ -346,11 +363,11 @@ <h1 id="secp256k1-blake160-multisig-all">secp256k1-blake160-multisig-all</h1>
         </li>
 
 
-        <li id="section-14">
+        <li id="section-15">
             <div class="annotation">
 
               <div class="sswrap ">
-                <a class="ss" href="#section-14">&#x00a7;</a>
+                <a class="ss" href="#section-15">&#x00a7;</a>
               </div>
               <p>Keep the full lock field somewhere, since later we will modify this field in place.</p>
 
@@ -363,11 +380,11 @@ <h1 id="secp256k1-blake160-multisig-all">secp256k1-blake160-multisig-all</h1>
         </li>
 
 
-        <li id="section-15">
+        <li id="section-16">
             <div class="annotation">
 
               <div class="sswrap ">
-                <a class="ss" href="#section-15">&#x00a7;</a>
+                <a class="ss" href="#section-16">&#x00a7;</a>
               </div>
               <p>Extract multisig script flags.</p>
 
@@ -396,11 +413,11 @@ <h1 id="secp256k1-blake160-multisig-all">secp256k1-blake160-multisig-all</h1>
         </li>
 
 
-        <li id="section-16">
+        <li id="section-17">
             <div class="annotation">
 
               <div class="sswrap ">
-                <a class="ss" href="#section-16">&#x00a7;</a>
+                <a class="ss" href="#section-17">&#x00a7;</a>
               </div>
               <p>Based on the number of public keys and thresholds, we can calculate
 the required length of the lock field.</p>
@@ -417,11 +434,11 @@ <h1 id="secp256k1-blake160-multisig-all">secp256k1-blake160-multisig-all</h1>
         </li>
 
 
-        <li id="section-17">
+        <li id="section-18">
             <div class="annotation">
 
               <div class="sswrap ">
-                <a class="ss" href="#section-17">&#x00a7;</a>
+                <a class="ss" href="#section-18">&#x00a7;</a>
               </div>
               <p>Perform hash check of the <code>multisig_script</code> part, notice the signature part
 is not included here.</p>
@@ -440,24 +457,6 @@ <h1 id="secp256k1-blake160-multisig-all">secp256k1-blake160-multisig-all</h1>
         </li>
 
 
-        <li id="section-18">
-            <div class="annotation">
-              
-              <div class="sswrap ">
-                <a class="ss" href="#section-18">&#x00a7;</a>
-              </div>
-              <p>Check lock period logic, we have prepared a handy utility function for this.</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>  ret = check_since(since);
-  <span class="hljs-keyword">if</span> (ret != CKB_SUCCESS) {
-    <span class="hljs-keyword">return</span> ret;
-  }</pre></div></div>
-            
-        </li>
-        
-        
         <li id="section-19">
             <div class="annotation">
 

src/tests/secp256k1_blake160_multisig_all.rs

@@ -465,6 +465,42 @@ fn test_multisig_0_2_3_unlock_with_since() {
     }
 }
 
+#[test]
+fn test_multisig_0_2_3_unlock_without_since() {
+    let mut data_loader = DummyDataLoader::new();
+    let keys = generate_keys(3);
+    let multi_sign_script = gen_multi_sign_script(&keys, 2, 0);
+    // no since value
+    let args = blake160(&multi_sign_script);
+    let _lock_script = gen_multi_sign_lock_script(args.clone());
+    let raw_tx = gen_tx(&mut data_loader, args);
+
+    {
+        // relative since
+        let since = 0x8000_0000_8888_8888u64;
+        let inputs: Vec<CellInput> = raw_tx
+            .inputs()
+            .into_iter()
+            .map(|i| i.as_builder().since(since.pack()).build())
+            .collect();
+        let raw_tx = raw_tx.as_advanced_builder().set_inputs(inputs).build();
+        let tx = multi_sign_tx(raw_tx, &multi_sign_script, &[&keys[1], &keys[2]]);
+        verify(&data_loader, &tx).expect("pass verification");
+    }
+    {
+        // absolute since
+        let since = 0x2000_0000_0000_0000u64;
+        let inputs: Vec<CellInput> = raw_tx
+            .inputs()
+            .into_iter()
+            .map(|i| i.as_builder().since(since.pack()).build())
+            .collect();
+        let raw_tx = raw_tx.as_advanced_builder().set_inputs(inputs).build();
+        let tx = multi_sign_tx(raw_tx, &multi_sign_script, &[&keys[1], &keys[2]]);
+        verify(&data_loader, &tx).expect("pass verification");
+    }
+}
+
 #[test]
 fn test_multisig_0_2_3_unlock_with_since_epoch() {
     let mut data_loader = DummyDataLoader::new();