Skip to content

Commit

Permalink
Merge pull request #5 from blooo-io/feat/LAPP-5-implement-minttoken-t…
Browse files Browse the repository at this point in the history
…ests-2

Feat/lapp 5 implement minttoken tests 2
  • Loading branch information
lisaoulmi authored Nov 24, 2021
2 parents 0f75ce4 + de45202 commit 29cd88b
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "ethereum-plugin-sdk"]
path = ethereum-plugin-sdk
url = https://github.com/LedgerHQ/ethereum-plugin-sdk
url = git@github.com:LedgerHQ/ethereum-plugin-sdk.git
34 changes: 34 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.1.2](https://github.com/ledgerhq/app-ethereum/compare/1.1.1...1.1.2) - 2021-10-12

### Fixed

- Network ticker is correctly displayed for sidechains

## [1.1.1](https://github.com/ledgerhq/app-ethereum/compare/1.1.0...1.1.1) - 2021-9-17

### Fixed

- Fixed derivation curve access

## [1.1.0](https://github.com/ledgerhq/app-ethereum/compare/1.0.6...1.1.0) - 2021-9-16

### Added

- Update to work with the latest plugin sdk

### Fixed

- Fixed derivation path access

## [1.0.6] - 2021-06-08

### Added

- Inital version of the brand new Paraswap plugin for Ethereum application.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Ledger Plugin App Poap

## Formatting

The C source code is expected to be formatted with `clang-format` 11.0.0 or higher.
The C source code is expected to be formatted with `clang-format` 11.0.0 or higher.
Binary file added icons/nanos_app_paraswap.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/nanox_app_paraswap.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 1 addition & 7 deletions src/handle_query_contract_ui.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ static void set_send_ui(ethQueryContractUI_t *msg, poap_parameters_t *context) {
msg->result = ETH_PLUGIN_RESULT_ERROR;
return;
}
// amountToString(context->amount_sent,
// sizeof(context->amount_sent),
// context->decimals_sent,
// context->ticker_sent,
// msg->msg,
// msg->msgLength);
}
// Set UI for "Receive" screen.
static void set_receive_ui(ethQueryContractUI_t *msg, poap_parameters_t *context) {
Expand Down Expand Up @@ -103,7 +97,7 @@ void handle_query_contract_ui(void *parameters) {
set_beneficiary_ui(msg, context);
break;
case BENEFICIARY_SCREEN:
set_warning_ui(msg, context);
set_beneficiary_ui(msg, context);
break;
default:
PRINTF("Received an invalid screenIndex\n");
Expand Down
2 changes: 1 addition & 1 deletion src/poap_plugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#define RUN_APPLICATION 1

#define NUM_POAP_SELECTORS 1
#define SELECTOR_SIZE 4

#define PLUGIN_NAME "Poap"

Expand All @@ -30,6 +29,7 @@ typedef enum {

// Would've loved to make this an enum but we don't have enough room because enums are `int` and not
// `uint8_t`.

#define EVENT_ID 0
#define TOKEN_RECEIVED 1
#define BENEFICIARY 2
Expand Down
10 changes: 5 additions & 5 deletions tests/build_local_test_elfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,30 @@ cd ..

echo "*Building elfs for Nano S..."

echo "**Building app-plugin for Nano S..."
echo "**Building app-poap for Nano S..."
make clean BOLOS_SDK=$NANOS_SDK
make -j DEBUG=1 BOLOS_SDK=$NANOS_SDK
cp bin/app.elf "tests/elfs/poap_nanos.elf"

echo "**Building app-ethereum for Nano S..."
cd $APP_ETHEREUM
make clean BOLOS_SDK=$NANOS_SDK
make -j DEBUG=1 BYPASS_SIGNATURES=1 BOLOS_SDK=$NANOS_SDK CHAIN=ethereum
make -j DEBUG=1 BOLOS_SDK=$NANOS_SDK CHAIN=ethereum BYPASS_SIGNATURES=1 ALLOW_DATA=1
cd -
cp "${APP_ETHEREUM}/bin/app.elf" "tests/elfs/ethereum_nanos.elf"


# echo "*Building elfs for Nano X..."

# echo "**Building plugin for Nano X..."
# echo "**Building app-poap for Nano X..."
# make clean BOLOS_SDK=$NANOX_SDK
# make -j DEBUG=1 BOLOS_SDK=$NANOX_SDK
# cp bin/app.elf "tests/elfs/plugin_nanox.elf"
# cp bin/app.elf "tests/elfs/poap_nanox.elf"

# echo "**Building app-ethereum for Nano X..."
# cd $APP_ETHEREUM
# make clean BOLOS_SDK=$NANOX_SDK
# make -j DEBUG=1 BYPASS_SIGNATURES=1 BOLOS_SDK=$NANOX_SDK CHAIN=ethereum
# make -j DEBUG=1 BOLOS_SDK=$NANOX_SDK CHAIN=ethereum BYPASS_SIGNATURES=1 ALLOW_DATA=1
# cd -
# cp "${APP_ETHEREUM}/bin/app.elf" "tests/elfs/ethereum_nanox.elf"

Expand Down
Empty file modified tests/elfs/ethereum_nanos.elf
100644 → 100755
Empty file.
Empty file modified tests/elfs/ethereum_nanox.elf
100644 → 100755
Empty file.
Binary file modified tests/elfs/poap_nanos.elf
100644 → 100755
Binary file not shown.

0 comments on commit 29cd88b

Please sign in to comment.