Merge branch '2024-02-07-fix-rainix' into 2024-02-07-gui-refactor-stores

rainlanguage · Feb 8, 2024 · bef4e5f · bef4e5f
2 parents 536024a + 8ef4f23
commit bef4e5f
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 39 deletions.
diff --git a/.github/workflows/manual-sol-artifacts.yaml b/.github/workflows/manual-sol-artifacts.yaml
@@ -25,9 +25,9 @@ jobs:
       - uses: DeterminateSystems/nix-installer-action@v4
       - uses: DeterminateSystems/magic-nix-cache-action@v2
 
-      - run: nix run .#rainix-sol-prelude
-      - run: nix run .#rainix-rs-prelude
-      - run: nix run .#rainix-sol-artifacts
+      - run: nix develop --command rainix-sol-prelude
+      - run: nix develop --command rainix-rs-prelude
+      - run: nix develop --command rainix-sol-artifacts
         env:
           ETH_RPC_URL: ${{ inputs.network == 'polygon' && secrets.CI_DEPLOY_POLYGON_RPC_URL || inputs.network == 'songbird' && secrets.CI_DEPLOY_SONGBIRD_RPC_URL || inputs.network == 'flare' && secrets.CI_DEPLOY_FLARE_RPC_URL || '' }}
           # Flare has hardcoded api key https://flarescan.com/documentation/recipes/foundry-verification

diff --git a/.github/workflows/rainix.yaml b/.github/workflows/rainix.yaml
@@ -32,21 +32,21 @@ jobs:
         uses: DeterminateSystems/nix-installer-action@v4
       - uses: DeterminateSystems/magic-nix-cache-action@v2
 
-      - run: nix run .#rainix-sol-prelude
+      - run: nix develop --command rainix-sol-prelude
         working-directory: lib/rain.interpreter
-      - run: nix run .#rainix-rs-prelude
+      - run: nix develop --command rainix-rs-prelude
         working-directory: lib/rain.interpreter
-      - run: nix run .#i9r-prelude
+      - run: nix develop --command i9r-prelude
         working-directory: lib/rain.interpreter
-      - run: nix run .#rainix-sol-prelude
+      - run: nix develop --command rainix-sol-prelude
         working-directory: lib/rain.metadata
 
-      - run: nix run .#rainix-sol-prelude
-      - run: nix run .#rainix-rs-prelude
+      - run: nix develop --command rainix-sol-prelude
+      - run: nix develop --command rainix-rs-prelude
 
       - name: Run ${{ matrix.task }}
         env:
           ETH_RPC_URL: ${{ secrets.CI_DEPLOY_RPC_URL }}
           ETHERSCAN_API_KEY: ${{ secrets.EXPLORER_VERIFICATION_KEY }}
           DEPLOY_VERIFIER: 'etherscan'
-        run: nix run .#${{ matrix.task }}
+        run: nix develop --command ${{ matrix.task }}
diff --git a/.github/workflows/tauri.yaml b/.github/workflows/tauri.yaml
@@ -13,21 +13,21 @@ jobs:
         uses: DeterminateSystems/nix-installer-action@v4
       - uses: DeterminateSystems/magic-nix-cache-action@v2
 
-      - run: nix run .#rainix-sol-prelude
+      - run: nix develop --command rainix-sol-prelude
         working-directory: .
-      - run: nix run .#rainix-rs-prelude
+      - run: nix develop --command rainix-rs-prelude
         working-directory: .
 
-      - run: nix run .#rainix-sol-prelude
+      - run: nix develop --command rainix-sol-prelude
         working-directory: lib/rain.interpreter
-      - run: nix run .#rainix-rs-prelude
+      - run: nix develop --command rainix-rs-prelude
         working-directory: lib/rain.interpreter
-      - run: nix run .#i9r-prelude
+      - run: nix develop --command i9r-prelude
         working-directory: lib/rain.interpreter
 
       - run: nix develop .#tauri-shell --command cargo build --verbose
         working-directory: ./tauri-app
-      - run: nix run .#ob-tauri-prelude
-      - run: nix run .#ob-tauri-test
+      - run: nix develop .#tauri-shell --command ob-tauri-prelude
+      - run: nix develop .#tauri-shell --command ob-tauri-test
       - run: nix develop .#tauri-shell --command cargo tauri build --verbose
         working-directory: ./tauri-app
diff --git a/.github/workflows/test-subgraph.yml b/.github/workflows/test-subgraph.yml
@@ -25,9 +25,9 @@ jobs:
       - uses: DeterminateSystems/nix-installer-action@v4
       - uses: DeterminateSystems/magic-nix-cache-action@v2
 
-      - run: nix run .#rainix-sol-prelude
+      - run: nix develop --command rainix-sol-prelude
         working-directory: .
-      - run: nix run .#rainix-rs-prelude
+      - run: nix develop --command rainix-rs-prelude
         working-directory: .
 
       - name: Docker compose up
@@ -47,16 +47,16 @@ jobs:
           docker compose run -w /repo/subgraph subgraph-cli graph create --node http://graph-node:8020 example/test
           docker compose run -w /repo/subgraph subgraph-cli graph deploy --node http://graph-node:8020 --ipfs http://ipfs:5001 -l "v0.0.0" example/test
 
-      - run: nix run .#rainix-sol-prelude
+      - run: nix develop --command rainix-sol-prelude
         working-directory: lib/rain.interpreter
-      - run: nix run .#rainix-rs-prelude
+      - run: nix develop --command rainix-rs-prelude
         working-directory: lib/rain.interpreter
       - name: Interpreter prelude
-        run: nix run .#i9r-prelude
+        run: nix develop --command i9r-prelude
         working-directory: lib/rain.interpreter
 
       - name: Deploy i9r to ethnode
-        run: nix run .#rainix-sol-artifacts
+        run: nix develop --command rainix-sol-artifacts
         env:
           ETH_RPC_URL: http://localhost:8545
           # Key for standard test mnemonic at index 0.
@@ -65,7 +65,7 @@ jobs:
         working-directory: lib/rain.interpreter
 
       - name: Deploy contracts to ethnode
-        run: nix run .#rainix-sol-artifacts
+        run: nix develop --command rainix-sol-artifacts
         env:
           ETH_RPC_URL: http://localhost:8545
           # Key for standard test mnemonic at index 0.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,7 +34,7 @@ typeshare = "1.0.1"
 thiserror = "1.0.56"
 strict-yaml-rust = "0.1.2"
 dotrain = { git = "https://github.com/rainlanguage/dotrain.git", rev = "8fcc7651df8abc49c72c648ac8e9c80b5e057e70" }
-rain-meta = { path = "lib/rain.metadata/crates/cli" }
+rain-metadata = { path = "lib/rain.metadata/crates/cli" }
 rain_interpreter_bindings = { path = "lib/rain.interpreter/crates/bindings" }
 rain_interpreter_dispair = { path = "lib/rain.interpreter/crates/dispair" }
 rain_interpreter_parser = { path = "lib/rain.interpreter/crates/parser" }

diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml
@@ -25,7 +25,7 @@ alloy-dyn-abi = { workspace = true }
 reqwest = { workspace = true }
 strict-yaml-rust = { workspace = true }
 dotrain = { workspace = true }
-rain-meta = { workspace = true }
+rain-metadata = { workspace = true }
 rain_interpreter_bindings = { workspace = true }
 rain_interpreter_dispair = { workspace = true }
 rain_interpreter_parser = { workspace = true }

diff --git a/crates/common/src/add_order.rs b/crates/common/src/add_order.rs
@@ -7,7 +7,7 @@ use alloy_primitives::{hex::FromHexError, Address, U256};
 use dotrain::{ComposeError, RainDocument, Store};
 use rain_interpreter_dispair::{DISPair, DISPairError};
 use rain_interpreter_parser::{Parser, ParserError, ParserV1};
-use rain_meta::{
+use rain_metadata::{
     ContentEncoding, ContentLanguage, ContentType, Error as RainMetaError, KnownMagic,
     RainMetaDocumentV1Item,
 };

diff --git a/flake.nix b/flake.nix
@@ -55,7 +55,10 @@
 
         devShells.default = rainix.devShells.${system}.default;
         devShells.tauri-shell = pkgs.mkShell {
-          packages = [ packages.ob-tauri-prelude ];
+          packages = [
+            packages.ob-tauri-prelude
+            packages.ob-tauri-test
+          ];
           inputsFrom = [ rainix.devShells.${system}.tauri-shell ];
         };
 

diff --git a/lib/rain.metadata b/lib/rain.metadata