Skip to content

Commit

Permalink
ripemd_160builtin (IntersectMBO#6378)
Browse files Browse the repository at this point in the history 
* Add ripemd-160 builtin with artificial cost model (copy of keccak_256)

* Add conformance tests

* More merging

* Merge metatheory

* Remove ripemd_160 from V3 ParamNames

* Update plutus-tx-plugin-tests results

* Update cardano-constitution-test results

* Add bench results and generate new model for RIPEMD-160

* Update conformance results for new ripemd-160 costs

* Add changelog entries

* Add changelog entries

* Uncomment changleog entries

* Fix JSON file

* Update defaultCostModelParams.json

* Remove entry from sha256_map in project.nix

* "Fix" plutus-ledger-api tests

* Remove comment about failing test

---------

Co-authored-by: Tomasz Rybarczyk <[email protected]>
  • Loading branch information
@paluh @v0d1ch
2 people authored and v0d1ch committed Dec 6, 2024
1 parent a686835 commit 1983ac8
Show file tree
Hide file tree
Showing 61 changed files with 1,264 additions and 1,045 deletions.
2 changes: 0 additions & 2 deletions cabal.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,10 @@ allow-newer:
, inline-r:containers
, inline-r:primitive


-- -------------------------------------------------------------------------------------------------
-- Following currently required for building with ghc-9.10.

constraints:
-- The API has changed for version 2.2, ledger depends on the old version and ledger will not
-- be updated until after the Conway release.
, cardano-crypto-class ^>= 2.1

2 changes: 1 addition & 1 deletion cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.cbor.size.golden
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2132
2135
2 changes: 1 addition & 1 deletion ...o-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.large.budget.golden
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ExBudget {exBudgetCPU = ExCPU 601476171, exBudgetMemory = ExMemory 2971818}
ExBudget {exBudgetCPU = ExCPU 601524171, exBudgetMemory = ExMemory 2972118}
2 changes: 1 addition & 1 deletion ...o-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.small.budget.golden
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ExBudget {exBudgetCPU = ExCPU 91525157, exBudgetMemory = ExMemory 413605}
ExBudget {exBudgetCPU = ExCPU 91573157, exBudgetMemory = ExMemory 413905}
1,549 changes: 775 additions & 774 deletions cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/sorted.uplc.golden
View file

Large diffs are not rendered by default.

62 changes: 31 additions & 31 deletions cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests/unsorted.uplc.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -801,15 +801,7 @@ program
(constr 3
[ (constr 1
[ cse
, (constr 1
[ (constr 0
[ (constr 0
[ ])
, (constr 1
[ cse
, cse ]) ])
, (constr 0
[ ]) ]) ]) ]))
, cse ]) ]))
(constr 3
[ (constr 1
[ cse
Expand All @@ -828,7 +820,15 @@ program
(constr 3
[ (constr 1
[ cse
, cse ]) ]))
, (constr 1
[ (constr 0
[ (constr 0
[ ])
, (constr 1
[ cse
, cse ]) ])
, (constr 0
[ ]) ]) ]) ]))
(constr 1
[ (constr 3
[ (constr 1
Expand All @@ -849,8 +849,7 @@ program
, (constr 1
[ cse
, (constr 1
[ (cse
10)
[ cse
, (constr 0
[ ]) ]) ]) ])
, (constr 0
Expand All @@ -859,18 +858,18 @@ program
[ (constr 1
[ ])
, (constr 1
[ (cse
10)
, cse ]) ]))
[ cse
, (constr 1
[ cse
, (constr 0
[ ]) ]) ]) ]))
(constr 0
[ (constr 1
[ ])
, (constr 1
[ cse
, (constr 1
[ cse
, (constr 0
[ ]) ]) ]) ]))
[ (cse
10)
, cse ]) ]))
(constr 1
[ (constr 0
[ (constr 0
Expand Down Expand Up @@ -905,7 +904,8 @@ program
, (constr 0
[ ]) ]))
(constr 1
[ cse
[ (cse
1)
, (constr 0
[ ]) ]))
(constr 1
Expand All @@ -917,31 +917,31 @@ program
, (constr 0
[ ]) ]))
(cse
1))
100))
(constr 0
[ (constr 1
[ ])
, cse ]))
(cse
100))
(cse 2))
10))
(cse 5))
(constr 0
[ (constr 1
[])
, (constr 1
[ 1
, (constr 0
[ ]) ]) ]))
(cse 4))
(cse 5))
(cse 2))
(cse 4))
(cse 1))
(unsafeRatio 9))
(unsafeRatio 0))
(unsafeRatio 3))
(unsafeRatio 4))
(unsafeRatio 4))
(unsafeRatio 3))
(unsafeRatio 9))
(unsafeRatio 1))
(constr 1 [0, (constr 0 [])]))
(unsafeRatio 51))
(unsafeRatio 1))
(unsafeRatio 0))
(fix1
(\go l ->
force (force chooseList)
Expand Down
8 changes: 4 additions & 4 deletions nix/project.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# editorconfig-checker-disable-file
# editorconfig-checker-disable-file

{ repoRoot, inputs, pkgs, system, lib }:

Expand All @@ -8,7 +8,7 @@ let
{
name = "plutus";

# We need the mkDefault here since compiler-nix-name will be overridden
# We need the mkDefault here since compiler-nix-name will be overridden
# in the flake variants.
compiler-nix-name = lib.mkDefault "ghc96";

Expand Down Expand Up @@ -59,7 +59,7 @@ let

modules = [

# Cross Compiling
# Cross Compiling
(lib.mkIf isCrossCompiling {
packages = {
# Things that need plutus-tx-plugin
Expand All @@ -79,7 +79,7 @@ let
reinstallableLibGhc = false;
})

# Common
# Common
{
packages = {
# In this case we can just propagate the native dependencies for the build of
Expand Down
2 changes: 1 addition & 1 deletion plutus-benchmark/plutus-benchmark.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ library marlowe-internal
build-depends:
, base
, bytestring
, cardano-crypto-class >=2.0.0.1 && <2.2
, cardano-crypto-class >=2.1.5 && <2.3
, directory
, filepath
, mtl
Expand Down
14 changes: 14 additions & 0 deletions ...cases/uplc/evaluation/builtin/semantics/ripemd_160/ripemd_160-empty/ripemd_160-empty.uplc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
-- Test vector (0-bit input) for Ripemd_160.
-- Output obtained using the online tool https://emn178.github.io/online-tools/ripemd_160.html
(program 1.0.0
[
[
(builtin equalsByteString)
[
(builtin ripemd_160)
(con bytestring #)
]
]
(con bytestring #9c1185a5c5e9fc54612808977ee8f548b2258d31)
]
)
2 changes: 2 additions & 0 deletions ...ation/builtin/semantics/ripemd_160/ripemd_160-empty/ripemd_160-empty.uplc.budget.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
({cpu: 2130451
| mem: 804})
1 change: 1 addition & 0 deletions ...c/evaluation/builtin/semantics/ripemd_160/ripemd_160-empty/ripemd_160-empty.uplc.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(program 1.0.0 (con bool True))
14 changes: 14 additions & 0 deletions .../evaluation/builtin/semantics/ripemd_160/ripemd_160-length-200/ripemd_160-length-200.uplc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
-- Test vector (0-bit input) for Ripemd_160.
-- Output obtained using the online tool https://emn178.github.io/online-tools/ripemd_160.html
(program 1.0.0
[
[
(builtin equalsByteString)
[
(builtin ripemd_160)
(con bytestring #2e7ea84da4bc4d7cfb463e3f2c8647057afff3fbececa1d200)
]
]
(con bytestring #f18921115370b049e99dfdd49fc92b371dd7c7e9)
]
)
2 changes: 2 additions & 0 deletions ...tin/semantics/ripemd_160/ripemd_160-length-200/ripemd_160-length-200.uplc.budget.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
({cpu: 2204011
| mem: 804})
1 change: 1 addition & 0 deletions ...on/builtin/semantics/ripemd_160/ripemd_160-length-200/ripemd_160-length-200.uplc.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(program 1.0.0 (con bool True))
3 changes: 3 additions & 0 deletions plutus-core/changelog.d/20240806_115314_kenneth.mackenzie.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### Added

- Builtin function `ripemd_160` implementing RIPEMD-160 hashing.
2 changes: 1 addition & 1 deletion plutus-core/cost-model/budgeting-bench/Benchmarks/Crypto.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,5 +317,5 @@ makeBenchmarks gen = [ benchVerifyEd25519Signature
, benchVerifyEcdsaSecp256k1Signature
, benchVerifySchnorrSecp256k1Signature
]
<> (benchByteStringOneArgOp <$> [Sha2_256, Sha3_256, Blake2b_224, Blake2b_256, Keccak_256])
<> (benchByteStringOneArgOp <$> [Sha2_256, Sha3_256, Blake2b_224, Blake2b_256, Keccak_256, Ripemd_160])
<> blsBenchmarks gen
1 change: 1 addition & 0 deletions plutus-core/cost-model/create-cost-model/BuiltinMemoryModels.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ builtinMemoryModels = BuiltinCostModelBase
, paramRotateByteString = Id $ ModelTwoArgumentsLinearInX identityFunction
, paramCountSetBits = Id $ ModelOneArgumentConstantCost 1
, paramFindFirstSetBit = Id $ ModelOneArgumentConstantCost 1
, paramRipemd_160 = Id $ hashMemModel Hash.ripemd_160
}
where identityFunction = OneVariableLinearFunction 0 1

4 changes: 4 additions & 0 deletions plutus-core/cost-model/create-cost-model/CreateBuiltinCostModel.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ builtinCostModelNames = BuiltinCostModelBase
, paramRotateByteString = "rotateByteStringModel"
, paramCountSetBits = "countSetBitsModel"
, paramFindFirstSetBit = "findFirstSetBitModel"
, paramRipemd_160 = "ripemd_160Model"

}


Expand Down Expand Up @@ -260,6 +262,8 @@ createBuiltinCostModel bmfile rfile = do
paramRotateByteString <- getParams readCF2 paramRotateByteString
paramCountSetBits <- getParams readCF1 paramCountSetBits
paramFindFirstSetBit <- getParams readCF1 paramFindFirstSetBit
-- And another hash function
paramRipemd_160 <- getParams readCF1 paramRipemd_160

pure $ BuiltinCostModelBase {..}

Expand Down
Loading

0 comments on commit 1983ac8

Please sign in to comment.