From 9b45a73a99b879e6fd362553f60de79405abad98 Mon Sep 17 00:00:00 2001 From: Jakub Nowakowski Date: Wed, 10 Apr 2024 11:08:24 +0200 Subject: [PATCH 1/5] Move core/ to solidity/ In the current approach we don't exect external contracts modules to be defined so we replace the core/ directory with solidity/. This is consistent with other mono-repos we have. --- .github/workflows/reusable-sdk-build.yaml | 12 ++-- ...uild.yaml => reusable-solidity-build.yaml} | 16 ++--- .github/workflows/sdk.yaml | 12 ++-- .../workflows/{core.yaml => solidity.yaml} | 62 +++++++++---------- .pre-commit-config.yaml | 29 +++++---- .prettierignore | 2 +- README.md | 4 +- netlify.toml | 8 +-- pnpm-workspace.yaml | 2 +- sdk/package.json | 2 +- sdk/src/lib/ethereum/bitcoin-depositor.ts | 2 +- sdk/src/lib/ethereum/stbtc.ts | 2 +- sdk/test/lib/ethereum/tbtc-depositor.test.ts | 2 +- {core => solidity}/.env | 0 {core => solidity}/.env.example | 0 {core => solidity}/.eslintignore | 0 {core => solidity}/.eslintrc | 0 {core => solidity}/.gitignore | 0 {core => solidity}/.mocharc.json | 0 {core => solidity}/.nvmrc | 0 {core => solidity}/.prettierignore | 0 {core => solidity}/.prettierrc.js | 0 {core => solidity}/.solhint.json | 0 {core => solidity}/.solhintignore | 0 {core => solidity}/.tsconfig-eslint.json | 0 {core => solidity}/README.md | 0 .../contracts/BitcoinDepositor.sol | 0 .../contracts/BitcoinRedeemer.sol | 0 .../contracts/MezoAllocator.sol | 0 .../contracts/PausableOwnable.sol | 0 .../contracts/bridge/ITBTCToken.sol | 0 .../contracts/interfaces/IDispatcher.sol | 0 .../contracts/lib/ERC4626Fees.sol | 0 {core => solidity}/contracts/stBTC.sol | 0 .../test/BitcoinDepositorHarness.sol | 0 .../contracts/test/MezoPortalStub.sol | 0 .../contracts/test/TestERC20.sol | 0 .../contracts/test/TestERC4626.sol | 0 .../contracts/test/TestTBTC.sol | 0 .../test/upgrades/BitcoinDepositorV2.sol | 0 .../contracts/test/upgrades/stBTCV2.sol | 0 {core => solidity}/contracts/utils/Errors.sol | 0 .../deploy/00_resolve_mezo_portal.ts | 0 .../deploy/00_resolve_tbtc_bridge.ts | 0 .../deploy/00_resolve_tbtc_token.ts | 0 .../deploy/00_resolve_tbtc_vault.ts | 0 .../deploy/00_resolve_testing_erc4626.ts | 0 {core => solidity}/deploy/01_deploy_stbtc.ts | 0 .../deploy/02_deploy_mezo_allocator.ts | 0 .../deploy/03_deploy_bitcoin_depositor.ts | 0 .../deploy/04_deploy_bitcoin_redeemer.ts | 0 .../deploy/11_stbtc_update_dispatcher.ts | 0 .../12_mezo_allocator_update_maintainer.ts | 0 .../13_stbtc_update_minimum_deposit_amount.ts | 0 .../deploy/14_update_pause_admin_stbtc.ts | 0 .../deploy/21_transfer_ownership_stbtc.ts | 0 ...23_transfer_ownership_bitcoin_depositor.ts | 0 .../24_transfer_ownership_bitcoin_redeemer.ts | 0 .../24_transfer_ownership_mezo_allocator.ts | 0 .../deployments/sepolia/.chainId | 0 .../deployments/sepolia/BitcoinDepositor.json | 0 .../49f0432287e96a47d66ba17ae7bf5d96.json | 0 .../b22c277b248ba02f9ec5bf62d176f9ce.json | 0 .../deployments/sepolia/stBTC.json | 0 .../external/mainnet/Bridge.json | 0 .../external/mainnet/MezoPortal.json | 0 {core => solidity}/external/mainnet/TBTC.json | 0 .../external/mainnet/TBTCVault.json | 0 .../external/sepolia/Bridge.json | 0 .../external/sepolia/MezoPortal.json | 0 {core => solidity}/external/sepolia/TBTC.json | 0 .../external/sepolia/TBTCVault.json | 0 {core => solidity}/hardhat.config.ts | 0 {core => solidity}/helpers/address.ts | 0 {core => solidity}/helpers/deployment.ts | 0 {core => solidity}/package.json | 2 +- .../scripts/fetch_external_artifacts.sh | 0 {core => solidity}/slither.config.json | 0 .../test/BitcoinDepositor.test.ts | 0 .../test/BitcoinDepositor.upgrade.test.ts | 0 .../test/BitcoinRedeemer.test.ts | 0 {core => solidity}/test/Deployment.test.ts | 0 {core => solidity}/test/MezoAllocator.test.ts | 0 {core => solidity}/test/data/tbtc.ts | 0 {core => solidity}/test/helpers.test.ts | 0 {core => solidity}/test/helpers/context.ts | 0 {core => solidity}/test/helpers/contract.ts | 0 {core => solidity}/test/helpers/index.ts | 0 {core => solidity}/test/helpers/snapshot.ts | 0 {core => solidity}/test/stBTC.test.ts | 0 {core => solidity}/test/stBTC.upgrade.test.ts | 0 {core => solidity}/test/utils/index.ts | 0 {core => solidity}/test/utils/number.ts | 0 {core => solidity}/tsconfig.export.json | 0 {core => solidity}/tsconfig.json | 0 {core => solidity}/types/index.ts | 0 96 files changed, 78 insertions(+), 79 deletions(-) rename .github/workflows/{reusable-core-build.yaml => reusable-solidity-build.yaml} (69%) rename .github/workflows/{core.yaml => solidity.yaml} (79%) rename {core => solidity}/.env (100%) rename {core => solidity}/.env.example (100%) rename {core => solidity}/.eslintignore (100%) rename {core => solidity}/.eslintrc (100%) rename {core => solidity}/.gitignore (100%) rename {core => solidity}/.mocharc.json (100%) rename {core => solidity}/.nvmrc (100%) rename {core => solidity}/.prettierignore (100%) rename {core => solidity}/.prettierrc.js (100%) rename {core => solidity}/.solhint.json (100%) rename {core => solidity}/.solhintignore (100%) rename {core => solidity}/.tsconfig-eslint.json (100%) rename {core => solidity}/README.md (100%) rename {core => solidity}/contracts/BitcoinDepositor.sol (100%) rename {core => solidity}/contracts/BitcoinRedeemer.sol (100%) rename {core => solidity}/contracts/MezoAllocator.sol (100%) rename {core => solidity}/contracts/PausableOwnable.sol (100%) rename {core => solidity}/contracts/bridge/ITBTCToken.sol (100%) rename {core => solidity}/contracts/interfaces/IDispatcher.sol (100%) rename {core => solidity}/contracts/lib/ERC4626Fees.sol (100%) rename {core => solidity}/contracts/stBTC.sol (100%) rename {core => solidity}/contracts/test/BitcoinDepositorHarness.sol (100%) rename {core => solidity}/contracts/test/MezoPortalStub.sol (100%) rename {core => solidity}/contracts/test/TestERC20.sol (100%) rename {core => solidity}/contracts/test/TestERC4626.sol (100%) rename {core => solidity}/contracts/test/TestTBTC.sol (100%) rename {core => solidity}/contracts/test/upgrades/BitcoinDepositorV2.sol (100%) rename {core => solidity}/contracts/test/upgrades/stBTCV2.sol (100%) rename {core => solidity}/contracts/utils/Errors.sol (100%) rename {core => solidity}/deploy/00_resolve_mezo_portal.ts (100%) rename {core => solidity}/deploy/00_resolve_tbtc_bridge.ts (100%) rename {core => solidity}/deploy/00_resolve_tbtc_token.ts (100%) rename {core => solidity}/deploy/00_resolve_tbtc_vault.ts (100%) rename {core => solidity}/deploy/00_resolve_testing_erc4626.ts (100%) rename {core => solidity}/deploy/01_deploy_stbtc.ts (100%) rename {core => solidity}/deploy/02_deploy_mezo_allocator.ts (100%) rename {core => solidity}/deploy/03_deploy_bitcoin_depositor.ts (100%) rename {core => solidity}/deploy/04_deploy_bitcoin_redeemer.ts (100%) rename {core => solidity}/deploy/11_stbtc_update_dispatcher.ts (100%) rename {core => solidity}/deploy/12_mezo_allocator_update_maintainer.ts (100%) rename {core => solidity}/deploy/13_stbtc_update_minimum_deposit_amount.ts (100%) rename {core => solidity}/deploy/14_update_pause_admin_stbtc.ts (100%) rename {core => solidity}/deploy/21_transfer_ownership_stbtc.ts (100%) rename {core => solidity}/deploy/23_transfer_ownership_bitcoin_depositor.ts (100%) rename {core => solidity}/deploy/24_transfer_ownership_bitcoin_redeemer.ts (100%) rename {core => solidity}/deploy/24_transfer_ownership_mezo_allocator.ts (100%) rename {core => solidity}/deployments/sepolia/.chainId (100%) rename {core => solidity}/deployments/sepolia/BitcoinDepositor.json (100%) rename {core => solidity}/deployments/sepolia/solcInputs/49f0432287e96a47d66ba17ae7bf5d96.json (100%) rename {core => solidity}/deployments/sepolia/solcInputs/b22c277b248ba02f9ec5bf62d176f9ce.json (100%) rename {core => solidity}/deployments/sepolia/stBTC.json (100%) rename {core => solidity}/external/mainnet/Bridge.json (100%) rename {core => solidity}/external/mainnet/MezoPortal.json (100%) rename {core => solidity}/external/mainnet/TBTC.json (100%) rename {core => solidity}/external/mainnet/TBTCVault.json (100%) rename {core => solidity}/external/sepolia/Bridge.json (100%) rename {core => solidity}/external/sepolia/MezoPortal.json (100%) rename {core => solidity}/external/sepolia/TBTC.json (100%) rename {core => solidity}/external/sepolia/TBTCVault.json (100%) rename {core => solidity}/hardhat.config.ts (100%) rename {core => solidity}/helpers/address.ts (100%) rename {core => solidity}/helpers/deployment.ts (100%) rename {core => solidity}/package.json (98%) rename {core => solidity}/scripts/fetch_external_artifacts.sh (100%) rename {core => solidity}/slither.config.json (100%) rename {core => solidity}/test/BitcoinDepositor.test.ts (100%) rename {core => solidity}/test/BitcoinDepositor.upgrade.test.ts (100%) rename {core => solidity}/test/BitcoinRedeemer.test.ts (100%) rename {core => solidity}/test/Deployment.test.ts (100%) rename {core => solidity}/test/MezoAllocator.test.ts (100%) rename {core => solidity}/test/data/tbtc.ts (100%) rename {core => solidity}/test/helpers.test.ts (100%) rename {core => solidity}/test/helpers/context.ts (100%) rename {core => solidity}/test/helpers/contract.ts (100%) rename {core => solidity}/test/helpers/index.ts (100%) rename {core => solidity}/test/helpers/snapshot.ts (100%) rename {core => solidity}/test/stBTC.test.ts (100%) rename {core => solidity}/test/stBTC.upgrade.test.ts (100%) rename {core => solidity}/test/utils/index.ts (100%) rename {core => solidity}/test/utils/number.ts (100%) rename {core => solidity}/tsconfig.export.json (100%) rename {core => solidity}/tsconfig.json (100%) rename {core => solidity}/types/index.ts (100%) diff --git a/.github/workflows/reusable-sdk-build.yaml b/.github/workflows/reusable-sdk-build.yaml index fe0a3d5ab..9c38cee5b 100644 --- a/.github/workflows/reusable-sdk-build.yaml +++ b/.github/workflows/reusable-sdk-build.yaml @@ -3,14 +3,14 @@ on: workflow_call: jobs: - core-build: - uses: ./.github/workflows/reusable-core-build.yaml + solidity-build: + uses: ./.github/workflows/reusable-solidity-build.yaml sdk-build: defaults: run: working-directory: ./sdk - needs: [core-build] + needs: [solidity-build] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -24,11 +24,11 @@ jobs: node-version-file: "sdk/.nvmrc" cache: "pnpm" - - name: Download Core Build Artifacts + - name: Download Solidity Build Artifacts uses: actions/download-artifact@v4 with: - name: core-build - path: core/ + name: solidity-build + path: solidity/ - name: Install Dependencies run: pnpm install --prefer-offline --frozen-lockfile diff --git a/.github/workflows/reusable-core-build.yaml b/.github/workflows/reusable-solidity-build.yaml similarity index 69% rename from .github/workflows/reusable-core-build.yaml rename to .github/workflows/reusable-solidity-build.yaml index 18309d41d..08d4b5327 100644 --- a/.github/workflows/reusable-core-build.yaml +++ b/.github/workflows/reusable-solidity-build.yaml @@ -1,13 +1,13 @@ -name: Build the core package +name: Build the Solidity package on: workflow_call: jobs: - build-core: + build-solidity: runs-on: ubuntu-latest defaults: run: - working-directory: ./core + working-directory: ./solidity steps: - uses: actions/checkout@v4 @@ -17,7 +17,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version-file: "core/.nvmrc" + node-version-file: "solidity/.nvmrc" cache: "pnpm" - name: Install Dependencies @@ -29,9 +29,9 @@ jobs: - name: Upload Build Artifacts uses: actions/upload-artifact@v4 with: - name: core-build + name: solidity-build path: | - core/build/ - core/cache/ - core/typechain/ + solidity/build/ + solidity/cache/ + solidity/typechain/ if-no-files-found: error diff --git a/.github/workflows/sdk.yaml b/.github/workflows/sdk.yaml index 5898da5ee..f83606fdd 100644 --- a/.github/workflows/sdk.yaml +++ b/.github/workflows/sdk.yaml @@ -31,11 +31,11 @@ jobs: node-version-file: "sdk/.nvmrc" cache: "pnpm" - - name: Download Core Build Artifacts + - name: Download Solidity Build Artifacts uses: actions/download-artifact@v4 with: - name: core-build - path: core/ + name: solidity-build + path: solidity/ - name: Install Dependencies run: pnpm install --prefer-offline --frozen-lockfile @@ -58,11 +58,11 @@ jobs: node-version-file: "sdk/.nvmrc" cache: "pnpm" - - name: Download Core Build Artifacts + - name: Download Solidity Build Artifacts uses: actions/download-artifact@v4 with: - name: core-build - path: core/ + name: solidity-build + path: solidity/ - name: Install Dependencies run: pnpm install --prefer-offline --frozen-lockfile diff --git a/.github/workflows/core.yaml b/.github/workflows/solidity.yaml similarity index 79% rename from .github/workflows/core.yaml rename to .github/workflows/solidity.yaml index 8dbe76ae6..7586edb1a 100644 --- a/.github/workflows/core.yaml +++ b/.github/workflows/solidity.yaml @@ -1,11 +1,11 @@ -name: Core +name: Solidity on: push: branches: - main paths: - - "core/**" + - "solidity/**" pull_request: workflow_dispatch: inputs: @@ -19,14 +19,14 @@ on: defaults: run: - working-directory: ./core + working-directory: ./solidity jobs: - core-build: - uses: ./.github/workflows/reusable-core-build.yaml + solidity-build: + uses: ./.github/workflows/reusable-solidity-build.yaml - core-format: - needs: [core-build] + solidity-format: + needs: [solidity-build] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -37,7 +37,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version-file: "core/.nvmrc" + node-version-file: "solidity/.nvmrc" cache: "pnpm" - name: Install Dependencies @@ -46,14 +46,14 @@ jobs: - name: Download Build Artifacts uses: actions/download-artifact@v4 with: - name: core-build - path: core/ + name: solidity-build + path: solidity/ - name: Format run: pnpm run format - core-slither: - needs: [core-build] + solidity-slither: + needs: [solidity-build] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -64,7 +64,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version-file: "core/.nvmrc" + node-version-file: "solidity/.nvmrc" cache: "pnpm" - name: Install Dependencies @@ -82,14 +82,14 @@ jobs: - name: Download Build Artifacts uses: actions/download-artifact@v4 with: - name: core-build - path: core/ + name: solidity-build + path: solidity/ - name: Run Slither run: slither --hardhat-ignore-compile . - core-test: - needs: [core-build] + solidity-test: + needs: [solidity-build] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -100,7 +100,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version-file: "core/.nvmrc" + node-version-file: "solidity/.nvmrc" cache: "pnpm" - name: Install Dependencies @@ -109,14 +109,14 @@ jobs: - name: Download Build Artifacts uses: actions/download-artifact@v4 with: - name: core-build - path: core/ + name: solidity-build + path: solidity/ - name: Test run: pnpm run test --no-compile - core-deploy-dry-run: - needs: [core-build] + solidity-deploy-dry-run: + needs: [solidity-build] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -127,7 +127,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version-file: "core/.nvmrc" + node-version-file: "solidity/.nvmrc" cache: "pnpm" - name: Install Dependencies @@ -136,14 +136,14 @@ jobs: - name: Download Build Artifacts uses: actions/download-artifact@v4 with: - name: core-build - path: core/ + name: solidity-build + path: solidity/ - name: Deploy run: pnpm run deploy --no-compile - core-deploy-testnet: - needs: [core-deploy-dry-run] + solidity-deploy-testnet: + needs: [solidity-deploy-dry-run] if: github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest steps: @@ -155,7 +155,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v4 with: - node-version-file: "core/.nvmrc" + node-version-file: "solidity/.nvmrc" cache: "pnpm" - name: Install dependencies @@ -164,8 +164,8 @@ jobs: - name: Download build artifacts uses: actions/download-artifact@v4 with: - name: core-build - path: core/ + name: solidity-build + path: solidity/ - name: Remove existing deployment artifacts for the selected network run: rm -rf deployments/${{ github.event.inputs.environment }} @@ -186,5 +186,5 @@ jobs: with: name: deployed-contracts-${{ github.event.inputs.environment }} path: | - core/deployments/${{ github.event.inputs.environment }} + solidity/deployments/${{ github.event.inputs.environment }} if-no-files-found: error diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fe78facce..f068599f0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,28 +5,28 @@ repos: - id: root-lint name: "lint root" entry: /usr/bin/env bash -c "npm run format" - exclude: (^core/|^dapp/|^website/|^subgraph/) + exclude: (^solidity/|^dapp/|^website/|^subgraph/) language: script description: "Checks code according to the package's linter configuration" - # Core - - id: core-lint-sol - name: "lint core sol" - entry: /usr/bin/env bash -c "npm --prefix ./core/ run lint:sol" - files: ^core/ + # Solidity + - id: solidity-lint-sol + name: "lint solidity sol" + entry: /usr/bin/env bash -c "npm --prefix ./solidity/ run lint:sol" + files: ^solidity/ types: [solidity] language: script description: "Checks solidity code according to the package's linter configuration" - - id: core-lint-js - name: "lint core ts/js" - entry: /usr/bin/env bash -c "npm --prefix ./core/ run lint:js" - files: ^core/ + - id: solidity-lint-js + name: "lint solidity ts/js" + entry: /usr/bin/env bash -c "npm --prefix ./solidity/ run lint:js" + files: ^solidity/ types_or: [ts, javascript] language: script description: "Checks TS/JS code according to the package's linter configuration" - - id: core-lint-config - name: "lint core json/yaml" - entry: /usr/bin/env bash -c "npm --prefix ./core/ run lint:config" - files: ^core/ + - id: solidity-lint-config + name: "lint solidity json/yaml" + entry: /usr/bin/env bash -c "npm --prefix ./solidity/ run lint:config" + files: ^solidity/ types_or: [json, yaml] language: script description: "Checks JSON/YAML code according to the package's linter configuration" @@ -90,4 +90,3 @@ repos: types_or: [json, yaml] language: script description: "Checks JSON/YAML code according to the package's linter configuration" - diff --git a/.prettierignore b/.prettierignore index 4511cab70..931aae2cc 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,5 @@ # Packages that have own prettier configuration. -core/ +solidity/ dapp/ website/ sdk/ diff --git a/README.md b/README.md index b159a1fd5..dc7b0f048 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Bitcoin Liquid Staking -[![Core](https://github.com/thesis/acre/actions/workflows/core.yaml/badge.svg?branch=main&event=push)](https://github.com/thesis/acre/actions/workflows/core.yaml) +[![Solidity](https://github.com/thesis/acre/actions/workflows/solidity.yaml/badge.svg?branch=main&event=push)](https://github.com/thesis/acre/actions/workflows/solidity.yaml) ## Development @@ -51,7 +51,7 @@ commands: pre-commit run --all-files # Execute hooks for specific files (e.g. stBTC.sol): -pre-commit run --files ./core/contracts/stBTC.sol +pre-commit run --files ./solidity/contracts/stBTC.sol ``` ### Syncpack diff --git a/netlify.toml b/netlify.toml index 59e82dbf2..aea5fdaae 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,7 +1,7 @@ [build] - # Don't run builds after the changes touching only the listed paths. - ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ':(exclude).github/' ':(exclude).vscode/' ':(exclude)core/' ':(exclude).git-blame-ignore-revs' ':(exclude).gitignore' ':(exclude).npmrc' ':(exclude).nvmrc' ':(exclude).pre-commit-config.yaml' ':(exclude).prettierignore' ':(exclude).prettierrc.js' ':(exclude).syncpackrc' ':(exclude)LICENSE' ':(exclude)README.md'" +# Don't run builds after the changes touching only the listed paths. +ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ':(exclude).github/' ':(exclude).vscode/' ':(exclude)solidity/' ':(exclude).git-blame-ignore-revs' ':(exclude).gitignore' ':(exclude).npmrc' ':(exclude).nvmrc' ':(exclude).pre-commit-config.yaml' ':(exclude).prettierignore' ':(exclude).prettierrc.js' ':(exclude).syncpackrc' ':(exclude)LICENSE' ':(exclude)README.md'" [context.production] - # Do not run builds for the production context. - ignore = "exit 0" +# Do not run builds for the production context. +ignore = "exit 0" diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 5305eb62f..e4234ab61 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,5 +1,5 @@ packages: - - core/ + - solidity/ - dapp/ - website/ - sdk/ diff --git a/sdk/package.json b/sdk/package.json index 5a6759438..fbec48325 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -27,7 +27,7 @@ }, "dependencies": { "@keep-network/tbtc-v2.ts": "2.4.0-dev.3", - "@acre-btc/core": "workspace:*", + "@acre-btc/solidity": "workspace:*", "ethers": "^6.10.0" } } diff --git a/sdk/src/lib/ethereum/bitcoin-depositor.ts b/sdk/src/lib/ethereum/bitcoin-depositor.ts index d968ee5b6..a3f74f22c 100644 --- a/sdk/src/lib/ethereum/bitcoin-depositor.ts +++ b/sdk/src/lib/ethereum/bitcoin-depositor.ts @@ -1,5 +1,5 @@ import { packRevealDepositParameters } from "@keep-network/tbtc-v2.ts" -import { BitcoinDepositor as BitcoinDepositorTypechain } from "@acre-btc/core/typechain/contracts/BitcoinDepositor" +import { BitcoinDepositor as BitcoinDepositorTypechain } from "@acre-btc/solidity/typechain/contracts/BitcoinDepositor" import { ZeroAddress, dataSlice, diff --git a/sdk/src/lib/ethereum/stbtc.ts b/sdk/src/lib/ethereum/stbtc.ts index a5087f2a6..8ef5f7187 100644 --- a/sdk/src/lib/ethereum/stbtc.ts +++ b/sdk/src/lib/ethereum/stbtc.ts @@ -1,4 +1,4 @@ -import { StBTC as StBTCTypechain } from "@acre-btc/core/typechain/contracts/StBTC" +import { StBTC as StBTCTypechain } from "@acre-btc/solidity/typechain/contracts/StBTC" import stBTC from "./artifacts/sepolia/stBTC.json" import { EthersContractConfig, diff --git a/sdk/test/lib/ethereum/tbtc-depositor.test.ts b/sdk/test/lib/ethereum/tbtc-depositor.test.ts index 7368af30a..1c37cef98 100644 --- a/sdk/test/lib/ethereum/tbtc-depositor.test.ts +++ b/sdk/test/lib/ethereum/tbtc-depositor.test.ts @@ -33,7 +33,7 @@ describe("BitcoinDepositor", () => { () => mockedContractInstance as unknown as Contract, ) - // TODO: get the address from artifact imported from `core` package. + // TODO: get the address from artifact imported from `solidity` package. depositorAddress = EthereumAddress.from( await ethers.Wallet.createRandom().getAddress(), ) diff --git a/core/.env b/solidity/.env similarity index 100% rename from core/.env rename to solidity/.env diff --git a/core/.env.example b/solidity/.env.example similarity index 100% rename from core/.env.example rename to solidity/.env.example diff --git a/core/.eslintignore b/solidity/.eslintignore similarity index 100% rename from core/.eslintignore rename to solidity/.eslintignore diff --git a/core/.eslintrc b/solidity/.eslintrc similarity index 100% rename from core/.eslintrc rename to solidity/.eslintrc diff --git a/core/.gitignore b/solidity/.gitignore similarity index 100% rename from core/.gitignore rename to solidity/.gitignore diff --git a/core/.mocharc.json b/solidity/.mocharc.json similarity index 100% rename from core/.mocharc.json rename to solidity/.mocharc.json diff --git a/core/.nvmrc b/solidity/.nvmrc similarity index 100% rename from core/.nvmrc rename to solidity/.nvmrc diff --git a/core/.prettierignore b/solidity/.prettierignore similarity index 100% rename from core/.prettierignore rename to solidity/.prettierignore diff --git a/core/.prettierrc.js b/solidity/.prettierrc.js similarity index 100% rename from core/.prettierrc.js rename to solidity/.prettierrc.js diff --git a/core/.solhint.json b/solidity/.solhint.json similarity index 100% rename from core/.solhint.json rename to solidity/.solhint.json diff --git a/core/.solhintignore b/solidity/.solhintignore similarity index 100% rename from core/.solhintignore rename to solidity/.solhintignore diff --git a/core/.tsconfig-eslint.json b/solidity/.tsconfig-eslint.json similarity index 100% rename from core/.tsconfig-eslint.json rename to solidity/.tsconfig-eslint.json diff --git a/core/README.md b/solidity/README.md similarity index 100% rename from core/README.md rename to solidity/README.md diff --git a/core/contracts/BitcoinDepositor.sol b/solidity/contracts/BitcoinDepositor.sol similarity index 100% rename from core/contracts/BitcoinDepositor.sol rename to solidity/contracts/BitcoinDepositor.sol diff --git a/core/contracts/BitcoinRedeemer.sol b/solidity/contracts/BitcoinRedeemer.sol similarity index 100% rename from core/contracts/BitcoinRedeemer.sol rename to solidity/contracts/BitcoinRedeemer.sol diff --git a/core/contracts/MezoAllocator.sol b/solidity/contracts/MezoAllocator.sol similarity index 100% rename from core/contracts/MezoAllocator.sol rename to solidity/contracts/MezoAllocator.sol diff --git a/core/contracts/PausableOwnable.sol b/solidity/contracts/PausableOwnable.sol similarity index 100% rename from core/contracts/PausableOwnable.sol rename to solidity/contracts/PausableOwnable.sol diff --git a/core/contracts/bridge/ITBTCToken.sol b/solidity/contracts/bridge/ITBTCToken.sol similarity index 100% rename from core/contracts/bridge/ITBTCToken.sol rename to solidity/contracts/bridge/ITBTCToken.sol diff --git a/core/contracts/interfaces/IDispatcher.sol b/solidity/contracts/interfaces/IDispatcher.sol similarity index 100% rename from core/contracts/interfaces/IDispatcher.sol rename to solidity/contracts/interfaces/IDispatcher.sol diff --git a/core/contracts/lib/ERC4626Fees.sol b/solidity/contracts/lib/ERC4626Fees.sol similarity index 100% rename from core/contracts/lib/ERC4626Fees.sol rename to solidity/contracts/lib/ERC4626Fees.sol diff --git a/core/contracts/stBTC.sol b/solidity/contracts/stBTC.sol similarity index 100% rename from core/contracts/stBTC.sol rename to solidity/contracts/stBTC.sol diff --git a/core/contracts/test/BitcoinDepositorHarness.sol b/solidity/contracts/test/BitcoinDepositorHarness.sol similarity index 100% rename from core/contracts/test/BitcoinDepositorHarness.sol rename to solidity/contracts/test/BitcoinDepositorHarness.sol diff --git a/core/contracts/test/MezoPortalStub.sol b/solidity/contracts/test/MezoPortalStub.sol similarity index 100% rename from core/contracts/test/MezoPortalStub.sol rename to solidity/contracts/test/MezoPortalStub.sol diff --git a/core/contracts/test/TestERC20.sol b/solidity/contracts/test/TestERC20.sol similarity index 100% rename from core/contracts/test/TestERC20.sol rename to solidity/contracts/test/TestERC20.sol diff --git a/core/contracts/test/TestERC4626.sol b/solidity/contracts/test/TestERC4626.sol similarity index 100% rename from core/contracts/test/TestERC4626.sol rename to solidity/contracts/test/TestERC4626.sol diff --git a/core/contracts/test/TestTBTC.sol b/solidity/contracts/test/TestTBTC.sol similarity index 100% rename from core/contracts/test/TestTBTC.sol rename to solidity/contracts/test/TestTBTC.sol diff --git a/core/contracts/test/upgrades/BitcoinDepositorV2.sol b/solidity/contracts/test/upgrades/BitcoinDepositorV2.sol similarity index 100% rename from core/contracts/test/upgrades/BitcoinDepositorV2.sol rename to solidity/contracts/test/upgrades/BitcoinDepositorV2.sol diff --git a/core/contracts/test/upgrades/stBTCV2.sol b/solidity/contracts/test/upgrades/stBTCV2.sol similarity index 100% rename from core/contracts/test/upgrades/stBTCV2.sol rename to solidity/contracts/test/upgrades/stBTCV2.sol diff --git a/core/contracts/utils/Errors.sol b/solidity/contracts/utils/Errors.sol similarity index 100% rename from core/contracts/utils/Errors.sol rename to solidity/contracts/utils/Errors.sol diff --git a/core/deploy/00_resolve_mezo_portal.ts b/solidity/deploy/00_resolve_mezo_portal.ts similarity index 100% rename from core/deploy/00_resolve_mezo_portal.ts rename to solidity/deploy/00_resolve_mezo_portal.ts diff --git a/core/deploy/00_resolve_tbtc_bridge.ts b/solidity/deploy/00_resolve_tbtc_bridge.ts similarity index 100% rename from core/deploy/00_resolve_tbtc_bridge.ts rename to solidity/deploy/00_resolve_tbtc_bridge.ts diff --git a/core/deploy/00_resolve_tbtc_token.ts b/solidity/deploy/00_resolve_tbtc_token.ts similarity index 100% rename from core/deploy/00_resolve_tbtc_token.ts rename to solidity/deploy/00_resolve_tbtc_token.ts diff --git a/core/deploy/00_resolve_tbtc_vault.ts b/solidity/deploy/00_resolve_tbtc_vault.ts similarity index 100% rename from core/deploy/00_resolve_tbtc_vault.ts rename to solidity/deploy/00_resolve_tbtc_vault.ts diff --git a/core/deploy/00_resolve_testing_erc4626.ts b/solidity/deploy/00_resolve_testing_erc4626.ts similarity index 100% rename from core/deploy/00_resolve_testing_erc4626.ts rename to solidity/deploy/00_resolve_testing_erc4626.ts diff --git a/core/deploy/01_deploy_stbtc.ts b/solidity/deploy/01_deploy_stbtc.ts similarity index 100% rename from core/deploy/01_deploy_stbtc.ts rename to solidity/deploy/01_deploy_stbtc.ts diff --git a/core/deploy/02_deploy_mezo_allocator.ts b/solidity/deploy/02_deploy_mezo_allocator.ts similarity index 100% rename from core/deploy/02_deploy_mezo_allocator.ts rename to solidity/deploy/02_deploy_mezo_allocator.ts diff --git a/core/deploy/03_deploy_bitcoin_depositor.ts b/solidity/deploy/03_deploy_bitcoin_depositor.ts similarity index 100% rename from core/deploy/03_deploy_bitcoin_depositor.ts rename to solidity/deploy/03_deploy_bitcoin_depositor.ts diff --git a/core/deploy/04_deploy_bitcoin_redeemer.ts b/solidity/deploy/04_deploy_bitcoin_redeemer.ts similarity index 100% rename from core/deploy/04_deploy_bitcoin_redeemer.ts rename to solidity/deploy/04_deploy_bitcoin_redeemer.ts diff --git a/core/deploy/11_stbtc_update_dispatcher.ts b/solidity/deploy/11_stbtc_update_dispatcher.ts similarity index 100% rename from core/deploy/11_stbtc_update_dispatcher.ts rename to solidity/deploy/11_stbtc_update_dispatcher.ts diff --git a/core/deploy/12_mezo_allocator_update_maintainer.ts b/solidity/deploy/12_mezo_allocator_update_maintainer.ts similarity index 100% rename from core/deploy/12_mezo_allocator_update_maintainer.ts rename to solidity/deploy/12_mezo_allocator_update_maintainer.ts diff --git a/core/deploy/13_stbtc_update_minimum_deposit_amount.ts b/solidity/deploy/13_stbtc_update_minimum_deposit_amount.ts similarity index 100% rename from core/deploy/13_stbtc_update_minimum_deposit_amount.ts rename to solidity/deploy/13_stbtc_update_minimum_deposit_amount.ts diff --git a/core/deploy/14_update_pause_admin_stbtc.ts b/solidity/deploy/14_update_pause_admin_stbtc.ts similarity index 100% rename from core/deploy/14_update_pause_admin_stbtc.ts rename to solidity/deploy/14_update_pause_admin_stbtc.ts diff --git a/core/deploy/21_transfer_ownership_stbtc.ts b/solidity/deploy/21_transfer_ownership_stbtc.ts similarity index 100% rename from core/deploy/21_transfer_ownership_stbtc.ts rename to solidity/deploy/21_transfer_ownership_stbtc.ts diff --git a/core/deploy/23_transfer_ownership_bitcoin_depositor.ts b/solidity/deploy/23_transfer_ownership_bitcoin_depositor.ts similarity index 100% rename from core/deploy/23_transfer_ownership_bitcoin_depositor.ts rename to solidity/deploy/23_transfer_ownership_bitcoin_depositor.ts diff --git a/core/deploy/24_transfer_ownership_bitcoin_redeemer.ts b/solidity/deploy/24_transfer_ownership_bitcoin_redeemer.ts similarity index 100% rename from core/deploy/24_transfer_ownership_bitcoin_redeemer.ts rename to solidity/deploy/24_transfer_ownership_bitcoin_redeemer.ts diff --git a/core/deploy/24_transfer_ownership_mezo_allocator.ts b/solidity/deploy/24_transfer_ownership_mezo_allocator.ts similarity index 100% rename from core/deploy/24_transfer_ownership_mezo_allocator.ts rename to solidity/deploy/24_transfer_ownership_mezo_allocator.ts diff --git a/core/deployments/sepolia/.chainId b/solidity/deployments/sepolia/.chainId similarity index 100% rename from core/deployments/sepolia/.chainId rename to solidity/deployments/sepolia/.chainId diff --git a/core/deployments/sepolia/BitcoinDepositor.json b/solidity/deployments/sepolia/BitcoinDepositor.json similarity index 100% rename from core/deployments/sepolia/BitcoinDepositor.json rename to solidity/deployments/sepolia/BitcoinDepositor.json diff --git a/core/deployments/sepolia/solcInputs/49f0432287e96a47d66ba17ae7bf5d96.json b/solidity/deployments/sepolia/solcInputs/49f0432287e96a47d66ba17ae7bf5d96.json similarity index 100% rename from core/deployments/sepolia/solcInputs/49f0432287e96a47d66ba17ae7bf5d96.json rename to solidity/deployments/sepolia/solcInputs/49f0432287e96a47d66ba17ae7bf5d96.json diff --git a/core/deployments/sepolia/solcInputs/b22c277b248ba02f9ec5bf62d176f9ce.json b/solidity/deployments/sepolia/solcInputs/b22c277b248ba02f9ec5bf62d176f9ce.json similarity index 100% rename from core/deployments/sepolia/solcInputs/b22c277b248ba02f9ec5bf62d176f9ce.json rename to solidity/deployments/sepolia/solcInputs/b22c277b248ba02f9ec5bf62d176f9ce.json diff --git a/core/deployments/sepolia/stBTC.json b/solidity/deployments/sepolia/stBTC.json similarity index 100% rename from core/deployments/sepolia/stBTC.json rename to solidity/deployments/sepolia/stBTC.json diff --git a/core/external/mainnet/Bridge.json b/solidity/external/mainnet/Bridge.json similarity index 100% rename from core/external/mainnet/Bridge.json rename to solidity/external/mainnet/Bridge.json diff --git a/core/external/mainnet/MezoPortal.json b/solidity/external/mainnet/MezoPortal.json similarity index 100% rename from core/external/mainnet/MezoPortal.json rename to solidity/external/mainnet/MezoPortal.json diff --git a/core/external/mainnet/TBTC.json b/solidity/external/mainnet/TBTC.json similarity index 100% rename from core/external/mainnet/TBTC.json rename to solidity/external/mainnet/TBTC.json diff --git a/core/external/mainnet/TBTCVault.json b/solidity/external/mainnet/TBTCVault.json similarity index 100% rename from core/external/mainnet/TBTCVault.json rename to solidity/external/mainnet/TBTCVault.json diff --git a/core/external/sepolia/Bridge.json b/solidity/external/sepolia/Bridge.json similarity index 100% rename from core/external/sepolia/Bridge.json rename to solidity/external/sepolia/Bridge.json diff --git a/core/external/sepolia/MezoPortal.json b/solidity/external/sepolia/MezoPortal.json similarity index 100% rename from core/external/sepolia/MezoPortal.json rename to solidity/external/sepolia/MezoPortal.json diff --git a/core/external/sepolia/TBTC.json b/solidity/external/sepolia/TBTC.json similarity index 100% rename from core/external/sepolia/TBTC.json rename to solidity/external/sepolia/TBTC.json diff --git a/core/external/sepolia/TBTCVault.json b/solidity/external/sepolia/TBTCVault.json similarity index 100% rename from core/external/sepolia/TBTCVault.json rename to solidity/external/sepolia/TBTCVault.json diff --git a/core/hardhat.config.ts b/solidity/hardhat.config.ts similarity index 100% rename from core/hardhat.config.ts rename to solidity/hardhat.config.ts diff --git a/core/helpers/address.ts b/solidity/helpers/address.ts similarity index 100% rename from core/helpers/address.ts rename to solidity/helpers/address.ts diff --git a/core/helpers/deployment.ts b/solidity/helpers/deployment.ts similarity index 100% rename from core/helpers/deployment.ts rename to solidity/helpers/deployment.ts diff --git a/core/package.json b/solidity/package.json similarity index 98% rename from core/package.json rename to solidity/package.json index 4ed08daac..ec2e9e3c3 100644 --- a/core/package.json +++ b/solidity/package.json @@ -1,5 +1,5 @@ { - "name": "@acre-btc/core", + "name": "@acre-btc/solidity", "version": "0.0.1", "description": "Bitcoin Liquid Staking", "license": "GPL-3.0-only", diff --git a/core/scripts/fetch_external_artifacts.sh b/solidity/scripts/fetch_external_artifacts.sh similarity index 100% rename from core/scripts/fetch_external_artifacts.sh rename to solidity/scripts/fetch_external_artifacts.sh diff --git a/core/slither.config.json b/solidity/slither.config.json similarity index 100% rename from core/slither.config.json rename to solidity/slither.config.json diff --git a/core/test/BitcoinDepositor.test.ts b/solidity/test/BitcoinDepositor.test.ts similarity index 100% rename from core/test/BitcoinDepositor.test.ts rename to solidity/test/BitcoinDepositor.test.ts diff --git a/core/test/BitcoinDepositor.upgrade.test.ts b/solidity/test/BitcoinDepositor.upgrade.test.ts similarity index 100% rename from core/test/BitcoinDepositor.upgrade.test.ts rename to solidity/test/BitcoinDepositor.upgrade.test.ts diff --git a/core/test/BitcoinRedeemer.test.ts b/solidity/test/BitcoinRedeemer.test.ts similarity index 100% rename from core/test/BitcoinRedeemer.test.ts rename to solidity/test/BitcoinRedeemer.test.ts diff --git a/core/test/Deployment.test.ts b/solidity/test/Deployment.test.ts similarity index 100% rename from core/test/Deployment.test.ts rename to solidity/test/Deployment.test.ts diff --git a/core/test/MezoAllocator.test.ts b/solidity/test/MezoAllocator.test.ts similarity index 100% rename from core/test/MezoAllocator.test.ts rename to solidity/test/MezoAllocator.test.ts diff --git a/core/test/data/tbtc.ts b/solidity/test/data/tbtc.ts similarity index 100% rename from core/test/data/tbtc.ts rename to solidity/test/data/tbtc.ts diff --git a/core/test/helpers.test.ts b/solidity/test/helpers.test.ts similarity index 100% rename from core/test/helpers.test.ts rename to solidity/test/helpers.test.ts diff --git a/core/test/helpers/context.ts b/solidity/test/helpers/context.ts similarity index 100% rename from core/test/helpers/context.ts rename to solidity/test/helpers/context.ts diff --git a/core/test/helpers/contract.ts b/solidity/test/helpers/contract.ts similarity index 100% rename from core/test/helpers/contract.ts rename to solidity/test/helpers/contract.ts diff --git a/core/test/helpers/index.ts b/solidity/test/helpers/index.ts similarity index 100% rename from core/test/helpers/index.ts rename to solidity/test/helpers/index.ts diff --git a/core/test/helpers/snapshot.ts b/solidity/test/helpers/snapshot.ts similarity index 100% rename from core/test/helpers/snapshot.ts rename to solidity/test/helpers/snapshot.ts diff --git a/core/test/stBTC.test.ts b/solidity/test/stBTC.test.ts similarity index 100% rename from core/test/stBTC.test.ts rename to solidity/test/stBTC.test.ts diff --git a/core/test/stBTC.upgrade.test.ts b/solidity/test/stBTC.upgrade.test.ts similarity index 100% rename from core/test/stBTC.upgrade.test.ts rename to solidity/test/stBTC.upgrade.test.ts diff --git a/core/test/utils/index.ts b/solidity/test/utils/index.ts similarity index 100% rename from core/test/utils/index.ts rename to solidity/test/utils/index.ts diff --git a/core/test/utils/number.ts b/solidity/test/utils/number.ts similarity index 100% rename from core/test/utils/number.ts rename to solidity/test/utils/number.ts diff --git a/core/tsconfig.export.json b/solidity/tsconfig.export.json similarity index 100% rename from core/tsconfig.export.json rename to solidity/tsconfig.export.json diff --git a/core/tsconfig.json b/solidity/tsconfig.json similarity index 100% rename from core/tsconfig.json rename to solidity/tsconfig.json diff --git a/core/types/index.ts b/solidity/types/index.ts similarity index 100% rename from core/types/index.ts rename to solidity/types/index.ts From db83064d0ddadc26c856e375523575dc3a841199 Mon Sep 17 00:00:00 2001 From: Jakub Nowakowski Date: Wed, 10 Apr 2024 11:12:28 +0200 Subject: [PATCH 2/5] Rename @acre-btc/solidity to @acre-btc/contracts --- sdk/package.json | 2 +- sdk/src/lib/ethereum/bitcoin-depositor.ts | 2 +- sdk/src/lib/ethereum/stbtc.ts | 2 +- solidity/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/package.json b/sdk/package.json index fbec48325..e29b1f487 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -27,7 +27,7 @@ }, "dependencies": { "@keep-network/tbtc-v2.ts": "2.4.0-dev.3", - "@acre-btc/solidity": "workspace:*", + "@acre-btc/contracts": "workspace:*", "ethers": "^6.10.0" } } diff --git a/sdk/src/lib/ethereum/bitcoin-depositor.ts b/sdk/src/lib/ethereum/bitcoin-depositor.ts index a3f74f22c..0facc9bba 100644 --- a/sdk/src/lib/ethereum/bitcoin-depositor.ts +++ b/sdk/src/lib/ethereum/bitcoin-depositor.ts @@ -1,5 +1,5 @@ import { packRevealDepositParameters } from "@keep-network/tbtc-v2.ts" -import { BitcoinDepositor as BitcoinDepositorTypechain } from "@acre-btc/solidity/typechain/contracts/BitcoinDepositor" +import { BitcoinDepositor as BitcoinDepositorTypechain } from "@acre-btc/contracts/typechain/contracts/BitcoinDepositor" import { ZeroAddress, dataSlice, diff --git a/sdk/src/lib/ethereum/stbtc.ts b/sdk/src/lib/ethereum/stbtc.ts index 8ef5f7187..4d3b04e60 100644 --- a/sdk/src/lib/ethereum/stbtc.ts +++ b/sdk/src/lib/ethereum/stbtc.ts @@ -1,4 +1,4 @@ -import { StBTC as StBTCTypechain } from "@acre-btc/solidity/typechain/contracts/StBTC" +import { StBTC as StBTCTypechain } from "@acre-btc/contracts/typechain/contracts/StBTC" import stBTC from "./artifacts/sepolia/stBTC.json" import { EthersContractConfig, diff --git a/solidity/package.json b/solidity/package.json index ec2e9e3c3..6f867cbaf 100644 --- a/solidity/package.json +++ b/solidity/package.json @@ -1,5 +1,5 @@ { - "name": "@acre-btc/solidity", + "name": "@acre-btc/contracts", "version": "0.0.1", "description": "Bitcoin Liquid Staking", "license": "GPL-3.0-only", From 537e79469128b408c5981099540a957970561cd3 Mon Sep 17 00:00:00 2001 From: Jakub Nowakowski Date: Wed, 10 Apr 2024 11:12:50 +0200 Subject: [PATCH 3/5] Fix linting --- .github/workflows/subgraph.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/subgraph.yaml b/.github/workflows/subgraph.yaml index 60586fad4..0460c7a30 100644 --- a/.github/workflows/subgraph.yaml +++ b/.github/workflows/subgraph.yaml @@ -121,4 +121,3 @@ jobs: - name: Tests run: pnpm run test - From f9172fc1e9e9bd1cb710a00e20f15fd29990367a Mon Sep 17 00:00:00 2001 From: Jakub Nowakowski Date: Wed, 10 Apr 2024 11:19:46 +0200 Subject: [PATCH 4/5] Update pnpm-lock.yaml --- pnpm-lock.yaml | 371 +++++++++++++++++++++---------------------------- 1 file changed, 156 insertions(+), 215 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 122c0166f..a58ff6a75 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,121 +18,6 @@ importers: specifier: ^11.2.1 version: 11.2.1 - core: - dependencies: - '@keep-network/bitcoin-spv-sol': - specifier: 3.4.0-solc-0.8 - version: 3.4.0-solc-0.8 - '@keep-network/tbtc-v2': - specifier: development - version: 1.6.0-dev.24(@keep-network/keep-core@1.8.1-dev.0) - '@openzeppelin/contracts': - specifier: ^5.0.0 - version: 5.0.0 - '@openzeppelin/contracts-upgradeable': - specifier: ^5.0.2 - version: 5.0.2(@openzeppelin/contracts@5.0.0) - '@thesis-co/solidity-contracts': - specifier: github:thesis/solidity-contracts#c315b9d - version: github.com/thesis/solidity-contracts/c315b9d - '@types/chai-as-promised': - specifier: ^7.1.8 - version: 7.1.8 - chai-as-promised: - specifier: ^7.1.1 - version: 7.1.1(chai@4.3.10) - devDependencies: - '@keep-network/hardhat-helpers': - specifier: ^0.7.1 - version: 0.7.1(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-verify@2.0.1)(@openzeppelin/hardhat-upgrades@3.0.5)(ethers@6.8.1)(hardhat-deploy@0.11.43)(hardhat@2.19.1) - '@nomicfoundation/hardhat-chai-matchers': - specifier: ^2.0.2 - version: 2.0.2(@nomicfoundation/hardhat-ethers@3.0.5)(chai@4.3.10)(ethers@6.8.1)(hardhat@2.19.1) - '@nomicfoundation/hardhat-ethers': - specifier: ^3.0.5 - version: 3.0.5(ethers@6.8.1)(hardhat@2.19.1) - '@nomicfoundation/hardhat-network-helpers': - specifier: ^1.0.9 - version: 1.0.9(hardhat@2.19.1) - '@nomicfoundation/hardhat-toolbox': - specifier: ^4.0.0 - version: 4.0.0(@nomicfoundation/hardhat-chai-matchers@2.0.2)(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-network-helpers@1.0.9)(@nomicfoundation/hardhat-verify@2.0.1)(@typechain/ethers-v6@0.5.1)(@typechain/hardhat@9.1.0)(@types/chai@4.3.11)(@types/mocha@10.0.6)(@types/node@20.9.4)(chai@4.3.10)(ethers@6.8.1)(hardhat-gas-reporter@1.0.9)(hardhat@2.19.1)(solidity-coverage@0.8.5)(ts-node@10.9.1)(typechain@8.3.2)(typescript@5.3.2) - '@nomicfoundation/hardhat-verify': - specifier: ^2.0.1 - version: 2.0.1(hardhat@2.19.1) - '@nomiclabs/hardhat-etherscan': - specifier: ^3.1.7 - version: 3.1.7(hardhat@2.19.1) - '@openzeppelin/hardhat-upgrades': - specifier: ^3.0.5 - version: 3.0.5(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-verify@2.0.1)(ethers@6.8.1)(hardhat@2.19.1) - '@thesis-co/eslint-config': - specifier: github:thesis/eslint-config#7b9bc8c - version: github.com/thesis/eslint-config/7b9bc8c(eslint@8.54.0)(prettier@3.1.0)(typescript@5.3.2) - '@typechain/ethers-v6': - specifier: ^0.5.1 - version: 0.5.1(ethers@6.8.1)(typechain@8.3.2)(typescript@5.3.2) - '@typechain/hardhat': - specifier: ^9.1.0 - version: 9.1.0(@typechain/ethers-v6@0.5.1)(ethers@6.8.1)(hardhat@2.19.1)(typechain@8.3.2) - '@types/chai': - specifier: ^4.3.11 - version: 4.3.11 - '@types/mocha': - specifier: ^10.0.6 - version: 10.0.6 - '@types/node': - specifier: ^20.9.4 - version: 20.9.4 - chai: - specifier: ^4.3.10 - version: 4.3.10 - eslint: - specifier: ^8.54.0 - version: 8.54.0 - ethers: - specifier: ^6.8.1 - version: 6.8.1 - hardhat: - specifier: ^2.19.1 - version: 2.19.1(ts-node@10.9.1)(typescript@5.3.2) - hardhat-contract-sizer: - specifier: ^2.10.0 - version: 2.10.0(hardhat@2.19.1) - hardhat-deploy: - specifier: ^0.11.43 - version: 0.11.43 - hardhat-gas-reporter: - specifier: ^1.0.9 - version: 1.0.9(hardhat@2.19.1) - prettier: - specifier: ^3.1.0 - version: 3.1.0 - prettier-plugin-solidity: - specifier: ^1.2.0 - version: 1.2.0(prettier@3.1.0) - solhint: - specifier: ^4.0.0 - version: 4.0.0 - solhint-config-thesis: - specifier: github:thesis/solhint-config - version: github.com/thesis/solhint-config/266de12d96d58f01171e20858b855ec80520de8d(solhint@4.0.0) - solidity-coverage: - specifier: ^0.8.5 - version: 0.8.5(hardhat@2.19.1) - solidity-docgen: - specifier: 0.6.0-beta.36 - version: 0.6.0-beta.36(hardhat@2.19.1) - ts-node: - specifier: ^10.9.1 - version: 10.9.1(@types/node@20.9.4)(typescript@5.3.2) - typechain: - specifier: ^8.3.2 - version: 8.3.2(typescript@5.3.2) - typescript: - specifier: ^5.3.2 - version: 5.3.2 - dapp: dependencies: '@acre-btc/sdk': @@ -170,7 +55,7 @@ importers: version: 0.23.13 axios: specifier: ^1.6.7 - version: 1.6.7 + version: 1.6.7(debug@4.3.4) ethers: specifier: ^6.10.0 version: 6.10.0 @@ -244,9 +129,9 @@ importers: sdk: dependencies: - '@acre-btc/core': + '@acre-btc/contracts': specifier: workspace:* - version: link:../core + version: link:../solidity '@keep-network/tbtc-v2.ts': specifier: 2.4.0-dev.3 version: 2.4.0-dev.3(@keep-network/keep-core@1.8.1-dev.0) @@ -285,6 +170,121 @@ importers: specifier: ^5.3.2 version: 5.3.2 + solidity: + dependencies: + '@keep-network/bitcoin-spv-sol': + specifier: 3.4.0-solc-0.8 + version: 3.4.0-solc-0.8 + '@keep-network/tbtc-v2': + specifier: development + version: 1.7.0-dev.4(@keep-network/keep-core@1.8.1-dev.0) + '@openzeppelin/contracts': + specifier: ^5.0.0 + version: 5.0.0 + '@openzeppelin/contracts-upgradeable': + specifier: ^5.0.2 + version: 5.0.2(@openzeppelin/contracts@5.0.0) + '@thesis-co/solidity-contracts': + specifier: github:thesis/solidity-contracts#c315b9d + version: github.com/thesis/solidity-contracts/c315b9d + '@types/chai-as-promised': + specifier: ^7.1.8 + version: 7.1.8 + chai-as-promised: + specifier: ^7.1.1 + version: 7.1.1(chai@4.3.10) + devDependencies: + '@keep-network/hardhat-helpers': + specifier: ^0.7.1 + version: 0.7.1(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-verify@2.0.1)(@openzeppelin/hardhat-upgrades@3.0.5)(ethers@6.10.0)(hardhat-deploy@0.11.43)(hardhat@2.19.1) + '@nomicfoundation/hardhat-chai-matchers': + specifier: ^2.0.2 + version: 2.0.2(@nomicfoundation/hardhat-ethers@3.0.5)(chai@4.3.10)(ethers@6.10.0)(hardhat@2.19.1) + '@nomicfoundation/hardhat-ethers': + specifier: ^3.0.5 + version: 3.0.5(ethers@6.10.0)(hardhat@2.19.1) + '@nomicfoundation/hardhat-network-helpers': + specifier: ^1.0.9 + version: 1.0.9(hardhat@2.19.1) + '@nomicfoundation/hardhat-toolbox': + specifier: ^4.0.0 + version: 4.0.0(@nomicfoundation/hardhat-chai-matchers@2.0.2)(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-network-helpers@1.0.9)(@nomicfoundation/hardhat-verify@2.0.1)(@typechain/ethers-v6@0.5.1)(@typechain/hardhat@9.1.0)(@types/chai@4.3.11)(@types/mocha@10.0.6)(@types/node@20.9.4)(chai@4.3.10)(ethers@6.10.0)(hardhat-gas-reporter@1.0.9)(hardhat@2.19.1)(solidity-coverage@0.8.5)(ts-node@10.9.1)(typechain@8.3.2)(typescript@5.3.2) + '@nomicfoundation/hardhat-verify': + specifier: ^2.0.1 + version: 2.0.1(hardhat@2.19.1) + '@nomiclabs/hardhat-etherscan': + specifier: ^3.1.7 + version: 3.1.7(hardhat@2.19.1) + '@openzeppelin/hardhat-upgrades': + specifier: ^3.0.5 + version: 3.0.5(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-verify@2.0.1)(ethers@6.10.0)(hardhat@2.19.1) + '@thesis-co/eslint-config': + specifier: github:thesis/eslint-config#7b9bc8c + version: github.com/thesis/eslint-config/7b9bc8c(eslint@8.54.0)(prettier@3.1.0)(typescript@5.3.2) + '@typechain/ethers-v6': + specifier: ^0.5.1 + version: 0.5.1(ethers@6.10.0)(typechain@8.3.2)(typescript@5.3.2) + '@typechain/hardhat': + specifier: ^9.1.0 + version: 9.1.0(@typechain/ethers-v6@0.5.1)(ethers@6.10.0)(hardhat@2.19.1)(typechain@8.3.2) + '@types/chai': + specifier: ^4.3.11 + version: 4.3.11 + '@types/mocha': + specifier: ^10.0.6 + version: 10.0.6 + '@types/node': + specifier: ^20.9.4 + version: 20.9.4 + chai: + specifier: ^4.3.10 + version: 4.3.10 + eslint: + specifier: ^8.54.0 + version: 8.54.0 + ethers: + specifier: ^6.8.1 + version: 6.10.0 + hardhat: + specifier: ^2.19.1 + version: 2.19.1(ts-node@10.9.1)(typescript@5.3.2) + hardhat-contract-sizer: + specifier: ^2.10.0 + version: 2.10.0(hardhat@2.19.1) + hardhat-deploy: + specifier: ^0.11.43 + version: 0.11.43 + hardhat-gas-reporter: + specifier: ^1.0.9 + version: 1.0.9(hardhat@2.19.1) + prettier: + specifier: ^3.1.0 + version: 3.1.0 + prettier-plugin-solidity: + specifier: ^1.2.0 + version: 1.2.0(prettier@3.1.0) + solhint: + specifier: ^4.0.0 + version: 4.0.0 + solhint-config-thesis: + specifier: github:thesis/solhint-config + version: github.com/thesis/solhint-config/266de12d96d58f01171e20858b855ec80520de8d(solhint@4.0.0) + solidity-coverage: + specifier: ^0.8.5 + version: 0.8.5(hardhat@2.19.1) + solidity-docgen: + specifier: 0.6.0-beta.36 + version: 0.6.0-beta.36(hardhat@2.19.1) + ts-node: + specifier: ^10.9.1 + version: 10.9.1(@types/node@20.9.4)(typescript@5.3.2) + typechain: + specifier: ^8.3.2 + version: 8.3.2(typescript@5.3.2) + typescript: + specifier: ^5.3.2 + version: 5.3.2 + subgraph: dependencies: '@graphprotocol/graph-cli': @@ -480,7 +480,7 @@ packages: '@babel/traverse': 7.23.4 '@babel/types': 7.23.4 convert-source-map: 2.0.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -1779,7 +1779,7 @@ packages: '@babel/helper-split-export-declaration': 7.22.6 '@babel/parser': 7.23.4 '@babel/types': 7.23.4 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -3503,7 +3503,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) espree: 9.6.1 globals: 13.23.0 ignore: 5.3.0 @@ -4158,7 +4158,7 @@ packages: engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 2.0.1 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -4500,7 +4500,7 @@ packages: - '@keep-network/keep-core' dev: false - /@keep-network/hardhat-helpers@0.7.1(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-verify@2.0.1)(@openzeppelin/hardhat-upgrades@3.0.5)(ethers@6.8.1)(hardhat-deploy@0.11.43)(hardhat@2.19.1): + /@keep-network/hardhat-helpers@0.7.1(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-verify@2.0.1)(@openzeppelin/hardhat-upgrades@3.0.5)(ethers@6.10.0)(hardhat-deploy@0.11.43)(hardhat@2.19.1): resolution: {integrity: sha512-de6Gy45JukZwGgZqVuR+Zq5PSqnmvKLDJn0/KrKT5tFzGspARUf1WzhDgTTB/D7gTK04sxlrL6WJM3XQ/wZEkw==} peerDependencies: '@nomicfoundation/hardhat-ethers': ^3.0.5 @@ -4510,10 +4510,10 @@ packages: hardhat: ^2.19.4 hardhat-deploy: ^0.11.45 dependencies: - '@nomicfoundation/hardhat-ethers': 3.0.5(ethers@6.8.1)(hardhat@2.19.1) + '@nomicfoundation/hardhat-ethers': 3.0.5(ethers@6.10.0)(hardhat@2.19.1) '@nomicfoundation/hardhat-verify': 2.0.1(hardhat@2.19.1) - '@openzeppelin/hardhat-upgrades': 3.0.5(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-verify@2.0.1)(ethers@6.8.1)(hardhat@2.19.1) - ethers: 6.8.1 + '@openzeppelin/hardhat-upgrades': 3.0.5(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-verify@2.0.1)(ethers@6.10.0)(hardhat@2.19.1) + ethers: 6.10.0 hardhat: 2.19.1(ts-node@10.9.1)(typescript@5.3.2) hardhat-deploy: 0.11.43 dev: true @@ -4635,8 +4635,8 @@ packages: - utf-8-validate dev: false - /@keep-network/tbtc-v2@1.6.0-dev.24(@keep-network/keep-core@1.8.1-dev.0): - resolution: {integrity: sha512-Nj/TYHlVg5J1ubVlLEbO7IQiqecDmVf2DPOqkICpveFxOiIbqzVtop4CsgEPvyRBomzHDUvZ6QFxYxJj/wbJbA==} + /@keep-network/tbtc-v2@1.7.0-dev.4(@keep-network/keep-core@1.8.1-dev.0): + resolution: {integrity: sha512-+DxR5XebK0DB5WIrQyCQG2osixBYpJhOuwQtLu3EDMsi4tFAPEh5MFjWG5LYeuEtX65p19mSC4Vj69/Z3jMgrA==} engines: {node: '>= 14.0.0'} dependencies: '@keep-network/bitcoin-spv-sol': 3.4.0-solc-0.8 @@ -5128,7 +5128,7 @@ packages: - utf-8-validate dev: true - /@nomicfoundation/hardhat-chai-matchers@2.0.2(@nomicfoundation/hardhat-ethers@3.0.5)(chai@4.3.10)(ethers@6.8.1)(hardhat@2.19.1): + /@nomicfoundation/hardhat-chai-matchers@2.0.2(@nomicfoundation/hardhat-ethers@3.0.5)(chai@4.3.10)(ethers@6.10.0)(hardhat@2.19.1): resolution: {integrity: sha512-9Wu9mRtkj0U9ohgXYFbB/RQDa+PcEdyBm2suyEtsJf3PqzZEEjLUZgWnMjlFhATMk/fp3BjmnYVPrwl+gr8oEw==} peerDependencies: '@nomicfoundation/hardhat-ethers': ^3.0.0 @@ -5136,24 +5136,24 @@ packages: ethers: ^6.1.0 hardhat: ^2.9.4 dependencies: - '@nomicfoundation/hardhat-ethers': 3.0.5(ethers@6.8.1)(hardhat@2.19.1) + '@nomicfoundation/hardhat-ethers': 3.0.5(ethers@6.10.0)(hardhat@2.19.1) '@types/chai-as-promised': 7.1.8 chai: 4.3.10 chai-as-promised: 7.1.1(chai@4.3.10) deep-eql: 4.1.3 - ethers: 6.8.1 + ethers: 6.10.0 hardhat: 2.19.1(ts-node@10.9.1)(typescript@5.3.2) ordinal: 1.0.3 dev: true - /@nomicfoundation/hardhat-ethers@3.0.5(ethers@6.8.1)(hardhat@2.19.1): + /@nomicfoundation/hardhat-ethers@3.0.5(ethers@6.10.0)(hardhat@2.19.1): resolution: {integrity: sha512-RNFe8OtbZK6Ila9kIlHp0+S80/0Bu/3p41HUpaRIoHLm6X3WekTd83vob3rE54Duufu1edCiBDxspBzi2rxHHw==} peerDependencies: ethers: ^6.1.0 hardhat: ^2.0.0 dependencies: debug: 4.3.4(supports-color@8.1.1) - ethers: 6.8.1 + ethers: 6.10.0 hardhat: 2.19.1(ts-node@10.9.1)(typescript@5.3.2) lodash.isequal: 4.5.0 transitivePeerDependencies: @@ -5169,7 +5169,7 @@ packages: hardhat: 2.19.1(ts-node@10.9.1)(typescript@5.3.2) dev: true - /@nomicfoundation/hardhat-toolbox@4.0.0(@nomicfoundation/hardhat-chai-matchers@2.0.2)(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-network-helpers@1.0.9)(@nomicfoundation/hardhat-verify@2.0.1)(@typechain/ethers-v6@0.5.1)(@typechain/hardhat@9.1.0)(@types/chai@4.3.11)(@types/mocha@10.0.6)(@types/node@20.9.4)(chai@4.3.10)(ethers@6.8.1)(hardhat-gas-reporter@1.0.9)(hardhat@2.19.1)(solidity-coverage@0.8.5)(ts-node@10.9.1)(typechain@8.3.2)(typescript@5.3.2): + /@nomicfoundation/hardhat-toolbox@4.0.0(@nomicfoundation/hardhat-chai-matchers@2.0.2)(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-network-helpers@1.0.9)(@nomicfoundation/hardhat-verify@2.0.1)(@typechain/ethers-v6@0.5.1)(@typechain/hardhat@9.1.0)(@types/chai@4.3.11)(@types/mocha@10.0.6)(@types/node@20.9.4)(chai@4.3.10)(ethers@6.10.0)(hardhat-gas-reporter@1.0.9)(hardhat@2.19.1)(solidity-coverage@0.8.5)(ts-node@10.9.1)(typechain@8.3.2)(typescript@5.3.2): resolution: {integrity: sha512-jhcWHp0aHaL0aDYj8IJl80v4SZXWMS1A2XxXa1CA6pBiFfJKuZinCkO6wb+POAt0LIfXB3gA3AgdcOccrcwBwA==} peerDependencies: '@nomicfoundation/hardhat-chai-matchers': ^2.0.0 @@ -5190,17 +5190,17 @@ packages: typechain: ^8.3.0 typescript: '>=4.5.0' dependencies: - '@nomicfoundation/hardhat-chai-matchers': 2.0.2(@nomicfoundation/hardhat-ethers@3.0.5)(chai@4.3.10)(ethers@6.8.1)(hardhat@2.19.1) - '@nomicfoundation/hardhat-ethers': 3.0.5(ethers@6.8.1)(hardhat@2.19.1) + '@nomicfoundation/hardhat-chai-matchers': 2.0.2(@nomicfoundation/hardhat-ethers@3.0.5)(chai@4.3.10)(ethers@6.10.0)(hardhat@2.19.1) + '@nomicfoundation/hardhat-ethers': 3.0.5(ethers@6.10.0)(hardhat@2.19.1) '@nomicfoundation/hardhat-network-helpers': 1.0.9(hardhat@2.19.1) '@nomicfoundation/hardhat-verify': 2.0.1(hardhat@2.19.1) - '@typechain/ethers-v6': 0.5.1(ethers@6.8.1)(typechain@8.3.2)(typescript@5.3.2) - '@typechain/hardhat': 9.1.0(@typechain/ethers-v6@0.5.1)(ethers@6.8.1)(hardhat@2.19.1)(typechain@8.3.2) + '@typechain/ethers-v6': 0.5.1(ethers@6.10.0)(typechain@8.3.2)(typescript@5.3.2) + '@typechain/hardhat': 9.1.0(@typechain/ethers-v6@0.5.1)(ethers@6.10.0)(hardhat@2.19.1)(typechain@8.3.2) '@types/chai': 4.3.11 '@types/mocha': 10.0.6 '@types/node': 20.9.4 chai: 4.3.10 - ethers: 6.8.1 + ethers: 6.10.0 hardhat: 2.19.1(ts-node@10.9.1)(typescript@5.3.2) hardhat-gas-reporter: 1.0.9(hardhat@2.19.1) solidity-coverage: 0.8.5(hardhat@2.19.1) @@ -5336,6 +5336,7 @@ packages: /@nomiclabs/hardhat-etherscan@3.1.7(hardhat@2.19.1): resolution: {integrity: sha512-tZ3TvSgpvsQ6B6OGmo1/Au6u8BrAkvs1mIC/eURA3xgIfznUZBhmpne8hv7BXUzw9xNL3fXdpOYgOQlVMTcoHQ==} + deprecated: The @nomiclabs/hardhat-etherscan package is deprecated, please use @nomicfoundation/hardhat-verify instead peerDependencies: hardhat: ^2.0.4 dependencies: @@ -5559,7 +5560,7 @@ packages: - encoding dev: true - /@openzeppelin/hardhat-upgrades@3.0.5(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-verify@2.0.1)(ethers@6.8.1)(hardhat@2.19.1): + /@openzeppelin/hardhat-upgrades@3.0.5(@nomicfoundation/hardhat-ethers@3.0.5)(@nomicfoundation/hardhat-verify@2.0.1)(ethers@6.10.0)(hardhat@2.19.1): resolution: {integrity: sha512-7Klg1B6fH45+7Zxzr6d9mLqudrL9Uk6CUG5AeG5NckPfP4ZlQRo1squcQ8yJPwqDS8rQjfChiqKDelp4LTjyZQ==} hasBin: true peerDependencies: @@ -5571,7 +5572,7 @@ packages: '@nomicfoundation/hardhat-verify': optional: true dependencies: - '@nomicfoundation/hardhat-ethers': 3.0.5(ethers@6.8.1)(hardhat@2.19.1) + '@nomicfoundation/hardhat-ethers': 3.0.5(ethers@6.10.0)(hardhat@2.19.1) '@nomicfoundation/hardhat-verify': 2.0.1(hardhat@2.19.1) '@openzeppelin/defender-admin-client': 1.52.0(debug@4.3.4) '@openzeppelin/defender-base-client': 1.52.0(debug@4.3.4) @@ -5582,7 +5583,7 @@ packages: chalk: 4.1.2 debug: 4.3.4(supports-color@8.1.1) ethereumjs-util: 7.1.5 - ethers: 6.8.1 + ethers: 6.10.0 hardhat: 2.19.1(ts-node@10.9.1)(typescript@5.3.2) proper-lockfile: 4.1.2 undici: 6.7.1 @@ -6815,21 +6816,21 @@ packages: /@turist/time@0.0.2: resolution: {integrity: sha512-qLOvfmlG2vCVw5fo/oz8WAZYlpe5a5OurgTj3diIxJCdjRHpapC+vQCz3er9LV79Vcat+DifBjeAhOAdmndtDQ==} - /@typechain/ethers-v6@0.5.1(ethers@6.8.1)(typechain@8.3.2)(typescript@5.3.2): + /@typechain/ethers-v6@0.5.1(ethers@6.10.0)(typechain@8.3.2)(typescript@5.3.2): resolution: {integrity: sha512-F+GklO8jBWlsaVV+9oHaPh5NJdd6rAKN4tklGfInX1Q7h0xPgVLP39Jl3eCulPB5qexI71ZFHwbljx4ZXNfouA==} peerDependencies: ethers: 6.x typechain: ^8.3.2 typescript: '>=4.7.0' dependencies: - ethers: 6.8.1 + ethers: 6.10.0 lodash: 4.17.21 ts-essentials: 7.0.3(typescript@5.3.2) typechain: 8.3.2(typescript@5.3.2) typescript: 5.3.2 dev: true - /@typechain/hardhat@9.1.0(@typechain/ethers-v6@0.5.1)(ethers@6.8.1)(hardhat@2.19.1)(typechain@8.3.2): + /@typechain/hardhat@9.1.0(@typechain/ethers-v6@0.5.1)(ethers@6.10.0)(hardhat@2.19.1)(typechain@8.3.2): resolution: {integrity: sha512-mtaUlzLlkqTlfPwB3FORdejqBskSnh+Jl8AIJGjXNAQfRQ4ofHADPl1+oU7Z3pAJzmZbUXII8MhOLQltcHgKnA==} peerDependencies: '@typechain/ethers-v6': ^0.5.1 @@ -6837,8 +6838,8 @@ packages: hardhat: ^2.9.9 typechain: ^8.3.2 dependencies: - '@typechain/ethers-v6': 0.5.1(ethers@6.8.1)(typechain@8.3.2)(typescript@5.3.2) - ethers: 6.8.1 + '@typechain/ethers-v6': 0.5.1(ethers@6.10.0)(typechain@8.3.2)(typescript@5.3.2) + ethers: 6.10.0 fs-extra: 9.1.0 hardhat: 2.19.1(ts-node@10.9.1)(typescript@5.3.2) typechain: 8.3.2(typescript@5.3.2) @@ -7341,7 +7342,7 @@ packages: '@typescript-eslint/type-utils': 6.12.0(eslint@8.54.0)(typescript@5.3.2) '@typescript-eslint/utils': 6.12.0(eslint@8.54.0)(typescript@5.3.2) '@typescript-eslint/visitor-keys': 6.12.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) eslint: 8.54.0 graphemer: 1.4.0 ignore: 5.3.0 @@ -7386,7 +7387,7 @@ packages: '@typescript-eslint/types': 6.12.0 '@typescript-eslint/typescript-estree': 6.12.0(typescript@5.3.2) '@typescript-eslint/visitor-keys': 6.12.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) eslint: 8.54.0 typescript: 5.3.2 transitivePeerDependencies: @@ -7437,7 +7438,7 @@ packages: dependencies: '@typescript-eslint/typescript-estree': 6.12.0(typescript@5.3.2) '@typescript-eslint/utils': 6.12.0(eslint@8.54.0)(typescript@5.3.2) - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) eslint: 8.54.0 ts-api-utils: 1.0.3(typescript@5.3.2) typescript: 5.3.2 @@ -7484,7 +7485,7 @@ packages: dependencies: '@typescript-eslint/types': 6.12.0 '@typescript-eslint/visitor-keys': 6.12.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 @@ -8302,19 +8303,9 @@ packages: /axios@0.21.4(debug@4.3.4): resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} dependencies: - follow-redirects: 1.15.3(debug@4.3.4) - transitivePeerDependencies: - - debug - - /axios@1.6.7: - resolution: {integrity: sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==} - dependencies: - follow-redirects: 1.15.5 - form-data: 4.0.0 - proxy-from-env: 1.1.0 + follow-redirects: 1.15.5(debug@4.3.4) transitivePeerDependencies: - debug - dev: false /axios@1.6.7(debug@4.3.4): resolution: {integrity: sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==} @@ -8324,7 +8315,6 @@ packages: proxy-from-env: 1.1.0 transitivePeerDependencies: - debug - dev: true /axobject-query@3.2.1: resolution: {integrity: sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==} @@ -10263,17 +10253,6 @@ packages: dependencies: ms: 2.1.3 - /debug@4.3.4: - resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.2 - /debug@4.3.4(supports-color@8.1.1): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -11526,7 +11505,7 @@ packages: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.2 @@ -11860,23 +11839,6 @@ packages: transitivePeerDependencies: - bufferutil - utf-8-validate - dev: false - - /ethers@6.8.1: - resolution: {integrity: sha512-iEKm6zox5h1lDn6scuRWdIdFJUCGg3+/aQWu0F4K0GVyEZiktFkqrJbRjTn1FlYEPz7RKA707D6g5Kdk6j7Ljg==} - engines: {node: '>=14.0.0'} - dependencies: - '@adraffy/ens-normalize': 1.10.0 - '@noble/curves': 1.2.0 - '@noble/hashes': 1.3.2 - '@types/node': 18.15.13 - aes-js: 4.0.0-beta.5 - tslib: 2.4.0 - ws: 8.5.0 - transitivePeerDependencies: - - bufferutil - - utf-8-validate - dev: true /ethjs-unit@0.1.6: resolution: {integrity: sha512-/Sn9Y0oKl0uqQuvgFk/zQgR7aw1g36qX/jzSQ5lSwlO0GigPymk4eGQfeNTD03w1dPOqfz8V77Cy43jH56pagw==} @@ -12325,27 +12287,6 @@ packages: tslib: 2.6.2 dev: false - /follow-redirects@1.15.3(debug@4.3.4): - resolution: {integrity: sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==} - engines: {node: '>=4.0'} - peerDependencies: - debug: '*' - peerDependenciesMeta: - debug: - optional: true - dependencies: - debug: 4.3.4(supports-color@8.1.1) - - /follow-redirects@1.15.5: - resolution: {integrity: sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==} - engines: {node: '>=4.0'} - peerDependencies: - debug: '*' - peerDependenciesMeta: - debug: - optional: true - dev: false - /follow-redirects@1.15.5(debug@4.3.4): resolution: {integrity: sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==} engines: {node: '>=4.0'} @@ -12356,7 +12297,6 @@ packages: optional: true dependencies: debug: 4.3.4(supports-color@8.1.1) - dev: true /follow-redirects@1.5.10: resolution: {integrity: sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==} @@ -19044,7 +18984,7 @@ packages: dependencies: command-exists: 1.2.9 commander: 3.0.2 - follow-redirects: 1.15.3(debug@4.3.4) + follow-redirects: 1.15.5(debug@4.3.4) fs-extra: 0.30.0 js-sha3: 0.8.0 memorystream: 0.3.1 @@ -22116,6 +22056,7 @@ packages: /zksync-web3@0.14.4(ethers@5.7.2): resolution: {integrity: sha512-kYehMD/S6Uhe1g434UnaMN+sBr9nQm23Ywn0EUP5BfQCsbjcr3ORuS68PosZw8xUTu3pac7G6YMSnNHk+fwzvg==} + deprecated: This package has been deprecated in favor of zksync-ethers@5.0.0 peerDependencies: ethers: ^5.7.0 dependencies: From c15fe460307345c740b76c95c75d51c5cbc5cea1 Mon Sep 17 00:00:00 2001 From: Jakub Nowakowski Date: Wed, 10 Apr 2024 11:20:34 +0200 Subject: [PATCH 5/5] Add commit to blame ignore --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index ec9afb3e3..0e95d8530 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,3 +1,6 @@ # Auto-fix linting d2a058fe6cfbab6f82d0d977d1b2d8bd9f494df1 0976ac1b09b7257fe74389bafe94697059a07aed + +# Move core/ to solidity/ +9b45a73a99b879e6fd362553f60de79405abad98