From 291f123ff4b2889e5f747d68b17a67065ce35b9c Mon Sep 17 00:00:00 2001 From: kayvank Date: Mon, 23 Sep 2024 07:21:15 -0700 Subject: [PATCH 1/4] nixify Add nix related artifacts to make project build in nixos --- .gitignore | 7 ++- flake.lock | 146 ++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 87 ++++++++++++++++++++++++++ package-lock.json | 48 +++++++++------ rust-toolchain.toml | 14 +++++ 5 files changed, 283 insertions(+), 19 deletions(-) create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 rust-toolchain.toml diff --git a/.gitignore b/.gitignore index 47cc9e32..980c8f84 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,11 @@ dist/ # Ignore environment-specific files .env +# Ignore nixos related environment-specific files +.envrc +.cargo/ +.direnv/ + # Ignore editor-specific files .vscode/ .idea/ @@ -25,4 +30,4 @@ target/ debug/ yarn.lock -contracts/deployments/ \ No newline at end of file +contracts/deployments/ diff --git a/flake.lock b/flake.lock new file mode 100644 index 00000000..96d4e60a --- /dev/null +++ b/flake.lock @@ -0,0 +1,146 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "foundry": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1725354688, + "narHash": "sha256-KHHFemVt6C/hbGoMzIq7cpxmjdp+KZVZaqbvx02aliY=", + "owner": "shazow", + "repo": "foundry.nix", + "rev": "671672bd60a0d2e5f6757638fdf27e806df755a4", + "type": "github" + }, + "original": { + "owner": "shazow", + "ref": "monthly", + "repo": "foundry.nix", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1666753130, + "narHash": "sha256-Wff1dGPFSneXJLI2c0kkdWTgxnQ416KE6X4KnFkgPYQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f540aeda6f677354f1e7144ab04352f61aaa0118", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1726755586, + "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "owner": "NixOs", + "repo": "nixpkgs", + "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "type": "github" + }, + "original": { + "owner": "NixOs", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1718428119, + "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "foundry": "foundry", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1726972233, + "narHash": "sha256-FlL/bNESOtDQoczRhmPfReNAmLqVg+dAX4HectPOOf0=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "36d73192555e569d27579f6c486fea3ab768823c", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 00000000..16eb3a71 --- /dev/null +++ b/flake.nix @@ -0,0 +1,87 @@ +{ + description = "ethereum-rs project"; + inputs = { + nixpkgs.url = "github:NixOs/nixpkgs/nixos-unstable"; + rust-overlay.url = "github:oxalica/rust-overlay"; + flake-utils.url = "github:numtide/flake-utils"; + foundry.url = "github:shazow/foundry.nix/monthly"; # Use monthly branch for permanent releases + + }; + outputs = { self, nixpkgs, rust-overlay, flake-utils, foundry, ... }@inputs: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + inherit system; + overlays = [ rust-overlay.overlays.default foundry.overlay ]; + }; + + toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; + cargoTomlContents = builtins.readFile ./Cargo.toml; + version = (builtins.fromTOML cargoTomlContents).package.version; + + ethereumEs = pkgs.rustPlatform.buildRustPackage { + inherit version; + name = "ethereumEs"; + buildInputs = with pkgs; [ openssl ]; + nativeBuildInputs = with pkgs; [ pkg-config openssl.dev ]; + + src = pkgs.lib.cleanSourceWith { src = self; }; + + cargoLock.lockFile = ./Cargo.lock; + + GIT_COMMIT_HASH_SHORT = self.shortRev or "unknown"; + + }; + + packages = { + ethereumEs = ethereumEs; + default = packages.ethereumEs; + }; + + overlays.default = final: prev: { ethereumEs = packages.ethereumEs; }; + + gitRev = if (builtins.hasAttr "rev" self) then self.rev else "dirty"; + in { + inherit packages overlays; + + devShells.default = pkgs.mkShell { + buildInputs = with pkgs; [ + foundry-bin + + solc + + toolchain + openssl + cargo-insta + pkg-config + eza + rust-analyzer-unwrapped + + nodejs + nodePackages.typescript + nodePackages.typescript-language-server + + docker + watchexec + cowsay + ]; + shellHook = '' + alias ls=eza + alias find=fd + echo "hello-world-avs" | cowsay + + export RUST_SRC_PATH="${toolchain}/lib/rustlib/src/rust/library" + export CARGO_HOME="$(pwd)/.cargo" + export PATH="$CARGO_HOME/bin:$PATH" + export RUST_BACKTRACE=1 + export CARGO_NET_GIT_FETCH_WITH_CLI=true + export ETH_RPC_URL='127.0.0.1:8545' + export ETHERSCAN_API_KEY='11' + cargo install cargo-expand + cargo install --version 0.5.7 sqlx-cli --no-default-features --features postgres + # cargo install cargo-udeps ## lets not do this till we ready for prod + cargo install bunyan + ''; + }; + }); +} diff --git a/package-lock.json b/package-lock.json index 01adff19..19e2e67f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,8 @@ "node_modules/@adraffy/ens-normalize": { "version": "1.10.1", "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.10.1.tgz", - "integrity": "sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw==" + "integrity": "sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw==", + "license": "MIT" }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", @@ -67,6 +68,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz", "integrity": "sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==", + "license": "MIT", "dependencies": { "@noble/hashes": "1.3.2" }, @@ -78,6 +80,7 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz", "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==", + "license": "MIT", "engines": { "node": ">= 16" }, @@ -114,12 +117,13 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "20.12.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz", - "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==", + "version": "20.16.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz", + "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==", "dev": true, + "license": "MIT", "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.19.2" } }, "node_modules/acorn": { @@ -136,9 +140,9 @@ } }, "node_modules/acorn-walk": { - "version": "8.3.3", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz", - "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==", + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", "dev": true, "license": "MIT", "dependencies": { @@ -151,7 +155,8 @@ "node_modules/aes-js": { "version": "4.0.0-beta.5", "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-4.0.0-beta.5.tgz", - "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==" + "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==", + "license": "MIT" }, "node_modules/arg": { "version": "4.1.3", @@ -181,6 +186,7 @@ "version": "10.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "license": "BSD-2-Clause", "engines": { "node": ">=10" } @@ -199,6 +205,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@adraffy/ens-normalize": "1.10.1", "@noble/curves": "1.2.0", @@ -215,7 +222,8 @@ "node_modules/ethers/node_modules/@types/node": { "version": "18.15.13", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz", - "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==" + "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==", + "license": "MIT" }, "node_modules/make-error": { "version": "1.3.6", @@ -271,13 +279,15 @@ "node_modules/tslib": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", + "license": "0BSD" }, "node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", + "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -287,10 +297,11 @@ } }, "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "dev": true, + "license": "MIT" }, "node_modules/v8-compile-cache-lib": { "version": "3.0.1", @@ -303,6 +314,7 @@ "version": "8.17.1", "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", + "license": "MIT", "engines": { "node": ">=10.0.0" }, diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 00000000..af441597 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,14 @@ +[toolchain] +channel = "nightly" +components = [ + "cargo", + "clippy", + "rust-analyzer", + "rust-src", + "rust-std", + "rustc-dev", + "rustc", + "rustfmt", +] +targets = [ "wasm32-unknown-unknown" ] +profile = "minimal" From 488bb05f0e4e6bcd3cef79517fec20870be8e9de Mon Sep 17 00:00:00 2001 From: kayvank Date: Fri, 11 Oct 2024 18:34:19 -0700 Subject: [PATCH 2/4] nixfy Add nix related artifacts such that we can create a development environment for nixos uses --- flake.nix | 134 ++++++++++++++++++++-------------------------- package-lock.json | 48 +++++++---------- 2 files changed, 76 insertions(+), 106 deletions(-) diff --git a/flake.nix b/flake.nix index 16eb3a71..8bd441d5 100644 --- a/flake.nix +++ b/flake.nix @@ -8,80 +8,62 @@ }; outputs = { self, nixpkgs, rust-overlay, flake-utils, foundry, ... }@inputs: - flake-utils.lib.eachDefaultSystem (system: - let - pkgs = import nixpkgs { - inherit system; - overlays = [ rust-overlay.overlays.default foundry.overlay ]; - }; - - toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; - cargoTomlContents = builtins.readFile ./Cargo.toml; - version = (builtins.fromTOML cargoTomlContents).package.version; - - ethereumEs = pkgs.rustPlatform.buildRustPackage { - inherit version; - name = "ethereumEs"; - buildInputs = with pkgs; [ openssl ]; - nativeBuildInputs = with pkgs; [ pkg-config openssl.dev ]; - - src = pkgs.lib.cleanSourceWith { src = self; }; - - cargoLock.lockFile = ./Cargo.lock; - - GIT_COMMIT_HASH_SHORT = self.shortRev or "unknown"; - - }; - - packages = { - ethereumEs = ethereumEs; - default = packages.ethereumEs; - }; - - overlays.default = final: prev: { ethereumEs = packages.ethereumEs; }; - - gitRev = if (builtins.hasAttr "rev" self) then self.rev else "dirty"; - in { - inherit packages overlays; - - devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ - foundry-bin - - solc - - toolchain - openssl - cargo-insta - pkg-config - eza - rust-analyzer-unwrapped - - nodejs - nodePackages.typescript - nodePackages.typescript-language-server - - docker - watchexec - cowsay - ]; - shellHook = '' - alias ls=eza - alias find=fd - echo "hello-world-avs" | cowsay - - export RUST_SRC_PATH="${toolchain}/lib/rustlib/src/rust/library" - export CARGO_HOME="$(pwd)/.cargo" - export PATH="$CARGO_HOME/bin:$PATH" - export RUST_BACKTRACE=1 - export CARGO_NET_GIT_FETCH_WITH_CLI=true - export ETH_RPC_URL='127.0.0.1:8545' - export ETHERSCAN_API_KEY='11' - cargo install cargo-expand - cargo install --version 0.5.7 sqlx-cli --no-default-features --features postgres - # cargo install cargo-udeps ## lets not do this till we ready for prod - cargo install bunyan - ''; - }; - }); + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + inherit system; + overlays = [ rust-overlay.overlays.default foundry.overlay ]; + }; + + toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; + cargoTomlContents = builtins.readFile ./Cargo.toml; + version = (builtins.fromTOML cargoTomlContents).package.version; + + ethereumEs = pkgs.rustPlatform.buildRustPackage { + inherit version; + name = "ethereumEs"; + buildInputs = with pkgs; [ openssl ]; + nativeBuildInputs = with pkgs; [ pkg-config openssl.dev ]; + + src = pkgs.lib.cleanSourceWith { src = self; }; + + cargoLock.lockFile = ./Cargo.lock; + + # GIT_COMMIT_HASH_SHORT = self.shortRev or "unknown"; + + }; + in { + + overlays.default = final: prev: { ethereumEs = ethereumEs; }; + + gitRev = if (builtins.hasAttr "rev" self) then self.rev else "dirty"; + + devShells.default = pkgs.mkShell { + buildInputs = with pkgs; [ + foundry-bin + solc + toolchain + openssl + cargo-insta + pkg-config + eza + rust-analyzer-unwrapped + nodejs_20 + nodePackages.typescript + nodePackages.typescript-language-server + watchexec + ]; + shellHook = '' + export RUST_SRC_PATH="${toolchain}/lib/rustlib/src/rust/library" + export CARGO_HOME="$(pwd)/.cargo" + export PATH="$CARGO_HOME/bin:$PATH" + export RUST_BACKTRACE=1 + export CARGO_NET_GIT_FETCH_WITH_CLI=true + export ETH_RPC_URL='127.0.0.1:8545' + export ETHERSCAN_API_KEY='fake-key' + export HOLESKY_PRIVATE_KEY='fake-key' + export PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 + ''; + }; + }); } diff --git a/package-lock.json b/package-lock.json index 19e2e67f..01adff19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,8 +20,7 @@ "node_modules/@adraffy/ens-normalize": { "version": "1.10.1", "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.10.1.tgz", - "integrity": "sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw==", - "license": "MIT" + "integrity": "sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw==" }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", @@ -68,7 +67,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz", "integrity": "sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==", - "license": "MIT", "dependencies": { "@noble/hashes": "1.3.2" }, @@ -80,7 +78,6 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz", "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==", - "license": "MIT", "engines": { "node": ">= 16" }, @@ -117,13 +114,12 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "20.16.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz", - "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==", + "version": "20.12.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz", + "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==", "dev": true, - "license": "MIT", "dependencies": { - "undici-types": "~6.19.2" + "undici-types": "~5.26.4" } }, "node_modules/acorn": { @@ -140,9 +136,9 @@ } }, "node_modules/acorn-walk": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", - "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", + "version": "8.3.3", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz", + "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==", "dev": true, "license": "MIT", "dependencies": { @@ -155,8 +151,7 @@ "node_modules/aes-js": { "version": "4.0.0-beta.5", "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-4.0.0-beta.5.tgz", - "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==", - "license": "MIT" + "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==" }, "node_modules/arg": { "version": "4.1.3", @@ -186,7 +181,6 @@ "version": "10.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", - "license": "BSD-2-Clause", "engines": { "node": ">=10" } @@ -205,7 +199,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@adraffy/ens-normalize": "1.10.1", "@noble/curves": "1.2.0", @@ -222,8 +215,7 @@ "node_modules/ethers/node_modules/@types/node": { "version": "18.15.13", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz", - "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==", - "license": "MIT" + "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==" }, "node_modules/make-error": { "version": "1.3.6", @@ -279,15 +271,13 @@ "node_modules/tslib": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", - "license": "0BSD" + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" }, "node_modules/typescript": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", - "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", "dev": true, - "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -297,11 +287,10 @@ } }, "node_modules/undici-types": { - "version": "6.19.8", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", - "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", - "dev": true, - "license": "MIT" + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true }, "node_modules/v8-compile-cache-lib": { "version": "3.0.1", @@ -314,7 +303,6 @@ "version": "8.17.1", "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", - "license": "MIT", "engines": { "node": ">=10.0.0" }, From cc981797385478da24e05eb2fb15636b484c6aff Mon Sep 17 00:00:00 2001 From: kayvank Date: Wed, 16 Oct 2024 07:37:36 -0700 Subject: [PATCH 3/4] nixify simplify rust toolchain --- flake.nix | 3 +-- rust-toolchain.toml | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 8bd441d5..d2a3aed8 100644 --- a/flake.nix +++ b/flake.nix @@ -29,8 +29,6 @@ cargoLock.lockFile = ./Cargo.lock; - # GIT_COMMIT_HASH_SHORT = self.shortRev or "unknown"; - }; in { @@ -60,6 +58,7 @@ export RUST_BACKTRACE=1 export CARGO_NET_GIT_FETCH_WITH_CLI=true export ETH_RPC_URL='127.0.0.1:8545' + export RPC_URL='127.0.0.1:8545' export ETHERSCAN_API_KEY='fake-key' export HOLESKY_PRIVATE_KEY='fake-key' export PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 diff --git a/rust-toolchain.toml b/rust-toolchain.toml index af441597..8e403514 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -6,7 +6,6 @@ components = [ "rust-analyzer", "rust-src", "rust-std", - "rustc-dev", "rustc", "rustfmt", ] From 44a9aea549105a2854ac5e5bb9d6d46e1a9510a2 Mon Sep 17 00:00:00 2001 From: kayvank Date: Wed, 16 Oct 2024 07:54:55 -0700 Subject: [PATCH 4/4] nixify Simplify environment variables in flake --- flake.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/flake.nix b/flake.nix index d2a3aed8..0c938962 100644 --- a/flake.nix +++ b/flake.nix @@ -56,8 +56,6 @@ export CARGO_HOME="$(pwd)/.cargo" export PATH="$CARGO_HOME/bin:$PATH" export RUST_BACKTRACE=1 - export CARGO_NET_GIT_FETCH_WITH_CLI=true - export ETH_RPC_URL='127.0.0.1:8545' export RPC_URL='127.0.0.1:8545' export ETHERSCAN_API_KEY='fake-key' export HOLESKY_PRIVATE_KEY='fake-key'