Skip to content

Commit 8a69907

Browse files
sjoerdvisschersjoerdvisscher
committed
Bump sc-tools
1 parent 3164887 commit 8a69907

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+197
-461
lines changed

‎.github/workflows/ci-compiled-scripts.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
2222
- name: Install system dependencies
2323
uses: input-output-hk/actions/base@latest
24-
24+
2525
- name: Install nix
2626
uses: cachix/install-nix-action@v27
2727

@@ -51,5 +51,5 @@ jobs:
5151
cabal run export-smart-tokens ./generated/scripts/preview 08a8d0bb8717839931b0a594f7c28b0a3b7c78f6e9172e977e250eab7637d879.0 08a8d0bb8717839931b0a594f7c28b0a3b7c78f6e9172e977e250eab7637d879.0 '"addr_test1qq986m3uel86pl674mkzneqtycyg7csrdgdxj6uf7v7kd857kquweuh5kmrj28zs8czrwkl692jm67vna2rf7xtafhpqk3hecm"'
5252
cabal run export-smart-tokens ./generated/scripts/mainnet b1977c1eb33590ca1311384ab68cd36209832213ad4483feb8a1b7cb64828946.0 b1977c1eb33590ca1311384ab68cd36209832213ad4483feb8a1b7cb64828946.0 '"addr_test1qq986m3uel86pl674mkzneqtycyg7csrdgdxj6uf7v7kd857kquweuh5kmrj28zs8czrwkl692jm67vna2rf7xtafhpqk3hecm"'
5353
cabal run write-openapi-schema -- generated/openapi/schema.json
54-
nix develop --accept-flake-config --command bash -c "aiken build src/examples/aiken/aiken --out ./src/examples/aiken/haskell/data/aiken-scripts.json"
54+
nix run github:aiken-lang/aiken/v1.1.19#aiken -- build src/examples/aiken/aiken --out ./src/examples/aiken/haskell/data/aiken-scripts.json
5555
git diff --quiet

‎.github/workflows/ci-nix.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,7 @@ jobs:
5757
- name: nix flake check
5858
run: nix flake --accept-flake-config check
5959
- name: Check aiken
60-
run: nix develop --accept-flake-config --command bash -c "cd src/examples/aiken/aiken && aiken build && aiken check"
60+
run: |
61+
cd src/examples/aiken/aiken
62+
nix run github:aiken-lang/aiken/v1.1.19#aiken -- build
63+
nix run github:aiken-lang/aiken/v1.1.19#aiken -- check

‎cabal.project‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,8 @@ repository cardano-haskell-packages
1515
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
1616

1717
index-state:
18-
, hackage.haskell.org 2025-04-15T08:13:08Z
19-
, cardano-haskell-packages 2025-04-11T16:42:25Z
20-
21-
constraints:
22-
plutus-core == 1.40.0.0,
23-
plutus-ledger-api == 1.40.0.0
24-
25-
allow-newer:
26-
*:plutus-core,
27-
*:plutus-ledger-api,
28-
29-
allow-older:
30-
-- NOTE: Currently, plutarch depends on plutus-core version 1.40, while the rest of the (cardano) world is at 1.37.
31-
-- TODO: Delete when plutarch is moving to 1.37
32-
plutarch:plutus-core
18+
, hackage.haskell.org 2025-08-14T14:31:31Z
19+
, cardano-haskell-packages 2025-08-14T14:31:31Z
3320

3421
with-compiler: ghc-9.6.6
3522

@@ -40,11 +27,29 @@ packages:
4027
src/examples/regulated-stablecoin
4128
src/examples/aiken/haskell
4229

