Delay linker resolutions

DeFiCh · Jul 27, 2023 · f456fd9 · f456fd9
1 parent 20e7383
commit f456fd9
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -3,3 +3,20 @@
 # builds and ad-hoc cargo invocations all
 # result in the consistent compilation
 target-dir = "./build/lib/target"
+
+rustflags = [
+  "-C", "link-arg=-z",
+  "-C", "link-arg=undefs",
+]
+
+[target.x86_64-apple-darwin]
+rustflags = [
+  "-C", "link-arg=-undefined",
+  "-C", "link-arg=dynamic_lookup",
+]
+
+[target.aarch64-apple-darwin]
+rustflags = [
+  "-C", "link-arg=-undefined",
+  "-C", "link-arg=dynamic_lookup",
+]
diff --git a/lib/ain-cpp-imports/src/bridge.rs b/lib/ain-cpp-imports/src/bridge.rs
@@ -21,7 +21,7 @@ pub mod ffi {
         fn pastChangiIntermediateHeight2() -> bool;
         fn pastChangiIntermediateHeight3() -> bool;
         fn pastChangiIntermediateHeight4() -> bool;
-        fn SomethingElse() -> bool;
+        fn pastChangiIntermediateHeight5() -> bool;
         fn CppLogPrintf(message: String);
     }
 }
diff --git a/lib/ain-cpp-imports/src/lib.rs b/lib/ain-cpp-imports/src/lib.rs
@@ -64,7 +64,7 @@ mod ffi {
     pub fn pastChangiIntermediateHeight4() -> bool {
         unimplemented!("{}", UNIMPL_MSG)
     }
-    pub fn SomethingElse() -> bool {
+    pub fn pastChangiIntermediateHeight5() -> bool {
         unimplemented!("{}", UNIMPL_MSG)
     }
 
@@ -160,7 +160,8 @@ pub fn past_changi_intermediate_height_4_height() -> bool {
 }
 
 pub fn past_changi_intermediate_height_5_height() -> bool {
-    ffi::SomethingElse()
+    const CHANGI_5_HEIGHT: i32 = 0;
+    ffi::getCurrentHeight() > CHANGI_5_HEIGHT
 }
 
 pub fn log_print(message: &str) {

diff --git a/src/ffi/ffiexports.cpp b/src/ffi/ffiexports.cpp
@@ -236,8 +236,9 @@ bool pastChangiIntermediateHeight4() {
     return ::ChainActive().Height() >= Params().GetConsensus().ChangiIntermediateHeight4;
 }
 
-bool SomethingElse() {
+bool pastChangiIntermediateHeight5() {
     LOCK(cs_main);
     return ::ChainActive().Height() >= Params().GetConsensus().ChangiIntermediateHeight5;
 }
 
+
diff --git a/src/ffi/ffiexports.h b/src/ffi/ffiexports.h
@@ -22,7 +22,7 @@ int getCurrentHeight();
 bool pastChangiIntermediateHeight2();
 bool pastChangiIntermediateHeight3();
 bool pastChangiIntermediateHeight4();
-bool SomethingElse();
+bool pastChangiIntermediateHeight5();
 void CppLogPrintf(rust::string message);
 
 #endif  // DEFI_FFI_FFIEXPORTS_H