Merge pull request #15129 from MinaProtocol/fix/use-legacy-receipt-ch…

…ain-hash-develop use random_oracle.legacy.salt for receipt_chain_hash.empty
MinaProtocol · Feb 15, 2024 · 0c9eea0 · 0c9eea0
2 parents e5b9d46 + 106c095
commit 0c9eea0
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 16 deletions.
diff --git a/buildkite/src/Command/ReplayerTest.dhall b/buildkite/src/Command/ReplayerTest.dhall
@@ -1,9 +1,13 @@
+let B = ../External/Buildkite.dhall
+
 let Prelude = ../External/Prelude.dhall
 
 let Command = ./Base.dhall
 let Docker = ./Docker/Type.dhall
 let Size = ./Size.dhall
 
+let B/SoftFail = B.definitions/commandStep/properties/soft_fail/Type
+
 let Cmd = ../Lib/Cmds.dhall in
 
 { step = \(dependsOn : List Command.TaggedKey.Type) ->
@@ -14,6 +18,7 @@ let Cmd = ../Lib/Cmds.dhall in
         ],
         label = "Replayer test",
         key = "replayer-test",
+        soft_fail = Some (B/SoftFail.Boolean True),
         target = Size.Large,
         depends_on = dependsOn
       }

diff --git a/scripts/compare-replayer-and-fork-config.sh b/scripts/compare-replayer-and-fork-config.sh
@@ -0,0 +1,4 @@
+cat $1 | jq '.genesis_ledger.accounts | .[] | {pk: .pk, balance: .balance, delegate: .delegate, receipt_chain_hash: .receipt_chain_hash, voting_for: .voting_for, nonce: (.nonce // "0")}' > replayer_output.json
+cat $2 | jq '.ledger.accounts | .[] | {pk: .pk, balance: .balance, delegate: .delegate, receipt_chain_hash: .receipt_chain_hash, voting_for: .voting_for, nonce: (.nonce // "0")}' > fork_output.json
+
+diff replayer_output.json fork_output.json
diff --git a/src/app/print_blockchain_snark_vk/blockchain_snark_vk.json b/src/app/print_blockchain_snark_vk/blockchain_snark_vk.json
diff --git a/src/lib/crypto/snarky_tests/snarky_tests.ml b/src/lib/crypto/snarky_tests/snarky_tests.ml
@@ -627,7 +627,7 @@ module Protocol_circuits = struct
 
   let transaction () : unit =
     let expected1 = "b8879f677f622a1d86648030701f43e1" in
-    let expected2 = "a58d09e2904bad2e3f983b3f9b0cf78f" in
+    let expected2 = "c17f6cef52fc6c73d389c0128e41a924" in
     let digest =
       Transaction_snark.constraint_system_digests ~constraint_constants ()
     in

diff --git a/src/lib/hash_prefixes/hash_prefixes.ml b/src/lib/hash_prefixes/hash_prefixes.ml
@@ -64,7 +64,7 @@ let signature_mainnet = create "MinaSignatureMainnet"
 
 let signature_other chain_name = create (chain_name ^ "Signature")
 
-let receipt_chain_user_command = create "MinaReceiptUC"
+let receipt_chain_user_command = create "CodaReceiptUC"
 
 (* leaving this one with "Coda", to preserve the existing hashes *)
 let receipt_chain_zkapp = create "CodaReceiptZkapp"

diff --git a/src/lib/mina_base/receipt.ml b/src/lib/mina_base/receipt.ml
@@ -47,8 +47,7 @@ module Chain_hash = struct
 
   let equal = Stable.Latest.equal
 
-  let empty =
-    of_hash (Hash_prefix_create.salt "CodaReceiptEmpty" |> Random_oracle.digest)
+  let empty = of_hash Random_oracle.Legacy.(salt "CodaReceiptEmpty" |> digest)
 
   let cons_signed_command_payload (e : Signed_command_elt.t) (t : t) =
     let open Random_oracle.Legacy in

diff --git a/src/lib/transaction_snark/test/app_state/proof_cache.json b/src/lib/transaction_snark/test/app_state/proof_cache.json
diff --git a/src/lib/transaction_snark/test/delegate/proof_cache.json b/src/lib/transaction_snark/test/delegate/proof_cache.json
diff --git a/src/lib/transaction_snark/test/fee_payer/proof_cache.json b/src/lib/transaction_snark/test/fee_payer/proof_cache.json
diff --git a/src/lib/transaction_snark/test/permissions/proof_cache.json b/src/lib/transaction_snark/test/permissions/proof_cache.json
diff --git a/src/lib/transaction_snark/test/token_symbol/proof_cache.json b/src/lib/transaction_snark/test/token_symbol/proof_cache.json
diff --git a/src/lib/transaction_snark/test/verification_key/proof_cache.json b/src/lib/transaction_snark/test/verification_key/proof_cache.json
diff --git a/src/lib/transaction_snark/test/voting_for/proof_cache.json b/src/lib/transaction_snark/test/voting_for/proof_cache.json
diff --git a/src/lib/transaction_snark/test/zkapp_deploy/proof_cache.json b/src/lib/transaction_snark/test/zkapp_deploy/proof_cache.json
diff --git a/src/lib/transaction_snark/test/zkapp_payments/proof_cache.json b/src/lib/transaction_snark/test/zkapp_payments/proof_cache.json
diff --git a/src/lib/transaction_snark/test/zkapp_preconditions/proof_cache.json b/src/lib/transaction_snark/test/zkapp_preconditions/proof_cache.json
diff --git a/src/lib/transaction_snark/test/zkapp_uri/proof_cache.json b/src/lib/transaction_snark/test/zkapp_uri/proof_cache.json