From 375109c4ede9adc695a31d8075f0654b186cf797 Mon Sep 17 00:00:00 2001 From: thedavidmeister Date: Sun, 7 Jan 2024 21:12:21 +0400 Subject: [PATCH] fix ci prep --- .github/workflows/rainix.yaml | 2 +- flake.lock | 84 +++++++++++++++++------------------ flake.nix | 15 +++---- 3 files changed, 50 insertions(+), 51 deletions(-) diff --git a/.github/workflows/rainix.yaml b/.github/workflows/rainix.yaml index 62f6f9995..6900f9b50 100644 --- a/.github/workflows/rainix.yaml +++ b/.github/workflows/rainix.yaml @@ -27,4 +27,4 @@ jobs: - uses: DeterminateSystems/magic-nix-cache-action@v2 - run: nix run .#ci-prep - - run: nix run github:rainlanguage/rainix#${{ matrix.task }} \ No newline at end of file + - run: nix run .#${{ matrix.task }} \ No newline at end of file diff --git a/flake.lock b/flake.lock index a765d7066..ee068ec7b 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -37,15 +37,12 @@ } }, "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -55,12 +52,15 @@ } }, "flake-utils_4": { + "inputs": { + "systems": "systems_3" + }, "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1687171271, + "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", "type": "github" }, "original": { @@ -89,8 +89,8 @@ }, "foundry": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1704568627, @@ -109,7 +109,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1686572087, @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687518131, - "narHash": "sha256-KirltRIc4SFfk8bTNudIqgKAALH5oqpW3PefmkfWK5M=", + "lastModified": 1666753130, + "narHash": "sha256-Wff1dGPFSneXJLI2c0kkdWTgxnQ416KE6X4KnFkgPYQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d8a93602bc54ece7a4e689d9aea1a574e2bbc24", + "rev": "f540aeda6f677354f1e7144ab04352f61aaa0118", "type": "github" }, "original": { @@ -141,27 +141,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1687518131, - "narHash": "sha256-KirltRIc4SFfk8bTNudIqgKAALH5oqpW3PefmkfWK5M=", - "owner": "NixOS", + "lastModified": 1699343069, + "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "3d8a93602bc54ece7a4e689d9aea1a574e2bbc24", + "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", "repo": "nixpkgs", + "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1666753130, - "narHash": "sha256-Wff1dGPFSneXJLI2c0kkdWTgxnQ416KE6X4KnFkgPYQ=", + "lastModified": 1687518131, + "narHash": "sha256-KirltRIc4SFfk8bTNudIqgKAALH5oqpW3PefmkfWK5M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f540aeda6f677354f1e7144ab04352f61aaa0118", + "rev": "3d8a93602bc54ece7a4e689d9aea1a574e2bbc24", "type": "github" }, "original": { @@ -171,17 +171,17 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1699343069, - "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", - "owner": "nixos", + "lastModified": 1687518131, + "narHash": "sha256-KirltRIc4SFfk8bTNudIqgKAALH5oqpW3PefmkfWK5M=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", + "rev": "3d8a93602bc54ece7a4e689d9aea1a574e2bbc24", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", "type": "github" } }, @@ -203,9 +203,9 @@ }, "rain": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_4", "naersk": "naersk", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1700476138, @@ -224,30 +224,30 @@ }, "rainix": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "foundry": "foundry", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", + "rain": "rain", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1704640612, - "narHash": "sha256-mXDlDyRUQ0n0e+WKCP4qVYJv/qcmUvkwZmol//cCGSI=", + "lastModified": 1704647295, + "narHash": "sha256-+8GH3wSGEMFLJOp6wv1E69yQOI4pNk6PUX9eztcdLqk=", "owner": "rainprotocol", "repo": "rainix", - "rev": "9e945f33349606c12f71559f947473766ed3f922", + "rev": "49f820b308eda51ea5d1f9697e85012004f1cf05", "type": "github" }, "original": { "owner": "rainprotocol", "repo": "rainix", - "rev": "9e945f33349606c12f71559f947473766ed3f922", + "rev": "49f820b308eda51ea5d1f9697e85012004f1cf05", "type": "github" } }, "root": { "inputs": { "flake-utils": "flake-utils", - "rain": "rain", "rainix": "rainix" } }, diff --git a/flake.nix b/flake.nix index f6f7239c3..6c51f1150 100644 --- a/flake.nix +++ b/flake.nix @@ -2,33 +2,32 @@ description = "Flake for development workflows."; inputs = { - rain.url = "github:rainprotocol/rain.cli/6a912680be6d967fd6114aafab793ebe8503d27b"; - rainix.url = "github:rainprotocol/rainix/9e945f33349606c12f71559f947473766ed3f922"; + rainix.url = "github:rainprotocol/rainix/49f820b308eda51ea5d1f9697e85012004f1cf05"; flake-utils.url = "github:numtide/flake-utils"; }; - outputs = {self, flake-utils, rainix, rain }: + outputs = {self, flake-utils, rainix }: flake-utils.lib.eachDefaultSystem (system: let pkgs = rainix.pkgs.${system}; - rain-bin = "${rain.defaultPackage.${system}}/bin/rain"; in rec { packages = rec { concrete-contracts = ["OrderBook" "GenericPoolOrderBookV3FlashBorrower" "GenericPoolOrderBookV3ArbOrderTaker" "RouteProcessorOrderBookV3ArbOrderTaker"]; build-meta-cmd = contract: '' - ${rain-bin} meta build \ - -i <(${rain-bin} meta solc artifact -c abi -i out/${contract}.sol/${contract}.json) -m solidity-abi-v2 -t json -e deflate -l en \ + rain meta build \ + -i <(rain meta solc artifact -c abi -i out/${contract}.sol/${contract}.json) -m solidity-abi-v2 -t json -e deflate -l en \ -i src/concrete/${contract}.meta.json -m interpreter-caller-meta-v1 -t json -e deflate -l en \ ''; build-single-meta = contract: '' ${(build-meta-cmd contract)} -o meta/${contract}.rain.meta; ''; - build-meta = pkgs.writeShellScriptBin "build-meta" ('' + + build-meta = rainix.mkTask.${system} { name = "build-meta"; body = ('' set -x; mkdir -p meta; forge build --force; - '' + pkgs.lib.concatStrings (map build-single-meta concrete-contracts)); + '' + pkgs.lib.concatStrings (map build-single-meta concrete-contracts)); }; deploy-single-contract = contract: '' forge script script/Deploy${contract}.sol:Deploy${contract} --legacy --verify --broadcast --rpc-url "''${CI_DEPLOY_RPC_URL}" --etherscan-api-key "''${EXPLORER_VERIFICATION_KEY}" \