30+
constraints:
31+
cardano-api == 10.17.2.0
32+
, plutus-core == 1.51.0.0
33+
, plutus-ledger-api == 1.51.0.0
34+
, quickcheck-dynamic == 3.4.2
35+
36+
allow-older:
37+
*:cardano-api
38+
, *:plutus-core
39+
, *:plutus-ledger-api
40+
, *:QuickCheck
41+
42+
allow-newer:
43+
*:cardano-api
44+
, *:plutus-core
45+
, *:plutus-ledger-api
46+
, *:QuickCheck
47+
4348
source-repository-package
4449
type: git
4550
location: https://github.com/j-mueller/sc-tools
46-
tag: 100452e6b64200cdffcb2582be07c47e1efebb6b
47-
--sha256: sha256-65swdL2zk1mbqdjten6SIX/2v8tADOX4AhzyE0ocpwY=
51+
tag: 1240643dbb8af5df075f4b1894a672744e733a7f
52+
--sha256: sha256-Jqj4DHEsXBrTSZSWqFiGKCNXwavOd2kAAFb8cPNZdgs=
4853
subdir:
4954
src/devnet
5055
src/coin-selection
@@ -58,9 +63,9 @@ source-repository-package
5863

5964
source-repository-package
6065
type: git
61-
location: https://github.com/Plutonomicon/plutarch-plutus
62-
tag: f84a46287b06f36abf8d2d63bec7ff75d32f3e91
63-
--sha256: sha256-gKBk9D6DHSEudq7P9+07yXWcgM/QX7NFp0tJXBodopM=
66+
location: https://github.com/choener/plutarch-plutus
67+
tag: 99315dada86e042bbc1dee5c5ccae158119031eb
68+
--sha256: sha256-kgjYtDcqqEsF61QqK5eoxwL4Gbj9A0tAAqw6xH01NB0=
6469
subdir:
6570
.
6671
plutarch-ledger-api
@@ -70,8 +75,8 @@ source-repository-package
7075
source-repository-package
7176
type: git
7277
location: https://github.com/input-output-hk/catalyst-onchain-libs
73-
tag: 2d8389099584e2d9735e9374895386c72d90517a
74-
--sha256: sha256-sdeDXUiL1MbEtJYbN4URwpQ8CbUKjxxGXUxjj1qqi3E=
78+
tag: 6c7156c441c18b2c76066eae1cce1578190c9cfd
79+
--sha256: sha256-bGf20nAEeMJ3iajMqRBN88BQSMVTXecXl6CztHiZUtA=
7580
subdir:
7681
src/plutarch-onchain-lib
7782

‎flake.lock‎

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
};
4141

4242
aiken = {
43-
url = "github:aiken-lang/aiken/v1.1.16";
43+
url = "github:aiken-lang/aiken/v1.1.19";
4444
inputs.nixpkgs.follows = "nixpkgs";
4545
};
4646
};
@@ -57,11 +57,13 @@
5757
"https://cache.iog.io"
5858
"https://cache.zw3rk.com"
5959
"https://cache.ml42.de"
60+
"https://sc-tools.cachix.org"
6061
];
6162
extra-trusted-public-keys = [
6263
"hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
6364
"loony-tools:pr9m4BkM/5/eSTZlkQyRt57Jz7OMBxNSUiMC4FkcNfk="
6465
"cache.ml42.de:RKmSRP9TOc87nh9FZCM/b/pMIE3kBLEeIe71ReCBwRM="
66+
"sc-tools.cachix.org-1:DY2+6v0HuMvoCt7wEqZTPqzZBcNk/Lexb72Vixz6n6I="
6567
];
6668
allow-import-from-derivation = true;
6769
};

‎src/examples/aiken/haskell/aiken-example.cabal‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ common lang
5555
library
5656
import: lang
5757
exposed-modules:
58-
Wst.Aiken.Blueprint
59-
Wst.Aiken.BlueprintKey
6058
Wst.Aiken.Error
6159
Wst.Aiken.Offchain
6260
Wst.Cli
@@ -69,21 +67,17 @@ library
6967
, base
7068
, base16-bytestring
7169
, Blammo
72-
, blockfrost-api
7370
, blockfrost-client-core
7471
, bytestring
7572
, cardano-api
76-
, containers
7773
, convex-base
7874
, convex-blockfrost
7975
, convex-coin-selection
8076
, convex-optics
8177
, convex-wallet
82-
, hset
8378
, lens
8479
, mtl
8580
, optparse-applicative
86-
, plutus-core
8781
, plutus-ledger-api
8882
, programmable-tokens-offchain
8983
, programmable-tokens-onchain
@@ -99,7 +93,6 @@ test-suite aiken-example-test
9993
, aiken-example
10094
, base >=4.14.0
10195
, cardano-api
102-
, containers
10396
, convex-base
10497
, convex-coin-selection
10598
, convex-wallet

