Merge branch 'master' into async-tree-building

Makefile

@@ -40,6 +40,9 @@ DOCKER_IMAGE_NIM_PARAMS ?= -d:chronicles_colors:none -d:insecure
 
 LINK_PCRE := 0
 
+CXXFLAGS ?= -std=c++17 -mssse3
+export CXXFLAGS
+
 # we don't want an error here, so we can handle things later, in the ".DEFAULT" target
 -include $(BUILD_SYSTEM_DIR)/makefiles/variables.mk
 

codex/contracts/deployment.nim

@@ -20,9 +20,9 @@ const knownAddresses = {
  "167005": {
   "Marketplace": Address.init("0x948CF9291b77Bd7ad84781b9047129Addf1b894F")
  }.toTable,
- # Codex Testnet - Oct 21 2024 07:31:50 AM (+00:00 UTC)
+ # Codex Testnet - Nov 03 2024 07:30:30 AM (+00:00 UTC)
  "789987": {
-  "Marketplace": Address.init("0x3F9Cf3F40F0e87d804B776D8403e3d29F85211f4")
+  "Marketplace": Address.init("0x5Bd66fA15Eb0E546cd26808248867a572cFF5706")
  }.toTable
 }.toTable
 

docker/docker-entrypoint.sh

@@ -45,12 +45,16 @@ fi
 
 # If marketplace is enabled from the testing environment,
 # The file has to be written before Codex starts.
-if [ -n "${PRIV_KEY}" ]; then
-  echo ${PRIV_KEY} > "private.key"
-  chmod 600 "private.key"
-  export CODEX_ETH_PRIVATE_KEY="private.key"
+for key in PRIV_KEY ETH_PRIVATE_KEY; do
+  keyfile="private.key"
+  if [[ -n "${!key}" ]]; then
+    [[ "${key}" == "PRIV_KEY" ]] && echo "PRIV_KEY variable is deprecated and will be removed in the next releases, please use ETH_PRIVATE_KEY instead!"
+    echo "${!key}" > "${keyfile}"
+    chmod 600 "${keyfile}"
+    export CODEX_ETH_PRIVATE_KEY="${keyfile}"
     echo "Private key set"
-fi
+  fi
+done
 
 # Circuit downloader
 # cirdl [circuitPath] [rpcEndpoint] [marketplaceAddress]

flake.lock

@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1729449015,
+        "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "89172919243df199fe237ba0f776c3e3e3d72367",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,35 @@
+{
+  description = "Codex build flake";
+  
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+  };
+
+  outputs = { self, nixpkgs }:
+    let
+      supportedSystems = [
+        "x86_64-linux" "aarch64-linux"
+        "x86_64-darwin" "aarch64-darwin"
+      ];
+      forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system);
+      pkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
+    in rec {
+      devShells = forAllSystems (system: let
+        pkgs = pkgsFor.${system};
+        inherit (pkgs) lib stdenv mkShell;
+      in {
+        default = mkShell.override { stdenv = pkgs.gcc11Stdenv; } {
+          buildInputs = with pkgs; [
+              # General
+              git pkg-config openssl lsb-release
+              # Build
+              rustc cargo nimble gcc11 cmake nim-unwrapped-1
+              # Libraries
+              gmp llvmPackages.openmp
+              # Tests
+              nodejs_18
+          ];
+        };
+      });
+    };
+}

vendor/nim-ethers

@@ -1 +1 @@
-Subproject commit 6523e70eafecc3b9728a491058818e685bd384fb
+Subproject commit 0ce6abf0fe942fe7cb1d14b8e4485621be9c3fe8