Skip to content

Commit

Permalink
feat: rename trustless to smart-contract, sidechain to partner chains…
Browse files Browse the repository at this point in the history
…, remove load docker images commands
  • Loading branch information
LGLO authored Aug 22, 2024
1 parent 2597671 commit b668d84
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 47 deletions.
34 changes: 17 additions & 17 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
process-compose.url = "github:Platonic-Systems/process-compose-flake";
services-flake.url = "github:tgunnoe/services-flake";

# Sidechains deps
trustless-sidechain = {
# Partner Chains deps
smart-contracts = {
url = "github:input-output-hk/partner-chains-smart-contracts/v6.1.0";
flake = false;
};
Expand Down
6 changes: 2 additions & 4 deletions nix/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@
flake-compat = import inputs.flake-compat;
cardanoPackages = (flake-compat { src = inputs.cardano-node; }).defaultNix.packages.${system};
dbSyncPackages = (flake-compat { src = inputs.cardano-dbsync; }).defaultNix.packages.${system};
trustlessPkgs = (flake-compat { src = inputs.trustless-sidechain; }).defaultNix.packages.${system};
sidechain-main-cli-image = (flake-compat { src = inputs.trustless-sidechain; }).defaultNix._packages.${system}.sidechain-main-cli-image;
smartContractsPkgs = (flake-compat { src = inputs.smart-contracts; }).defaultNix.packages.${system};
cardanoExtraPkgs = (flake-compat { src = inputs.cardano-nix; }).defaultNix.packages.${system};

in {
packages = {
inherit sidechain-main-cli-image;
inherit (trustlessPkgs) sidechain-main-cli;
inherit (smartContractsPkgs) sidechain-main-cli;
inherit (cardanoPackages) cardano-node cardano-cli cardano-testnet;
inherit (dbSyncPackages) "cardano-db-sync:exe:cardano-db-sync";
kupo = cardanoExtraPkgs."kupo-${kupoVersion}";
Expand Down
34 changes: 10 additions & 24 deletions nix/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -102,36 +102,22 @@
];
}
{
category = "Sidechains";
category = "Partner Chains";
pkgs = [
{
name = "cardano-cli";
help = "CLI v9.1.0 that is used in sidechains dependency stack";
help = "CLI v9.1.0 that is used in partner-chains dependency stack";
# This command has some eval because of IFD
command = "${self'.packages.cardano-cli}/bin/cardano-cli $@";
}
{
name = "trustless-sidechain-cli-image:load:docker";
help = "Build and load the trustless sidechain cli image into docker";
command = ''
nix run ${self}#sidechain-main-cli-image.copyToDockerDaemon
'';
}
{
name = "trustless-sidechain-cli-image:load:podman";
help = "Build and load the trustless sidechain cli image into podman";
command = ''
nix run ${self}#sidechain-main-cli-image.copyToPodman
'';
}
];
}
];
extraCommands =
commands
++ self.lib.categorize [
{
category = "Sidechains";
category = "Partner Chains";
pkgs = [
{
name = "partnerchains-stack";
Expand All @@ -142,7 +128,7 @@
}
{
name = "sidechain-main-cli";
help = "CLI application to execute Trustless Sidechain Cardano endpoints";
help = "CLI to interact with Partner Chains Smart Contracts";
command = ''
${self'.packages.sidechain-main-cli}/bin/sidechain-main-cli $@
'';
Expand All @@ -153,26 +139,26 @@
in {
devshells.default = {
inherit packages env commands;
name = "Sidechains Substrate Node Devshell";
name = "Partner Chains Substrate Node Devshell";
};
devshells.process-compose = {
inherit packages env;
commands = extraCommands;
name = "Sidechains Substrate Node Devshell with whole stack";
name = "Partner Chains Substrate Node Devshell with whole stack";
};
devshells.trustless-sidechain = {
devshells.smart-contracts = {
inherit packages env;
commands = commands ++ [
{
category = "Sidechains";
category = "Partner Chains";
name = "sidechain-main-cli";
help = "CLI application to execute Trustless Sidechain Cardano endpoints";
help = "CLI to interact with Partner Chains Smart Contracts";
command = ''
${self'.packages.sidechain-main-cli}/bin/sidechain-main-cli $@
'';
}
];
name = "Sidechains Substrate Node Devshell with Trustless CLI";
name = "Partner Chains Substrate Node Devshell with Smart Contracts CLI";
};
};
}

0 comments on commit b668d84

Please sign in to comment.