init, fix conflicts

Author: chirag-parmar

Makefile

@@ -87,11 +87,14 @@ PORTAL_TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(FLUFFY_TOOLS))
 OS_PLATFORM = $(shell $(CC) -dumpmachine)
 ifneq (, $(findstring darwin, $(OS_PLATFORM)))
   SHAREDLIBEXT = dylib
+  STATICLIBEXT = a
 else
 ifneq (, $(findstring mingw, $(OS_PLATFORM))$(findstring cygwin, $(OS_PLATFORM))$(findstring msys, $(OS_PLATFORM)))
   SHAREDLIBEXT = dll
+  STATICLIBEXT = lib
 else
   SHAREDLIBEXT = so
+  STATICLIBEXT = a
 endif
 endif
 
@@ -168,7 +171,7 @@ all: | $(TOOLS) nimbus_execution_client
 
 # "-d:release" cannot be added to config.nims
 
-NIM_PARAMS += -d:release
+NIM_PARAMS += -d:debug
 ifneq ($(if $(ENABLE_LINE_NUMBERS),$(ENABLE_LINE_NUMBERS),0),0)
 NIM_PARAMS += -d:chronicles_line_numbers:1
 endif
@@ -350,7 +353,8 @@ nimbus-verified-proxy-test: | build deps
 libverifproxy: | build deps
 	+ echo -e $(BUILD_MSG) "build/$@" && \
 		$(ENV_SCRIPT) nim --version && \
-		$(ENV_SCRIPT) nim c --app:lib -d:"libp2p_pki_schemes=secp256k1" --noMain:on --threads:on --nimcache:nimcache/libverifproxy -o:$(VERIF_PROXY_OUT_PATH)/$@.$(SHAREDLIBEXT) $(NIM_PARAMS) nimbus_verified_proxy/libverifproxy/verifproxy.nim
+		echo $(NIM_PARAMS) && \
+		$(ENV_SCRIPT) nim c --app:staticlib -d:"libp2p_pki_schemes=secp256k1" --noMain:on --out:$(VERIF_PROXY_OUT_PATH)/$@.$(STATICLIBEXT) $(NIM_PARAMS) nimbus_verified_proxy/libverifproxy/verifproxy.nim
 	cp nimbus_verified_proxy/libverifproxy/verifproxy.h $(VERIF_PROXY_OUT_PATH)/
 	echo -e $(BUILD_END_MSG) "build/$@"
 

nimbus_verified_proxy/libverifproxy/example.c

@@ -0,0 +1,53 @@
+#include "./verifproxy.h"
+#include <stdio.h>
+#include <unistd.h>
+#include <stdbool.h>
+
+static bool wait = false;
+
+void onBlockNumber(int status, char *res) {
+  printf("response: %s\n", res);
+  freeResponse(res);
+}
+
+void onStart(int status, char *res) {
+  printf("Verified Proxy started successfully\n");
+  freeResponse(res);
+}
+
+void waitIsOver(int status, char *res) {
+  printf("waiting finished successfully\n");
+  printf("status: %d\n", status);
+  
+  wait = false;
+
+  // printf("response: %s\n", res);
+  freeResponse(res);
+}
+
+void doMultipleAsyncTasks(Context *ctx) {
+  eth_blockNumber(ctx, onBlockNumber);
+  nonBusySleep(ctx, 4, waitIsOver);
+}
+
+int main() {
+  NimMain();
+  Context *ctx = createAsyncTaskContext(); 
+
+  const char* jsonConfig =
+    "{"
+    "\"Eth2Network\": \"mainnet\","
+    "\"TrustedBlockRoot\": \"0x6e2b0d0725949a5ce977b61646cc4353a8c789f6c2b8fc8bfc98fcfdb99b3d0\","
+    "\"BackendUrl\": \"https://eth.llamarpc.com\","
+    "\"LogLevel\": \"info\""
+    "}";
+  startVerifProxy(ctx, jsonConfig, onStart);
+  while(true) {
+    if (!wait) {
+      wait = true;
+      doMultipleAsyncTasks(ctx);
+    }
+    pollAsyncTaskEngine(ctx);
+  }
+  freeContext(ctx);
+}

nimbus_verified_proxy/libverifproxy/verifproxy.h

@@ -10,12 +10,42 @@
 #ifndef __verifproxy__
 #define __verifproxy__
 
-typedef struct VerifProxyContext VerifProxyContext;
-typedef void (*onHeaderCallback)(const char* s, int t);
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-void quit(void);
+#ifndef __has_attribute
+#define __has_attribute(x) 0
+#endif
 
-VerifProxyContext* startVerifProxy(const char* configJson, onHeaderCallback onHeader);
-void stopVerifProxy(VerifProxyContext*);
+#ifndef __has_feature
+#define __has_feature(x) 0
+#endif
+
+#if __has_attribute(warn_unused_result)
+#define ETH_RESULT_USE_CHECK __attribute__((warn_unused_result))
+#else
+#define ETH_RESULT_USE_CHECK
+#endif
+
+void NimMain(void);
+
+typedef struct Context Context;
+
+ETH_RESULT_USE_CHECK Context *createAsyncTaskContext();
+
+typedef void (*CallBackProc) (int status, char *res);
+
+void eth_blockNumber(Context *ctx, CallBackProc cb);
+void freeResponse(char *res);
+void freeContext(Context *ctx);
+void nonBusySleep(Context *ctx, int secs, CallBackProc cb);
+void startVerifProxy(Context *ctx, char* configJson, CallBackProc onstart);
+void stopVerifProxy(Context *ctx);
+void pollAsyncTaskEngine(Context *ctx);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __verifproxy__ */