Refactor rust tree into lib (#1903)

* Fix typo in clang dockerfile (#1842) * Update PULL_REQUEST_TEMPLATE.md * mingw fixes for bcrypt, suppress depends related warnings (#1847) * Suppress depends related superfluous warnings * Fix passthrough string quote * Fix windres, bcrypt failures * Cleanup build process and workflows (#1851) * Suppress depends related superfluous warnings * Fix passthrough string quote * Fix windres, bcrypt failures * Cleanup build, workflows, dockerfiles * Cleanup comments * Refactor default var setup * Cleanup comments * Add safe_rm_rf and simplify left file list * Fix shellcheck * Fix arm core images * More cleanup, unify packaging, safer rm * Apply default conf across all arch, conf args append * Apply glibc compat only on linux builds * Clean up obsolete comments * Cleanup unmaintained deps, configs and tools (#1855) * Suppress depends related superfluous warnings * Fix passthrough string quote * Fix windres, bcrypt failures * Cleanup build, workflows, dockerfiles * Cleanup comments * Refactor default var setup * Cleanup comments * Add safe_rm_rf and simplify left file list * Fix shellcheck * Fix arm core images * More cleanup, unify packaging, safer rm * Apply default conf across all arch, conf args append * Apply glibc compat only on linux builds * Clean up obsolete comments * Cleanup unmaintained files * Remove install.md * Remove libdeficonsensus dyn lib, defi-wallet * Enable static linking * Revert boost changes * Remove outdated man pages * Remove debian packaging related file * Bump boost min to 1.77, remove obsolete checks * Revert boost config cleanup * More cleanups, nsis, gitian * Remove boost reduce exports change * Cleanup boost obsolete check * Remove wallet tool test * Update toolchains, deps and further cleanup (#1857) * Suppress depends related superfluous warnings * Fix passthrough string quote * Fix windres, bcrypt failures * Cleanup build, workflows, dockerfiles * Cleanup comments * Refactor default var setup * Cleanup comments * Add safe_rm_rf and simplify left file list * Fix shellcheck * Fix arm core images * More cleanup, unify packaging, safer rm * Apply default conf across all arch, conf args append * Apply glibc compat only on linux builds * Clean up obsolete comments * Cleanup unmaintained files * Remove install.md * Remove libdeficonsensus dyn lib, defi-wallet * Enable static linking * Revert boost changes * Remove outdated man pages * Remove debian packaging related file * Bump boost min to 1.77, remove obsolete checks * Revert boost config cleanup * More cleanups, nsis, gitian * Remove boost reduce exports change * Cleanup boost obsolete check * Reorganize scripts, merge share and contrib * Fix docker script * Remove wallet tool test * static libgcc, disable tests and benches on CI builds * Fix CI builds to use consistent compilers * Better consistency in toolchains * Remove cdrkit, libdmg and switch to docker multiplatform base * Update cppcheck version * Switch libdeficonsensus to internal, toolchain cleanups (#1860) * Cleanup deps * Switch libdeficonsensus to an internal lib * Update ubuntu bases * Update darwin llvm to 16, update cctools and all depends (#1862) * Update toolchains * Remove obsolete zeromq patches * Make libtapi path agnostic of version * Update XCode SDK * Rename target to x86_64-apple-darwin * Revert to older behavior of zeromq * Remove superfluous LIBADD * Couple LDFLAGS together * Skip unrecognized flag on clang * Fix unintended quote * Overhaul of build, CI tests and lints, packaging and deps (#1880) * Fix spv out of tree builds * Sync dockerignore and gitignore * Overhaul of builds (to out of tree), deps updates, simplify dockefiles, CI test, lints and more * Uncomment benchmark code, disable with flags instead * Resolve compiler warnings * Fix arm64 crc intrinsics flags * Minor CI updates and docker login fixes * Add `--prefix` into configure to workaround surviving config.sub rechecks * Update ignores (#1888) * Fixes for make.sh undeclared locals and clean-artifacts (#1887) * Fix local decls in make.sh * Fix lints * Actually fix lints * Move rust crate to lib * Fix CI lib path * Fix Cargo fmt * Revert the bench change * Switch to stable toolchain and x64 platform * Fix stable toolchain --------- Co-authored-by: Shoham Chakraborty <[email protected]> Co-authored-by: jouzo <[email protected]>
DeFiCh · Apr 13, 2023 · 5f93587 · 5f93587
1 parent 5af36f2
commit 5f93587
Show file tree

Hide file tree

Showing 53 changed files with 66 additions and 57 deletions.
diff --git a/.github/workflows/tests-evm.yml → .github/workflows/tests-rust.yml b/.github/workflows/tests-evm.yml → .github/workflows/tests-rust.yml
@@ -1,11 +1,11 @@
-name: Tests - EVM
+name: Tests - Rust
 
 on:
   push:
-    paths: [ src/rust/** ]
-    
+    paths: [ lib/** ]
+
   pull_request:
-    paths: [ src/rust/** ]
+    paths: [ lib/** ]
 
 jobs:
   lint_cargo_fmt:
@@ -17,16 +17,15 @@ jobs:
       - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af
         with:
           profile: minimal
-          toolchain: nightly
-          target: wasm32-unknown-unknown
+          toolchain: stable
           default: true
           override: true
           components: rustfmt, clippy
 
       - run: |
-          cd src/rust
+          cd lib
           cargo fmt --all -- --check
-  
+
   lint_cargo_clippy:
     name: Lint (cargo clippy)
     runs-on: ubuntu-latest
@@ -40,16 +39,15 @@ jobs:
       - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af
         with:
           profile: minimal
-          toolchain: nightly
-          target: wasm32-unknown-unknown
+          toolchain: stable
           default: true
           override: true
           components: rustfmt, clippy
 
       - run: |
-          cd src/rust
+          cd lib
           cargo clippy
-  
+
   test_cargo:
     name: Test (cargo)
     runs-on: ubuntu-latest
@@ -63,12 +61,11 @@ jobs:
       - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af
         with:
           profile: minimal
-          toolchain: nightly
-          target: wasm32-unknown-unknown
+          toolchain: stable
           default: true
           override: true
           components: rustfmt, clippy
-          
+
       - run: |
-          cd src/rust
+          cd lib
           cargo test --no-fail-fast
diff --git a/configure.ac b/configure.ac
@@ -1421,7 +1421,7 @@ case $host in
   ;;
 esac
 
-AC_CONFIG_FILES([Makefile src/Makefile src/rust/Makefile test/config.ini])
+AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile test/config.ini])
 AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
 AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])])
 AC_CONFIG_LINKS([contrib/filter-lcov.py:contrib/filter-lcov.py])

diff --git a/src/rust/.gitignore → lib/.gitignore b/src/rust/.gitignore → lib/.gitignore
diff --git a/src/rust/Cargo.lock → lib/Cargo.lock b/src/rust/Cargo.lock → lib/Cargo.lock
diff --git a/src/rust/Cargo.toml → lib/Cargo.toml b/src/rust/Cargo.toml → lib/Cargo.toml
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -0,0 +1,31 @@
+CARGO ?= cargo
+
+TARGET ?= $(RUST_TARGET)
+TARGET ?= x86_64-unknown-linux-gnu
+
+.PHONY:
+all: build-ain-rs-exports build-ain-grpc
+
+
+# TODO: assumes release builds atm
+.PHONY:
+build-ain-rs-exports: build-ain-grpc
+	@cd $(abs_srcdir) && \
+	CRATE_CC_NO_DEFAULTS=1 BUILD_DIR="$(abs_builddir)" $(CARGO) build --package ain-rs-exports \
+		--release $(if $(TARGET),--target $(TARGET),) --target-dir $(abs_builddir)/target && \
+	mkdir -p $(abs_builddir)/gen/{include,lib,src} && \
+	cp $(abs_builddir)/target/$(TARGET)/release/libain_rs_exports.a $(abs_builddir)/gen/lib/ && \
+	cp $(abs_builddir)/ain_rs_exports.h $(abs_builddir)/gen/include/ && \
+	cp $(abs_builddir)/ain_rs_exports.cpp $(abs_builddir)/gen/src/
+
+.PHONY:
+build-ain-grpc:
+	@cd $(abs_srcdir) && \
+	CRATE_CC_NO_DEFAULTS=1 BUILD_DIR="$(abs_builddir)" $(CARGO) build --package ain-grpc \
+		--release $(if $(TARGET),--target $(TARGET),) --target-dir $(abs_builddir)
+
+.PHONY:
+clean-local:
+	@cd $(abs_srcdir) && \
+	$(CARGO) clean --target-dir $(abs_builddir) && \
+	rm -rf $(abs_builddir)/gen
diff --git a/src/rust/ain-cpp-imports/.gitignore → lib/ain-cpp-imports/.gitignore b/src/rust/ain-cpp-imports/.gitignore → lib/ain-cpp-imports/.gitignore
diff --git a/src/rust/ain-cpp-imports/Cargo.toml → lib/ain-cpp-imports/Cargo.toml b/src/rust/ain-cpp-imports/Cargo.toml → lib/ain-cpp-imports/Cargo.toml
diff --git a/src/rust/ain-cpp-imports/build.rs.disabled → lib/ain-cpp-imports/build.rs.disabled b/src/rust/ain-cpp-imports/build.rs.disabled → lib/ain-cpp-imports/build.rs.disabled
diff --git a/src/rust/ain-cpp-imports/src/lib.rs → lib/ain-cpp-imports/src/lib.rs b/src/rust/ain-cpp-imports/src/lib.rs → lib/ain-cpp-imports/src/lib.rs
diff --git a/src/rust/ain-evm/.gitignore → lib/ain-evm/.gitignore b/src/rust/ain-evm/.gitignore → lib/ain-evm/.gitignore
diff --git a/src/rust/ain-evm/Cargo.toml → lib/ain-evm/Cargo.toml b/src/rust/ain-evm/Cargo.toml → lib/ain-evm/Cargo.toml
diff --git a/src/rust/ain-evm/src/block.rs → lib/ain-evm/src/block.rs b/src/rust/ain-evm/src/block.rs → lib/ain-evm/src/block.rs
diff --git a/src/rust/ain-evm/src/ecrecover.rs → lib/ain-evm/src/ecrecover.rs b/src/rust/ain-evm/src/ecrecover.rs → lib/ain-evm/src/ecrecover.rs
diff --git a/src/rust/ain-evm/src/evm.rs → lib/ain-evm/src/evm.rs b/src/rust/ain-evm/src/evm.rs → lib/ain-evm/src/evm.rs
diff --git a/src/rust/ain-evm/src/executor.rs → lib/ain-evm/src/executor.rs b/src/rust/ain-evm/src/executor.rs → lib/ain-evm/src/executor.rs
diff --git a/src/rust/ain-evm/src/handler.rs → lib/ain-evm/src/handler.rs b/src/rust/ain-evm/src/handler.rs → lib/ain-evm/src/handler.rs
diff --git a/src/rust/ain-evm/src/lib.rs → lib/ain-evm/src/lib.rs b/src/rust/ain-evm/src/lib.rs → lib/ain-evm/src/lib.rs
diff --git a/src/rust/ain-evm/src/runtime.rs → lib/ain-evm/src/runtime.rs b/src/rust/ain-evm/src/runtime.rs → lib/ain-evm/src/runtime.rs
diff --git a/src/rust/ain-evm/src/traits.rs → lib/ain-evm/src/traits.rs b/src/rust/ain-evm/src/traits.rs → lib/ain-evm/src/traits.rs
diff --git a/src/rust/ain-evm/src/transaction.rs → lib/ain-evm/src/transaction.rs b/src/rust/ain-evm/src/transaction.rs → lib/ain-evm/src/transaction.rs
diff --git a/src/rust/ain-evm/src/tx_queue.rs → lib/ain-evm/src/tx_queue.rs b/src/rust/ain-evm/src/tx_queue.rs → lib/ain-evm/src/tx_queue.rs
diff --git a/src/rust/ain-evm/tests/block.rs → lib/ain-evm/tests/block.rs b/src/rust/ain-evm/tests/block.rs → lib/ain-evm/tests/block.rs
diff --git a/src/rust/ain-grpc/Cargo.toml → lib/ain-grpc/Cargo.toml b/src/rust/ain-grpc/Cargo.toml → lib/ain-grpc/Cargo.toml
diff --git a/src/rust/ain-grpc/build.rs → lib/ain-grpc/build.rs b/src/rust/ain-grpc/build.rs → lib/ain-grpc/build.rs
diff --git a/src/rust/ain-grpc/src/codegen.rs → lib/ain-grpc/src/codegen.rs b/src/rust/ain-grpc/src/codegen.rs → lib/ain-grpc/src/codegen.rs
diff --git a/src/rust/ain-grpc/src/gen/rpc.rs → lib/ain-grpc/src/gen/rpc.rs b/src/rust/ain-grpc/src/gen/rpc.rs → lib/ain-grpc/src/gen/rpc.rs
diff --git a/src/rust/ain-grpc/src/gen/types.rs → lib/ain-grpc/src/gen/types.rs b/src/rust/ain-grpc/src/gen/types.rs → lib/ain-grpc/src/gen/types.rs
diff --git a/src/rust/ain-grpc/src/lib.rs → lib/ain-grpc/src/lib.rs b/src/rust/ain-grpc/src/lib.rs → lib/ain-grpc/src/lib.rs
diff --git a/src/rust/ain-grpc/src/rpc.rs → lib/ain-grpc/src/rpc.rs b/src/rust/ain-grpc/src/rpc.rs → lib/ain-grpc/src/rpc.rs
diff --git a/src/rust/ain-grpc/src/tests.rs → lib/ain-grpc/src/tests.rs b/src/rust/ain-grpc/src/tests.rs → lib/ain-grpc/src/tests.rs
diff --git a/src/rust/ain-rs-exports/Cargo.toml → lib/ain-rs-exports/Cargo.toml b/src/rust/ain-rs-exports/Cargo.toml → lib/ain-rs-exports/Cargo.toml
diff --git a/src/rust/ain-rs-exports/build.rs → lib/ain-rs-exports/build.rs b/src/rust/ain-rs-exports/build.rs → lib/ain-rs-exports/build.rs
diff --git a/src/rust/ain-rs-exports/src/lib.rs → lib/ain-rs-exports/src/lib.rs b/src/rust/ain-rs-exports/src/lib.rs → lib/ain-rs-exports/src/lib.rs
@@ -14,7 +14,11 @@ mod ffi {
         fn evm_get_context() -> u64;
         fn evm_discard_context(context: u64);
         fn evm_queue_tx(context: u64, raw_tx: &str) -> Result<bool>;
-        fn evm_finalise(context: u64, update_state: bool, miner_address: [u8; 20]) -> Result<Vec<u8>>;
+        fn evm_finalise(
+            context: u64,
+            update_state: bool,
+            miner_address: [u8; 20],
+        ) -> Result<Vec<u8>>;
 
         fn init_runtime();
         fn start_servers(json_addr: &str, grpc_addr: &str) -> Result<()>;
@@ -86,7 +90,14 @@ fn evm_queue_tx(context: u64, raw_tx: &str) -> Result<bool, Box<dyn Error>> {
 }
 
 use rlp::Encodable;
-fn evm_finalise(context: u64, update_state: bool, miner_address: [u8; 20]) -> Result<Vec<u8>, Box<dyn Error>> {
-    let (block, _failed_tx) = RUNTIME.handlers.finalize_block(context, update_state, miner_address)?;
+fn evm_finalise(
+    context: u64,
+    update_state: bool,
+    miner_address: [u8; 20],
+) -> Result<Vec<u8>, Box<dyn Error>> {
+    let (block, _failed_tx) =
+        RUNTIME
+            .handlers
+            .finalize_block(context, update_state, miner_address)?;
     Ok(block.header.rlp_bytes().into())
 }
diff --git a/src/rust/proto/google/protobuf/any.proto → lib/proto/google/protobuf/any.proto b/src/rust/proto/google/protobuf/any.proto → lib/proto/google/protobuf/any.proto
diff --git a/src/rust/proto/google/protobuf/api.proto → lib/proto/google/protobuf/api.proto b/src/rust/proto/google/protobuf/api.proto → lib/proto/google/protobuf/api.proto
diff --git a/...oto/google/protobuf/compiler/plugin.proto → ...oto/google/protobuf/compiler/plugin.proto b/...oto/google/protobuf/compiler/plugin.proto → ...oto/google/protobuf/compiler/plugin.proto
diff --git a/...st/proto/google/protobuf/descriptor.proto → lib/proto/google/protobuf/descriptor.proto b/...st/proto/google/protobuf/descriptor.proto → lib/proto/google/protobuf/descriptor.proto
diff --git a/...rust/proto/google/protobuf/duration.proto → lib/proto/google/protobuf/duration.proto b/...rust/proto/google/protobuf/duration.proto → lib/proto/google/protobuf/duration.proto
diff --git a/src/rust/proto/google/protobuf/empty.proto → lib/proto/google/protobuf/empty.proto b/src/rust/proto/google/protobuf/empty.proto → lib/proto/google/protobuf/empty.proto
diff --git a/...st/proto/google/protobuf/field_mask.proto → lib/proto/google/protobuf/field_mask.proto b/...st/proto/google/protobuf/field_mask.proto → lib/proto/google/protobuf/field_mask.proto
diff --git a/...roto/google/protobuf/source_context.proto → ...roto/google/protobuf/source_context.proto b/...roto/google/protobuf/source_context.proto → ...roto/google/protobuf/source_context.proto
diff --git a/src/rust/proto/google/protobuf/struct.proto → lib/proto/google/protobuf/struct.proto b/src/rust/proto/google/protobuf/struct.proto → lib/proto/google/protobuf/struct.proto
diff --git a/...ust/proto/google/protobuf/timestamp.proto → lib/proto/google/protobuf/timestamp.proto b/...ust/proto/google/protobuf/timestamp.proto → lib/proto/google/protobuf/timestamp.proto
diff --git a/src/rust/proto/google/protobuf/type.proto → lib/proto/google/protobuf/type.proto b/src/rust/proto/google/protobuf/type.proto → lib/proto/google/protobuf/type.proto
diff --git a/...rust/proto/google/protobuf/wrappers.proto → lib/proto/google/protobuf/wrappers.proto b/...rust/proto/google/protobuf/wrappers.proto → lib/proto/google/protobuf/wrappers.proto
diff --git a/src/rust/proto/rpc/blockchain.proto → lib/proto/rpc/blockchain.proto b/src/rust/proto/rpc/blockchain.proto → lib/proto/rpc/blockchain.proto
diff --git a/src/rust/proto/rpc/eth.proto → lib/proto/rpc/eth.proto b/src/rust/proto/rpc/eth.proto → lib/proto/rpc/eth.proto
diff --git a/src/rust/proto/types/block.proto → lib/proto/types/block.proto b/src/rust/proto/types/block.proto → lib/proto/types/block.proto
diff --git a/src/rust/proto/types/eth.proto → lib/proto/types/eth.proto b/src/rust/proto/types/eth.proto → lib/proto/types/eth.proto
diff --git a/src/rust/proto/types/tx.proto → lib/proto/types/tx.proto b/src/rust/proto/types/tx.proto → lib/proto/types/tx.proto
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -2,7 +2,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
-SUBDIRS = rust
+SUBDIRS = ../lib
 DIST_SUBDIRS = secp256k1 univalue
 
 AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) $(GPROF_LDFLAGS) $(SANITIZER_LDFLAGS)
@@ -26,15 +26,16 @@ LIBDEFI_SPV_INCLUDES = \
 	-I$(srcdir)/spv/bitcoin \
 	-I$(srcdir)/spv/bcash
 
-LIBAIN_RS_INCLUDES = -I$(builddir)/rust/include
-LIBAIN_RS_LIB = -L$(builddir)/rust/lib -lain_rs_exports
-LIBAIN_RS_SRC = $(builddir)/rust/src/ain_rs_exports.cpp
+LIBAIN_DIR = $(abs_top_builddir)/lib/gen
+LIBAIN_RS_INCLUDES = -I$(LIBAIN_DIR)/include
+LIBAIN_RS_LIB = -L$(LIBAIN_DIR)/lib -lain_rs_exports
+LIBAIN_RS_SRC = $(LIBAIN_DIR)/src/ain_rs_exports.cpp
 LIBAIN_RS_H = ain_rs_exports.h
 
 $(LIBAIN_RS_SRC):
 $(LIBAIN_RS_H):
 $(LIBAIN_RS_LIB): FORCE
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C rust
+	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(abs_top_srcdir)/lib
 
 DEFI_INCLUDES = -I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS)
 DEFI_INCLUDES += -I$(srcdir)/secp256k1/include

diff --git a/src/rust/Makefile.am b/src/rust/Makefile.am