Promote develop to master

.github/workflows/pull_request.yml

@@ -25,8 +25,8 @@ jobs:
         env:
           PUBLIC_STAGE: ${{ env.STAGE }}
 
-      - name: Build users service
-        run: npm run build --workspace @casimir/users
+      - name: Build auth service
+        run: npm run build --workspace @casimir/auth
 
       - name: Test cdk stacks
         run: npm run test --workspace @casimir/cdk

.github/workflows/push.yml

@@ -45,8 +45,8 @@ jobs:
         env:
           PUBLIC_STAGE: ${{ env.STAGE }}
 
-      - name: Build users service
-        run: npm run build --workspace @casimir/users
+      - name: Build auth service
+        run: npm run build --workspace @casimir/auth
 
       - name: Deploy cdk infrastructure
         run: npm run deploy

.github/workflows/release.yml

@@ -43,8 +43,8 @@ jobs:
       - name: Build landing app
         run: npm run build --workspace @casimir/landing
 
-      - name: Build users service
-        run: npm run build --workspace @casimir/users
+      - name: Build auth service
+        run: npm run build --workspace @casimir/auth
 
       - name: Deploy cdk infrastructure
         run: npm run deploy

README.md

@@ -100,37 +100,31 @@ Ethereum contract development is serviced through [Hardhat](https://hardhat.io/)
 1. Compile the contracts in [contracts/ethereum](contracts/ethereum).
 
     ```zsh
-    npm run task:compile
+    npm run task:compile --workspace @casimir/ethereum
     ```
 
-2. Deploy a contract, specifically [contracts/ethereum/src/Sample.sol](contracts/ethereum/src/Sample.sol) with [contracts/ethereum/deploy/sample.ts](contracts/ethereum/deploy/sample.ts).
+2. Deploy a contract, specifically [contracts/ethereum/src/SSVManager.sol](contracts/ethereum/src/Sample.sol) with [contracts/ethereum/deploy/ssv.deploy.ts](contracts/ethereum/deploy/ssv.deploy.ts).
 
     ```zsh
-    npm run deploy:sample
+    npm run deploy:ssv --workspace @casimir/ethereum
     ```
 
 3. Test the Sample with the tests in [contracts/ethereum/test/sample.ts](contracts/ethereum/test/sample.ts).
 
     ```zsh
-    npm run test:contracts
+    npm run test --workspace @casimir/ethereum
     ```
 
-4. Print all local accounts.
-
-    ```zsh
-    npm run task:accounts
-    ```
-
-6. Use a contract in a Casimir app.
+4. Use a contract in the Casimir web app.
 
     ```typescript
     // Todo add Casimir Typescript usage
     ```
 
-7. Clean [contracts/ethereum/build/artifacts](contracts/ethereum/build/artifacts) and [contracts/ethereum/build/cache](contracts/ethereum/build/cache)).    
+5. Clean [contracts/ethereum/build/artifacts](contracts/ethereum/build/artifacts) and [contracts/ethereum/build/cache](contracts/ethereum/build/cache)).    
 
     ```zsh
-    npm run task:clean
+    npm run task:clean --workspace @casimir/ethereum
     ```
 
     > 🚩 Note, this is required if you change the Hardhat configuration.
