Merge pull request #11 from blooo-io/feat/implement-updated-contract-…

…methods Feat/implement updated contract methods
blooo-io · Feb 23, 2023 · 01836bb · 01836bb
2 parents db34419 + e99e888
commit 01836bb
Show file tree

Hide file tree

Showing 106 changed files with 4,555 additions and 5,495 deletions.
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -1,6 +1,7 @@
 name: Compilation & tests
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -26,7 +27,6 @@ jobs:
 
       - name: Build Ledger NFT plugin
         run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
           make DEBUG=1
 
       - name: Upload Ledger NFT binary
@@ -48,7 +48,7 @@ jobs:
 
       - name: Build with Clang Static Analyzer
         run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
           make clean
           scan-build --use-cc=clang -analyze-headers -enable-checker security -enable-checker unix -enable-checker valist -o scan-build --status-bugs make default
       - uses: actions/upload-artifact@v2
@@ -70,7 +70,7 @@ jobs:
 
       - name: Build with cov-build
         run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
           make clean
           cov-build --dir cov-int make default
       - name: Submit the result to Coverity Scan
@@ -93,20 +93,26 @@ jobs:
       image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
+      - name: Clone SDK
+        uses: actions/checkout@v3
+        with:
+          repository: LedgerHQ/ethereum-plugin-sdk
+          path: ethereum-plugin-sdk
+          ref: develop
       - name: Build plugin for Nano S
         run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
           make clean
           make BOLOS_SDK=$NANOS_SDK
       - name: Move binary to test directory
         run: |
           mkdir -p ./tests/elfs/
           mv bin/app.elf ./tests/elfs/ledger_nft_nanos.elf
       - name: Upload plugin binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: binaries
           path: tests/elfs/ledger_nft_nanos.elf
@@ -118,20 +124,26 @@ jobs:
       image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
+      - name: Clone SDK
+        uses: actions/checkout@v3
+        with:
+          repository: LedgerHQ/ethereum-plugin-sdk
+          path: ethereum-plugin-sdk
+          ref: develop
       - name: Build plugin for Nano S+
         run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
           make clean
           make BOLOS_SDK=$NANOSP_SDK
       - name: Move binary to test directory
         run: |
           mkdir -p ./tests/elfs/
           mv bin/app.elf ./tests/elfs/ledger_nft_nanosp.elf
       - name: Upload plugin binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: binaries
           path: tests/elfs/ledger_nft_nanosp.elf
@@ -143,20 +155,26 @@ jobs:
       image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
+      - name: Clone SDK
+        uses: actions/checkout@v3
+        with:
+          repository: LedgerHQ/ethereum-plugin-sdk
+          path: ethereum-plugin-sdk
+          ref: develop
       - name: Build plugin for Nano X
         run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
           make clean
           make BOLOS_SDK=$NANOX_SDK
       - name: Move binary to test directory
         run: |
           mkdir -p ./tests/elfs/
           mv bin/app.elf ./tests/elfs/ledger_nft_nanox.elf
       - name: Upload plugin binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: binaries
           path: tests/elfs/ledger_nft_nanox.elf
@@ -168,22 +186,22 @@ jobs:
       image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
     steps:
       - name: Checkout app-ethereum
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: LedgerHQ/app-ethereum
-          ref: ${{ ((github.base_ref || github.ref_name) == 'main' && 'master') || (github.base_ref || github.ref_name) }}
+          ref: develop
           submodules: recursive
       - name: Build ethereum
         run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
           make clean
           make -j DEBUG=1 BYPASS_SIGNATURES=1 BOLOS_SDK=$NANOS_SDK CHAIN=ethereum ALLOW_DATA=1
       - name: Move binary to test directory
         run: |
           mkdir -p ./tests/elfs/
           mv bin/app.elf ./tests/elfs/ethereum_nanos.elf
       - name: Upload plugin binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: binaries
           path: tests/elfs/ethereum_nanos.elf
@@ -195,22 +213,22 @@ jobs:
       image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
     steps:
       - name: Checkout app-ethereum
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: LedgerHQ/app-ethereum
-          ref: ${{ ((github.base_ref || github.ref_name) == 'main' && 'master') || (github.base_ref || github.ref_name) }}
+          ref: develop
           submodules: recursive
       - name: Build ethereum
         run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
           make clean
           make -j DEBUG=1 BYPASS_SIGNATURES=1 BOLOS_SDK=$NANOSP_SDK CHAIN=ethereum ALLOW_DATA=1
       - name: Move binary to test directory
         run: |
           mkdir -p ./tests/elfs/
           mv bin/app.elf ./tests/elfs/ethereum_nanosp.elf
       - name: Upload plugin binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: binaries
           path: tests/elfs/ethereum_nanosp.elf
