Promote develop to master

.github/workflows/push.yml

@@ -38,8 +38,7 @@ jobs:
         run: npm ci
 
       - name: Build helpers
-        run: npm run build
-        working-directory: common/helpers
+        run: npm run build --workspace @casimir/helpers
 
       - name: Build landing app
         run: npm run build --workspace @casimir/landing

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "scripts/ledger/resources/app-bitcoin"]
+	path = scripts/ledger/resources/app-bitcoin
+	url = https://github.com/LedgerHQ/app-bitcoin-new.git
+[submodule "scripts/ledger/resources/app-ethereum"]
+	path = scripts/ledger/resources/app-ethereum
+	url = https://github.com/LedgerHQ/app-ethereum.git
+[submodule "scripts/ledger/resources/app-solana"]
+	path = scripts/ledger/resources/app-solana
+	url = https://github.com/LedgerHQ/app-solana.git
+[submodule "scripts/ledger/resources/speculos"]
+	path = scripts/ledger/resources/speculos
+	url = https://github.com/LedgerHQ/speculos.git

README.md

@@ -29,9 +29,13 @@ Make sure your development environment has these prerequisites.
 
 1. [Node.js (v16.x)](https://nodejs.org/en/download/) – we use [nvm](https://github.com/nvm-sh/nvm) to manage Node.js versions.
 
-2. [AWS CLI (v2.x)](https://aws.amazon.com/cli/) – create an [AWS profile](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) named `consensus-networks-dev`.
+2. [Docker (v4.x)](https://docs.docker.com/engine/install/) - make sure your Docker runs on startup.
 
-3. [SAM CLI (v1.x)](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install-mac.html) - tool for mocking backend services locally.
+3. [AWS CLI (v2.x)](https://aws.amazon.com/cli/) – create an [AWS profile](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) named `consensus-networks-dev`.
+
+4. [SAM CLI (v1.x)](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install-mac.html) - tool for mocking backend services locally.
+
+> 🚩 You also need to make sure to have at least one SSH authentication key on your GitHub account (for the git cloning of submodules in various scripts). See [Adding a new SSH key to your GitHub account](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account).
 
 ### Scripts and Dependencies
 
@@ -70,7 +74,15 @@ You can get up and running without configuration. You can also mock local backen
 
     > 🚩 You will need the [SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install-mac.html) for local mocking.
 
-3. The commands and flags above apply to any package in the [apps](apps/) directory. While the default app is [@casimir/web](apps/web/), you can specify others by passing a subcommand to `npm run dev`.
+3. Emulate a Ledger hardware wallet with [Speculos](#speculos). The default application is ethereum, and we also currently have support for the bitcoin and solana applications.
+
+    ```zsh
+    npm run dev --speculos # or specify --speculos=ethereum, --speculos=bitcoin, or --speculos=solana
+    ```
+
+    > 🚩 On MacOS, if you get an error because port 5000 is in use, go to  > System Preferences... > Sharing and uncheck Airplay Receiver.
+
+4. The commands and flags above apply to any package in the [apps](apps/) directory. While the default app is [@casimir/web](apps/web/), you can specify others by passing a subcommand to `npm run dev`.
 
     ```zsh
     # @casimir/web
@@ -109,14 +121,17 @@ EVM contract development is serviced through [Hardhat](https://hardhat.io/). The
     npm run task:accounts
     ```
 
-*Todo finish sample flow (show usage of compiled contract ABI in app)*
-6. Use a contract in a Casimir app...
+6. Use a contract in a Casimir app.
 
-7. Clean [contracts/evm/build/artifacts](contracts/evm/build/artifacts) and [contracts/evm/build/cache](contracts/evm/build/cache)).
+    ```typescript
+    // Todo add Casimir Typescript usage
+    ```
+
+7. Clean [contracts/evm/build/artifacts](contracts/evm/build/artifacts) and [contracts/evm/build/cache](contracts/evm/build/cache)).    
 
     ```zsh
     npm run task:clean
-    ``` 
+    ```
 
     > 🚩 Note, this is required if you change the Hardhat configuration.
 

apps/landing/src/composables/users.ts

@@ -24,7 +24,7 @@ export default function useUsers() {
      * @returns {string} The base URL for the users API
      */
     function getUsersBaseUrl(): string {
-        if (import.meta.env.PUBLIC_MOCK_ENABLED) {
+        if (import.meta.env.PUBLIC_MOCK) {
             return `http://localhost:${import.meta.env.PUBLIC_USERS_PORT}`
         } else {
             return `https://users.${import.meta.env.PUBLIC_STAGE || 'dev'}.casimir.co`

apps/landing/src/main.ts

@@ -5,7 +5,8 @@ import { createRouter, createWebHistory } from 'vue-router'
 import routes from '~pages'
 
 console.log('Creating app...', import.meta.env)
-console.log('Local mocking is', import.meta.env.PUBLIC_MOCK_ENABLED ? 'enabled' : 'disabled')
+console.log('Local mocking is', import.meta.env.PUBLIC_MOCK ? 'enabled' : 'disabled')
+console.log('Ledger emulator is', import.meta.env.PUBLIC_SPECULOS_PORT ? 'enabled' : 'disabled')
 
 const app = createApp(App)
 const router = createRouter({

apps/web/package.json

@@ -10,6 +10,9 @@
   },
   "dependencies": {
     "@heroicons/vue": "^1.0.6",
+    "@ledgerhq/hw-app-eth": "^6.29.4",
+    "@ledgerhq/hw-transport-webhid": "^6.27.2",
+    "buffer": "^6.0.3",
     "ethers": "^5.6.9",
     "iotex-antenna": "^0.31.3",
     "vue": "^3.2.25",
@@ -18,6 +21,7 @@
   "devDependencies": {
     "@esbuild-plugins/node-globals-polyfill": "^0.1.1",
     "@esbuild-plugins/node-modules-polyfill": "^0.1.4",
+    "@rollup/plugin-inject": "^4.0.4",
     "@vitejs/plugin-vue": "^2.3.3",
     "autoprefixer": "^10.4.7",
     "postcss": "^8.4.14",

apps/web/src/components/Wallet.vue

@@ -11,7 +11,10 @@
         </p>
       </div>
       <div class="coinbase-div">
-        <button class="coinbase-btn" @click="connectWallet('CoinbaseWallet')">
+        <button
+          class="coinbase-btn"
+          @click="connectWallet('CoinbaseWallet')"
+        >
           {{ coinbaseButtonText }}
         </button>
         <p>
@@ -20,23 +23,42 @@
         </p>
       </div>
       <div class="ioPay-div">
-        <button class="iopay-btn" @click="connectWallet('IoPay')">
+        <button
+          class="iopay-btn"
+          @click="connectWallet('IoPay')"
+        >
           {{ ioPayButtonText }}
         </button>
         <p>
           Connected ioPay Account:
           <span> {{ ioPayAccountsResult }} </span>
         </p>
       </div>
+      <button 
+        class="ledger-btn" 
+        @click="connectWallet('Ledger')"
+      >
+        Connect Ledger
+      </button>
     </div>
     <div class="form-container">
       <form @submit.prevent="sendTransaction(selectedProvider)">
         <label for="address">Address</label>
-        <input v-model="toAddress" type="text" placeholder="To Address" />
-        <br />
+        <input
+          v-model="toAddress"
+          type="text"
+          placeholder="To Address"
+        >
+        <br>
         <label for="amount">Amount</label>
-        <input v-model="amount" type="text" placeholder="Amount Ether" />
-        <button type="submit">Send Transaction</button>
+        <input
+          v-model="amount"
+          type="text"
+          placeholder="Amount Ether"
+        >
+        <button type="submit">
+          Send Transaction
+        </button>
       </form>
     </div>
   </div>
@@ -127,6 +149,10 @@ button {
   background-color: rgb(0, 218, 180);
 }
 
+.ledger-btn {
+  background-color: rgb(0, 0, 0);
+}
+
 .connect-wallet-container {
   display: flex;
   flex-direction: column;

apps/web/src/composables/ledger.ts

@@ -0,0 +1,26 @@
+import SpeculosHttpTransport from '@casimir/hw-transport-speculos'
+import TransportWebHID from '@ledgerhq/hw-transport-webhid'
+import Eth from '@ledgerhq/hw-app-eth'
+
+export default function useLedger() {
+
+    const bip32Path = '44\'/60\'/0\'/0/0'
+
+    async function getLedgerEthSigner() {
+        const transport = await _getLedgerTransport()
+        return new Eth(transport)
+    }
+
+    async function _getLedgerTransport() {
+        if (import.meta.env.PUBLIC_SPECULOS_PORT) {
+            return await SpeculosHttpTransport.open(`http://127.0.0.1:${import.meta.env.PUBLIC_SPECULOS_PORT}`)
+        } else {
+            return await TransportWebHID.create()
+        }
+    }
+
+    return {
+        bip32Path,
+        getLedgerEthSigner
+    }
+}

apps/web/src/composables/wallet.ts

@@ -1,6 +1,7 @@
 import { ref } from 'vue'
 import { ethers } from 'ethers'
 import useIoPay from '@/composables/iopay'
+import useLedger from '@/composables/ledger'
 import useEthers from '@/composables/ethers'
 import { BrowserProviders } from '@/interfaces/BrowserProviders'
 import { EthersProvider } from '@/interfaces/EthersProvider'
@@ -21,6 +22,7 @@ const ethersProviderList = ['MetaMask', 'CoinbaseWallet']
 
 export default function useWallet() {
   const { getIoPayAccounts, sendIoPayTransaction } = useIoPay()
+  const { bip32Path, getLedgerEthSigner } = useLedger()
   const ethereum: any = window.ethereum
   const availableProviders = ref<BrowserProviders>(
     getBrowserProviders(ethereum)
@@ -50,6 +52,11 @@ export default function useWallet() {
         const accounts = await getIoPayAccounts()
         const { address } = accounts[0]
         setSelectedAccount(address)
+      } else if (provider === 'Ledger') {
+        const ledgerEth = await getLedgerEthSigner()
+        const { address } = await ledgerEth.getAddress(bip32Path)
+        console.log(address)
+        setSelectedAccount(address)
       } else {
         throw new Error('No provider selected')
       }
@@ -76,6 +83,15 @@ export default function useWallet() {
         })
       } else if (selectedProvider.value === 'IoPay') {
         await sendIoPayTransaction(toAddress.value, amount.value)
+      } else if (selectedProvider.value === 'Ledger') {
+
+        // npm run dev:ethereum in another process
+        // const ledgerEth = await getLedgerEthSigner()
+        // Create - { to: ... }
+        // Serialize - ethers.utils.serializeTransaction
+        // Sign - ledgerEth.signTransaction
+        // Send - (new ethers.providers.JsonRpcProvider("http://127.0.0.1:8545")).sendTransaction
+
       } else {
         throw new Error('Provider selected not yet supported')
       }

apps/web/src/types/ProviderString.ts

@@ -1,2 +1,2 @@
 import { BrowserProviders } from '@/interfaces/BrowserProviders'
-export type ProviderString = keyof BrowserProviders | 'IoPay' | ''
+export type ProviderString = keyof BrowserProviders | 'IoPay' | 'Ledger' |''

apps/web/vite.config.ts

@@ -3,9 +3,8 @@ import { UserConfig } from 'vite'
 import { fileURLToPath } from 'url'
 import * as path from 'path'
 import pages from 'vite-plugin-pages'
-
-import NodeModulesPolyfills from '@esbuild-plugins/node-modules-polyfill'
 import NodeGlobalsPolyfillPlugin from '@esbuild-plugins/node-globals-polyfill'
+import inject from '@rollup/plugin-inject'
 
 const config: UserConfig = {
   plugins: [
@@ -14,20 +13,21 @@ const config: UserConfig = {
       dirs: [{ dir: 'src/pages', baseRoute: '' }],
       extensions: ['vue'],
     }),
+    inject({
+      Buffer: ['buffer', 'Buffer']
+    }) as Plugin // https://github.com/rollup/plugins/issues/1243
   ],
   define: {
-    'window.global': 'globalThis'
+    'global': 'globalThis'
   },
   optimizeDeps: {
     include: ['iotex-antenna'],
     esbuildOptions: {
       plugins: [
-        NodeModulesPolyfills(),
         NodeGlobalsPolyfillPlugin({
           process: true,
-          buffer: true,
-          define: true,
-        }),
+          buffer: true
+        })
       ],
     },
   },
@@ -39,7 +39,7 @@ const config: UserConfig = {
   resolve: {
     alias: {
       '@': path.resolve(path.dirname(fileURLToPath(import.meta.url)), 'src'),
-      './runtimeConfig': './runtimeConfig.browser',
+      './runtimeConfig': './runtimeConfig.browser'
     },
     extensions: [
       '.js',

common/data/pyproject.toml

@@ -13,7 +13,6 @@ python-dotenv = "^0.20.0"
 s3fs = "^2022.7.1"
 matplotlib = "^3.5.2"
 pandas = "^1.4.3"
-diagrams = "^0.21.1"
 
 [tool.poetry.dev-dependencies]
 jupyter = "^1.0.0"

common/data/src/index.ts

@@ -19,9 +19,12 @@ export function schemaToGlueColumns(jsonSchema: JsonSchema): glue.Column[] {
 
     let type: glue.Type = glue.Schema[typeKey]
 
-    if (name.endsWith('_at')) type = glue.Schema.DATE
+    if (name.endsWith('at')) type = glue.Schema.DATE
+
     if (name === 'candidate_list') type = glue.Schema.array(glue.Schema.STRING)
 
+    if (name.endsWith('amount')) type = glue.Schema.BIG_INT
+
     const comment = property.description
     return { name, type, comment }
   })

common/data/src/schemas/event.schema.json

@@ -45,7 +45,7 @@
             "description": "The list of candidates in a stake action"
         },
         "amount": {
-            "type": "integer",
+            "type": "string",
             "description": "The amount of the currency in the event"
         },
         "duration":{

common/hw-transport-speculos/.gitignore

@@ -0,0 +1,2 @@
+node_modules/
+dist/

common/hw-transport-speculos/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "@casimir/hw-transport-speculos",
+  "version": "0.0.1",
+  "main": "src/index.ts",
+  "dependencies": {
+    "@ledgerhq/hw-transport": "^6.27.2"
+  },
+  "scripts": {
+    "dev": "npx esno src/index.ts",
+    "build": "esbuild src/index.ts --bundle --minify --sourcemap --platform=node --target=esnext --outfile=dist/index.js",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  }
+}