@@ -226,7 +220,7 @@ Code is organized into work directories (apps, services, infrastructure – and
 ├── scripts/ (devops and build scripts)
 |   └── local/ (mock and serve tasks)
 ├── services/ (backend services)
-|   └── users/ (users lambda api)
+|   └── auth/ (auth lambda api)
 └── package.json (project-wide npm dependencies and scripts)
 ```
 

apps/landing/src/pages/index/index.vue

@@ -3,9 +3,7 @@ import { ArrowRightIcon } from '@heroicons/vue/solid'
 import { ref, Ref } from 'vue'
 import Puddles from '@/components/Puddles.vue'
 import useSlideshow from '@/composables/slideshow'
-import useUsers from '@/composables/users'
 const { slideshowProgress, currentSlide } = useSlideshow()
-const { signupUser } = useUsers()
 const successMessage: Ref = ref<HTMLDivElement>()
 const invalidMessage: Ref = ref<HTMLDivElement>()
 
@@ -27,8 +25,7 @@ async function onSubmit() {
     const newEmail = email.value
     email.value = ''
     successMessage.value.style.display = 'block'
-    const res = await signupUser(newEmail)
-    console.log('Signup result', await res.json())
+    console.log('Email signup API removed. You sent', newEmail)
   } catch (err) {
     console.log('Signup error', err)
   }

apps/web/src/composables/auth.ts

@@ -0,0 +1,39 @@
+import { LoginCredentials } from '@casimir/types'
+
+export default function useAuth() {
+
+    /**
+     * Logs a user in with an address, message and signed message
+     * 
+     * @param {LoginCredentials} loginCredentials - The user's address, message and signed message 
+     * @returns {Promise<Response>} - The response from the login request
+     */
+    async function login(loginCredentials: LoginCredentials): Promise<Response> {
+        const requestOptions = {
+            method: 'POST',
+            headers: { 
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify(loginCredentials)
+        }
+        const authBaseUrl = _getAuthBaseUrl()
+        return await fetch(`${authBaseUrl}/login`, requestOptions)
+    }
+
+    /**
+     * Get the auth base url for the current environment
+     * 
+     * @returns {string} The base URL for the auth API
+     */
+    function _getAuthBaseUrl(): string {
+        if (import.meta.env.PUBLIC_MOCK) {
+            return `http://localhost:${import.meta.env.PUBLIC_AUTH_PORT}`
+        } else {
+            return `https://auth.${import.meta.env.PUBLIC_STAGE || 'dev'}.casimir.co`
+        }
+    }
+
+    return {
+        login
+    }
+}

apps/web/src/composables/ethers.ts

@@ -5,6 +5,9 @@ import { EthersProvider } from '@/interfaces/EthersProvider'
 import { ProviderString } from '@/types/ProviderString'
 import { TransactionInit } from '@/interfaces/TransactionInit'
 import { MessageInit } from '@/interfaces/MessageInit'
