From 96dc2883726dce82ca346df115b021599e3c9dac Mon Sep 17 00:00:00 2001 From: Mikhail <16622558+mmv08@users.noreply.github.com> Date: Tue, 14 May 2024 09:57:49 +0200 Subject: [PATCH] WIN --- .github/workflows/certora_4337.yml | 2 +- .github/workflows/ci_4337_gas_metering.yml | 8 ++++---- modules/4337/package.json | 2 -- modules/passkey/package.json | 3 +-- modules/passkey/tsconfig.json | 2 +- pnpm-lock.yaml | 10 +++++----- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/certora_4337.yml b/.github/workflows/certora_4337.yml index cb6f1c01..d30ad49f 100644 --- a/.github/workflows/certora_4337.yml +++ b/.github/workflows/certora_4337.yml @@ -37,7 +37,7 @@ jobs: sudo mv solc-static-linux /usr/local/bin/solc8.23 - name: Install dependencies - run: npm ci + run: pnpm install - name: Verify rule ${{ matrix.rule }} working-directory: ./modules/4337 diff --git a/.github/workflows/ci_4337_gas_metering.yml b/.github/workflows/ci_4337_gas_metering.yml index 0262192c..c4b5a541 100644 --- a/.github/workflows/ci_4337_gas_metering.yml +++ b/.github/workflows/ci_4337_gas_metering.yml @@ -12,11 +12,11 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 20.x - cache: npm - cache-dependency-path: package-lock.json + node-version: ${{ matrix.node-version }} + cache: 'pnpm' + - name: Install dependencies + run: pnpm install - run: | - npm ci npm run fmt:check -w examples/4337-gas-metering npm run lint -w examples/4337-gas-metering npm run build -w examples/4337-gas-metering diff --git a/modules/4337/package.json b/modules/4337/package.json index 65a76ba4..cb0feb1a 100644 --- a/modules/4337/package.json +++ b/modules/4337/package.json @@ -9,8 +9,6 @@ "files": [ "contracts", "dist", - "src", - "test", "build" ], "scripts": { diff --git a/modules/passkey/package.json b/modules/passkey/package.json index a8e82211..b603b0c3 100644 --- a/modules/passkey/package.json +++ b/modules/passkey/package.json @@ -23,7 +23,6 @@ "files": [ "contracts", "dist", - "src", "build" ], "scripts": { @@ -50,7 +49,7 @@ "@noble/curves": "^1.4.0", "@nomicfoundation/hardhat-toolbox": "^5.0.0", "@safe-global/mock-contract": "^4.1.0", - "@safe-global/safe-4337": "^0.3.0", + "@safe-global/safe-4337": "workspace:^0.3.0", "@safe-global/safe-4337-local-bundler": "workspace:^0.0.0", "@simplewebauthn/server": "^10.0.0", "dotenv": "^16.4.5", diff --git a/modules/passkey/tsconfig.json b/modules/passkey/tsconfig.json index ae3d7616..38f89d8c 100644 --- a/modules/passkey/tsconfig.json +++ b/modules/passkey/tsconfig.json @@ -10,5 +10,5 @@ "skipLibCheck": true, "resolveJsonModule": true }, - "include": ["src/**/*.ts", "hardhat.config.ts", "test", "./typechain-types"] + "include": ["./src/**/*.ts", "./hardhat.config.ts", "./test", "./typechain-types"] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d77e789a..abd770f7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -335,8 +335,8 @@ importers: specifier: ^4.1.0 version: 4.1.0 '@safe-global/safe-4337': - specifier: ^0.3.0 - version: 0.3.0(ethers@6.12.1(bufferutil@4.0.8)(utf-8-validate@5.0.10)) + specifier: workspace:^0.3.0 + version: link:../4337 '@safe-global/safe-4337-local-bundler': specifier: workspace:^0.0.0 version: link:../../packages/4337-local-bundler @@ -6304,7 +6304,7 @@ snapshots: '@scure/bip32@1.3.2': dependencies: '@noble/curves': 1.2.0 - '@noble/hashes': 1.3.3 + '@noble/hashes': 1.3.2 '@scure/base': 1.1.6 '@scure/bip32@1.3.3': @@ -6320,7 +6320,7 @@ snapshots: '@scure/bip39@1.2.1': dependencies: - '@noble/hashes': 1.3.3 + '@noble/hashes': 1.3.2 '@scure/base': 1.1.6 '@scure/bip39@1.2.2': @@ -9953,7 +9953,7 @@ snapshots: rimraf@2.7.1: dependencies: - glob: 7.2.3 + glob: 7.2.0 rimraf@3.0.2: dependencies: