Merge branch 'master' into josh/0.66.1

.github/workflows/ci.yml

@@ -384,18 +384,6 @@ jobs:
       - name: Cargo Run E2E Tests (EVM)
         run: cargo run --locked --release --bin test -- --target evm --locked --no-encoding-v1
 
-  cargo-run-e2e-test-midenvm:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install toolchain
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@v2
-      - name: Cargo Run E2E Tests (EVM)
-        run: cargo run --locked --release --bin test -- --target midenvm --locked --no-encoding-v1
-
   # TODO: Remove this upon merging std tests with the rest of the E2E tests.
   cargo-test-lib-std:
     runs-on: buildjet-8vcpu-ubuntu-2204

Cargo.toml

@@ -26,11 +26,7 @@ members = [
     "swayfmt",
     "test",
 ]
-exclude = [
-    "examples/*",
-    "swayfmt/test_macros",
-    "forc-test/test_data"
-]
+exclude = ["examples/*", "swayfmt/test_macros", "forc-test/test_data"]
 
 [workspace.package]
 edition = "2021"
@@ -167,8 +163,6 @@ libp2p-identity = "0.2"
 libtest-mimic = "0.7"
 lsp-types = "0.94"
 mdbook = { version = "0.4", default-features = false }
-miden = "0.3"
-miden-core = "0.3"
 minifier = "0.3"
 notify = "6.1"
 notify-debouncer-mini = "0.4"

forc-pkg/src/pkg.rs

@@ -1886,8 +1886,6 @@ pub fn compile(
 
             ProgramABI::Evm(ops)
         }
-
-        BuildTarget::MidenVM => ProgramABI::MidenVM(()),
     };
 
     let entries = asm_res

sway-core/Cargo.toml

@@ -26,7 +26,6 @@ im.workspace = true
 indexmap.workspace = true
 itertools.workspace = true
 lazy_static.workspace = true
-miden-core.workspace = true
 object = { workspace = true, features = ["write"] }
 parking_lot.workspace = true
 pest.workspace = true

sway-core/src/asm_generation/finalized_asm.rs

@@ -1,5 +1,4 @@
 use super::instruction_set::InstructionSet;
-use super::ToMidenBytecode;
 use super::{
     fuel::{checks, data_section::DataSection},
     ProgramABI, ProgramKind,
@@ -78,10 +77,6 @@ impl FinalizedAsm {
                     })
                 }
             }
-            InstructionSet::MidenVM { ops } => Ok(CompiledBytecode {
-                bytecode: ops.to_bytecode().into(),
-                named_data_section_entries_offsets: Default::default(),
-            }),
         }
     }
 }
@@ -553,6 +548,5 @@ pub fn check_invalid_opcodes(handler: &Handler, asm: &FinalizedAsm) -> Result<()
             ProgramKind::Predicate => checks::check_predicate_opcodes(handler, &ops[..]),
         },
         InstructionSet::Evm { ops: _ } => Ok(()),
-        InstructionSet::MidenVM { ops: _ } => Ok(()),
     }
 }

sway-core/src/asm_generation/from_ir.rs

@@ -7,7 +7,6 @@ use super::{
         fuel_asm_builder::FuelAsmBuilder,
         register_sequencer::RegisterSequencer,
     },
-    MidenVMAsmBuilder,
 };
 use crate::{asm_generation::ProgramKind, BuildConfig, BuildTarget};
 
@@ -57,13 +56,6 @@ pub fn compile_ir_context_to_finalized_asm(
             build_config,
             EvmAsmBuilder::new(kind, ir),
         ),
-        BuildTarget::MidenVM => compile(
-            handler,
-            ir,
-            module,
-            build_config,
-            MidenVMAsmBuilder::new(kind, ir),
-        ),
     }?;
 
     check_invalid_opcodes(handler, &finalized_asm)?;