Update plugin sdk build script to only copy files instead of cherry-p…

…icking functions
LedgerHQ · Jan 18, 2024 · 084fa26 · 084fa26
1 parent b8402af
commit 084fa26
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 284 deletions.
diff --git a/.github/workflows/sdk-generation.yml b/.github/workflows/sdk-generation.yml
@@ -26,7 +26,7 @@ jobs:
           persist-credentials: false
 
       - name: Build new SDK
-        run: python tools/build_sdk.py
+        run: ./tools/build_sdk.sh
 
       - name: Extract branch name
         shell: bash

diff --git a/Makefile b/Makefile
@@ -277,7 +277,7 @@ ifeq ($(CHAIN),ethereum)
     endif
 
     # rebuild SDK
-    $(shell python3 tools/build_sdk.py)
+    $(shell ./tools/build_sdk.sh)
 
     # check if a difference is noticed (fail if it happens in CI build)
     ifneq ($(shell git status | grep 'ethereum-plugin-sdk'),)

diff --git a/src_common/eth_plugin_interface.h b/src_common/eth_plugin_interface.h
@@ -1,12 +1,18 @@
 // clang-format off
 
-#ifndef _ETH_PLUGIN_INTERFACE_H_
-#define _ETH_PLUGIN_INTERFACE_H_
+#pragma once
 
 #include "os.h"
 #include "cx.h"
+
+// Include other header compatible with plugins
 #include "asset_info.h"
+#include "caller_api.h"
+#include "common_utils.h"
 #include "tx_content.h"
+#include "uint128.h"
+#include "uint256.h"
+#include "uint_common.h"
 
 /*************************************************************************************************
  * Comments provided in this file are quick reminders on the usage of the plugin interface       *
@@ -217,6 +223,4 @@ typedef struct ethQueryContractUI_s {
 } ethQueryContractUI_t;
 // void handle_query_contract_ui(ethQueryContractUI_t *parameters);
 
-#endif  // _ETH_PLUGIN_INTERFACE_H_
-
 // clang-format on
diff --git a/src_common/plugin_utils.h b/src_common/plugin_utils.h
@@ -20,6 +20,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#include "eth_plugin_interface.h"
+
 #define SELECTOR_SIZE    4
 #define PARAMETER_LENGTH 32
 

diff --git a/src_plugin_sdk/README.md b/src_plugin_sdk/README.md
@@ -14,5 +14,5 @@ Be careful, and weight your choices.
 If for some reasons you want to rebuild this SDK manually from [app-ethereum](https://github.com/LedgerHQ/app-ethereum) (reminder: it is rebuild automatically when building app-ethereum itself):
 
 ```shell
-$> python3 tools/build_sdk.py
+$> ./tools/build_sdk.sh
 ```
diff --git a/src_plugin_sdk/plugin_utils.c b/src_plugin_sdk/plugin_utils.c
diff --git a/src_plugin_sdk/plugin_utils.h b/src_plugin_sdk/plugin_utils.h
diff --git a/src_plugin_sdk/main.c → src_plugin_sdk/src/main.c b/src_plugin_sdk/main.c → src_plugin_sdk/src/main.c
diff --git a/tools/build_sdk.py b/tools/build_sdk.py
diff --git a/tools/build_sdk.sh b/tools/build_sdk.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Clean the sdk
+find ./ethereum-plugin-sdk/ -mindepth 1 -maxdepth 1 ! -name .git -exec rm -r {} \;
+
+# Copy exclusive files
+cp -r src_plugin_sdk/* ./ethereum-plugin-sdk/
+
+# Copy common sources
+cp -r src_common/* ./ethereum-plugin-sdk/src/