Skip to content
This repository has been archived by the owner on Jun 24, 2024. It is now read-only.

Commit

Permalink
Separate out Nix code
Browse files Browse the repository at this point in the history
  • Loading branch information
@soareschen
soareschen committed Jan 19, 2024
1 parent cfb5473 commit 03d853f
Show file tree
Hide file tree
Showing 3 changed files with 202 additions and 175 deletions.
214 changes: 39 additions & 175 deletions flake.nix
View file
Original file line number Diff line number Diff line change
@@ -1,184 +1,48 @@
{
description = "Nix development dependencies for ibc-rs";

inputs = {
nixpkgs.url = github:nixos/nixpkgs/nixpkgs-unstable;
flake-utils.url = github:numtide/flake-utils;
rust-overlay.url = github:oxalica/rust-overlay;

};

outputs = inputs: let
utils = inputs.flake-utils.lib;
in
utils.eachSystem
[
"x86_64-linux"
]
(system: let
nixpkgs = import inputs.nixpkgs {
inherit system;
overlays = [
inputs.rust-overlay.overlays.default
];
};

rust-bin = nixpkgs.rust-bin.stable.latest.complete;

risc0-rust-tarball = builtins.fetchurl {
url = "https://github.com/risc0/rust/releases/download/test-release-2/rust-toolchain-x86_64-unknown-linux-gnu.tar.gz";
sha256 = "sha256:1nqgpx6ww0rla5c4jzam6fr43v6lf0flsj572racjqwq9xk86l4a";
};

risc0-rust = nixpkgs.stdenv.mkDerivation {
name = "risc0-rust";

unpackPhase = "true";

nativeBuildInputs = [
rust-bin
nixpkgs.zlib
nixpkgs.autoPatchelfHook
];

dontBuild = true;

installPhase = ''
mkdir -p $out
cd $out
tar xzf ${risc0-rust-tarball}
chmod +x bin/*
runHook postInstall
'';
};

rollup-guest-src = nixpkgs.stdenv.mkDerivation {
name = "rollup-guest-src";
src = ./.;
dontBuild = true;

installPhase = ''
mkdir -p $out
cp -r crates $out/
cp Cargo.toml constants.json $out/
'';
};

rollup-guest-mock = nixpkgs.rustPlatform.buildRustPackage {
name = "rollup-guest-mock";

src = rollup-guest-src;

sourceRoot = "rollup-guest-src/crates/provers/risc0/guest-mock";

cargoLock = {
lockFile = ./crates/provers/risc0/guest-mock/Cargo.lock;
outputHashes = {
"sov-accounts-0.3.0" = "sha256-Bmzo0xe1GdSKEIAyYx0PHhauNdVBMawOSSIflhdfi6U=";
"jmt-0.9.0" = "sha256-pq1v6FXS//6Dh+fdysQIVp+RVLHdXrW5aDx3263O1rs=";
"risc0-binfmt-0.19.1" = "sha256-Av3rpNhDny8FroOcn8eyvZcR8hFSNukA7n9impm1HHU=";
description = "Nix development dependencies for ibc-rs";

inputs = {
nixpkgs.url = github:nixos/nixpkgs/nixpkgs-unstable;

flake-utils.url = github:numtide/flake-utils;

rust-overlay.url = github:oxalica/rust-overlay;
};

outputs = inputs:
let
utils = inputs.flake-utils.lib;
in
utils.eachSystem
[
"x86_64-linux"
]
(system: let
nixpkgs = import inputs.nixpkgs {
inherit system;
overlays = [
inputs.rust-overlay.overlays.default
];
};
};

nativeBuildInputs = [
rust-bin
nixpkgs.lld
];

doCheck = false;

CONSTANTS_MANIFEST = rollup-guest-src;

buildPhase = ''
RUSTC=${risc0-rust}/bin/rustc \
CARGO_ENCODED_RUSTFLAGS=$'-C\x1fpasses=loweratomic\x1f-C\x1flink-arg=-Ttext=0x00200800\x1f-C\x1flink-arg=--fatal-warnings\x1f-C\x1fpanic=abort\x1f-C\x1flinker=lld' \
cargo build --release --target riscv32im-risc0-zkvm-elf -p guest-mock-starter
'';
rust-bin = nixpkgs.rust-bin.stable.latest.complete;

installPhase = ''
mkdir -p $out
cp target/riscv32im-risc0-zkvm-elf/release/mock_da $out/
'';
};

rollup-guest-celestia = nixpkgs.rustPlatform.buildRustPackage {
name = "rollup-guest-celestia";

src = rollup-guest-src;

sourceRoot = "rollup-guest-src/crates/provers/risc0/guest-celestia";

cargoLock = {
lockFile = ./crates/provers/risc0/guest-celestia/Cargo.lock;
outputHashes = {
"celestia-proto-0.1.0" = "sha256-iUgrctxdJUyhfrEQ0zoVj5AKIqgj/jQVNli5/K2nxK0=";
"jmt-0.9.0" = "sha256-pq1v6FXS//6Dh+fdysQIVp+RVLHdXrW5aDx3263O1rs=";
"nmt-rs-0.1.0" = "sha256-jcHbqyIKk8ZDDjSz+ot5YDxROOnrpM4TRmNFVfNniwU=";
"sov-accounts-0.3.0" = "sha256-Bmzo0xe1GdSKEIAyYx0PHhauNdVBMawOSSIflhdfi6U=";
"tendermint-0.32.0" = "sha256-FtY7a+hBvQryATrs3mykCWFRe8ABTT6cuf5oh9IBElQ=";
"risc0-binfmt-0.19.1" = "sha256-Av3rpNhDny8FroOcn8eyvZcR8hFSNukA7n9impm1HHU=";
risc0-rust-tarball = builtins.fetchurl {
url = "https://github.com/risc0/rust/releases/download/test-release-2/rust-toolchain-x86_64-unknown-linux-gnu.tar.gz";
sha256 = "sha256:1nqgpx6ww0rla5c4jzam6fr43v6lf0flsj572racjqwq9xk86l4a";
};
};

nativeBuildInputs = [
rust-bin
nixpkgs.lld
nixpkgs.protobuf
];

doCheck = false;

CONSTANTS_MANIFEST = rollup-guest-src;

buildPhase = ''
RUSTC=${risc0-rust}/bin/rustc \
CARGO_ENCODED_RUSTFLAGS=$'-C\x1fpasses=loweratomic\x1f-C\x1flink-arg=-Ttext=0x00200800\x1f-C\x1flink-arg=--fatal-warnings\x1f-C\x1fpanic=abort\x1f-C\x1flinker=lld' \
cargo build --release --target riscv32im-risc0-zkvm-elf -p sov-demo-prover-guest-celestia
'';

installPhase = ''
mkdir -p $out
cp target/riscv32im-risc0-zkvm-elf/release/rollup $out/
'';
};


rollup = nixpkgs.rustPlatform.buildRustPackage {
name = "sov-rollup-starter";

src = ./.;

cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"celestia-proto-0.1.0" = "sha256-iUgrctxdJUyhfrEQ0zoVj5AKIqgj/jQVNli5/K2nxK0=";
"jmt-0.9.0" = "sha256-pq1v6FXS//6Dh+fdysQIVp+RVLHdXrW5aDx3263O1rs=";
"nmt-rs-0.1.0" = "sha256-jcHbqyIKk8ZDDjSz+ot5YDxROOnrpM4TRmNFVfNniwU=";
"sov-accounts-0.3.0" = "sha256-Bmzo0xe1GdSKEIAyYx0PHhauNdVBMawOSSIflhdfi6U=";
"tendermint-0.32.0" = "sha256-FtY7a+hBvQryATrs3mykCWFRe8ABTT6cuf5oh9IBElQ=";
"bonsai-sdk-0.5.1" = "sha256-Av3rpNhDny8FroOcn8eyvZcR8hFSNukA7n9impm1HHU=";
risc0-rust = import ./nix/risc0.nix {
inherit nixpkgs rust-bin risc0-rust-tarball;
};
};

doCheck = false;
buildNoDefaultFeatures = true;
buildFeatures = [ "celestia_da" ];

PKG_CONFIG_PATH = "${nixpkgs.openssl.dev}/lib/pkgconfig";

ROLLUP_ELF_PATH = "${rollup-guest-celestia}/rollup";
CONSTANTS_MANIFEST = ./.;

nativeBuildInputs = [
nixpkgs.pkg-config
nixpkgs.protobuf
nixpkgs.rustPlatform.bindgenHook
];

};
in {
packages = {
inherit risc0-rust rollup rollup-guest-mock rollup-guest-celestia;
};
});
rollup-packages = import ./nix/rollup.nix {
inherit nixpkgs rust-bin risc0-rust;
};
in {
packages = {
inherit risc0-rust;
inherit (rollup-packages) rollup rollup-guest-mock rollup-guest-celestia;
};
});
}
29 changes: 29 additions & 0 deletions nix/risc0.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
nixpkgs
, rust-bin
, risc0-rust-tarball
}:
let
risc0-rust = nixpkgs.stdenv.mkDerivation {
name = "risc0-rust";

unpackPhase = "true";

nativeBuildInputs = [
rust-bin
nixpkgs.zlib
nixpkgs.autoPatchelfHook
];

dontBuild = true;

installPhase = ''
mkdir -p $out
cd $out
tar xzf ${risc0-rust-tarball}
chmod +x bin/*
runHook postInstall
'';
};
in
risc0-rust
134 changes: 134 additions & 0 deletions nix/rollup.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
{
nixpkgs
, rust-bin
, risc0-rust
}:
let
rollup-guest-src = nixpkgs.stdenv.mkDerivation {
name = "rollup-guest-src";
src = ../.;
dontBuild = true;

installPhase = ''
mkdir -p $out
cp -r crates $out/
cp Cargo.toml constants.json $out/
'';
};

rollup-guest-mock = nixpkgs.rustPlatform.buildRustPackage {
name = "rollup-guest-mock";

src = rollup-guest-src;

sourceRoot = "rollup-guest-src/crates/provers/risc0/guest-mock";

cargoLock = {
lockFile = ./crates/provers/risc0/guest-mock/Cargo.lock;
outputHashes = {
"sov-accounts-0.3.0" = "sha256-Bmzo0xe1GdSKEIAyYx0PHhauNdVBMawOSSIflhdfi6U=";
"jmt-0.9.0" = "sha256-pq1v6FXS//6Dh+fdysQIVp+RVLHdXrW5aDx3263O1rs=";
"risc0-binfmt-0.19.1" = "sha256-Av3rpNhDny8FroOcn8eyvZcR8hFSNukA7n9impm1HHU=";
};
};

nativeBuildInputs = [
rust-bin
nixpkgs.lld
];

doCheck = false;

CONSTANTS_MANIFEST = rollup-guest-src;

buildPhase = ''
RUSTC=${risc0-rust}/bin/rustc \
CARGO_ENCODED_RUSTFLAGS=$'-C\x1fpasses=loweratomic\x1f-C\x1flink-arg=-Ttext=0x00200800\x1f-C\x1flink-arg=--fatal-warnings\x1f-C\x1fpanic=abort\x1f-C\x1flinker=lld' \
cargo build --release --target riscv32im-risc0-zkvm-elf -p guest-mock-starter
'';

installPhase = ''
mkdir -p $out
cp target/riscv32im-risc0-zkvm-elf/release/mock_da $out/
'';
};

rollup-guest-celestia = nixpkgs.rustPlatform.buildRustPackage {
name = "rollup-guest-celestia";

src = rollup-guest-src;

sourceRoot = "rollup-guest-src/crates/provers/risc0/guest-celestia";

cargoLock = {
lockFile = ../crates/provers/risc0/guest-celestia/Cargo.lock;
outputHashes = {
"celestia-proto-0.1.0" = "sha256-iUgrctxdJUyhfrEQ0zoVj5AKIqgj/jQVNli5/K2nxK0=";
"jmt-0.9.0" = "sha256-pq1v6FXS//6Dh+fdysQIVp+RVLHdXrW5aDx3263O1rs=";
"nmt-rs-0.1.0" = "sha256-jcHbqyIKk8ZDDjSz+ot5YDxROOnrpM4TRmNFVfNniwU=";
"sov-accounts-0.3.0" = "sha256-Bmzo0xe1GdSKEIAyYx0PHhauNdVBMawOSSIflhdfi6U=";
"tendermint-0.32.0" = "sha256-FtY7a+hBvQryATrs3mykCWFRe8ABTT6cuf5oh9IBElQ=";
"risc0-binfmt-0.19.1" = "sha256-Av3rpNhDny8FroOcn8eyvZcR8hFSNukA7n9impm1HHU=";
};
};

nativeBuildInputs = [
rust-bin
nixpkgs.lld
nixpkgs.protobuf
];

doCheck = false;

CONSTANTS_MANIFEST = rollup-guest-src;

buildPhase = ''
RUSTC=${risc0-rust}/bin/rustc \
CARGO_ENCODED_RUSTFLAGS=$'-C\x1fpasses=loweratomic\x1f-C\x1flink-arg=-Ttext=0x00200800\x1f-C\x1flink-arg=--fatal-warnings\x1f-C\x1fpanic=abort\x1f-C\x1flinker=lld' \
cargo build --release --target riscv32im-risc0-zkvm-elf -p sov-demo-prover-guest-celestia
'';

installPhase = ''
mkdir -p $out
cp target/riscv32im-risc0-zkvm-elf/release/rollup $out/
'';
};


rollup = nixpkgs.rustPlatform.buildRustPackage {
name = "sov-rollup-starter";

src = ../.;

cargoLock = {
lockFile = ../Cargo.lock;
outputHashes = {
"celestia-proto-0.1.0" = "sha256-iUgrctxdJUyhfrEQ0zoVj5AKIqgj/jQVNli5/K2nxK0=";
"jmt-0.9.0" = "sha256-pq1v6FXS//6Dh+fdysQIVp+RVLHdXrW5aDx3263O1rs=";
"nmt-rs-0.1.0" = "sha256-jcHbqyIKk8ZDDjSz+ot5YDxROOnrpM4TRmNFVfNniwU=";
"sov-accounts-0.3.0" = "sha256-Bmzo0xe1GdSKEIAyYx0PHhauNdVBMawOSSIflhdfi6U=";
"tendermint-0.32.0" = "sha256-FtY7a+hBvQryATrs3mykCWFRe8ABTT6cuf5oh9IBElQ=";
"bonsai-sdk-0.5.1" = "sha256-Av3rpNhDny8FroOcn8eyvZcR8hFSNukA7n9impm1HHU=";
};
};

doCheck = false;
buildNoDefaultFeatures = true;
buildFeatures = [ "celestia_da" ];

PKG_CONFIG_PATH = "${nixpkgs.openssl.dev}/lib/pkgconfig";

ROLLUP_ELF_PATH = "${rollup-guest-celestia}/rollup";
CONSTANTS_MANIFEST = ../.;

nativeBuildInputs = [
nixpkgs.pkg-config
nixpkgs.protobuf
nixpkgs.rustPlatform.bindgenHook
];

};
in
{
inherit rollup rollup-guest-celestia rollup-guest-mock;
}

0 comments on commit 03d853f

Please sign in to comment.