@@ -222,22 +240,22 @@ jobs:
       image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
     steps:
       - name: Checkout app-ethereum
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: LedgerHQ/app-ethereum
-          ref: ${{ ((github.base_ref || github.ref_name) == 'main' && 'master') || (github.base_ref || github.ref_name) }}
+          ref: develop
           submodules: recursive
       - name: Build ethereum
         run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
           make clean
           make -j DEBUG=1 BYPASS_SIGNATURES=1 BOLOS_SDK=$NANOX_SDK CHAIN=ethereum ALLOW_DATA=1
       - name: Move binary to test directory
         run: |
           mkdir -p ./tests/elfs/
           mv bin/app.elf ./tests/elfs/ethereum_nanox.elf
       - name: Upload plugin binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: binaries
           path: tests/elfs/ethereum_nanox.elf
@@ -258,19 +276,19 @@ jobs:
           echo $HOME
           echo $DISPLAY
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Download built binaries
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: binaries
           path: tests/elfs/
       - name: Check downloaded binaries
         run: ls -lh ./tests/elfs
       - run: sudo apt-get update -y && sudo apt-get install -y libusb-1.0.0 libudev-dev
       - name: Install node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: "16.4.0"
+          node-version: "14.18.1"
       - name: Install yarn
         run: |
           npm install -g yarn
@@ -279,4 +297,4 @@ jobs:
           cd tests && yarn install
       - name: Run zemu tests
         run: |
-          cd tests && yarn test
+          cd tests && docker pull zondax/builder-zemu@sha256:8d7b06cedf2d018b9464f4af4b7a8357c3fbb180f3ab153f8cb8f138defb22a4 && yarn test
diff --git a/.github/workflows/lint-workflow.yml b/.github/workflows/lint-workflow.yml
@@ -1,14 +1,15 @@
 name: Code style check
 
 on:
+  workflow_dispatch:
   push:
     branches:
-    - main
-    - develop
+      - main
+      - develop
   pull_request:
     branches:
-    - main
-    - develop
+      - main
+      - develop
 
 jobs:
   job_lint:

diff --git a/.gitignore b/.gitignore
@@ -6,9 +6,14 @@ debug/
 dep/
 obj/
 tests/elfs/
+build
 
 # Editors
 .idea/
+.vscode
+
+# Codespace configuration
+.devcontainer
 
 # Python
 *.pyc[cod]

diff --git a/README.md b/README.md
@@ -27,10 +27,21 @@ Need more information about the interface, the architecture, or general stuff ab
 
 Smart contracts covered by this plugin are:
 
-| Network | Version | Smart Contract |
-| ---       | --- | --- |
+|  Network | Version | Smart Contract |
+| ---      | --- | --- |
 | Goerli   | V0  | `0x6c304a1f99cecd3a9983001e943f3de00ed811d0`|
-
+| Goerli   | V0  | `0x9ea4571a739a1d644e17d34a86e7dee97609b256`|
+
+On these smart contracts, the functions covered by this plugin are:
+
+|    Function   | Selector  | Displayed Parameters |
+| ---           | ---       | --- |
+|mint           | 0xa0712d68| <table><tbody> <tr><td><code>uint256 amount</code></td></tr> </tbody></table> |
+|preSaleMint    | 0x827481ea| <table><tbody> <tr><td><code>uint256 amount</code></td></tr> </tbody></table> |
+|stableMintSign | 0x11413601| <table><tbody> <tr><td><code>uint256 amount</code></td></tr> </tbody></table> |
+|stableMint     | 0x804b936f| <table><tbody> <tr><td><code>uint256 amount</code></td></tr> </tbody></table> |
+|mintSign       | 0xf39247a9| <table><tbody> <tr><td><code>uint256 amount</code></td></tr> </tbody></table> |
+|mint (v2)      | 0xa0712d68| <table><tbody> <tr><td><code>uint256 amount</code></td></tr> </tbody></table> |
 
 ## Build
 

diff --git a/ethereum-plugin-sdk b/ethereum-plugin-sdk
diff --git a/src/contract.c b/src/contract.c
@@ -8,13 +8,31 @@ static const uint8_t MINT_SELECTOR[SELECTOR_SIZE] = {0xa0, 0x71, 0x2d, 0x68};
 // Selector: 0x827481ea
 static const uint8_t PRE_SALE_MINT_SELECTOR[SELECTOR_SIZE] = {0x82, 0x74, 0x81, 0xea};
 