‎src/examples/aiken/haskell/data/aiken-scripts.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"plutusVersion": "v3",
77
"compiler": {
88
"name": "Aiken",
9-
"version": "v1.1.9+unknown"
9+
"version": "v1.1.19+e525483"
1010
},
1111
"license": "Apache-2.0"
1212
},
@@ -19,16 +19,16 @@
1919
"$ref": "#/definitions/Int"
2020
}
2121
},
22-
"compiledCode": "5857010100323232323225333002323232323253330073370e900218041baa0011323370e6eb400d20c801300a300937540022940c024c02800cc020008c01c008c01c004c010dd50008a4c26cacae6955ceaab9e5742ae881",
23-
"hash": "0f8107a024cfbc7e5e787d67acddcec748ceb280fcc4b14c305e6a2d"
22+
"compiledCode": "585701010029800aba2aba1aab9eaab9dab9a4888896600264646644b30013370e900218031baa00289919b87375a6012008906400980418039baa0028a504014600c600e002600c004600c00260066ea801a29344d9590011",
23+
"hash": "a82718805c3541469346431c0cc023a76afce8d6d2c1c64d00bf1950"
2424
},
2525
{
2626
"title": "transfer.issue.else",
2727
"redeemer": {
2828
"schema": {}
2929
},
30-
"compiledCode": "5857010100323232323225333002323232323253330073370e900218041baa0011323370e6eb400d20c801300a300937540022940c024c02800cc020008c01c008c01c004c010dd50008a4c26cacae6955ceaab9e5742ae881",
31-
"hash": "0f8107a024cfbc7e5e787d67acddcec748ceb280fcc4b14c305e6a2d"
30+
"compiledCode": "585701010029800aba2aba1aab9eaab9dab9a4888896600264646644b30013370e900218031baa00289919b87375a6012008906400980418039baa0028a504014600c600e002600c004600c00260066ea801a29344d9590011",
31+
"hash": "a82718805c3541469346431c0cc023a76afce8d6d2c1c64d00bf1950"
3232
},
3333
{
3434
"title": "transfer.transfer.withdraw",
@@ -38,16 +38,16 @@
3838
"$ref": "#/definitions/Int"
3939
}
4040
},
41-
"compiledCode": "5857010100323232323225333002323232323253330073370e900218041baa0011323370e6eb400d209003300a300937540022940c024c02800cc020008c01c008c01c004c010dd50008a4c26cacae6955ceaab9e5742ae881",
42-
"hash": "17e9e9e3412e7198877557fab1181f394ed36cf5db27b418d3f68990"
41+
"compiledCode": "585701010029800aba2aba1aab9eaab9dab9a4888896600264646644b30013370e900218031baa00289919b87375a6012008904801980418039baa0028a504014600c600e002600c004600c00260066ea801a29344d9590011",
42+
"hash": "93fd90884c772ced27987503f9d37c857372b99cf5cc716197ebb8bd"
4343
},
4444
{
4545
"title": "transfer.transfer.else",
4646
"redeemer": {
4747
"schema": {}
4848
},
49-
"compiledCode": "5857010100323232323225333002323232323253330073370e900218041baa0011323370e6eb400d209003300a300937540022940c024c02800cc020008c01c008c01c004c010dd50008a4c26cacae6955ceaab9e5742ae881",
50-
"hash": "17e9e9e3412e7198877557fab1181f394ed36cf5db27b418d3f68990"
49+
"compiledCode": "585701010029800aba2aba1aab9eaab9dab9a4888896600264646644b30013370e900218031baa00289919b87375a6012008904801980418039baa0028a504014600c600e002600c004600c00260066ea801a29344d9590011",
50+
"hash": "93fd90884c772ced27987503f9d37c857372b99cf5cc716197ebb8bd"
5151
}
5252
],
5353
"definitions": {

0 commit comments

Comments
 (0)