Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vasil update #73

Merged
merged 43 commits into from
Sep 2, 2022
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
2d6a065
Bump bpi
szg251 May 30, 2022
ba78898
Update to patched plutus-apps
szg251 May 31, 2022
46f34d1
Update to latest plutus-apps commit
szg251 Jun 2, 2022
da2b4b4
Update to next plutus-apps
szg251 Jun 28, 2022
167ce00
Merge branch 'master' of github.com:mlabs-haskell/plutip into gergely…
szg251 Jun 29, 2022
88e5318
Use cardano-node 1.35.0
szg251 Jul 4, 2022
d212bbd
Update to the latest cardano-wallet, and address API changes
szg251 Jul 15, 2022
d548a16
Fixing local-cluster
szg251 Jul 18, 2022
9346809
Silence chain-index.
zmrocze Jul 19, 2022
555c259
Add PlutusV2 cost model.
zmrocze Jul 19, 2022
de512c0
Merge pull request #97 from mlabs-haskell/karol/vasil-with-latest-wallet
zmrocze Jul 20, 2022
22945eb
Bump BPI
szg251 Jul 26, 2022
e4afd43
Push forked plutus-apps to mlabs-haskell org
szg251 Jul 27, 2022
922b5e0
Merge branch 'master' into gergely/vasil
mikekeke Aug 11, 2022
90ea983
BPI update
mikekeke Aug 11, 2022
b4e4d22
Merge branch 'master' into gergely/vasil
mikekeke Aug 12, 2022
6811ae8
Vasil compliance update:
mikekeke Aug 16, 2022
8364c43
add back V2 cost models
mikekeke Aug 17, 2022
37449d3
BPI update
mikekeke Aug 18, 2022
13eda07
Merge pull request #115 from mlabs-haskell/gergely/vasil-update-apps
mikekeke Aug 18, 2022
9a60d36
formatting, re-enable hoogle
mikekeke Aug 18, 2022
bbc760e
Merge branch 'master' into gergely/vasil
mikekeke Aug 18, 2022
ecefab7
wip: adjustments:
mikekeke Aug 18, 2022
1a4bbdd
more formatting
mikekeke Aug 18, 2022
ac72469
remove hardcoded path from test cluster config
mikekeke Aug 18, 2022
9efdab8
fixed: fee for value assertion tests
mikekeke Aug 18, 2022
551d926
wait for chain-index longer
mikekeke Aug 18, 2022
1a775b5
updates:
mikekeke Aug 19, 2022
1ee56e9
fix formatting
mikekeke Aug 19, 2022
ba82db3
follow BPI update
mikekeke Aug 23, 2022
8ef0d04
follow BPI commit revert
mikekeke Aug 23, 2022
9273633
updates:
mikekeke Aug 24, 2022
c3d4693
bump BPI
mikekeke Aug 25, 2022
2d17ad2
bump BPI
mikekeke Aug 26, 2022
4279cbc
waiting for chain-index on cluster start
mikekeke Aug 28, 2022
ae394a6
Merge pull request #123 from mlabs-haskell/vasil-waiting-for-index
mikekeke Aug 28, 2022
1d83485
Created new branch for `adjustUnbalancedTx` test.
Anteproperispomenon Aug 29, 2022
91735e2
Cleaned up import list.
Anteproperispomenon Aug 30, 2022
6a54a46
update BPI
mikekeke Sep 2, 2022
9974aa3
Merge branch 'master' into gergely/vasil
mikekeke Sep 2, 2022
5cd3722
Merge branch 'gergely/vasil' into david/adjust-tx-test-2
mikekeke Sep 2, 2022
3b7e7e8
Merge pull request #126 from mlabs-haskell/david/adjust-tx-test-2
mikekeke Sep 2, 2022
eb2573e
Merge branch 'master' into gergely/vasil
mikekeke Sep 2, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
index-state: 2022-01-22T00:00:00Z
index-state: 2022-05-18T00:00:00Z

packages: ./.

tests: true
benchmarks: true

allow-newer: size-based:template-haskell
allow-newer:
*:aeson
, size-based:template-haskell

constraints:
aeson >= 2
, hedgehog >= 1.1