+// Function: stableMintSign
+// Selector: 0x11413601
+static const uint8_t STABLE_MINT_SIGN_SELECTOR[SELECTOR_SIZE] = {0x11, 0x41, 0x36, 0x01};
+
+// Function: stableMint
+// Selector: 0x804b936f
+static const uint8_t STABLE_MINT_SELECTOR[SELECTOR_SIZE] = {0x80, 0x4b, 0x93, 0x6f};
+
+// Function: mintSign
+// Selector: 0xf39247a9
+static const uint8_t MINT_SIGN_SELECTOR[SELECTOR_SIZE] = {0xf3, 0x92, 0x47, 0xa9};
+
+// Function: mint (v2)
+// Selector: 0xa0712d68
+static const uint8_t MINT_V2_SELECTOR[SELECTOR_SIZE] = {0xa0, 0x71, 0x2d, 0x68};
+
 // Plugin uses 0x00000 as a dummy address to reprecent ETH.
 const uint8_t NULL_ETH_ADDRESS[ADDRESS_LENGTH] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
 // Array of all the different nft selectors.
-const uint8_t *const LEDGER_NFT_SELECTORS[NUM_SELECTORS] = {
-    MINT_SELECTOR,
-    PRE_SALE_MINT_SELECTOR,
-};
+const uint8_t *const LEDGER_NFT_SELECTORS[NUM_SELECTORS] = {MINT_SELECTOR,
+                                                            PRE_SALE_MINT_SELECTOR,
+                                                            STABLE_MINT_SIGN_SELECTOR,
+                                                            STABLE_MINT_SELECTOR,
+                                                            MINT_SIGN_SELECTOR,
+                                                            MINT_V2_SELECTOR};
diff --git a/src/handle_init_contract.c b/src/handle_init_contract.c
@@ -34,6 +34,10 @@ void handle_init_contract(void *parameters) {
     switch (context->selectorIndex) {
         case MINT:
         case PRE_SALE_MINT:
+        case STABLE_MINT_SIGN:
+        case STABLE_MINT:
+        case MINT_SIGN:
+        case MINT_V2:
             context->next_param = AMOUNT;
             break;
         default:

diff --git a/src/handle_provide_parameter.c b/src/handle_provide_parameter.c
@@ -40,6 +40,10 @@ void handle_provide_parameter(void *parameters) {
         switch (context->selectorIndex) {
             case MINT:
             case PRE_SALE_MINT:
+            case STABLE_MINT_SIGN:
+            case STABLE_MINT:
+            case MINT_SIGN:
+            case MINT_V2:
                 handle_mint(msg, context);
                 break;
             default:

diff --git a/src/handle_query_contract_id.c b/src/handle_query_contract_id.c
@@ -13,6 +13,18 @@ void handle_query_contract_id(void *parameters) {
         case PRE_SALE_MINT:
             strlcpy(msg->version, "Presale Mint", msg->versionLength);
             break;
+        case STABLE_MINT_SIGN:
+            strlcpy(msg->version, "Stable Mint Sign", msg->versionLength);
+            break;
+        case STABLE_MINT:
+            strlcpy(msg->version, "Stable Mint", msg->versionLength);
+            break;
+        case MINT_SIGN:
+            strlcpy(msg->version, "Mint Sign", msg->versionLength);
+            break;
+        case MINT_V2:
+            strlcpy(msg->version, "Mint", msg->versionLength);
+            break;
         default:
             PRINTF("Selector index: %d not supported\n", context->selectorIndex);
             msg->result = ETH_PLUGIN_RESULT_ERROR;

diff --git a/src/ledger_nft_plugin.h b/src/ledger_nft_plugin.h
@@ -4,7 +4,7 @@
 #include "eth_internals.h"
 #include "eth_plugin_interface.h"
 
-#define NUM_SELECTORS    2
+#define NUM_SELECTORS    6
 #define PLUGIN_NAME      "Ledger NFT"
 #define TOKEN_FOUND      1 << 1
 #define SELECTOR_SIZE    4
@@ -15,10 +15,7 @@
 extern const uint8_t NULL_ETH_ADDRESS[ADDRESS_LENGTH];
 
 #define ADDRESS_IS_NETWORK_TOKEN(_addr) (!memcmp(_addr, NULL_ETH_ADDRESS, ADDRESS_LENGTH))
-typedef enum {
-    MINT,
-    PRE_SALE_MINT,
-} selector_t;
+typedef enum { MINT, PRE_SALE_MINT, STABLE_MINT_SIGN, STABLE_MINT, MINT_SIGN, MINT_V2 } selector_t;
 
 // Enumeration used to parse the smart contract data.
 typedef enum {
+21 −0		include/eth_internals.c
+6 −2		include/eth_internals.h
+2 −1		include/eth_plugin_interface.h