Merge pull request #10 from newton-blockchain/EmelyanenkoK-proposal-w…

…ins-losses Fix non-critical bug in config-code
newton-blockchain · Feb 20, 2021 · ce54f13 · ce54f13
2 parents c83d905 + ea6fbc5
commit ce54f13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/crypto/smartcont/config-code.fc b/crypto/smartcont/config-code.fc
@@ -601,7 +601,9 @@ _ unpack_proposal(slice pstatus) inline_ref {
       voters_list = cons(voter_id, voters_list);
     }
   } until (~ f);
-  var (rounds_remaining, losses, wins) = (rest~load_uint(8), rest~load_uint(8), rest~load_uint(8));
+  ;; Note there is a bug in config contract currently deployed in testnet2:
+  ;; wins and losses are messed up
+  var (rounds_remaining, wins, losses) = (rest~load_uint(8), rest~load_uint(8), rest~load_uint(8));
   rest.end_parse();
   var (param_id, param_val, param_hash) = parse_config_proposal(proposal);
   return [expires, critical?, [param_id, param_val, param_hash], vset_id, voters_list, weight_remaining, rounds_remaining, losses, wins];

diff --git a/crypto/smartcont/create-config-proposal.fif b/crypto/smartcont/create-config-proposal.fif
@@ -16,7 +16,7 @@ begin-options
     "Creates a critical parameter change proposal" option-help
   "x" "--expires-in" { parse-int =: expire-in } short-long-option-arg
     "Sets proposal expiration time in seconds (default " expire-in (.) $+ +")" option-help
-  "H" "--old-hash" { (hex-number) not abort"256-bit hex number expected as hash" =: old-hash }
+  "H" "--old-hash" { (hex-number) 1 = not .s abort"256-bit hex number expected as hash" =: old-hash }
      short-long-option-arg
      "Sets the required cell hash of existing parameter value (0 means no value)" option-help 
   "h" "--help" { usage } short-long-option