+import { TransactionRequest } from '@ethersproject/abstract-provider'
+import { Deferrable } from '@ethersproject/properties'
+import useAuth from '@/composables/auth'
 
 const defaultProviders = {
   MetaMask: undefined,
@@ -60,10 +63,26 @@ export default function useEthers() {
       new ethers.providers.Web3Provider(browserProvider as EthersProvider)
     const signer = web3Provider.getSigner()
     const signature = await signer.signMessage(hashedMessage)
+
+    // Todo move this sample code
+    const { login } = useAuth()
+    const response = await login({ address: signer._address, message: hashedMessage, signedMessage: signature })
+    console.log('Response', await response.json()) // Currently the response is always false
+
     return signature
   }
 
-  return { ethersProviderList, getEthersAddress, sendEthersTransaction, signEthersMessage }
+  async function getGasPriceAndLimit(
+    rpcUrl: string,
+    unsignedTransaction: Deferrable<TransactionRequest>
+  ) {
+    const provider = new ethers.providers.JsonRpcProvider(rpcUrl)
+    const gasPrice = await provider.getGasPrice()
+    const gasLimit = await provider.estimateGas(unsignedTransaction as Deferrable<TransactionRequest>)
+    return { gasPrice, gasLimit }
+  }
+
+  return { ethersProviderList, getEthersAddress, sendEthersTransaction, signEthersMessage, getGasPriceAndLimit }
 }
 
 function getBrowserProviders(ethereum: any) {

apps/web/src/composables/ledger.ts

@@ -6,6 +6,7 @@ import { TransactionInit } from '@/interfaces/TransactionInit'
 import { Deferrable } from '@ethersproject/properties'
 import { TransactionRequest } from '@ethersproject/abstract-provider'
 import { MessageInit } from '@/interfaces/MessageInit'
+import useEthers from './ethers'
 
 export default function useLedger() {
   const bip32Path = '44\'/60\'/0\'/0/0'
@@ -36,18 +37,16 @@ export default function useLedger() {
     const rpcUrl = import.meta.env.PUBLIC_ETHEREUM_RPC || 'http://localhost:8545/'
     const provider = new ethers.providers.JsonRpcProvider(rpcUrl)
     const { chainId } = await provider.getNetwork()
-    const gasPrice = await provider.getGasPrice()
     const nonce = await provider.getTransactionCount(from)
     const unsignedTransaction: ethers.utils.UnsignedTransaction = {
       to,
-      gasPrice,
       nonce,
       chainId,
       value: ethers.utils.parseUnits(value)
     }
-    const gasLimit = await provider.estimateGas(
-      unsignedTransaction as Deferrable<TransactionRequest>
-    )
+    const { getGasPriceAndLimit } = useEthers()
+    const { gasPrice, gasLimit } = await getGasPriceAndLimit(rpcUrl, unsignedTransaction as Deferrable<TransactionRequest>)
+    unsignedTransaction.gasPrice = gasPrice
     unsignedTransaction.gasLimit = gasLimit
 
     // Todo check before click (user can +/- gas limit accordingly)

common/types/package.json

@@ -0,0 +1,5 @@
+{
+    "name": "@casimir/types",
+    "private": true,
+    "main": "src/index.ts"
+}

common/types/src/index.ts

@@ -0,0 +1,2 @@
+import { LoginCredentials } from './interfaces/LoginCredentials'
+export type { LoginCredentials }

common/types/src/interfaces/LoginCredentials.ts

@@ -0,0 +1,5 @@
+export interface LoginCredentials {
+    address: string;
+    message: string;
+    signedMessage: string;
+}

contracts/ethereum/deploy/ssv.deploy.ts

@@ -1,6 +1,5 @@
-import hre from 'hardhat'
+import { ethers } from 'hardhat'
 import { SSVManager } from '@casimir/ethereum/build/artifacts/types'
-const { ethers } = hre
 
 async function main() {
   const factory = await ethers.getContractFactory('SSVManager')

contracts/ethereum/package.json

@@ -3,7 +3,7 @@
     "scripts": {
         "dev:node": "npx hardhat node",
         "deploy:ssv": "npx hardhat run deploy/ssv.deploy.ts",
-        "test:contracts": "npx hardhat test",
+        "test": "mocha --require hardhat/register --recursive --exit --extension ts --timeout 15000",
         "task:clean": "npx hardhat clean",
         "task:compile": "npm run task:clean && npx hardhat compile",
         "postinstall": "npm run task:compile"
@@ -19,9 +19,9 @@
         "@types/mocha": "^9.1.1",
         "@types/node": "^17.0.45",
         "chai": "^4.3.6",
-        "ethereum-waffle": "^3.4.4",
-        "hardhat": "^2.9.9",
+        "hardhat": "^2.12.0",
         "localtunnel": "^2.0.2",
+        "mocha": "^10.0.0",
         "ts-node": "^10.8.2",
         "typechain": "^8.1.0"
     }

contracts/ethereum/test/ssv.test.ts

@@ -1,8 +1,7 @@
-import hre from 'hardhat'
+import { ethers } from 'hardhat'
 import { loadFixture } from '@nomicfoundation/hardhat-network-helpers'
 import { expect } from 'chai'
 import { SSVManager } from '@casimir/ethereum/build/artifacts/types'
-const { ethers } = hre
 
 /** Fixture to deploy SSV manager contract */
 async function deploymentFixture() {
@@ -43,7 +42,7 @@ async function thirdUserDepositFixture() {
   return { contract, firstUser, owner, secondUser, thirdUser }
 }
 
-describe('SSV Manager', async function () {
+describe('SSV manager', async function () {
 
   it('First user\'s deposit of 16 ETH should open the first pool', async function () {
     const { contract } = await loadFixture(firstUserDepositFixture)

infrastructure/cdk/bin/index.ts

@@ -3,7 +3,7 @@ import 'source-map-support/register'
 import * as cdk from 'aws-cdk-lib'
 import { pascalCase } from '@casimir/helpers'
 import { LandingStack } from '../lib/landing/landing-stack'
-import { UsersStack } from '../lib/users/users-stack'
+import { AuthStack } from '../lib/auth/auth-stack'
 import { DnsStack } from '../lib/dns/dns-stack'
 import { EtlStack } from '../lib/etl/etl-stack'
 
@@ -19,6 +19,6 @@ if (!process.env.PROJECT || !process.env.STAGE) {
     const dnsStack = new DnsStack(app, `${project}DnsStack${stage}`, { env: defaultEnv, project, stage })
     const { domain, dnsRecords, hostedZone } = dnsStack
     new EtlStack(app, `${project}EtlStack${stage}`, { env: defaultEnv, project, stage })
-    new UsersStack(app, `${project}UsersStack${stage}`, { env: defaultEnv, project, stage, domain, dnsRecords, hostedZone })
+    new AuthStack(app, `${project}AuthStack${stage}`, { env: defaultEnv, project, stage, domain, dnsRecords, hostedZone })
     new LandingStack(app, `${project}LandingStack${stage}`, { env: defaultEnv, project, stage, domain, dnsRecords, hostedZone })
 }