Integrate Move VM into main build (#5229)

* Integrate Move VM into top-level build

* Switch to protoc-free libra

Cargo.toml

@@ -30,6 +30,8 @@ members = [
     "programs/exchange_api",
     "programs/exchange_program",
     "programs/failure_program",
+    "programs/move_loader_api",
+    "programs/move_loader_program",
     "programs/noop_program",
     "programs/stake_api",
     "programs/stake_program",
@@ -51,6 +53,4 @@ members = [
 
 exclude = [
     "programs/bpf/rust/noop",
-    "programs/move_loader_api",
-    "programs/move_loader_program",
 ]

ci/buildkite.yml

@@ -15,9 +15,6 @@ steps:
   - command: "ci/test-bench.sh"
     name: "bench"
     timeout_in_minutes: 60
-  - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_stable_docker_image ci/test-move-demo.sh"
-    name: "move-demo"
-    timeout_in_minutes: 30
   - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_stable_docker_image ci/test-stable.sh"
     name: "stable"
     timeout_in_minutes: 40

ci/test-move-demo.sh

@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-set -e
-cd "$(dirname "$0")/.."
-
-annotate() {
-  ${BUILDKITE:-false} && {
-    buildkite-agent annotate "$@"
-  }
-}
-
-ci/affects-files.sh \
-  .rs$ \
-  Cargo.lock$ \
-  Cargo.toml$ \
-  ci/test-move-demo.sh \
-|| {
-  annotate --style info --context test-bench \
-    "Bench skipped as no .rs files were modified"
-  exit 0
-}
-
-
-source ci/_
-source ci/upload-ci-artifact.sh
-
-eval "$(ci/channel-info.sh)"
-source ci/rust-version.sh stable
-
-set -o pipefail
-export RUST_BACKTRACE=1
-
-# Run Move tests
-_ cargo +"$rust_stable" test --manifest-path=programs/move_loader_program/Cargo.toml ${V:+--verbose}
-_ cargo +"$rust_stable" test --manifest-path=programs/move_loader_api/Cargo.toml ${V:+--verbose}

programs/move_loader_api/Cargo.toml

@@ -20,16 +20,16 @@ serde_json = "1.0.40"
 solana-logger = { path = "../../logger", version = "0.17.0" }
 solana-sdk = { path = "../../sdk", version = "0.17.0" }
 
-bytecode_verifier = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_bytecode_verifier" }
-compiler = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_compiler" }
-failure = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_failure_ext" }
-language_e2e_tests = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_language_e2e_tests" }
-state_view = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_state_view" }
-stdlib = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_stdlib" }
-types = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_types" }
-vm = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_vm" }
-vm_cache_map = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_vm_cache_map" }
-vm_runtime = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0.3.1", package = "solana_libra_vm_runtime" }
+bytecode_verifier = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_bytecode_verifier" }
+compiler = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_compiler" }
+failure = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_failure_ext" }
+language_e2e_tests = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_language_e2e_tests" }
+state_view = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_state_view" }
+stdlib = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_stdlib" }
+types = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_types" }
+vm = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_vm" }
+vm_cache_map = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_vm_cache_map" }
+vm_runtime = { git = "https://github.com/solana-labs/libra", tag = "v0.0.0-sol13.2", package = "solana_libra_vm_runtime" }
 
 [lib]
 crate-type = ["lib"]