From 75868688d166cd7a8dfbf64598dc4679781b5bda Mon Sep 17 00:00:00 2001 From: Michele Nuzzi Date: Mon, 15 Jul 2024 15:05:54 +0200 Subject: [PATCH] fix v3 offchain costs --- package-lock.json | 8 ++++---- package.json | 2 +- packages/offchain/package-lock.json | 8 ++++---- packages/offchain/package.json | 2 +- .../offchain/src/__tests__/docs/docs.v3.hello.test.ts | 9 +++++++++ ...s.v3.hello.test.ts => contract.docs.v3.hello.test.ts} | 2 +- 6 files changed, 20 insertions(+), 11 deletions(-) rename packages/onchain/src/pluts/__tests__/{docs.v3.hello.test.ts => contract.docs.v3.hello.test.ts} (94%) diff --git a/package-lock.json b/package-lock.json index 1d948190..48f4bbb0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "@harmoniclabs/plu-ts-offchain": "0.1.13-dev4", "@harmoniclabs/plu-ts-onchain": "^0.3.0-dev2", "@harmoniclabs/plutus-data": "^1.2.4", - "@harmoniclabs/plutus-machine": "^2.0.0-dev2", + "@harmoniclabs/plutus-machine": "^2.0.0-dev3", "@harmoniclabs/uint8array-utils": "^1.0.0", "@harmoniclabs/uplc": "^1.2.3" }, @@ -1966,9 +1966,9 @@ } }, "node_modules/@harmoniclabs/plutus-machine": { - "version": "2.0.0-dev2", - "resolved": "https://registry.npmjs.org/@harmoniclabs/plutus-machine/-/plutus-machine-2.0.0-dev2.tgz", - "integrity": "sha512-MiMDXT6xaq8wrEHvWC3kOf+ij+PWthcZ/Xr7IndV6keG9spY6ctPDnRn0FvBQQh7/93/smwp2OtCcAVf53TZUA==", + "version": "2.0.0-dev3", + "resolved": "https://registry.npmjs.org/@harmoniclabs/plutus-machine/-/plutus-machine-2.0.0-dev3.tgz", + "integrity": "sha512-EfKpN03ocPAwEOiJrmDs/wofpSf/9vVJF/ISXlOgpbBUFKEML0V/peDzSOFOqufiNdPbzEyTlnO7vBW4Awvb2Q==", "dependencies": { "@harmoniclabs/bigint-utils": "^1.0.0", "@harmoniclabs/cardano-costmodels-ts": "^1.1.0", diff --git a/package.json b/package.json index 87da23d4..22913a5f 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "@harmoniclabs/cbor": "^1.3.0", "@harmoniclabs/plutus-data": "^1.2.4", "@harmoniclabs/cardano-costmodels-ts": "^1.1.0", - "@harmoniclabs/plutus-machine": "^2.0.0-dev2", + "@harmoniclabs/plutus-machine": "^2.0.0-dev3", "@harmoniclabs/uplc": "^1.2.3", "@harmoniclabs/cardano-ledger-ts": "^0.2.1", "@harmoniclabs/plu-ts-offchain": "0.1.13-dev4", diff --git a/packages/offchain/package-lock.json b/packages/offchain/package-lock.json index e19a5fa1..08f4afda 100644 --- a/packages/offchain/package-lock.json +++ b/packages/offchain/package-lock.json @@ -36,7 +36,7 @@ "@harmoniclabs/cbor": "^1.3.0", "@harmoniclabs/pair": "^1.0.0", "@harmoniclabs/plutus-data": "^1.2.4", - "@harmoniclabs/plutus-machine": "^2.0.0-dev2", + "@harmoniclabs/plutus-machine": "^2.0.0-dev3", "@harmoniclabs/uplc": "^1.2.3" } }, @@ -1926,9 +1926,9 @@ } }, "node_modules/@harmoniclabs/plutus-machine": { - "version": "2.0.0-dev2", - "resolved": "https://registry.npmjs.org/@harmoniclabs/plutus-machine/-/plutus-machine-2.0.0-dev2.tgz", - "integrity": "sha512-MiMDXT6xaq8wrEHvWC3kOf+ij+PWthcZ/Xr7IndV6keG9spY6ctPDnRn0FvBQQh7/93/smwp2OtCcAVf53TZUA==", + "version": "2.0.0-dev3", + "resolved": "https://registry.npmjs.org/@harmoniclabs/plutus-machine/-/plutus-machine-2.0.0-dev3.tgz", + "integrity": "sha512-EfKpN03ocPAwEOiJrmDs/wofpSf/9vVJF/ISXlOgpbBUFKEML0V/peDzSOFOqufiNdPbzEyTlnO7vBW4Awvb2Q==", "peer": true, "dependencies": { "@harmoniclabs/bigint-utils": "^1.0.0", diff --git a/packages/offchain/package.json b/packages/offchain/package.json index 1e13a13d..43768478 100644 --- a/packages/offchain/package.json +++ b/packages/offchain/package.json @@ -64,7 +64,7 @@ "@harmoniclabs/cbor": "^1.3.0", "@harmoniclabs/plutus-data": "^1.2.4", "@harmoniclabs/cardano-costmodels-ts": "^1.1.0", - "@harmoniclabs/plutus-machine": "^2.0.0-dev2", + "@harmoniclabs/plutus-machine": "^2.0.0-dev3", "@harmoniclabs/uplc": "^1.2.3", "@harmoniclabs/cardano-ledger-ts": "^0.2.1" }, diff --git a/packages/offchain/src/__tests__/docs/docs.v3.hello.test.ts b/packages/offchain/src/__tests__/docs/docs.v3.hello.test.ts index 1afd51da..5a4290c4 100644 --- a/packages/offchain/src/__tests__/docs/docs.v3.hello.test.ts +++ b/packages/offchain/src/__tests__/docs/docs.v3.hello.test.ts @@ -3,6 +3,7 @@ import { DataB } from "@harmoniclabs/plutus-data"; import { fromAscii, fromHex } from "@harmoniclabs/uint8array-utils"; import { defaultMainnetGenesisInfos, TxBuilder } from "../.."; import { defaultV3Costs } from "@harmoniclabs/cardano-costmodels-ts" +import { parseUPLC, showUPLC } from "@harmoniclabs/uplc"; test("Hello plu-ts",() => { @@ -11,6 +12,12 @@ test("Hello plu-ts",() => { fromHex("01010032323232323232322323259800800c5268b2ae686644b3001002800c5282ae693001329800991aba1357446ae8800400a003001800c0064601800300148888888c8cc966002600290004400e2b300130014800a20091598009800a400910058acc004c005200688034566002600290044401e2b300130014802a20111655cd1573455cd1573455cd15734370e6aae74004d55cf0009baa007134928ca6002e3e664664600e46ae80c0080040052f588eb8dd6191aba1357446ae88d5d11aba2357446ae88d5d11aba2001300435742005375c6ae84005222330093003001002244464664b300130014800220071598009800a400510048b2ae68ab9a1b8735573a0026aae78004dd500184cdc79bae300a0014890c48656c6c6f20706c752d7473003002001235573c6ea800488cc01484008888cc014008c00c0048cc00c852811119802980200109801800912cc00400a2946002ab9a18011111194c004c0100066006003002401866008006004444b3001001801c4cc008d5d08009aba2001555cf88c8c0088cc0080080048c0088cc0080080048d5d09aba200101") ); + console.log( + showUPLC( + parseUPLC( script.bytes ).body + ) + ); + const scriptAddr = Address.mainnet( Credential.script( script.hash ) ); @@ -63,4 +70,6 @@ test("Hello plu-ts",() => { changeAddress: myAddr }); + console.log( tx.body.fee ); + }) \ No newline at end of file diff --git a/packages/onchain/src/pluts/__tests__/docs.v3.hello.test.ts b/packages/onchain/src/pluts/__tests__/contract.docs.v3.hello.test.ts similarity index 94% rename from packages/onchain/src/pluts/__tests__/docs.v3.hello.test.ts rename to packages/onchain/src/pluts/__tests__/contract.docs.v3.hello.test.ts index 8756e852..f93f9d05 100644 --- a/packages/onchain/src/pluts/__tests__/docs.v3.hello.test.ts +++ b/packages/onchain/src/pluts/__tests__/contract.docs.v3.hello.test.ts @@ -31,7 +31,7 @@ test("hello pluts", () => { ); }); - const compiled = compile( contract ); + const compiled = compile( contract, [ 1, 0, 0 ] ); console.log( toHex( compiled ) ); }); \ No newline at end of file