test-show-details: direct
176 changes: 176 additions & 0 deletions cluster-data/alonzo-genesis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,3 +185,179 @@ costModels:
verifySignature-memory-arguments: 1
cekLamCost-exBudgetMemory: 100
sliceByteString-cpu-arguments-intercept: 150000
PlutusV2:
cekApplyCost-exBudgetCPU: 23000
cekApplyCost-exBudgetMemory: 100
cekBuiltinCost-exBudgetCPU: 23000
cekBuiltinCost-exBudgetMemory: 100
cekConstCost-exBudgetCPU: 23000
cekConstCost-exBudgetMemory: 100
cekDelayCost-exBudgetCPU: 23000
cekDelayCost-exBudgetMemory: 100
cekForceCost-exBudgetCPU: 23000
cekForceCost-exBudgetMemory: 100
cekLamCost-exBudgetCPU: 23000
cekLamCost-exBudgetMemory: 100
cekStartupCost-exBudgetCPU: 100
cekStartupCost-exBudgetMemory: 100
cekVarCost-exBudgetCPU: 23000
cekVarCost-exBudgetMemory: 100
addInteger-cpu-arguments-intercept: 205665
addInteger-cpu-arguments-slope: 812
addInteger-memory-arguments-intercept: 1
addInteger-memory-arguments-slope: 1
appendByteString-cpu-arguments-intercept: 1000
appendByteString-cpu-arguments-slope: 571
appendByteString-memory-arguments-intercept: 0
appendByteString-memory-arguments-slope: 1
appendString-cpu-arguments-intercept: 1000
appendString-cpu-arguments-slope: 24177
appendString-memory-arguments-intercept: 4
appendString-memory-arguments-slope: 1
bData-cpu-arguments: 1000
bData-memory-arguments: 32
blake2b_256-cpu-arguments-intercept: 117366
blake2b_256-cpu-arguments-slope: 10475
blake2b_256-memory-arguments: 4
chooseData-cpu-arguments: 19537
chooseData-memory-arguments: 32
chooseList-cpu-arguments: 175354
chooseList-memory-arguments: 32
chooseUnit-cpu-arguments: 46417
chooseUnit-memory-arguments: 4
consByteString-cpu-arguments-intercept: 221973
consByteString-cpu-arguments-slope: 511
consByteString-memory-arguments-intercept: 0
consByteString-memory-arguments-slope: 1
constrData-cpu-arguments: 89141
constrData-memory-arguments: 32
decodeUtf8-cpu-arguments-intercept: 497525
decodeUtf8-cpu-arguments-slope: 14068
decodeUtf8-memory-arguments-intercept: 4
decodeUtf8-memory-arguments-slope: 2
divideInteger-cpu-arguments-constant: 196500
divideInteger-cpu-arguments-model-arguments-intercept: 453240
divideInteger-cpu-arguments-model-arguments-slope: 220
divideInteger-memory-arguments-intercept: 0
divideInteger-memory-arguments-minimum: 1
divideInteger-memory-arguments-slope: 1
encodeUtf8-cpu-arguments-intercept: 1000
encodeUtf8-cpu-arguments-slope: 28662
encodeUtf8-memory-arguments-intercept: 4
encodeUtf8-memory-arguments-slope: 2
equalsByteString-cpu-arguments-constant: 245000
equalsByteString-cpu-arguments-intercept: 216773
equalsByteString-cpu-arguments-slope: 62
equalsByteString-memory-arguments: 1
equalsData-cpu-arguments-intercept: 1060367
equalsData-cpu-arguments-slope: 12586
equalsData-memory-arguments: 1
equalsInteger-cpu-arguments-intercept: 208512
equalsInteger-cpu-arguments-slope: 421
equalsInteger-memory-arguments: 1
equalsString-cpu-arguments-constant: 187000
equalsString-cpu-arguments-intercept: 1000
equalsString-cpu-arguments-slope: 52998
equalsString-memory-arguments: 1
fstPair-cpu-arguments: 80436
fstPair-memory-arguments: 32
headList-cpu-arguments: 43249
headList-memory-arguments: 32
iData-cpu-arguments: 1000
iData-memory-arguments: 32
ifThenElse-cpu-arguments: 80556
ifThenElse-memory-arguments: 1
indexByteString-cpu-arguments: 57667
indexByteString-memory-arguments: 4
lengthOfByteString-cpu-arguments: 1000
lengthOfByteString-memory-arguments: 10
lessThanByteString-cpu-arguments-intercept: 197145
lessThanByteString-cpu-arguments-slope: 156
lessThanByteString-memory-arguments: 1
lessThanEqualsByteString-cpu-arguments-intercept: 197145
lessThanEqualsByteString-cpu-arguments-slope: 156
lessThanEqualsByteString-memory-arguments: 1
lessThanEqualsInteger-cpu-arguments-intercept: 204924
lessThanEqualsInteger-cpu-arguments-slope: 473
lessThanEqualsInteger-memory-arguments: 1
lessThanInteger-cpu-arguments-intercept: 208896
lessThanInteger-cpu-arguments-slope: 511
lessThanInteger-memory-arguments: 1
listData-cpu-arguments: 52467
listData-memory-arguments: 32
mapData-cpu-arguments: 64832
mapData-memory-arguments: 32
mkCons-cpu-arguments: 65493
mkCons-memory-arguments: 32
mkNilData-cpu-arguments: 22558
mkNilData-memory-arguments: 32
mkNilPairData-cpu-arguments: 16563
mkNilPairData-memory-arguments: 32
mkPairData-cpu-arguments: 76511
mkPairData-memory-arguments: 32
modInteger-cpu-arguments-constant: 196500
modInteger-cpu-arguments-model-arguments-intercept: 453240
modInteger-cpu-arguments-model-arguments-slope: 220
modInteger-memory-arguments-intercept: 0
modInteger-memory-arguments-minimum: 1
modInteger-memory-arguments-slope: 1
multiplyInteger-cpu-arguments-intercept: 69522
multiplyInteger-cpu-arguments-slope: 11687
multiplyInteger-memory-arguments-intercept: 0
multiplyInteger-memory-arguments-slope: 1
nullList-cpu-arguments: 60091
nullList-memory-arguments: 32
quotientInteger-cpu-arguments-constant: 196500
quotientInteger-cpu-arguments-model-arguments-intercept: 453240
quotientInteger-cpu-arguments-model-arguments-slope: 220
quotientInteger-memory-arguments-intercept: 0
quotientInteger-memory-arguments-minimum: 1
quotientInteger-memory-arguments-slope: 1
remainderInteger-cpu-arguments-constant: 196500
remainderInteger-cpu-arguments-model-arguments-intercept: 453240
remainderInteger-cpu-arguments-model-arguments-slope: 220
remainderInteger-memory-arguments-intercept: 0
remainderInteger-memory-arguments-minimum: 1
remainderInteger-memory-arguments-slope: 1
serialiseData-cpu-arguments-intercept: 1159724
serialiseData-cpu-arguments-slope: 392670
serialiseData-memory-arguments-intercept: 0
serialiseData-memory-arguments-slope: 2
sha2_256-cpu-arguments-intercept: 806990
sha2_256-cpu-arguments-slope: 30482
sha2_256-memory-arguments: 4
sha3_256-cpu-arguments-intercept: 1927926
sha3_256-cpu-arguments-slope: 82523
sha3_256-memory-arguments: 4
sliceByteString-cpu-arguments-intercept: 265318
sliceByteString-cpu-arguments-slope: 0
sliceByteString-memory-arguments-intercept: 4
sliceByteString-memory-arguments-slope: 0
sndPair-cpu-arguments: 85931
sndPair-memory-arguments: 32
subtractInteger-cpu-arguments-intercept: 205665
subtractInteger-cpu-arguments-slope: 812
subtractInteger-memory-arguments-intercept: 1
subtractInteger-memory-arguments-slope: 1
tailList-cpu-arguments: 41182
tailList-memory-arguments: 32
trace-cpu-arguments: 212342
trace-memory-arguments: 32
unBData-cpu-arguments: 31220
unBData-memory-arguments: 32
unConstrData-cpu-arguments: 32696
unConstrData-memory-arguments: 32
unIData-cpu-arguments: 43357
unIData-memory-arguments: 32
unListData-cpu-arguments: 32247
unListData-memory-arguments: 32
unMapData-cpu-arguments: 38314
unMapData-memory-arguments: 32
verifyEcdsaSecp256k1Signature-cpu-arguments: 35892428
verifyEcdsaSecp256k1Signature-memory-arguments: 10
verifyEd25519Signature-cpu-arguments-intercept: 9462713
verifyEd25519Signature-cpu-arguments-slope: 1021
verifyEd25519Signature-memory-arguments: 10
verifySchnorrSecp256k1Signature-cpu-arguments-intercept: 38887044
verifySchnorrSecp256k1Signature-cpu-arguments-slope: 32947
verifySchnorrSecp256k1Signature-memory-arguments: 10
Loading