Merge pull request #22 from blooo-io/remove-conflicting-methods

Remove conflicting methods
blooo-io · Mar 28, 2024 · 7e87399 · 7e87399
2 parents ed43245 + 718281f
commit 7e87399
Show file tree

Hide file tree

Showing 363 changed files with 5 additions and 15,792 deletions.
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ APPNAME = "StakeKit"
 
 # Application version
 APPVERSION_M = 1
-APPVERSION_N = 1
+APPVERSION_N = 2
 APPVERSION_P = 0
 
 include ethereum-plugin-sdk/standard_plugin.mk
diff --git a/ethereum-plugin-sdk b/ethereum-plugin-sdk
diff --git a/glyphs/icon_back.gif b/glyphs/icon_back.gif
diff --git a/glyphs/icon_back_x.gif b/glyphs/icon_back_x.gif
diff --git a/glyphs/icon_certificate.gif b/glyphs/icon_certificate.gif
diff --git a/glyphs/icon_crossmark.gif b/glyphs/icon_crossmark.gif
diff --git a/glyphs/icon_dashboard.gif b/glyphs/icon_dashboard.gif
diff --git a/glyphs/icon_dashboard_x.gif b/glyphs/icon_dashboard_x.gif
diff --git a/glyphs/icon_down.gif b/glyphs/icon_down.gif
diff --git a/glyphs/icon_eye.gif b/glyphs/icon_eye.gif
diff --git a/glyphs/icon_left.gif b/glyphs/icon_left.gif
diff --git a/glyphs/icon_right.gif b/glyphs/icon_right.gif
diff --git a/glyphs/icon_toggle_reset.gif b/glyphs/icon_toggle_reset.gif
diff --git a/glyphs/icon_toggle_set.gif b/glyphs/icon_toggle_set.gif
diff --git a/glyphs/icon_up.gif b/glyphs/icon_up.gif
diff --git a/glyphs/icon_validate_14.gif b/glyphs/icon_validate_14.gif
diff --git a/glyphs/icon_warning.gif b/glyphs/icon_warning.gif
diff --git a/glyphs/stax_stakekit_64px.gif b/glyphs/stax_stakekit_64px.gif
diff --git a/icons/nanos_app_stakekit.gif b/icons/nanos_app_stakekit.gif
diff --git a/icons/nanox_app_stakekit.gif b/icons/nanox_app_stakekit.gif
diff --git a/icons/stax_app_stakekit.gif b/icons/stax_app_stakekit.gif
+21 −1		CHANGELOG.md
+1 −1		README.md
+0 −123		include/eth_internals.h
+51 −0		src/asset_info.h
+20 −14		src/caller_api.h
+175 −175		src/common_utils.c
+88 −0		src/common_utils.h
+7 −13		src/eth_internals.h
+9 −7		src/eth_plugin_interface.h
+1 −1		src/main.c
+42 −0		src/plugin_utils.c
+37 −0		src/plugin_utils.h
+43 −0		src/tx_content.h
+0 −16		standard_plugin.mk