Merge pull request #7 from bobanetwork/wsdt/general-cleanup

chore: Frontend deployed
bobanetwork · Jul 30, 2024 · a2734d3 · a2734d3
2 parents e7f968c + c8e2622
commit a2734d3
Show file tree

Hide file tree

Showing 65 changed files with 4,233 additions and 6,710 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,6 @@
-[submodule "lib/forge-std"]
-	path = lib/forge-std
+[submodule "contracts/lib/forge-std"]
+	path = contracts/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "openzeppelin-contracts"]
-	path = openzeppelin-contracts
+[submodule "contracts/lib/openzeppelin-contracts"]
+	path = contracts/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-	branch = release-v4.8
diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml
@@ -6,11 +6,11 @@ services:
       context: ./offchain
       dockerfile: ../Dockerfile
     ports:
-      - "${OC_LISTEN_PORT:-3000}:${OC_LISTEN_PORT:-3000}"
+      - "${OC_LISTEN_PORT:-1234}:${OC_LISTEN_PORT:-1234}"
     env_file: .env
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:${OC_LISTEN_PORT:-3000}/hc"]
+      test: ["CMD", "curl", "-f", "http://localhost:${OC_LISTEN_PORT:-1234}/hc"]
       interval: 30s
       timeout: 10s
       retries: 3

diff --git a/backend/package.json b/backend/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "aa-hc-backend",
+  "name": "aa-hc-example-backend",
   "version": "1.0.0",
   "main": "index.js",
   "scripts": {

diff --git a/contracts/.github/workflows/test.yml b/contracts/.github/workflows/test.yml
@@ -0,0 +1,45 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+env:
+  FOUNDRY_PROFILE: ci
+
+jobs:
+  check:
+    strategy:
+      fail-fast: true
+
+    name: Foundry project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      - name: Show Forge version
+        run: |
+          forge --version
+
+      - name: Run Forge fmt
+        run: |
+          forge fmt --check
+        id: fmt
+
+      - name: Run Forge build
+        run: |
+          forge build --sizes
+        id: build
+
+      - name: Run Forge tests
+        run: |
+          forge test -vvv
+        id: test
diff --git a/contracts/.gitignore b/contracts/.gitignore
@@ -0,0 +1,14 @@
+# Compiler files
+cache/
+out/
+
+# Ignores development broadcast logs
+!/broadcast
+/broadcast/*/31337/
+/broadcast/**/dry-run/
+
+# Docs
+docs/
+
+# Dotenv file
+.env
diff --git a/contracts/foundry.toml b/contracts/foundry.toml
@@ -1,6 +1,6 @@
 [profile.default]
-src = 'contracts'
-out = 'out'
+src = "src"
+out = "out"
 libs = ['node_modules', 'lib']
 test = 'test'
 cache_path  = 'cache_forge'
@@ -10,4 +10,5 @@ remappings = [
     "@openzeppelin/=node_modules/@openzeppelin/",
     "@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/",
     "hardhat/=node_modules/hardhat/"
-]
+]
+
diff --git a/contracts/jest.config.js b/contracts/jest.config.js
@@ -1,8 +1,6 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
   preset: "ts-jest",
- // testEnvironment: "node",
- // moduleNameMapper: {
- //   '^@/(.*)$': '<rootDir>/src/$1'
- // }
+  testMatch: ["<rootDir>/test/**/*.test.{js,jsx,ts,tsx}"],
+  testEnvironment: "node",
 }
diff --git a/contracts/lib/forge-std b/contracts/lib/forge-std
diff --git a/contracts/lib/openzeppelin-contracts b/contracts/lib/openzeppelin-contracts
diff --git a/contracts/package.json b/contracts/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "aa-hc",
+  "name": "aa-hc-example-contracts",
   "version": "1.0.0",
   "main": "index.js",
   "scripts": {
-    "start": "ts-node src/backend/server.ts",
-    "test": "jest"
+    "build": "forge build",
+    "test": "forge test && jest"
   },
   "license": "MIT",
   "devDependencies": {
@@ -28,7 +28,7 @@
     "@types/supertest": "^6.0.2",
     "axios-mock-adapter": "^1.22.0",
     "chai": "4",
-    "ethers": "5",
+    "ethers": "^6.13.2",
     "hardhat": "^2.22.6",
     "hardhat-gas-reporter": "^2.2.0",
     "jest": "^29.7.0",

diff --git a/contracts/pnpm-lock.yaml b/contracts/pnpm-lock.yaml
diff --git a/contracts/scripts/deploy.s.sol → contracts/script/deploy.s.sol b/contracts/scripts/deploy.s.sol → contracts/script/deploy.s.sol
@@ -2,11 +2,11 @@
 pragma solidity ^0.8.13;
 
 import "forge-std/Script.sol";
-import "../contracts/core/EntryPoint.sol";
-import "../contracts/core/HCHelper.sol";
-import "../contracts/samples/HybridAccountFactory.sol";
-import "../contracts/samples/SimpleAccountFactory.sol";
-import "../contracts/TokenPrice.sol";
+import "../src/core/EntryPoint.sol";
+import "../src/core/HCHelper.sol";
+import "../src/samples/HybridAccountFactory.sol";
+import "../src/samples/SimpleAccountFactory.sol";
+import "../src/TokenPrice.sol";
 //import "openzeppelin-contracts/contracts/mocks/InitializableMock.sol";
 // forge script scripts/deploy.sol:DeployExample --rpc-url http://localhost:9545 --broadcast
 

diff --git a/contracts/scripts/prefund.s.sol → contracts/script/prefund.s.sol b/contracts/scripts/prefund.s.sol → contracts/script/prefund.s.sol
diff --git a/contracts/contracts/Lock.sol → contracts/src/Lock.sol b/contracts/contracts/Lock.sol → contracts/src/Lock.sol
diff --git a/contracts/contracts/TokenPrice.sol → contracts/src/TokenPrice.sol b/contracts/contracts/TokenPrice.sol → contracts/src/TokenPrice.sol
@@ -16,13 +16,6 @@ contract TokenPrice {
         helperAddr = _helperAddr;
     }
 
-    function getTest(string calldata token) public {
-        tokenPrices[token] = TokenPriceStruct({
-            price: "10",
-            timestamp: block.timestamp
-        });
-    }
-
     function fetchPrice(string calldata token) public {
         HybridAccount ha = HybridAccount(payable(helperAddr));
         string memory price;

diff --git a/contracts/contracts/core/BaseAccount.sol → contracts/src/core/BaseAccount.sol b/contracts/contracts/core/BaseAccount.sol → contracts/src/core/BaseAccount.sol
diff --git a/contracts/contracts/core/BasePaymaster.sol → contracts/src/core/BasePaymaster.sol b/contracts/contracts/core/BasePaymaster.sol → contracts/src/core/BasePaymaster.sol
diff --git a/contracts/contracts/core/EntryPoint.sol → contracts/src/core/EntryPoint.sol b/contracts/contracts/core/EntryPoint.sol → contracts/src/core/EntryPoint.sol
diff --git a/contracts/contracts/core/HCHelper.sol → contracts/src/core/HCHelper.sol b/contracts/contracts/core/HCHelper.sol → contracts/src/core/HCHelper.sol
diff --git a/contracts/contracts/core/Helpers.sol → contracts/src/core/Helpers.sol b/contracts/contracts/core/Helpers.sol → contracts/src/core/Helpers.sol
diff --git a/contracts/contracts/core/NonceManager.sol → contracts/src/core/NonceManager.sol b/contracts/contracts/core/NonceManager.sol → contracts/src/core/NonceManager.sol
diff --git a/contracts/contracts/core/SenderCreator.sol → contracts/src/core/SenderCreator.sol b/contracts/contracts/core/SenderCreator.sol → contracts/src/core/SenderCreator.sol
diff --git a/contracts/contracts/core/StakeManager.sol → contracts/src/core/StakeManager.sol b/contracts/contracts/core/StakeManager.sol → contracts/src/core/StakeManager.sol
diff --git a/contracts/contracts/interfaces/IAccount.sol → contracts/src/interfaces/IAccount.sol b/contracts/contracts/interfaces/IAccount.sol → contracts/src/interfaces/IAccount.sol
diff --git a/...acts/contracts/interfaces/IAggregator.sol → contracts/src/interfaces/IAggregator.sol b/...acts/contracts/interfaces/IAggregator.sol → contracts/src/interfaces/IAggregator.sol
diff --git a/...acts/contracts/interfaces/IEntryPoint.sol → contracts/src/interfaces/IEntryPoint.sol b/...acts/contracts/interfaces/IEntryPoint.sol → contracts/src/interfaces/IEntryPoint.sol
diff --git a/...ts/contracts/interfaces/INonceManager.sol → contracts/src/interfaces/INonceManager.sol b/...ts/contracts/interfaces/INonceManager.sol → contracts/src/interfaces/INonceManager.sol
diff --git a/...racts/contracts/interfaces/IPaymaster.sol → contracts/src/interfaces/IPaymaster.sol b/...racts/contracts/interfaces/IPaymaster.sol → contracts/src/interfaces/IPaymaster.sol
diff --git a/...ts/contracts/interfaces/IStakeManager.sol → contracts/src/interfaces/IStakeManager.sol b/...ts/contracts/interfaces/IStakeManager.sol → contracts/src/interfaces/IStakeManager.sol
diff --git a/...ts/contracts/interfaces/UserOperation.sol → contracts/src/interfaces/UserOperation.sol b/...ts/contracts/interfaces/UserOperation.sol → contracts/src/interfaces/UserOperation.sol
diff --git a/...ts/contracts/samples/DepositPaymaster.sol → contracts/src/samples/DepositPaymaster.sol b/...ts/contracts/samples/DepositPaymaster.sol → contracts/src/samples/DepositPaymaster.sol
diff --git a/...racts/contracts/samples/HybridAccount.sol → contracts/src/samples/HybridAccount.sol b/...racts/contracts/samples/HybridAccount.sol → contracts/src/samples/HybridAccount.sol
diff --git a/...ontracts/samples/HybridAccountFactory.sol → ...acts/src/samples/HybridAccountFactory.sol b/...ontracts/samples/HybridAccountFactory.sol → ...acts/src/samples/HybridAccountFactory.sol
diff --git a/contracts/contracts/samples/IOracle.sol → contracts/src/samples/IOracle.sol b/contracts/contracts/samples/IOracle.sol → contracts/src/samples/IOracle.sol
diff --git a/...racts/contracts/samples/SimpleAccount.sol → contracts/src/samples/SimpleAccount.sol b/...racts/contracts/samples/SimpleAccount.sol → contracts/src/samples/SimpleAccount.sol
diff --git a/...ontracts/samples/SimpleAccountFactory.sol → ...acts/src/samples/SimpleAccountFactory.sol b/...ontracts/samples/SimpleAccountFactory.sol → ...acts/src/samples/SimpleAccountFactory.sol
diff --git a/...acts/contracts/samples/TokenPaymaster.sol → contracts/src/samples/TokenPaymaster.sol b/...acts/contracts/samples/TokenPaymaster.sol → contracts/src/samples/TokenPaymaster.sol
diff --git a/.../contracts/samples/VerifyingPaymaster.sol → contracts/src/samples/VerifyingPaymaster.sol b/.../contracts/samples/VerifyingPaymaster.sol → contracts/src/samples/VerifyingPaymaster.sol
diff --git a/...acts/contracts/samples/bls/BLSAccount.sol → contracts/src/samples/bls/BLSAccount.sol b/...acts/contracts/samples/bls/BLSAccount.sol → contracts/src/samples/bls/BLSAccount.sol
diff --git a/...ntracts/samples/bls/BLSAccountFactory.sol → ...cts/src/samples/bls/BLSAccountFactory.sol b/...ntracts/samples/bls/BLSAccountFactory.sol → ...cts/src/samples/bls/BLSAccountFactory.sol
diff --git a/...racts/contracts/samples/bls/BLSHelper.sol → contracts/src/samples/bls/BLSHelper.sol b/...racts/contracts/samples/bls/BLSHelper.sol → contracts/src/samples/bls/BLSHelper.sol
diff --git a/...ts/samples/bls/BLSSignatureAggregator.sol → ...rc/samples/bls/BLSSignatureAggregator.sol b/...ts/samples/bls/BLSSignatureAggregator.sol → ...rc/samples/bls/BLSSignatureAggregator.sol
diff --git a/...cts/contracts/samples/bls/IBLSAccount.sol → contracts/src/samples/bls/IBLSAccount.sol b/...cts/contracts/samples/bls/IBLSAccount.sol → contracts/src/samples/bls/IBLSAccount.sol
diff --git a/...cts/contracts/samples/bls/lib/BLSOpen.sol → contracts/src/samples/bls/lib/BLSOpen.sol b/...cts/contracts/samples/bls/lib/BLSOpen.sol → contracts/src/samples/bls/lib/BLSOpen.sol
diff --git a/...b/hubble-contracts/contracts/libs/BLS.sol → ...b/hubble-contracts/contracts/libs/BLS.sol b/...b/hubble-contracts/contracts/libs/BLS.sol → ...b/hubble-contracts/contracts/libs/BLS.sol
diff --git a/...libs/BNPairingPrecompileCostEstimator.sol → ...libs/BNPairingPrecompileCostEstimator.sol b/...libs/BNPairingPrecompileCostEstimator.sol → ...libs/BNPairingPrecompileCostEstimator.sol
diff --git a/...ubble-contracts/contracts/libs/ModExp.sol → ...ubble-contracts/contracts/libs/ModExp.sol b/...ubble-contracts/contracts/libs/ModExp.sol → ...ubble-contracts/contracts/libs/ModExp.sol
diff --git a/...samples/callback/TokenCallbackHandler.sol → ...samples/callback/TokenCallbackHandler.sol b/...samples/callback/TokenCallbackHandler.sol → ...samples/callback/TokenCallbackHandler.sol
diff --git a/contracts/contracts/utils/Exec.sol → contracts/src/utils/Exec.sol b/contracts/contracts/utils/Exec.sol → contracts/src/utils/Exec.sol