diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9332f8d06..ca8592e62 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -62,7 +62,7 @@ jobs: MOCHA_REPORTER: dot MOCHA_RETRY_COUNT: 2 run: | - yarn workspace @equilibria/perennial-v2 run ${{ env.PARSER_BROKEN != 'true' && 'coverage' || 'test' }} + yarn workspace @perennial/core run ${{ env.PARSER_BROKEN != 'true' && 'coverage' || 'test' }} - name: Upload lcov file uses: actions/upload-artifact@v3 with: @@ -100,7 +100,7 @@ jobs: MOCHA_RETRY_COUNT: 2 MAINNET_NODE_URL: ${{ secrets.MAINNET_NODE_URL }} run: | - yarn workspace @equilibria/perennial-v2 run ${{ env.PARSER_BROKEN != 'true' && 'coverage:integration' || 'test:integration' }} + yarn workspace @perennial/core run ${{ env.PARSER_BROKEN != 'true' && 'coverage:integration' || 'test:integration' }} - name: Upload lcov file uses: actions/upload-artifact@v3 with: @@ -170,7 +170,7 @@ jobs: MOCHA_REPORTER: dot MOCHA_RETRY_COUNT: 2 run: | - yarn workspace @equilibria/perennial-v2-account run ${{ env.PARSER_BROKEN != 'true' && 'coverage' || 'test' }} + yarn workspace @perennial/account run ${{ env.PARSER_BROKEN != 'true' && 'coverage' || 'test' }} - name: Upload lcov file uses: actions/upload-artifact@v3 with: @@ -200,7 +200,7 @@ jobs: MOCHA_RETRY_COUNT: 2 ARBITRUM_NODE_URL: ${{ secrets.ARBITRUM_NODE_URL }} run: | - yarn workspace @equilibria/perennial-v2-account run ${{ env.PARSER_BROKEN != 'true' && 'coverage:integration' || 'test:integration' }} + yarn workspace @perennial/account run ${{ env.PARSER_BROKEN != 'true' && 'coverage:integration' || 'test:integration' }} - name: Upload lcov file uses: actions/upload-artifact@v3 with: @@ -231,7 +231,7 @@ jobs: MOCHA_REPORTER: dot MOCHA_RETRY_COUNT: 2 run: | - yarn workspace @equilibria/perennial-v2-oracle run ${{ env.PARSER_BROKEN != 'true' && 'coverage' || 'test' }} + yarn workspace @perennial/oracle run ${{ env.PARSER_BROKEN != 'true' && 'coverage' || 'test' }} - name: Upload lcov file uses: actions/upload-artifact@v3 with: @@ -261,7 +261,7 @@ jobs: MOCHA_RETRY_COUNT: 2 MAINNET_NODE_URL: ${{ secrets.MAINNET_NODE_URL }} run: | - yarn workspace @equilibria/perennial-v2-oracle run ${{ env.PARSER_BROKEN != 'true' && 'coverage:integration' || 'test:integration' }} + yarn workspace @perennial/oracle run ${{ env.PARSER_BROKEN != 'true' && 'coverage:integration' || 'test:integration' }} - name: Upload lcov file uses: actions/upload-artifact@v3 with: @@ -291,7 +291,7 @@ jobs: MOCHA_RETRY_COUNT: 2 ARBITRUM_SEPOLIA_NODE_URL: ${{ secrets.ARBITRUM_SEPOLIA_NODE_URL }} run: | - yarn workspace @equilibria/perennial-v2-oracle run ${{ env.PARSER_BROKEN != 'true' && 'coverage:integrationSepolia' || 'test:integrationSepolia' }} + yarn workspace @perennial/oracle run ${{ env.PARSER_BROKEN != 'true' && 'coverage:integrationSepolia' || 'test:integrationSepolia' }} - name: Upload lcov file uses: actions/upload-artifact@v3 with: @@ -322,7 +322,7 @@ jobs: MOCHA_REPORTER: dot MOCHA_RETRY_COUNT: 2 run: | - yarn workspace @equilibria/perennial-v2-order run ${{ env.PARSER_BROKEN != 'true' && 'coverage' || 'test' }} + yarn workspace @perennial/order run ${{ env.PARSER_BROKEN != 'true' && 'coverage' || 'test' }} - name: Upload lcov file uses: actions/upload-artifact@v3 with: @@ -352,7 +352,7 @@ jobs: MOCHA_RETRY_COUNT: 2 ARBITRUM_NODE_URL: ${{ secrets.ARBITRUM_NODE_URL }} run: | - yarn workspace @equilibria/perennial-v2-order run ${{ env.PARSER_BROKEN != 'true' && 'coverage:integration' || 'test:integration' }} + yarn workspace @perennial/order run ${{ env.PARSER_BROKEN != 'true' && 'coverage:integration' || 'test:integration' }} - name: Upload lcov file uses: actions/upload-artifact@v3 with: @@ -383,7 +383,7 @@ jobs: MOCHA_REPORTER: dot MOCHA_RETRY_COUNT: 2 run: | - yarn workspace @equilibria/perennial-v2-vault run ${{ env.PARSER_BROKEN != 'true' && 'coverage' || 'test' }} + yarn workspace @perennial/vault run ${{ env.PARSER_BROKEN != 'true' && 'coverage' || 'test' }} - name: Upload lcov file uses: actions/upload-artifact@v3 with: @@ -413,7 +413,7 @@ jobs: MOCHA_RETRY_COUNT: 2 MAINNET_NODE_URL: ${{ secrets.MAINNET_NODE_URL }} run: | - yarn workspace @equilibria/perennial-v2-vault run ${{ env.PARSER_BROKEN != 'true' && 'coverage:integration' || 'test:integration' }} + yarn workspace @perennial/vault run ${{ env.PARSER_BROKEN != 'true' && 'coverage:integration' || 'test:integration' }} - name: Upload lcov file uses: actions/upload-artifact@v3 with: @@ -444,7 +444,7 @@ jobs: MOCHA_REPORTER: dot MOCHA_RETRY_COUNT: 2 run: | - yarn workspace @equilibria/perennial-v2-extensions run ${{ env.PARSER_BROKEN != 'true' && 'coverage' || 'test' }} + yarn workspace @perennial/extensions run ${{ env.PARSER_BROKEN != 'true' && 'coverage' || 'test' }} - name: Upload lcov file uses: actions/upload-artifact@v3 with: @@ -474,7 +474,7 @@ jobs: MOCHA_RETRY_COUNT: 2 MAINNET_NODE_URL: ${{ secrets.MAINNET_NODE_URL }} run: | - yarn workspace @equilibria/perennial-v2-extensions run ${{ env.PARSER_BROKEN != 'true' && 'coverage:integration' || 'test:integration' }} + yarn workspace @perennial/extensions run ${{ env.PARSER_BROKEN != 'true' && 'coverage:integration' || 'test:integration' }} - name: Upload lcov file uses: actions/upload-artifact@v3 with: @@ -505,7 +505,7 @@ jobs: MOCHA_REPORTER: dot MOCHA_RETRY_COUNT: 2 run: | - yarn workspace @equilibria/perennial-v2-verifier run ${{ env.PARSER_BROKEN != 'true' && 'coverage' || 'test' }} + yarn workspace @perennial/verifier run ${{ env.PARSER_BROKEN != 'true' && 'coverage' || 'test' }} - name: Upload lcov file uses: actions/upload-artifact@v3 with: diff --git a/README.md b/README.md index ecd965d64..875054470 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ ## 📦 Packages -| Package | Description | Latest Version | -| -------------------------- | :-------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------: | -| `@perennial-v2` | Core perennial smart contracts. | [![npm version](https://badge.fury.io/js/@equilibria%2Fperennial-v2.svg)](https://badge.fury.io/js/@equilibria%2Fperennial-v2) | -| `@perennial-v2-deploy` | Deployment scripts and artifacts. | [![npm version](https://badge.fury.io/js/@equilibria%2Fperennial-v2-deploy.svg)](https://badge.fury.io/js/@equilibria%2Fperennial-v2-deploy) | -| `@perennial-v2-extensions` | Extension smart contracts. | [![npm version](https://badge.fury.io/js/@equilibria%2Fperennial-v2-extensions.svg)](https://badge.fury.io/js/@equilibria%2Fperennial-v2-extensions) | -| `@perennial-v2-oracle` | Oracle provider smart contracts. | [![npm version](https://badge.fury.io/js/@equilibria%2Fperennial-v2-oracle.svg)](https://badge.fury.io/js/@equilibria%2Fperennial-v2-oracle) | -| `@perennial-v2-vault` | Vault smart contracts. | [![npm version](https://badge.fury.io/js/@equilibria%2Fperennial-v2-vault.svg)](https://badge.fury.io/js/@equilibria%2Fperennial-v2-vault) | +| Package | Description | Latest Version | +| ----------------------- | :-------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------: | +| `@perennial/core` | Core perennial smart contracts. | [![npm version](https://badge.fury.io/js/@perennial%2Fcore.svg)](https://badge.fury.io/js/@perennial%2Fcore) | +| `@perennial/deploy` | Deployment scripts and artifacts. | [![npm version](https://badge.fury.io/js/@perennial%2Fperennial/deploy.svg)](https://badge.fury.io/js/@perennial%2Fperennial/deploy) | +| `@perennial/extensions` | Extension smart contracts. | [![npm version](https://badge.fury.io/js/@perennial%2Fperennial/extensions.svg)](https://badge.fury.io/js/@perennial%2Fperennial/extensions) | +| `@perennial/oracle` | Oracle provider smart contracts. | [![npm version](https://badge.fury.io/js/@perennial%2Fperennial/oracle.svg)](https://badge.fury.io/js/@perennial%2Fperennial/oracle) | +| `@perennial/vault` | Vault smart contracts. | [![npm version](https://badge.fury.io/js/@perennial%2Fperennial/vault.svg)](https://badge.fury.io/js/@perennial%2Fperennial/vault) | ## 🔗 Resources @@ -40,7 +40,7 @@ This also generates the Typechain types ### Test -Perennial has 4 logic packages: `perennial-v2`, `perennial-v2-extensions`, `perennial-v2-oracle`, and `perennial-v2-vault` +Perennial has 4 logic packages: `core`, `deploy`, `extensions`, `oracle`, and `vault` Run the Mocha unit tests a specific package: @@ -51,7 +51,7 @@ $ yarn workspace @equilibria/ run test For example, to run the tests for the core package: ```sh -$ yarn workspace @equilibria/perennial-v2 run test +$ yarn workspace @perennial/core run test ``` To run tests against a Mainnet fork, set your `MAINNET_NODE_URL` in the root `.env` and run @@ -63,7 +63,7 @@ $ yarn workspace run @equilibria/ test:integration For example, to run the integration tests for the core package: ```sh -$ yarn workspace @equilibria/perennial-v2 run test:integration +$ yarn workspace @perennial/core run test:integration ``` ## 🔐 Security diff --git a/packages/perennial-account/contracts/Account.sol b/packages/perennial-account/contracts/Account.sol index a6f4b1657..bff75976c 100644 --- a/packages/perennial-account/contracts/Account.sol +++ b/packages/perennial-account/contracts/Account.sol @@ -11,7 +11,7 @@ import { Token6 } from "@equilibria/root/token/types/Token6.sol"; import { Token18 } from "@equilibria/root/token/types/Token18.sol"; import { IAccount } from "./interfaces/IAccount.sol"; -import { IMarket, Position } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; +import { IMarket, Position } from "@perennial/core/contracts/interfaces/IMarket.sol"; /// @title Account /// @notice Collateral Accounts allow users to manage collateral across Perennial markets @@ -108,4 +108,4 @@ contract Account is IAccount, Instance { if (msg.sender != owner && msg.sender != address(factory())) revert AccountNotAuthorizedError(); _; } -} \ No newline at end of file +} diff --git a/packages/perennial-account/contracts/AccountVerifier.sol b/packages/perennial-account/contracts/AccountVerifier.sol index 5d9b1d639..fc7c648a5 100644 --- a/packages/perennial-account/contracts/AccountVerifier.sol +++ b/packages/perennial-account/contracts/AccountVerifier.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.24; import { EIP712 } from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; import { SignatureChecker } from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol"; import { VerifierBase } from "@equilibria/root/verifier/VerifierBase.sol"; -import { IMarketFactory } from "@equilibria/perennial-v2/contracts/interfaces/IMarketFactory.sol"; +import { IMarketFactory } from "@perennial/core/contracts/interfaces/IMarketFactory.sol"; import { IAccountVerifier } from "./interfaces/IAccountVerifier.sol"; import { IRelayVerifier } from "./interfaces/IRelayVerifier.sol"; // only needed for docstrings diff --git a/packages/perennial-account/contracts/Controller.sol b/packages/perennial-account/contracts/Controller.sol index d70bf45e1..994750882 100644 --- a/packages/perennial-account/contracts/Controller.sol +++ b/packages/perennial-account/contracts/Controller.sol @@ -8,7 +8,7 @@ import { Token6 } from "@equilibria/root/token/types/Token6.sol"; import { Token18 } from "@equilibria/root/token/types/Token18.sol"; import { Fixed6, Fixed6Lib } from "@equilibria/root/number/types/Fixed6.sol"; import { UFixed6, UFixed6Lib } from "@equilibria/root/number/types/UFixed6.sol"; -import { IMarketFactory } from "@equilibria/perennial-v2/contracts/interfaces/IMarketFactory.sol"; +import { IMarketFactory } from "@perennial/core/contracts/interfaces/IMarketFactory.sol"; import { IAccount, IMarket } from "./interfaces/IAccount.sol"; import { IAccountVerifier, IController } from "./interfaces/IController.sol"; diff --git a/packages/perennial-account/contracts/Controller_Arbitrum.sol b/packages/perennial-account/contracts/Controller_Arbitrum.sol index 8105b0f5f..eb668ce34 100644 --- a/packages/perennial-account/contracts/Controller_Arbitrum.sol +++ b/packages/perennial-account/contracts/Controller_Arbitrum.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.24; import { Kept_Arbitrum, Kept } from "@equilibria/root/attribute/Kept/Kept_Arbitrum.sol"; import { UFixed18 } from "@equilibria/root/number/types/UFixed18.sol"; import { IVerifierBase } from "@equilibria/root/verifier/interfaces/IVerifierBase.sol"; -import { IMarketFactory } from "@equilibria/perennial-v2/contracts/interfaces/IMarketFactory.sol"; +import { IMarketFactory } from "@perennial/core/contracts/interfaces/IMarketFactory.sol"; import { Controller_Incentivized } from "./Controller_Incentivized.sol"; /// @title Controller_Arbitrum diff --git a/packages/perennial-account/contracts/Controller_Incentivized.sol b/packages/perennial-account/contracts/Controller_Incentivized.sol index a9ebcef93..aecc7818b 100644 --- a/packages/perennial-account/contracts/Controller_Incentivized.sol +++ b/packages/perennial-account/contracts/Controller_Incentivized.sol @@ -10,8 +10,8 @@ import { UFixed18, UFixed18Lib } from "@equilibria/root/number/types/UFixed18.so import { Token6 } from "@equilibria/root/token/types/Token6.sol"; import { Token18 } from "@equilibria/root/token/types/Token18.sol"; import { IVerifierBase } from "@equilibria/root/verifier/interfaces/IVerifierBase.sol"; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; -import { IMarketFactory } from "@equilibria/perennial-v2/contracts/interfaces/IMarketFactory.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; +import { IMarketFactory } from "@perennial/core/contracts/interfaces/IMarketFactory.sol"; import { IAccount } from "./interfaces/IAccount.sol"; import { IController } from "./interfaces/IController.sol"; @@ -321,4 +321,4 @@ abstract contract Controller_Incentivized is Controller, IRelayer, Kept { data ); } -} \ No newline at end of file +} diff --git a/packages/perennial-account/contracts/interfaces/IAccount.sol b/packages/perennial-account/contracts/interfaces/IAccount.sol index fc605dfdb..ea864d8a3 100644 --- a/packages/perennial-account/contracts/interfaces/IAccount.sol +++ b/packages/perennial-account/contracts/interfaces/IAccount.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity ^0.8.13; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; import { Fixed6 } from "@equilibria/root/number/types/Fixed6.sol"; import { UFixed18 } from "@equilibria/root/number/types/UFixed18.sol"; import { UFixed6 } from "@equilibria/root/number/types/UFixed6.sol"; @@ -44,4 +44,4 @@ interface IAccount { /// @notice Converts a specified amount of DSU to USDC /// @param amount Quantity of DSU to burn, in 18-decimal precision function unwrap(UFixed18 amount) external; -} \ No newline at end of file +} diff --git a/packages/perennial-account/contracts/interfaces/IController.sol b/packages/perennial-account/contracts/interfaces/IController.sol index 08c068005..f1300d56b 100644 --- a/packages/perennial-account/contracts/interfaces/IController.sol +++ b/packages/perennial-account/contracts/interfaces/IController.sol @@ -4,7 +4,7 @@ pragma solidity ^0.8.13; import { Fixed6 } from "@equilibria/root/number/types/Fixed6.sol"; import { Token6 } from "@equilibria/root/token/types/Token6.sol"; import { Token18 } from "@equilibria/root/token/types/Token18.sol"; -import { IMarketFactory } from "@equilibria/perennial-v2/contracts/interfaces/IMarketFactory.sol"; +import { IMarketFactory } from "@perennial/core/contracts/interfaces/IMarketFactory.sol"; import { IAccount, IMarket } from "../interfaces/IAccount.sol"; import { IAccountVerifier } from "../interfaces/IAccountVerifier.sol"; @@ -157,4 +157,4 @@ interface IController { /// @param withdrawal Message requesting a withdrawal /// @param signature ERC712 message signature function withdrawWithSignature(Withdrawal calldata withdrawal, bytes calldata signature) external; -} \ No newline at end of file +} diff --git a/packages/perennial-account/contracts/types/RelayedAccessUpdateBatch.sol b/packages/perennial-account/contracts/types/RelayedAccessUpdateBatch.sol index 5c2098b8c..a30e75897 100644 --- a/packages/perennial-account/contracts/types/RelayedAccessUpdateBatch.sol +++ b/packages/perennial-account/contracts/types/RelayedAccessUpdateBatch.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity ^0.8.13; -import { AccessUpdateBatch, AccessUpdateBatchLib } from "@equilibria/perennial-v2-verifier/contracts/types/AccessUpdateBatch.sol"; +import { AccessUpdateBatch, AccessUpdateBatchLib } from "@perennial/verifier/contracts/types/AccessUpdateBatch.sol"; import { Action, ActionLib } from "./Action.sol"; struct RelayedAccessUpdateBatch { @@ -28,4 +28,4 @@ library RelayedAccessUpdateBatchLib { function hash(RelayedAccessUpdateBatch memory self) internal pure returns (bytes32) { return keccak256(abi.encode(STRUCT_HASH, AccessUpdateBatchLib.hash(self.accessUpdateBatch), ActionLib.hash(self.action))); } -} \ No newline at end of file +} diff --git a/packages/perennial-account/contracts/types/RelayedOperatorUpdate.sol b/packages/perennial-account/contracts/types/RelayedOperatorUpdate.sol index 1a3506fa9..19d490420 100644 --- a/packages/perennial-account/contracts/types/RelayedOperatorUpdate.sol +++ b/packages/perennial-account/contracts/types/RelayedOperatorUpdate.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity ^0.8.13; -import { OperatorUpdate, OperatorUpdateLib } from "@equilibria/perennial-v2-verifier/contracts/types/OperatorUpdate.sol"; +import { OperatorUpdate, OperatorUpdateLib } from "@perennial/verifier/contracts/types/OperatorUpdate.sol"; import { Action, ActionLib } from "./Action.sol"; struct RelayedOperatorUpdate { @@ -28,4 +28,4 @@ library RelayedOperatorUpdateLib { function hash(RelayedOperatorUpdate memory self) internal pure returns (bytes32) { return keccak256(abi.encode(STRUCT_HASH, OperatorUpdateLib.hash(self.operatorUpdate), ActionLib.hash(self.action))); } -} \ No newline at end of file +} diff --git a/packages/perennial-account/contracts/types/RelayedSignerUpdate.sol b/packages/perennial-account/contracts/types/RelayedSignerUpdate.sol index e55327576..52c31a4c5 100644 --- a/packages/perennial-account/contracts/types/RelayedSignerUpdate.sol +++ b/packages/perennial-account/contracts/types/RelayedSignerUpdate.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity ^0.8.13; -import { SignerUpdate, SignerUpdateLib } from "@equilibria/perennial-v2-verifier/contracts/types/SignerUpdate.sol"; +import { SignerUpdate, SignerUpdateLib } from "@perennial/verifier/contracts/types/SignerUpdate.sol"; import { Action, ActionLib } from "./Action.sol"; struct RelayedSignerUpdate { diff --git a/packages/perennial-account/hardhat.config.ts b/packages/perennial-account/hardhat.config.ts index 17f9abcb8..d8b0dac96 100644 --- a/packages/perennial-account/hardhat.config.ts +++ b/packages/perennial-account/hardhat.config.ts @@ -2,9 +2,9 @@ import defaultConfig from '../common/hardhat.default.config' const config = defaultConfig({ dependencyPaths: [ - '@equilibria/perennial-v2/contracts/MarketFactory.sol', - '@equilibria/perennial-v2/contracts/Market.sol', - '@equilibria/perennial-v2-verifier/contracts/interfaces/IVerifier.sol', + '@perennial/core/contracts/MarketFactory.sol', + '@perennial/core/contracts/Market.sol', + '@perennial/verifier/contracts/interfaces/IVerifier.sol', ], }) diff --git a/packages/perennial-account/package.json b/packages/perennial-account/package.json index 5c8b0bcd6..e10d2bc3e 100644 --- a/packages/perennial-account/package.json +++ b/packages/perennial-account/package.json @@ -1,5 +1,5 @@ { - "name": "@equilibria/perennial-v2-account", + "name": "@perennial/account", "version": "1.3.0", "description": "Perennial V2 Collateral Account", "files": [ @@ -24,6 +24,6 @@ "author": "", "license": "APACHE-2.0", "dependencies": { - "@equilibria/perennial-v2": "1.3.0" + "@perennial/core": "1.3.0" } } diff --git a/packages/perennial-account/test/helpers/arbitrumHelpers.ts b/packages/perennial-account/test/helpers/arbitrumHelpers.ts index 12c05f735..3efbaf873 100644 --- a/packages/perennial-account/test/helpers/arbitrumHelpers.ts +++ b/packages/perennial-account/test/helpers/arbitrumHelpers.ts @@ -9,7 +9,7 @@ import { Oracle__factory, PythFactory, PythFactory__factory, -} from '@equilibria/perennial-v2-oracle/types/generated' +} from '@perennial/oracle/types/generated' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { createMarket, deployController, deployOracleFactory, deployProtocolForOracle } from './setupHelpers' import { @@ -26,7 +26,7 @@ import { GasOracle__factory, } from '../../types/generated' import { impersonate } from '../../../common/testutil' -import { IVerifier } from '@equilibria/perennial-v2/types/generated' +import { IVerifier } from '@perennial/core/types/generated' const PYTH_ADDRESS = '0xff1a0f4744e8582DF1aE09D5611b887B6a12925C' const PYTH_ETH_USD_PRICE_FEED = '0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace' diff --git a/packages/perennial-account/test/helpers/setupHelpers.ts b/packages/perennial-account/test/helpers/setupHelpers.ts index b0c2bc937..170f83c9e 100644 --- a/packages/perennial-account/test/helpers/setupHelpers.ts +++ b/packages/perennial-account/test/helpers/setupHelpers.ts @@ -31,8 +31,8 @@ import { VersionLib__factory, VersionStorageLib__factory, MagicValueLib__factory, -} from '@equilibria/perennial-v2/types/generated' -import { MarketParameterStruct, RiskParameterStruct } from '@equilibria/perennial-v2/types/generated/contracts/Market' +} from '@perennial/core/types/generated' +import { MarketParameterStruct, RiskParameterStruct } from '@perennial/core/types/generated/contracts/Market' import { OracleFactory__factory, @@ -40,9 +40,9 @@ import { Oracle__factory, IOracleFactory, IOracle, -} from '@equilibria/perennial-v2-oracle/types/generated' -import { OracleVersionStruct } from '../../types/generated/@equilibria/perennial-v2/contracts/interfaces/IOracleProvider' -import { Verifier__factory } from '@equilibria/perennial-v2-verifier/types/generated' +} from '@perennial/oracle/types/generated' +import { OracleVersionStruct } from '../../types/generated/@perennial/core/contracts/interfaces/IOracleProvider' +import { Verifier__factory } from '@perennial/verifier/types/generated' // Simulates an oracle update from KeeperOracle. // If timestamp matches a requested version, callbacks implicitly settle the market. @@ -183,9 +183,7 @@ export async function deployProtocolForOracle( // Creates a market for a specified collateral token, which can't do much of anything export async function mockMarket(token: Address): Promise { const oracle = await smock.fake('IOracleProvider') - const verifier = await smock.fake( - '@equilibria/perennial-v2-verifier/contracts/interfaces/IVerifier.sol:IVerifier', - ) + const verifier = await smock.fake('@perennial/verifier/contracts/interfaces/IVerifier.sol:IVerifier') const factory = await smock.fake('IMarketFactory') const factorySigner = await impersonateWithBalance(factory.address, utils.parseEther('10')) diff --git a/packages/perennial-account/test/integration/Controller.ts b/packages/perennial-account/test/integration/Controller.ts index ebfe0cb2a..a14297cdc 100644 --- a/packages/perennial-account/test/integration/Controller.ts +++ b/packages/perennial-account/test/integration/Controller.ts @@ -11,13 +11,8 @@ import { parse6decimal } from '../../../common/testutil/types' import { Account, Account__factory, Controller, IERC20Metadata } from '../../types/generated' import { IAccountVerifier } from '../../types/generated/contracts/interfaces' import { IAccountVerifier__factory } from '../../types/generated/factories/contracts/interfaces' -import { - IKeeperOracle, - IOracleFactory, - IOracleProvider, - PythFactory, -} from '@equilibria/perennial-v2-oracle/types/generated' -import { IMarket, IMarketFactory } from '@equilibria/perennial-v2/types/generated' +import { IKeeperOracle, IOracleFactory, IOracleProvider, PythFactory } from '@perennial/oracle/types/generated' +import { IMarket, IMarketFactory } from '@perennial/core/types/generated' import { signDeployAccount, signMarketTransfer, signRebalanceConfigChange, signWithdrawal } from '../helpers/erc712' import { advanceToPrice } from '../helpers/setupHelpers' import { diff --git a/packages/perennial-account/test/integration/Controller_Arbitrum.ts b/packages/perennial-account/test/integration/Controller_Arbitrum.ts index 7cbe8f123..0d8eb19f8 100644 --- a/packages/perennial-account/test/integration/Controller_Arbitrum.ts +++ b/packages/perennial-account/test/integration/Controller_Arbitrum.ts @@ -50,10 +50,10 @@ import { signCommon as signNonceCancellation, signOperatorUpdate, signSignerUpdate, -} from '@equilibria/perennial-v2-verifier/test/helpers/erc712' -import { Verifier, Verifier__factory } from '@equilibria/perennial-v2-verifier/types/generated' -import { IVerifier__factory } from '@equilibria/perennial-v2/types/generated' -import { IKeeperOracle, IOracleFactory, PythFactory } from '@equilibria/perennial-v2-oracle/types/generated' +} from '@perennial/verifier/test/helpers/erc712' +import { Verifier, Verifier__factory } from '@perennial/verifier/types/generated' +import { IVerifier__factory } from '@perennial/core/types/generated' +import { IKeeperOracle, IOracleFactory, PythFactory } from '@perennial/oracle/types/generated' const { ethers } = HRE diff --git a/packages/perennial-account/test/unit/Controller.ts b/packages/perennial-account/test/unit/Controller.ts index 3b8ff8350..5e84290a3 100644 --- a/packages/perennial-account/test/unit/Controller.ts +++ b/packages/perennial-account/test/unit/Controller.ts @@ -22,8 +22,8 @@ import { getEventArguments } from '../../../common/testutil/transaction' import { FakeContract, smock } from '@defi-wonderland/smock' import { deployController, mockMarket } from '../helpers/setupHelpers' import { parse6decimal } from '../../../common/testutil/types' -import { IMarket } from '@equilibria/perennial-v2-oracle/types/generated' -import { IMarketFactory } from '@equilibria/perennial-v2/types/generated' +import { IMarket } from '@perennial/oracle/types/generated' +import { IMarketFactory } from '@perennial/core/types/generated' const { ethers } = HRE diff --git a/packages/perennial-account/test/unit/Verifier.ts b/packages/perennial-account/test/unit/Verifier.ts index f7e6fce9e..01883e845 100644 --- a/packages/perennial-account/test/unit/Verifier.ts +++ b/packages/perennial-account/test/unit/Verifier.ts @@ -25,11 +25,11 @@ import { signCommon as signNonceCancellation, signOperatorUpdate, signSignerUpdate, -} from '@equilibria/perennial-v2-verifier/test/helpers/erc712' +} from '@perennial/verifier/test/helpers/erc712' import { impersonate } from '../../../common/testutil' import { currentBlockTimestamp } from '../../../common/testutil/time' import { parse6decimal } from '../../../common/testutil/types' -import { Verifier, Verifier__factory } from '@equilibria/perennial-v2-verifier/types/generated' +import { Verifier, Verifier__factory } from '@perennial/verifier/types/generated' const { ethers } = HRE diff --git a/packages/perennial-deploy/deploy/004_deploy_market.ts b/packages/perennial-deploy/deploy/004_deploy_market.ts index 8c886356d..2effb40c5 100644 --- a/packages/perennial-deploy/deploy/004_deploy_market.ts +++ b/packages/perennial-deploy/deploy/004_deploy_market.ts @@ -20,13 +20,13 @@ export const MARKET_LIBRARIES: Array<{ }> = [ { name: 'CheckpointLib', - contract: '@equilibria/perennial-v2/contracts/libs/CheckpointLib.sol:CheckpointLib', + contract: '@perennial/core/contracts/libs/CheckpointLib.sol:CheckpointLib', }, { name: 'InvariantLib', contract: undefined }, { name: 'VersionLib', contract: undefined }, { name: 'CheckpointStorageLib', - contract: '@equilibria/perennial-v2/contracts/types/Checkpoint.sol:CheckpointStorageLib', + contract: '@perennial/core/contracts/types/Checkpoint.sol:CheckpointStorageLib', }, { name: 'GlobalStorageLib', contract: undefined }, { name: 'MarketParameterStorageLib', contract: undefined }, diff --git a/packages/perennial-deploy/hardhat.config.ts b/packages/perennial-deploy/hardhat.config.ts index c9e01cbc8..486340e39 100644 --- a/packages/perennial-deploy/hardhat.config.ts +++ b/packages/perennial-deploy/hardhat.config.ts @@ -1,6 +1,6 @@ import defaultConfig from '../common/hardhat.default.config' -import { solidityOverrides as coreOverrides } from '@equilibria/perennial-v2/hardhat.config' -import { solidityOverrides as vaultOverrides } from '@equilibria/perennial-v2-vault/hardhat.config' +import { solidityOverrides as coreOverrides } from '@perennial/core/hardhat.config' +import { solidityOverrides as vaultOverrides } from '@perennial/vault/hardhat.config' import './tasks' const config = defaultConfig({ @@ -8,28 +8,28 @@ const config = defaultConfig({ '@openzeppelin/contracts/governance/TimelockController.sol', '@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol', '@openzeppelin/contracts/interfaces/IERC20.sol', - '@equilibria/perennial-v2-oracle/contracts/payoff/PowerHalf.sol', - '@equilibria/perennial-v2-oracle/contracts/payoff/PowerTwo.sol', - '@equilibria/perennial-v2-oracle/contracts/payoff/Inverse.sol', - '@equilibria/perennial-v2-oracle/contracts/Oracle.sol', - '@equilibria/perennial-v2-oracle/contracts/OracleFactory.sol', - '@equilibria/perennial-v2-oracle/contracts/keeper/KeeperFactory.sol', - '@equilibria/perennial-v2-oracle/contracts/keeper/KeeperOracle.sol', - '@equilibria/perennial-v2-oracle/contracts/pyth/PythFactory.sol', - '@equilibria/perennial-v2/contracts/Market.sol', - '@equilibria/perennial-v2/contracts/MarketFactory.sol', - '@equilibria/perennial-v2-vault/contracts/Vault.sol', - '@equilibria/perennial-v2-vault/contracts/VaultFactory.sol', - '@equilibria/perennial-v2-extensions/contracts/MultiInvoker.sol', - '@equilibria/perennial-v2-extensions/contracts/MultiInvoker_Arbitrum.sol', - '@equilibria/perennial-v2-extensions/contracts/MultiInvoker_Optimism.sol', - '@equilibria/perennial-v2-extensions/contracts/Coordinator.sol', + '@perennial/oracle/contracts/payoff/PowerHalf.sol', + '@perennial/oracle/contracts/payoff/PowerTwo.sol', + '@perennial/oracle/contracts/payoff/Inverse.sol', + '@perennial/oracle/contracts/Oracle.sol', + '@perennial/oracle/contracts/OracleFactory.sol', + '@perennial/oracle/contracts/keeper/KeeperFactory.sol', + '@perennial/oracle/contracts/keeper/KeeperOracle.sol', + '@perennial/oracle/contracts/pyth/PythFactory.sol', + '@perennial/core/contracts/Market.sol', + '@perennial/core/contracts/MarketFactory.sol', + '@perennial/vault/contracts/Vault.sol', + '@perennial/vault/contracts/VaultFactory.sol', + '@perennial/extensions/contracts/MultiInvoker.sol', + '@perennial/extensions/contracts/MultiInvoker_Arbitrum.sol', + '@perennial/extensions/contracts/MultiInvoker_Optimism.sol', + '@perennial/extensions/contracts/Coordinator.sol', ], solidityOverrides: { - '@equilibria/perennial-v2/contracts/Market.sol': { + '@perennial/core/contracts/Market.sol': { ...coreOverrides['contracts/Market.sol'], }, - '@equilibria/perennial-v2-vault/contracts/Vault.sol': { + '@perennial/vault/contracts/Vault.sol': { ...vaultOverrides['contracts/Vault.sol'], }, }, diff --git a/packages/perennial-deploy/package.json b/packages/perennial-deploy/package.json index da8cb908b..0a601b3b3 100644 --- a/packages/perennial-deploy/package.json +++ b/packages/perennial-deploy/package.json @@ -1,5 +1,5 @@ { - "name": "@equilibria/perennial-v2-deploy", + "name": "@perennial/deploy", "version": "1.3.0", "description": "Perennial V2 Deployment Tooling", "files": [ @@ -33,7 +33,7 @@ "license": "APACHE-2.0", "dependencies": { "@defi-wonderland/smock": "^2.3.5", - "@equilibria/perennial-v2": "1.3.0", + "@perennial/core": "1.3.0", "@pythnetwork/pyth-evm-js": "^1.29.0", "@types/isomorphic-fetch": "^0.0.37", "graphql": "^16.8.1", diff --git a/packages/perennial-deploy/tasks/multisig_ops/constants.ts b/packages/perennial-deploy/tasks/multisig_ops/constants.ts index b4f6c8750..b171f80ba 100644 --- a/packages/perennial-deploy/tasks/multisig_ops/constants.ts +++ b/packages/perennial-deploy/tasks/multisig_ops/constants.ts @@ -1,9 +1,6 @@ import { utils } from 'ethers' -import { - MarketParameterStruct, - RiskParameterStruct, -} from '../../types/generated/@equilibria/perennial-v2/contracts/Market' -import { ProtocolParameterStruct } from '../../types/generated/@equilibria/perennial-v2/contracts/MarketFactory' +import { MarketParameterStruct, RiskParameterStruct } from '../../types/generated/@perennial/core/contracts/Market' +import { ProtocolParameterStruct } from '../../types/generated/@perennial/core/contracts/MarketFactory' export const NewRiskParams: Record = { XRP: { diff --git a/packages/perennial-deploy/test/verification/arbitrum/perennial/verifyMarkets.test.ts b/packages/perennial-deploy/test/verification/arbitrum/perennial/verifyMarkets.test.ts index 2ad7cf462..247dee9ed 100644 --- a/packages/perennial-deploy/test/verification/arbitrum/perennial/verifyMarkets.test.ts +++ b/packages/perennial-deploy/test/verification/arbitrum/perennial/verifyMarkets.test.ts @@ -10,7 +10,7 @@ import { } from '../../../../types/generated' import { utils, constants } from 'ethers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { OracleFactory } from '@equilibria/perennial-v2-oracle/types/generated' +import { OracleFactory } from '@perennial/oracle/types/generated' import { getLabsMultisig } from '../../../../../common/testutil/constants' const GAUNTLET_ADDRESS = '0x9B08824A87D79a65dD30Fc5c6B9e734A313E4235' diff --git a/packages/perennial-deploy/test/verification/base/perennial/verifyMarkets.test.ts b/packages/perennial-deploy/test/verification/base/perennial/verifyMarkets.test.ts index de27c8b21..c0e7f1d75 100644 --- a/packages/perennial-deploy/test/verification/base/perennial/verifyMarkets.test.ts +++ b/packages/perennial-deploy/test/verification/base/perennial/verifyMarkets.test.ts @@ -10,7 +10,7 @@ import { } from '../../../../types/generated' import { utils, constants } from 'ethers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { OracleFactory } from '@equilibria/perennial-v2-oracle/types/generated' +import { OracleFactory } from '@perennial/oracle/types/generated' import { getLabsMultisig } from '../../../../../common/testutil/constants' const GAUNTLET_ADDRESS = '0x9B08824A87D79a65dD30Fc5c6B9e734A313E4235' diff --git a/packages/perennial-extensions/contracts/Coordinator.sol b/packages/perennial-extensions/contracts/Coordinator.sol index d1aabceca..b7bcb9f94 100644 --- a/packages/perennial-extensions/contracts/Coordinator.sol +++ b/packages/perennial-extensions/contracts/Coordinator.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.24; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; -import { RiskParameter } from "@equilibria/perennial-v2/contracts/types/RiskParameter.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; +import { RiskParameter } from "@perennial/core/contracts/types/RiskParameter.sol"; import { Ownable } from "@equilibria/root/attribute/Ownable.sol"; import { ICoordinator } from "./interfaces/ICoordinator.sol"; diff --git a/packages/perennial-extensions/contracts/MultiInvoker.sol b/packages/perennial-extensions/contracts/MultiInvoker.sol index 345b0feef..0f7fa23da 100644 --- a/packages/perennial-extensions/contracts/MultiInvoker.sol +++ b/packages/perennial-extensions/contracts/MultiInvoker.sol @@ -14,12 +14,12 @@ import { UFixed18, UFixed18Lib } from "@equilibria/root/number/types/UFixed18.so import { Fixed6, Fixed6Lib } from "@equilibria/root/number/types/Fixed6.sol"; import { Fixed18, Fixed18Lib } from "@equilibria/root/number/types/Fixed18.sol"; import { Kept } from "@equilibria/root/attribute/Kept/Kept.sol"; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; -import { Order } from "@equilibria/perennial-v2/contracts/types/Order.sol"; -import { Position } from "@equilibria/perennial-v2/contracts/types/Position.sol"; -import { IPythFactory } from "@equilibria/perennial-v2-oracle/contracts/interfaces/IPythFactory.sol"; -import { IVault } from "@equilibria/perennial-v2-vault/contracts/interfaces/IVault.sol"; -import { Intent } from "@equilibria/perennial-v2-verifier/contracts/types/Intent.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; +import { Order } from "@perennial/core/contracts/types/Order.sol"; +import { Position } from "@perennial/core/contracts/types/Position.sol"; +import { IPythFactory } from "@perennial/oracle/contracts/interfaces/IPythFactory.sol"; +import { IVault } from "@perennial/vault/contracts/interfaces/IVault.sol"; +import { Intent } from "@perennial/verifier/contracts/types/Intent.sol"; import { IMultiInvoker } from "./interfaces/IMultiInvoker.sol"; import { TriggerOrder, TriggerOrderStorage } from "./types/TriggerOrder.sol"; import { InterfaceFee } from "./types/InterfaceFee.sol"; diff --git a/packages/perennial-extensions/contracts/interfaces/ICoordinator.sol b/packages/perennial-extensions/contracts/interfaces/ICoordinator.sol index de224c1d6..2f17e0095 100644 --- a/packages/perennial-extensions/contracts/interfaces/ICoordinator.sol +++ b/packages/perennial-extensions/contracts/interfaces/ICoordinator.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity ^0.8.13; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; -import { RiskParameter } from "@equilibria/perennial-v2/contracts/types/RiskParameter.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; +import { RiskParameter } from "@perennial/core/contracts/types/RiskParameter.sol"; interface ICoordinator { function setComptroller(address comptroller) external; diff --git a/packages/perennial-extensions/contracts/interfaces/IMultiInvoker.sol b/packages/perennial-extensions/contracts/interfaces/IMultiInvoker.sol index dc8bf0407..5c7053688 100644 --- a/packages/perennial-extensions/contracts/interfaces/IMultiInvoker.sol +++ b/packages/perennial-extensions/contracts/interfaces/IMultiInvoker.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.13; import { IFactory } from "@equilibria/root/attribute/interfaces/IFactory.sol"; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; import { IBatcher } from "@equilibria/emptyset-batcher/interfaces/IBatcher.sol"; import { IEmptySetReserve } from "@equilibria/emptyset-batcher/interfaces/IEmptySetReserve.sol"; import { UFixed6 } from "@equilibria/root/number/types/UFixed6.sol"; @@ -63,4 +63,4 @@ interface IMultiInvoker { function latestNonce() external view returns (uint256); function orders(address account, IMarket market, uint256 nonce) external view returns (TriggerOrder memory); function canExecuteOrder(address account, IMarket market, uint256 nonce) external view returns (bool); -} \ No newline at end of file +} diff --git a/packages/perennial-extensions/contracts/types/TriggerOrder.sol b/packages/perennial-extensions/contracts/types/TriggerOrder.sol index c8fb10ca9..c84ded42e 100644 --- a/packages/perennial-extensions/contracts/types/TriggerOrder.sol +++ b/packages/perennial-extensions/contracts/types/TriggerOrder.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.13; import { UFixed6, UFixed6Lib } from "@equilibria/root/number/types/UFixed6.sol"; import { Fixed6, Fixed6Lib } from "@equilibria/root/number/types/Fixed6.sol"; -import { OracleVersion } from "@equilibria/perennial-v2/contracts/types/OracleVersion.sol"; -import { Position } from "@equilibria/perennial-v2/contracts/types/Position.sol"; +import { OracleVersion } from "@perennial/core/contracts/types/OracleVersion.sol"; +import { Position } from "@perennial/core/contracts/types/Position.sol"; import { InterfaceFee } from "./InterfaceFee.sol"; struct TriggerOrder { diff --git a/packages/perennial-extensions/hardhat.config.ts b/packages/perennial-extensions/hardhat.config.ts index 8a3b4813a..d8cee712e 100644 --- a/packages/perennial-extensions/hardhat.config.ts +++ b/packages/perennial-extensions/hardhat.config.ts @@ -2,16 +2,16 @@ import defaultConfig from '../common/hardhat.default.config' const config = defaultConfig({ dependencyPaths: [ - '@equilibria/perennial-v2/contracts/MarketFactory.sol', - '@equilibria/perennial-v2/contracts/Market.sol', - '@equilibria/perennial-v2-vault/contracts/Vault.sol', - '@equilibria/perennial-v2-vault/contracts/VaultFactory.sol', - '@equilibria/perennial-v2-oracle/contracts/interfaces/IKeeperOracle.sol', - '@equilibria/perennial-v2-oracle/contracts/keeper/KeeperOracle.sol', - '@equilibria/perennial-v2-oracle/contracts/pyth/PythFactory.sol', - '@equilibria/perennial-v2-oracle/contracts/Oracle.sol', - '@equilibria/perennial-v2-oracle/contracts/OracleFactory.sol', - '@equilibria/perennial-v2-oracle/contracts/payoff/PowerTwo.sol', + '@perennial/core/contracts/MarketFactory.sol', + '@perennial/core/contracts/Market.sol', + '@perennial/vault/contracts/Vault.sol', + '@perennial/vault/contracts/VaultFactory.sol', + '@perennial/oracle/contracts/interfaces/IKeeperOracle.sol', + '@perennial/oracle/contracts/keeper/KeeperOracle.sol', + '@perennial/oracle/contracts/pyth/PythFactory.sol', + '@perennial/oracle/contracts/Oracle.sol', + '@perennial/oracle/contracts/OracleFactory.sol', + '@perennial/oracle/contracts/payoff/PowerTwo.sol', '@equilibria/root/attribute/Kept/Kept.sol', ], }) diff --git a/packages/perennial-extensions/package.json b/packages/perennial-extensions/package.json index 5ab849421..906533f86 100644 --- a/packages/perennial-extensions/package.json +++ b/packages/perennial-extensions/package.json @@ -1,5 +1,5 @@ { - "name": "@equilibria/perennial-v2-extensions", + "name": "@perennial/extensions", "version": "1.3.0", "description": "Perennial V2 Extensions", "files": [ @@ -29,8 +29,8 @@ "license": "Apache-2.0", "dependencies": { "@equilibria/emptyset-batcher": "^0.1.0", - "@equilibria/perennial-v2": "1.3.0", - "@equilibria/perennial-v2-oracle": "1.3.0" + "@perennial/core": "1.3.0", + "@perennial/oracle": "1.3.0" }, "devDependencies": { "@ethersproject/abstract-provider": "^5" diff --git a/packages/perennial-extensions/test/helpers/invoke.ts b/packages/perennial-extensions/test/helpers/invoke.ts index 65938fd0e..4a83a852a 100644 --- a/packages/perennial-extensions/test/helpers/invoke.ts +++ b/packages/perennial-extensions/test/helpers/invoke.ts @@ -3,10 +3,10 @@ import { IMultiInvoker } from '../../types/generated' import { InterfaceFeeStruct, TriggerOrderStruct } from '../../types/generated/contracts/MultiInvoker' import { ethers } from 'hardhat' import { BigNumber, constants } from 'ethers' -import { IntentStruct } from '../../types/generated/@equilibria/perennial-v2/contracts/Market' +import { IntentStruct } from '../../types/generated/@perennial/core/contracts/Market' import { signIntent } from '../../../perennial-verifier/test/helpers/erc712' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { IVerifier } from '@equilibria/perennial-v2/types/generated' +import { IVerifier } from '@perennial/core/types/generated' import { sign } from 'crypto' export const MAX_INT = ethers.constants.MaxInt256 diff --git a/packages/perennial-extensions/test/helpers/types.ts b/packages/perennial-extensions/test/helpers/types.ts index 61d03fbc9..7a5437570 100644 --- a/packages/perennial-extensions/test/helpers/types.ts +++ b/packages/perennial-extensions/test/helpers/types.ts @@ -1,8 +1,8 @@ import { BigNumber, BigNumberish, constants } from 'ethers' -import { IMarket, PositionStruct } from '../../types/generated/@equilibria/perennial-v2/contracts/interfaces/IMarket' +import { IMarket, PositionStruct } from '../../types/generated/@perennial/core/contracts/interfaces/IMarket' import { FakeContract } from '@defi-wonderland/smock' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { LocalStruct } from '@equilibria/perennial-v2/types/generated/contracts/Market' +import { LocalStruct } from '@perennial/core/types/generated/contracts/Market' import { InterfaceFeeStruct, TriggerOrderStruct } from '../../types/generated/contracts/MultiInvoker' import { parse6decimal } from '../../../common/testutil/types' diff --git a/packages/perennial-extensions/test/integration/core/Invoke.test.ts b/packages/perennial-extensions/test/integration/core/Invoke.test.ts index 86b2b0d02..a0098ab29 100644 --- a/packages/perennial-extensions/test/integration/core/Invoke.test.ts +++ b/packages/perennial-extensions/test/integration/core/Invoke.test.ts @@ -45,7 +45,7 @@ import { BigNumber, constants } from 'ethers' import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { Compare, Dir, openTriggerOrder } from '../../helpers/types' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { IERC20Metadata } from '@equilibria/perennial-v2/types/generated' +import { IERC20Metadata } from '@perennial/core/types/generated' use(smock.matchers) diff --git a/packages/perennial-extensions/test/integration/helpers/setupHelpers.ts b/packages/perennial-extensions/test/integration/helpers/setupHelpers.ts index 4754c200b..bdb2d3eae 100644 --- a/packages/perennial-extensions/test/integration/helpers/setupHelpers.ts +++ b/packages/perennial-extensions/test/integration/helpers/setupHelpers.ts @@ -40,24 +40,21 @@ import { MarketFactory__factory, MagicValueLib__factory, } from '../../../types/generated' -import { CheckpointStorageLib__factory } from '../../../types/generated/factories/@equilibria/perennial-v2/contracts/types/Checkpoint.sol' // Import directly from path due to name collision with vault type -import { CheckpointLib__factory } from '../../../types/generated/factories/@equilibria/perennial-v2/contracts/libs/CheckpointLib__factory' // Import directly from path due to name collision with vault type -import { ChainlinkContext } from '@equilibria/perennial-v2/test/integration/helpers/chainlinkHelpers' +import { CheckpointStorageLib__factory } from '../../../types/generated/factories/@perennial/core/contracts/types/Checkpoint.sol' // Import directly from path due to name collision with vault type +import { CheckpointLib__factory } from '../../../types/generated/factories/@perennial/core/contracts/libs/CheckpointLib__factory' // Import directly from path due to name collision with vault type +import { ChainlinkContext } from '@perennial/core/test/integration/helpers/chainlinkHelpers' import { DEFAULT_ORACLE_RECEIPT, parse6decimal } from '../../../../common/testutil/types' -import { CHAINLINK_CUSTOM_CURRENCIES } from '@equilibria/perennial-v2-oracle/util/constants' -import { - MarketParameterStruct, - RiskParameterStruct, -} from '../../../types/generated/@equilibria/perennial-v2/contracts/Market' +import { CHAINLINK_CUSTOM_CURRENCIES } from '@perennial/oracle/util/constants' +import { MarketParameterStruct, RiskParameterStruct } from '../../../types/generated/@perennial/core/contracts/Market' import { FakeContract, smock } from '@defi-wonderland/smock' -import { deployProductOnMainnetFork } from '@equilibria/perennial-v2-vault/test/integration/helpers/setupHelpers' +import { deployProductOnMainnetFork } from '@perennial/vault/test/integration/helpers/setupHelpers' import { ProxyAdmin, ProxyAdmin__factory, TransparentUpgradeableProxy__factory, IVerifier, IVerifier__factory, -} from '@equilibria/perennial-v2/types/generated' +} from '@perennial/core/types/generated' import { Verifier__factory } from '../../../../perennial-verifier/types/generated' const { ethers } = HRE @@ -135,37 +132,37 @@ export async function deployProtocol(chainlinkContext?: ChainlinkContext): Promi const marketImpl = await new Market__factory( { - '@equilibria/perennial-v2/contracts/libs/CheckpointLib.sol:CheckpointLib': ( + '@perennial/core/contracts/libs/CheckpointLib.sol:CheckpointLib': ( await new CheckpointLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/libs/InvariantLib.sol:InvariantLib': ( + '@perennial/core/contracts/libs/InvariantLib.sol:InvariantLib': ( await new InvariantLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/libs/VersionLib.sol:VersionLib': ( + '@perennial/core/contracts/libs/VersionLib.sol:VersionLib': ( await new VersionLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/libs/MagicValueLib.sol:MagicValueLib': ( + '@perennial/core/contracts/libs/MagicValueLib.sol:MagicValueLib': ( await new MagicValueLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Checkpoint.sol:CheckpointStorageLib': ( + '@perennial/core/contracts/types/Checkpoint.sol:CheckpointStorageLib': ( await new CheckpointStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Global.sol:GlobalStorageLib': ( + '@perennial/core/contracts/types/Global.sol:GlobalStorageLib': ( await new GlobalStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/MarketParameter.sol:MarketParameterStorageLib': ( + '@perennial/core/contracts/types/MarketParameter.sol:MarketParameterStorageLib': ( await new MarketParameterStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Position.sol:PositionStorageGlobalLib': ( + '@perennial/core/contracts/types/Position.sol:PositionStorageGlobalLib': ( await new PositionStorageGlobalLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Position.sol:PositionStorageLocalLib': ( + '@perennial/core/contracts/types/Position.sol:PositionStorageLocalLib': ( await new PositionStorageLocalLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/RiskParameter.sol:RiskParameterStorageLib': ( + '@perennial/core/contracts/types/RiskParameter.sol:RiskParameterStorageLib': ( await new RiskParameterStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Version.sol:VersionStorageLib': ( + '@perennial/core/contracts/types/Version.sol:VersionStorageLib': ( await new VersionStorageLib__factory(owner).deploy() ).address, }, diff --git a/packages/perennial-extensions/test/unit/MultiInvoker/MultiInvoker.test.ts b/packages/perennial-extensions/test/unit/MultiInvoker/MultiInvoker.test.ts index 73f4f81dd..452d9da53 100644 --- a/packages/perennial-extensions/test/unit/MultiInvoker/MultiInvoker.test.ts +++ b/packages/perennial-extensions/test/unit/MultiInvoker/MultiInvoker.test.ts @@ -39,8 +39,8 @@ import { DEFAULT_LOCAL, DEFAULT_POSITION, Local, parse6decimal } from '../../../ import { openTriggerOrder, setGlobalPrice, setMarketPosition, Compare, Dir } from '../../helpers/types' import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' -import { PositionStruct } from '@equilibria/perennial-v2/types/generated/contracts/Market' -import { OracleVersionStruct } from '../../../types/generated/@equilibria/perennial-v2-oracle/contracts/Oracle' +import { PositionStruct } from '@perennial/core/types/generated/contracts/Market' +import { OracleVersionStruct } from '../../../types/generated/@perennial/oracle/contracts/Oracle' const ethers = { HRE } use(smock.matchers) diff --git a/packages/perennial-oracle/contracts/Oracle.sol b/packages/perennial-oracle/contracts/Oracle.sol index 4c03a854b..cacb67f04 100644 --- a/packages/perennial-oracle/contracts/Oracle.sol +++ b/packages/perennial-oracle/contracts/Oracle.sol @@ -5,10 +5,10 @@ import { UFixed6 } from "@equilibria/root/number/types/UFixed6.sol"; import { UFixed18Lib } from "@equilibria/root/number/types/UFixed18.sol"; import { Token18 } from "@equilibria/root/token/types/Token18.sol"; import { Instance } from "@equilibria/root/attribute/Instance.sol"; -import { IOracleProvider} from "@equilibria/perennial-v2/contracts/interfaces/IOracleProvider.sol"; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; -import { OracleVersion } from "@equilibria/perennial-v2/contracts/types/OracleVersion.sol"; -import { OracleReceipt } from "@equilibria/perennial-v2/contracts/types/OracleReceipt.sol"; +import { IOracleProvider} from "@perennial/core/contracts/interfaces/IOracleProvider.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; +import { OracleVersion } from "@perennial/core/contracts/types/OracleVersion.sol"; +import { OracleReceipt } from "@perennial/core/contracts/types/OracleReceipt.sol"; import { IOracle } from "./interfaces/IOracle.sol"; /// @title Oracle diff --git a/packages/perennial-oracle/contracts/OracleFactory.sol b/packages/perennial-oracle/contracts/OracleFactory.sol index ffa904ba9..4bdea1756 100644 --- a/packages/perennial-oracle/contracts/OracleFactory.sol +++ b/packages/perennial-oracle/contracts/OracleFactory.sol @@ -4,8 +4,8 @@ pragma solidity 0.8.24; import { UFixed6Lib } from "@equilibria/root/number/types/UFixed6.sol"; import { Token18 } from "@equilibria/root/token/types/Token18.sol"; import { Factory } from "@equilibria/root/attribute/Factory.sol"; -import { IOracleProvider } from "@equilibria/perennial-v2/contracts/interfaces/IOracleProvider.sol"; -import { IOracleProviderFactory } from "@equilibria/perennial-v2/contracts/interfaces/IOracleProviderFactory.sol"; +import { IOracleProvider } from "@perennial/core/contracts/interfaces/IOracleProvider.sol"; +import { IOracleProviderFactory } from "@perennial/core/contracts/interfaces/IOracleProviderFactory.sol"; import { IOracleFactory } from "./interfaces/IOracleFactory.sol"; import { OracleParameter, OracleParameterStorage } from "./types/OracleParameter.sol"; import { IOracle } from "./interfaces/IOracle.sol"; diff --git a/packages/perennial-oracle/contracts/interfaces/IKeeperFactory.sol b/packages/perennial-oracle/contracts/interfaces/IKeeperFactory.sol index 4463a3ab1..3395d0f5c 100644 --- a/packages/perennial-oracle/contracts/interfaces/IKeeperFactory.sol +++ b/packages/perennial-oracle/contracts/interfaces/IKeeperFactory.sol @@ -4,8 +4,8 @@ pragma solidity ^0.8.13; import { UFixed6 } from "@equilibria/root/number/types/UFixed6.sol"; import { Fixed18 } from "@equilibria/root/number/types/Fixed18.sol"; import { IFactory } from "@equilibria/root/attribute/interfaces/IFactory.sol"; -import { IOracleProvider } from "@equilibria/perennial-v2/contracts/interfaces/IOracleProvider.sol"; -import { IOracleProviderFactory } from "@equilibria/perennial-v2/contracts/interfaces/IOracleProviderFactory.sol"; +import { IOracleProvider } from "@perennial/core/contracts/interfaces/IOracleProvider.sol"; +import { IOracleProviderFactory } from "@perennial/core/contracts/interfaces/IOracleProviderFactory.sol"; import { IGasOracle } from "@equilibria/root/gas/GasOracle.sol"; import { IKeeperOracle } from "./IKeeperOracle.sol"; import { IOracleFactory } from "./IOracleFactory.sol"; diff --git a/packages/perennial-oracle/contracts/interfaces/IKeeperOracle.sol b/packages/perennial-oracle/contracts/interfaces/IKeeperOracle.sol index 2c77a71a4..6f174eb33 100644 --- a/packages/perennial-oracle/contracts/interfaces/IKeeperOracle.sol +++ b/packages/perennial-oracle/contracts/interfaces/IKeeperOracle.sol @@ -2,9 +2,9 @@ pragma solidity ^0.8.13; import { IInstance } from "@equilibria/root/attribute/interfaces/IInstance.sol"; -import { IOracleProvider } from "@equilibria/perennial-v2/contracts/interfaces/IOracleProvider.sol"; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; -import { OracleVersion } from "@equilibria/perennial-v2/contracts/types/OracleVersion.sol"; +import { IOracleProvider } from "@perennial/core/contracts/interfaces/IOracleProvider.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; +import { OracleVersion } from "@perennial/core/contracts/types/OracleVersion.sol"; import { IOracle } from "./IOracle.sol"; import { PriceResponse } from "../keeper/types/PriceResponse.sol"; diff --git a/packages/perennial-oracle/contracts/interfaces/IOracle.sol b/packages/perennial-oracle/contracts/interfaces/IOracle.sol index 02539095b..814de40db 100644 --- a/packages/perennial-oracle/contracts/interfaces/IOracle.sol +++ b/packages/perennial-oracle/contracts/interfaces/IOracle.sol @@ -4,8 +4,8 @@ pragma solidity ^0.8.13; import { UFixed6 } from "@equilibria/root/number/types/UFixed6.sol"; import { Token18 } from "@equilibria/root/token/types/Token18.sol"; import { IInstance } from "@equilibria/root/attribute/interfaces/IInstance.sol"; -import { IOracleProvider } from "@equilibria/perennial-v2/contracts/interfaces/IOracleProvider.sol"; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; +import { IOracleProvider } from "@perennial/core/contracts/interfaces/IOracleProvider.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; interface IOracle is IOracleProvider, IInstance { // sig: 0x8852e53b @@ -51,4 +51,4 @@ interface IOracle is IOracleProvider, IInstance { function market() external view returns (IMarket); function withdraw(Token18 token) external; function beneficiary() external view returns (address); -} \ No newline at end of file +} diff --git a/packages/perennial-oracle/contracts/interfaces/IOracleFactory.sol b/packages/perennial-oracle/contracts/interfaces/IOracleFactory.sol index f48d4f5f6..f5cc510ce 100644 --- a/packages/perennial-oracle/contracts/interfaces/IOracleFactory.sol +++ b/packages/perennial-oracle/contracts/interfaces/IOracleFactory.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.13; import { Token18 } from "@equilibria/root/token/types/Token18.sol"; import { IFactory } from "@equilibria/root/attribute/interfaces/IFactory.sol"; -import { IOracleProvider } from "@equilibria/perennial-v2/contracts/interfaces/IOracleProvider.sol"; -import { IOracleProviderFactory } from "@equilibria/perennial-v2/contracts/interfaces/IOracleProviderFactory.sol"; +import { IOracleProvider } from "@perennial/core/contracts/interfaces/IOracleProvider.sol"; +import { IOracleProviderFactory } from "@perennial/core/contracts/interfaces/IOracleProviderFactory.sol"; import { IOracle } from "./IOracle.sol"; import { OracleParameter } from "../types/OracleParameter.sol"; diff --git a/packages/perennial-oracle/contracts/keeper/KeeperFactory.sol b/packages/perennial-oracle/contracts/keeper/KeeperFactory.sol index 694a827c7..f09508027 100644 --- a/packages/perennial-oracle/contracts/keeper/KeeperFactory.sol +++ b/packages/perennial-oracle/contracts/keeper/KeeperFactory.sol @@ -8,8 +8,8 @@ import { Fixed6, Fixed6Lib } from "@equilibria/root/number/types/Fixed6.sol"; import { Fixed18, Fixed18Lib } from "@equilibria/root/number/types/Fixed18.sol"; import { Factory } from "@equilibria/root/attribute/Factory.sol"; import { IGasOracle } from "@equilibria/root/gas/GasOracle.sol"; -import { IOracleProvider } from "@equilibria/perennial-v2/contracts/interfaces/IOracleProvider.sol"; -import { OracleVersion } from "@equilibria/perennial-v2/contracts/types/OracleVersion.sol"; +import { IOracleProvider } from "@perennial/core/contracts/interfaces/IOracleProvider.sol"; +import { OracleVersion } from "@perennial/core/contracts/types/OracleVersion.sol"; import { IKeeperOracle } from "../interfaces/IKeeperOracle.sol"; import { IKeeperFactory } from "../interfaces/IKeeperFactory.sol"; import { IOracleFactory } from "../interfaces/IOracleFactory.sol"; diff --git a/packages/perennial-oracle/contracts/keeper/KeeperOracle.sol b/packages/perennial-oracle/contracts/keeper/KeeperOracle.sol index 09dfc77fa..045527677 100644 --- a/packages/perennial-oracle/contracts/keeper/KeeperOracle.sol +++ b/packages/perennial-oracle/contracts/keeper/KeeperOracle.sol @@ -7,9 +7,9 @@ import { UFixed6Lib } from "@equilibria/root/number/types/UFixed6.sol"; import { UFixed18Lib } from "@equilibria/root/number/types/UFixed18.sol"; import { Instance } from "@equilibria/root/attribute/Instance.sol"; import { IGasOracle } from "@equilibria/root/gas/GasOracle.sol"; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; -import { OracleVersion } from "@equilibria/perennial-v2/contracts/types/OracleVersion.sol"; -import { OracleReceipt } from "@equilibria/perennial-v2/contracts/types/OracleReceipt.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; +import { OracleVersion } from "@perennial/core/contracts/types/OracleVersion.sol"; +import { OracleReceipt } from "@perennial/core/contracts/types/OracleReceipt.sol"; import { IKeeperFactory } from "../interfaces/IKeeperFactory.sol"; import { IKeeperOracle } from "../interfaces/IKeeperOracle.sol"; import { PriceResponse, PriceResponseStorage, PriceResponseLib } from "./types/PriceResponse.sol"; diff --git a/packages/perennial-oracle/contracts/keeper/KeeperOracle_Migration.sol b/packages/perennial-oracle/contracts/keeper/KeeperOracle_Migration.sol index d48bbf037..b223247cc 100644 --- a/packages/perennial-oracle/contracts/keeper/KeeperOracle_Migration.sol +++ b/packages/perennial-oracle/contracts/keeper/KeeperOracle_Migration.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.24; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; -import { OracleVersion } from "@equilibria/perennial-v2/contracts/types/OracleVersion.sol"; -import { OracleReceipt } from "@equilibria/perennial-v2/contracts/types/OracleReceipt.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; +import { OracleVersion } from "@perennial/core/contracts/types/OracleVersion.sol"; +import { OracleReceipt } from "@perennial/core/contracts/types/OracleReceipt.sol"; import { PriceResponse } from "./types/PriceResponse.sol"; import { KeeperOracle } from "./KeeperOracle.sol"; diff --git a/packages/perennial-oracle/contracts/keeper/types/PriceResponse.sol b/packages/perennial-oracle/contracts/keeper/types/PriceResponse.sol index 027eac890..f5264cfc2 100644 --- a/packages/perennial-oracle/contracts/keeper/types/PriceResponse.sol +++ b/packages/perennial-oracle/contracts/keeper/types/PriceResponse.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.13; import { UFixed6, UFixed6Lib } from "@equilibria/root/number/types/UFixed6.sol"; import { Fixed6 } from "@equilibria/root/number/types/Fixed6.sol"; -import { OracleVersion } from "@equilibria/perennial-v2/contracts/types/OracleVersion.sol"; -import { OracleReceipt } from "@equilibria/perennial-v2/contracts/types/OracleReceipt.sol"; +import { OracleVersion } from "@perennial/core/contracts/types/OracleVersion.sol"; +import { OracleReceipt } from "@perennial/core/contracts/types/OracleReceipt.sol"; struct PriceResponse { /// @dev The oracle price of the corresponding version diff --git a/packages/perennial-oracle/contracts/test/PriceResponseTester.sol b/packages/perennial-oracle/contracts/test/PriceResponseTester.sol index 34aa0c7fb..7fd284135 100644 --- a/packages/perennial-oracle/contracts/test/PriceResponseTester.sol +++ b/packages/perennial-oracle/contracts/test/PriceResponseTester.sol @@ -2,8 +2,8 @@ pragma solidity ^0.8.13; import { PriceResponse, PriceResponseLib, PriceResponseStorage } from "../keeper/types/PriceResponse.sol"; -import { OracleVersion } from "@equilibria/perennial-v2/contracts/types/OracleVersion.sol"; -import { OracleReceipt } from "@equilibria/perennial-v2/contracts/types/OracleReceipt.sol"; +import { OracleVersion } from "@perennial/core/contracts/types/OracleVersion.sol"; +import { OracleReceipt } from "@perennial/core/contracts/types/OracleReceipt.sol"; contract PriceResponseTester { PriceResponseStorage public priceResponse; @@ -27,4 +27,4 @@ contract PriceResponseTester { function toOracleReceipt(PriceResponse memory self, uint256 callbacks) external pure returns (OracleReceipt memory) { return PriceResponseLib.toOracleReceipt(self, callbacks); } -} \ No newline at end of file +} diff --git a/packages/perennial-oracle/hardhat.config.ts b/packages/perennial-oracle/hardhat.config.ts index 97fd1176d..c8cd328e0 100644 --- a/packages/perennial-oracle/hardhat.config.ts +++ b/packages/perennial-oracle/hardhat.config.ts @@ -5,11 +5,11 @@ const config = defaultConfig({ dependencyPaths: [ '@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol', '@equilibria/root/attribute/Kept/Kept_Arbitrum.sol', - '@equilibria/perennial-v2/contracts/interfaces/IMarketFactory.sol', - '@equilibria/perennial-v2/contracts/MarketFactory.sol', - '@equilibria/perennial-v2/contracts/Market.sol', - '@equilibria/perennial-v2/contracts/types/MarketParameter.sol', - '@equilibria/perennial-v2/contracts/types/RiskParameter.sol', + '@perennial/core/contracts/interfaces/IMarketFactory.sol', + '@perennial/core/contracts/MarketFactory.sol', + '@perennial/core/contracts/Market.sol', + '@perennial/core/contracts/types/MarketParameter.sol', + '@perennial/core/contracts/types/RiskParameter.sol', ], }) diff --git a/packages/perennial-oracle/package.json b/packages/perennial-oracle/package.json index 6e303dc15..e08037198 100644 --- a/packages/perennial-oracle/package.json +++ b/packages/perennial-oracle/package.json @@ -1,5 +1,5 @@ { - "name": "@equilibria/perennial-v2-oracle", + "name": "@perennial/oracle", "version": "1.3.0", "description": "Perennial V2 Oracle", "files": [ @@ -33,6 +33,6 @@ "author": "", "license": "APACHE-2.0", "dependencies": { - "@equilibria/perennial-v2": "1.3.0" + "@perennial/core": "1.3.0" } } diff --git a/packages/perennial-oracle/test/integration/metaquants/MetaQuantsOracleFactory.test.ts b/packages/perennial-oracle/test/integration/metaquants/MetaQuantsOracleFactory.test.ts index e7220acef..e4154721c 100644 --- a/packages/perennial-oracle/test/integration/metaquants/MetaQuantsOracleFactory.test.ts +++ b/packages/perennial-oracle/test/integration/metaquants/MetaQuantsOracleFactory.test.ts @@ -304,37 +304,37 @@ testOracles.forEach(testOracle => { const marketImpl = await new Market__factory( { - '@equilibria/perennial-v2/contracts/libs/CheckpointLib.sol:CheckpointLib': ( + '@perennial/core/contracts/libs/CheckpointLib.sol:CheckpointLib': ( await new CheckpointLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/libs/InvariantLib.sol:InvariantLib': ( + '@perennial/core/contracts/libs/InvariantLib.sol:InvariantLib': ( await new InvariantLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/libs/VersionLib.sol:VersionLib': ( + '@perennial/core/contracts/libs/VersionLib.sol:VersionLib': ( await new VersionLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Checkpoint.sol:CheckpointStorageLib': ( + '@perennial/core/contracts/types/Checkpoint.sol:CheckpointStorageLib': ( await new CheckpointStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Global.sol:GlobalStorageLib': ( + '@perennial/core/contracts/types/Global.sol:GlobalStorageLib': ( await new GlobalStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/MarketParameter.sol:MarketParameterStorageLib': ( + '@perennial/core/contracts/types/MarketParameter.sol:MarketParameterStorageLib': ( await new MarketParameterStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Position.sol:PositionStorageGlobalLib': ( + '@perennial/core/contracts/types/Position.sol:PositionStorageGlobalLib': ( await new PositionStorageGlobalLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Position.sol:PositionStorageLocalLib': ( + '@perennial/core/contracts/types/Position.sol:PositionStorageLocalLib': ( await new PositionStorageLocalLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/RiskParameter.sol:RiskParameterStorageLib': ( + '@perennial/core/contracts/types/RiskParameter.sol:RiskParameterStorageLib': ( await new RiskParameterStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Version.sol:VersionStorageLib': ( + '@perennial/core/contracts/types/Version.sol:VersionStorageLib': ( await new VersionStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/libs/MagicValueLib.sol:MagicValueLib': ( + '@perennial/core/contracts/libs/MagicValueLib.sol:MagicValueLib': ( await new MagicValueLib__factory(owner).deploy() ).address, }, diff --git a/packages/perennial-oracle/test/integration/pyth/PythOracleFactory.test.ts b/packages/perennial-oracle/test/integration/pyth/PythOracleFactory.test.ts index 351a6d164..7ceb373b3 100644 --- a/packages/perennial-oracle/test/integration/pyth/PythOracleFactory.test.ts +++ b/packages/perennial-oracle/test/integration/pyth/PythOracleFactory.test.ts @@ -259,37 +259,37 @@ testOracles.forEach(testOracle => { const marketImpl = await new Market__factory( { - '@equilibria/perennial-v2/contracts/libs/CheckpointLib.sol:CheckpointLib': ( + '@perennial/core/contracts/libs/CheckpointLib.sol:CheckpointLib': ( await new CheckpointLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/libs/InvariantLib.sol:InvariantLib': ( + '@perennial/core/contracts/libs/InvariantLib.sol:InvariantLib': ( await new InvariantLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/libs/VersionLib.sol:VersionLib': ( + '@perennial/core/contracts/libs/VersionLib.sol:VersionLib': ( await new VersionLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Checkpoint.sol:CheckpointStorageLib': ( + '@perennial/core/contracts/types/Checkpoint.sol:CheckpointStorageLib': ( await new CheckpointStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Global.sol:GlobalStorageLib': ( + '@perennial/core/contracts/types/Global.sol:GlobalStorageLib': ( await new GlobalStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/MarketParameter.sol:MarketParameterStorageLib': ( + '@perennial/core/contracts/types/MarketParameter.sol:MarketParameterStorageLib': ( await new MarketParameterStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Position.sol:PositionStorageGlobalLib': ( + '@perennial/core/contracts/types/Position.sol:PositionStorageGlobalLib': ( await new PositionStorageGlobalLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Position.sol:PositionStorageLocalLib': ( + '@perennial/core/contracts/types/Position.sol:PositionStorageLocalLib': ( await new PositionStorageLocalLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/RiskParameter.sol:RiskParameterStorageLib': ( + '@perennial/core/contracts/types/RiskParameter.sol:RiskParameterStorageLib': ( await new RiskParameterStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Version.sol:VersionStorageLib': ( + '@perennial/core/contracts/types/Version.sol:VersionStorageLib': ( await new VersionStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/libs/MagicValueLib.sol:MagicValueLib': ( + '@perennial/core/contracts/libs/MagicValueLib.sol:MagicValueLib': ( await new MagicValueLib__factory(owner).deploy() ).address, }, diff --git a/packages/perennial-oracle/test/integrationSepolia/chainlink/ChainlinkOracleFactory.test.ts b/packages/perennial-oracle/test/integrationSepolia/chainlink/ChainlinkOracleFactory.test.ts index 52a0c2d0d..aef63013e 100644 --- a/packages/perennial-oracle/test/integrationSepolia/chainlink/ChainlinkOracleFactory.test.ts +++ b/packages/perennial-oracle/test/integrationSepolia/chainlink/ChainlinkOracleFactory.test.ts @@ -271,37 +271,37 @@ testOracles.forEach(testOracle => { const marketImpl = await new Market__factory( { - '@equilibria/perennial-v2/contracts/libs/CheckpointLib.sol:CheckpointLib': ( + '@perennial/core/contracts/libs/CheckpointLib.sol:CheckpointLib': ( await new CheckpointLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/libs/InvariantLib.sol:InvariantLib': ( + '@perennial/core/contracts/libs/InvariantLib.sol:InvariantLib': ( await new InvariantLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/libs/VersionLib.sol:VersionLib': ( + '@perennial/core/contracts/libs/VersionLib.sol:VersionLib': ( await new VersionLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Checkpoint.sol:CheckpointStorageLib': ( + '@perennial/core/contracts/types/Checkpoint.sol:CheckpointStorageLib': ( await new CheckpointStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Global.sol:GlobalStorageLib': ( + '@perennial/core/contracts/types/Global.sol:GlobalStorageLib': ( await new GlobalStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/MarketParameter.sol:MarketParameterStorageLib': ( + '@perennial/core/contracts/types/MarketParameter.sol:MarketParameterStorageLib': ( await new MarketParameterStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Position.sol:PositionStorageGlobalLib': ( + '@perennial/core/contracts/types/Position.sol:PositionStorageGlobalLib': ( await new PositionStorageGlobalLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Position.sol:PositionStorageLocalLib': ( + '@perennial/core/contracts/types/Position.sol:PositionStorageLocalLib': ( await new PositionStorageLocalLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/RiskParameter.sol:RiskParameterStorageLib': ( + '@perennial/core/contracts/types/RiskParameter.sol:RiskParameterStorageLib': ( await new RiskParameterStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/types/Version.sol:VersionStorageLib': ( + '@perennial/core/contracts/types/Version.sol:VersionStorageLib': ( await new VersionStorageLib__factory(owner).deploy() ).address, - '@equilibria/perennial-v2/contracts/libs/MagicValueLib.sol:MagicValueLib': ( + '@perennial/core/contracts/libs/MagicValueLib.sol:MagicValueLib': ( await new MagicValueLib__factory(owner).deploy() ).address, }, diff --git a/packages/perennial-order/contracts/Manager.sol b/packages/perennial-order/contracts/Manager.sol index 1d8e6ca75..845b7a1e1 100644 --- a/packages/perennial-order/contracts/Manager.sol +++ b/packages/perennial-order/contracts/Manager.sol @@ -7,7 +7,7 @@ import { Fixed6, Fixed6Lib } from "@equilibria/root/number/types/Fixed6.sol"; import { UFixed6, UFixed6Lib } from "@equilibria/root/number/types/UFixed6.sol"; import { UFixed18, UFixed18Lib } from "@equilibria/root/number/types/UFixed18.sol"; import { Token6 } from "@equilibria/root/token/types/Token6.sol"; -import { IMarket, IMarketFactory } from "@equilibria/perennial-v2/contracts/interfaces/IMarketFactory.sol"; +import { IMarket, IMarketFactory } from "@perennial/core/contracts/interfaces/IMarketFactory.sol"; import { IManager } from "./interfaces/IManager.sol"; import { IOrderVerifier } from "./interfaces/IOrderVerifier.sol"; diff --git a/packages/perennial-order/contracts/Manager_Arbitrum.sol b/packages/perennial-order/contracts/Manager_Arbitrum.sol index 785875dad..a60785bb5 100644 --- a/packages/perennial-order/contracts/Manager_Arbitrum.sol +++ b/packages/perennial-order/contracts/Manager_Arbitrum.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.24; import { IEmptySetReserve } from "@equilibria/emptyset-batcher/interfaces/IEmptySetReserve.sol"; import { Kept, Kept_Arbitrum, Token18, UFixed18 } from "@equilibria/root/attribute/Kept/Kept_Arbitrum.sol"; import { Token6 } from "@equilibria/root/token/types/Token6.sol"; -import { IMarketFactory } from "@equilibria/perennial-v2/contracts/interfaces/IMarketFactory.sol"; +import { IMarketFactory } from "@perennial/core/contracts/interfaces/IMarketFactory.sol"; import { IOrderVerifier, Manager } from "./Manager.sol"; diff --git a/packages/perennial-order/contracts/OrderVerifier.sol b/packages/perennial-order/contracts/OrderVerifier.sol index 3502605d9..5ea081c13 100644 --- a/packages/perennial-order/contracts/OrderVerifier.sol +++ b/packages/perennial-order/contracts/OrderVerifier.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.24; import { EIP712 } from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; import { SignatureChecker } from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol"; import { VerifierBase } from "@equilibria/root/verifier/VerifierBase.sol"; -import { IMarketFactory } from "@equilibria/perennial-v2/contracts/interfaces/IMarketFactory.sol"; +import { IMarketFactory } from "@perennial/core/contracts/interfaces/IMarketFactory.sol"; import { IOrderVerifier } from "./interfaces/IOrderVerifier.sol"; import { Action, ActionLib } from "./types/Action.sol"; diff --git a/packages/perennial-order/contracts/interfaces/IManager.sol b/packages/perennial-order/contracts/interfaces/IManager.sol index 362e41c32..6bbf8cb11 100644 --- a/packages/perennial-order/contracts/interfaces/IManager.sol +++ b/packages/perennial-order/contracts/interfaces/IManager.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity ^0.8.13; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; import { CancelOrderAction } from "../types/CancelOrderAction.sol"; import { InterfaceFee } from "../types/InterfaceFee.sol"; diff --git a/packages/perennial-order/contracts/test/TriggerOrderTester.sol b/packages/perennial-order/contracts/test/TriggerOrderTester.sol index 2f536cbdf..8f3d27cf0 100644 --- a/packages/perennial-order/contracts/test/TriggerOrderTester.sol +++ b/packages/perennial-order/contracts/test/TriggerOrderTester.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.13; import { UFixed6, UFixed6Lib } from "@equilibria/root/number/types/UFixed6.sol"; -import { IMarket, OracleVersion } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; +import { IMarket, OracleVersion } from "@perennial/core/contracts/interfaces/IMarket.sol"; import { TriggerOrder, TriggerOrderLib, diff --git a/packages/perennial-order/contracts/types/Action.sol b/packages/perennial-order/contracts/types/Action.sol index bf63bc7e6..1fbce451d 100644 --- a/packages/perennial-order/contracts/types/Action.sol +++ b/packages/perennial-order/contracts/types/Action.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.13; import { Common, CommonLib } from "@equilibria/root/verifier/types/Common.sol"; import { UFixed6 } from "@equilibria/root/number/types/UFixed6.sol"; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; /// @notice Fields which need to be hashed for each order action struct Action { diff --git a/packages/perennial-order/contracts/types/CancelOrderAction.sol b/packages/perennial-order/contracts/types/CancelOrderAction.sol index 996d5afee..0905361ff 100644 --- a/packages/perennial-order/contracts/types/CancelOrderAction.sol +++ b/packages/perennial-order/contracts/types/CancelOrderAction.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.13; import { Common, CommonLib } from "@equilibria/root/verifier/types/Common.sol"; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; import { Action, ActionLib } from "./Action.sol"; /// @notice Request to cancel a persisted ("placed") order diff --git a/packages/perennial-order/contracts/types/PlaceOrderAction.sol b/packages/perennial-order/contracts/types/PlaceOrderAction.sol index 2af62d92d..ca1988435 100644 --- a/packages/perennial-order/contracts/types/PlaceOrderAction.sol +++ b/packages/perennial-order/contracts/types/PlaceOrderAction.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.13; import { Common, CommonLib } from "@equilibria/root/verifier/types/Common.sol"; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; import { Action, ActionLib } from "./Action.sol"; import { TriggerOrder, TriggerOrderStorageLib } from "./TriggerOrder.sol"; diff --git a/packages/perennial-order/contracts/types/TriggerOrder.sol b/packages/perennial-order/contracts/types/TriggerOrder.sol index 1afea7c62..6f800d335 100644 --- a/packages/perennial-order/contracts/types/TriggerOrder.sol +++ b/packages/perennial-order/contracts/types/TriggerOrder.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.13; import { Fixed6, Fixed6Lib } from "@equilibria/root/number/types/UFixed6.sol"; import { UFixed6, UFixed6Lib } from "@equilibria/root/number/types/UFixed6.sol"; -import { IMarket, OracleVersion, Order, Position } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; +import { IMarket, OracleVersion, Order, Position } from "@perennial/core/contracts/interfaces/IMarket.sol"; import { InterfaceFee, InterfaceFeeLib } from "./InterfaceFee.sol"; /// @notice Changes a user's position in a market when price reaches a trigger threshold diff --git a/packages/perennial-order/hardhat.config.ts b/packages/perennial-order/hardhat.config.ts index be0adafea..f7c8ac555 100644 --- a/packages/perennial-order/hardhat.config.ts +++ b/packages/perennial-order/hardhat.config.ts @@ -1,7 +1,7 @@ import defaultConfig from '../common/hardhat.default.config' const config = defaultConfig({ - dependencyPaths: ['@equilibria/perennial-v2/contracts/Market.sol'], + dependencyPaths: ['@perennial/core/contracts/Market.sol'], }) export default config diff --git a/packages/perennial-order/package.json b/packages/perennial-order/package.json index 59e784688..9f15d50a7 100644 --- a/packages/perennial-order/package.json +++ b/packages/perennial-order/package.json @@ -1,5 +1,5 @@ { - "name": "@equilibria/perennial-v2-order", + "name": "@perennial/order", "version": "1.3.0", "description": "Perennial V2 Trigger Orders", "files": [ @@ -23,6 +23,6 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@equilibria/perennial-v2": "1.3.0" + "@perennial/core": "1.3.0" } } diff --git a/packages/perennial-order/test/helpers/arbitrumHelpers.ts b/packages/perennial-order/test/helpers/arbitrumHelpers.ts index 8742cba5c..2a140cf05 100644 --- a/packages/perennial-order/test/helpers/arbitrumHelpers.ts +++ b/packages/perennial-order/test/helpers/arbitrumHelpers.ts @@ -1,6 +1,6 @@ import { expect } from 'chai' import { BigNumber, CallOverrides, constants, utils } from 'ethers' -import { IMarket, MarketFactory, MarketFactory__factory } from '@equilibria/perennial-v2/types/generated' +import { IMarket, MarketFactory, MarketFactory__factory } from '@perennial/core/types/generated' import { IKeeperOracle, IOracleFactory, @@ -10,8 +10,8 @@ import { PythFactory, PythFactory__factory, GasOracle__factory, -} from '@equilibria/perennial-v2-oracle/types/generated' -import { Verifier__factory } from '@equilibria/perennial-v2-verifier/types/generated' +} from '@perennial/oracle/types/generated' +import { Verifier__factory } from '@perennial/verifier/types/generated' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { IERC20Metadata, IERC20Metadata__factory, IMarketFactory, IVerifier } from '../../types/generated' import { impersonate } from '../../../common/testutil' diff --git a/packages/perennial-order/test/helpers/marketHelpers.ts b/packages/perennial-order/test/helpers/marketHelpers.ts index e9bfaa5f9..352cf3ecf 100644 --- a/packages/perennial-order/test/helpers/marketHelpers.ts +++ b/packages/perennial-order/test/helpers/marketHelpers.ts @@ -18,7 +18,7 @@ import { VersionLib__factory, VersionStorageLib__factory, MagicValueLib__factory, -} from '@equilibria/perennial-v2/types/generated' +} from '@perennial/core/types/generated' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { IERC20Metadata } from '../../types/generated' import { parse6decimal } from '../../../common/testutil/types' diff --git a/packages/perennial-order/test/helpers/oracleHelpers.ts b/packages/perennial-order/test/helpers/oracleHelpers.ts index d7e593151..ba3cafef1 100644 --- a/packages/perennial-order/test/helpers/oracleHelpers.ts +++ b/packages/perennial-order/test/helpers/oracleHelpers.ts @@ -15,7 +15,7 @@ import { OracleFactory__factory, OracleVersionStruct, PythFactory, -} from '@equilibria/perennial-v2-oracle/types/generated' +} from '@perennial/oracle/types/generated' const { ethers } = HRE diff --git a/packages/perennial-order/test/integration/Manager_Arbitrum.test.ts b/packages/perennial-order/test/integration/Manager_Arbitrum.test.ts index e8e834353..d9565e3c2 100644 --- a/packages/perennial-order/test/integration/Manager_Arbitrum.test.ts +++ b/packages/perennial-order/test/integration/Manager_Arbitrum.test.ts @@ -10,8 +10,8 @@ import { advanceBlock, currentBlockTimestamp, increase } from '../../../common/t import { getEventArguments, getTimestamp } from '../../../common/testutil/transaction' import { parse6decimal } from '../../../common/testutil/types' -import { IERC20Metadata, IMarketFactory, IMarket, IOracleProvider } from '@equilibria/perennial-v2/types/generated' -import { IKeeperOracle, IOracleFactory } from '@equilibria/perennial-v2-oracle/types/generated' +import { IERC20Metadata, IMarketFactory, IMarket, IOracleProvider } from '@perennial/core/types/generated' +import { IKeeperOracle, IOracleFactory } from '@perennial/oracle/types/generated' import { ArbGasInfo, IEmptySetReserve, diff --git a/packages/perennial-order/test/unit/Manager.test.ts b/packages/perennial-order/test/unit/Manager.test.ts index 165448639..1690f17c1 100644 --- a/packages/perennial-order/test/unit/Manager.test.ts +++ b/packages/perennial-order/test/unit/Manager.test.ts @@ -7,7 +7,7 @@ import { FakeContract, smock } from '@defi-wonderland/smock' import { currentBlockTimestamp } from '../../../common/testutil/time' import { parse6decimal } from '../../../common/testutil/types' -import { IERC20, IFactory, IMarketFactory, IMarket, IOracleProvider } from '@equilibria/perennial-v2/types/generated' +import { IERC20, IFactory, IMarketFactory, IMarket, IOracleProvider } from '@perennial/core/types/generated' import { AggregatorV3Interface, diff --git a/packages/perennial-order/test/unit/Verifier.test.ts b/packages/perennial-order/test/unit/Verifier.test.ts index 5fb304d48..100a0be01 100644 --- a/packages/perennial-order/test/unit/Verifier.test.ts +++ b/packages/perennial-order/test/unit/Verifier.test.ts @@ -11,7 +11,7 @@ import { currentBlockTimestamp } from '../../../common/testutil/time' import { signAction, signCancelOrderAction, signCommon, signPlaceOrderAction } from '../helpers/eip712' import { DEFAULT_TRIGGER_ORDER } from '../helpers/order' -import { IMarket } from '@equilibria/perennial-v2/types/generated' +import { IMarket } from '@perennial/core/types/generated' import { IManager, IMarketFactory, IOrderVerifier, OrderVerifier, OrderVerifier__factory } from '../../types/generated' const { ethers } = HRE diff --git a/packages/perennial-vault/contracts/Vault.sol b/packages/perennial-vault/contracts/Vault.sol index 1f213dcf0..e9f8046f3 100644 --- a/packages/perennial-vault/contracts/Vault.sol +++ b/packages/perennial-vault/contracts/Vault.sol @@ -6,10 +6,10 @@ import { UFixed18Lib } from "@equilibria/root/number/types/UFixed18.sol"; import { Fixed6, Fixed6Lib } from "@equilibria/root/number/types/Fixed6.sol"; import { Token18 } from "@equilibria/root/token/types/Token18.sol"; import { Instance } from "@equilibria/root/attribute/Instance.sol"; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; -import { Checkpoint as PerennialCheckpoint } from "@equilibria/perennial-v2/contracts/types/Checkpoint.sol"; -import { OracleVersion } from "@equilibria/perennial-v2/contracts/types/OracleVersion.sol"; -import { Local } from "@equilibria/perennial-v2/contracts/types/Local.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; +import { Checkpoint as PerennialCheckpoint } from "@perennial/core/contracts/types/Checkpoint.sol"; +import { OracleVersion } from "@perennial/core/contracts/types/OracleVersion.sol"; +import { Local } from "@perennial/core/contracts/types/Local.sol"; import { Math } from "@openzeppelin/contracts/utils/math/Math.sol"; import { IVault } from "./interfaces/IVault.sol"; import { IVaultFactory } from "./interfaces/IVaultFactory.sol"; diff --git a/packages/perennial-vault/contracts/VaultFactory.sol b/packages/perennial-vault/contracts/VaultFactory.sol index b34e55433..f46fb829d 100644 --- a/packages/perennial-vault/contracts/VaultFactory.sol +++ b/packages/perennial-vault/contracts/VaultFactory.sol @@ -5,8 +5,8 @@ import { UFixed6, UFixed6Lib } from "@equilibria/root/number/types/UFixed6.sol"; import { UFixed18Lib } from "@equilibria/root/number/types/UFixed18.sol"; import { Token18 } from "@equilibria/root/token/types/Token18.sol"; import { Factory } from "@equilibria/root/attribute/Factory.sol"; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; -import { IMarketFactory } from "@equilibria/perennial-v2/contracts/interfaces/IMarketFactory.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; +import { IMarketFactory } from "@perennial/core/contracts/interfaces/IMarketFactory.sol"; import { IVault } from "./interfaces/IVault.sol"; import { IVaultFactory } from "./interfaces/IVaultFactory.sol"; diff --git a/packages/perennial-vault/contracts/interfaces/IVault.sol b/packages/perennial-vault/contracts/interfaces/IVault.sol index 5a71395ec..7729f08eb 100644 --- a/packages/perennial-vault/contracts/interfaces/IVault.sol +++ b/packages/perennial-vault/contracts/interfaces/IVault.sol @@ -1,8 +1,8 @@ //SPDX-License-Identifier: Apache-2.0 pragma solidity ^0.8.13; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; -import { Checkpoint as PerennialCheckpoint } from "@equilibria/perennial-v2/contracts/types/Checkpoint.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; +import { Checkpoint as PerennialCheckpoint } from "@perennial/core/contracts/types/Checkpoint.sol"; import { IInstance } from "@equilibria/root/attribute/interfaces/IInstance.sol"; import { UFixed6 } from "@equilibria/root/number/types/UFixed6.sol"; import { Fixed6 } from "@equilibria/root/number/types/Fixed6.sol"; diff --git a/packages/perennial-vault/contracts/interfaces/IVaultFactory.sol b/packages/perennial-vault/contracts/interfaces/IVaultFactory.sol index bddf0f1b0..f239747db 100644 --- a/packages/perennial-vault/contracts/interfaces/IVaultFactory.sol +++ b/packages/perennial-vault/contracts/interfaces/IVaultFactory.sol @@ -2,8 +2,8 @@ pragma solidity ^0.8.13; import { IFactory } from "@equilibria/root/attribute/interfaces/IFactory.sol"; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; -import { IMarketFactory } from "@equilibria/perennial-v2/contracts/interfaces/IMarketFactory.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; +import { IMarketFactory } from "@perennial/core/contracts/interfaces/IMarketFactory.sol"; import { UFixed6 } from "@equilibria/root/number/types/UFixed6.sol"; import { Token18 } from "@equilibria/root/token/types/Token18.sol"; import { IVault } from "./IVault.sol"; diff --git a/packages/perennial-vault/contracts/libs/StrategyLib.sol b/packages/perennial-vault/contracts/libs/StrategyLib.sol index 20b9704ee..86312cb4f 100644 --- a/packages/perennial-vault/contracts/libs/StrategyLib.sol +++ b/packages/perennial-vault/contracts/libs/StrategyLib.sol @@ -3,13 +3,13 @@ pragma solidity ^0.8.13; import { Fixed6, Fixed6Lib } from "@equilibria/root/number/types/Fixed6.sol"; import { UFixed6, UFixed6Lib } from "@equilibria/root/number/types/UFixed6.sol"; -import { MarketParameter } from "@equilibria/perennial-v2/contracts/types/MarketParameter.sol"; -import { RiskParameter } from "@equilibria/perennial-v2/contracts/types/RiskParameter.sol"; -import { Local } from "@equilibria/perennial-v2/contracts/types/Local.sol"; -import { Global } from "@equilibria/perennial-v2/contracts/types/Global.sol"; -import { Position, PositionLib } from "@equilibria/perennial-v2/contracts/types/Position.sol"; -import { Order } from "@equilibria/perennial-v2/contracts/types/Order.sol"; -import { OracleVersion } from "@equilibria/perennial-v2/contracts/types/OracleVersion.sol"; +import { MarketParameter } from "@perennial/core/contracts/types/MarketParameter.sol"; +import { RiskParameter } from "@perennial/core/contracts/types/RiskParameter.sol"; +import { Local } from "@perennial/core/contracts/types/Local.sol"; +import { Global } from "@perennial/core/contracts/types/Global.sol"; +import { Position, PositionLib } from "@perennial/core/contracts/types/Position.sol"; +import { Order } from "@perennial/core/contracts/types/Order.sol"; +import { OracleVersion } from "@perennial/core/contracts/types/OracleVersion.sol"; import { Registration } from "../types/Registration.sol"; /// @dev The context of an underlying market diff --git a/packages/perennial-vault/contracts/test/CheckpointTester.sol b/packages/perennial-vault/contracts/test/CheckpointTester.sol index 029f86c06..d9c9e5e6a 100644 --- a/packages/perennial-vault/contracts/test/CheckpointTester.sol +++ b/packages/perennial-vault/contracts/test/CheckpointTester.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.13; import { UFixed6 } from "@equilibria/root/number/types/UFixed6.sol"; -import { Checkpoint as PerennialCheckpoint } from "@equilibria/perennial-v2/contracts/types/Checkpoint.sol"; +import { Checkpoint as PerennialCheckpoint } from "@perennial/core/contracts/types/Checkpoint.sol"; import { Checkpoint, CheckpointStorage } from "../types/Checkpoint.sol"; import { Account } from "../types/Account.sol"; diff --git a/packages/perennial-vault/contracts/types/Checkpoint.sol b/packages/perennial-vault/contracts/types/Checkpoint.sol index 390d4d221..e21a7af8b 100644 --- a/packages/perennial-vault/contracts/types/Checkpoint.sol +++ b/packages/perennial-vault/contracts/types/Checkpoint.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.13; import { UFixed6, UFixed6Lib } from "@equilibria/root/number/types/UFixed6.sol"; import { Fixed6, Fixed6Lib } from "@equilibria/root/number/types/Fixed6.sol"; -import { Checkpoint as PerennialCheckpoint } from "@equilibria/perennial-v2/contracts/types/Checkpoint.sol"; +import { Checkpoint as PerennialCheckpoint } from "@perennial/core/contracts/types/Checkpoint.sol"; import { Account } from "./Account.sol"; /// @dev Checkpoint type diff --git a/packages/perennial-vault/contracts/types/Registration.sol b/packages/perennial-vault/contracts/types/Registration.sol index 2e9751b4f..3ebf16f86 100644 --- a/packages/perennial-vault/contracts/types/Registration.sol +++ b/packages/perennial-vault/contracts/types/Registration.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity ^0.8.13; -import { IMarket } from "@equilibria/perennial-v2/contracts/interfaces/IMarket.sol"; +import { IMarket } from "@perennial/core/contracts/interfaces/IMarket.sol"; import { UFixed6 } from "@equilibria/root/number/types/UFixed6.sol"; /// @dev Registration type diff --git a/packages/perennial-vault/hardhat.config.ts b/packages/perennial-vault/hardhat.config.ts index 55f9fdd82..3410d5c2c 100644 --- a/packages/perennial-vault/hardhat.config.ts +++ b/packages/perennial-vault/hardhat.config.ts @@ -14,7 +14,7 @@ export const solidityOverrides = { } const config = defaultConfig({ - dependencyPaths: ['@equilibria/perennial-v2-oracle/contracts/interfaces/IOracleFactory.sol'], + dependencyPaths: ['@perennial/oracle/contracts/interfaces/IOracleFactory.sol'], solidityOverrides, }) diff --git a/packages/perennial-vault/package.json b/packages/perennial-vault/package.json index a307e39ce..61a2eb4a7 100644 --- a/packages/perennial-vault/package.json +++ b/packages/perennial-vault/package.json @@ -1,5 +1,5 @@ { - "name": "@equilibria/perennial-v2-vault", + "name": "@perennial/vault", "version": "1.3.0", "description": "Perennial V2 Vault", "files": [ @@ -30,6 +30,6 @@ "author": "", "license": "APACHE-2.0", "dependencies": { - "@equilibria/perennial-v2": "1.3.0" + "@perennial/core": "1.3.0" } } diff --git a/packages/perennial-vault/test/integration/helpers/setupHelpers.ts b/packages/perennial-vault/test/integration/helpers/setupHelpers.ts index 14dbfec4e..859219c78 100644 --- a/packages/perennial-vault/test/integration/helpers/setupHelpers.ts +++ b/packages/perennial-vault/test/integration/helpers/setupHelpers.ts @@ -2,7 +2,7 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { constants, BigNumberish } from 'ethers' import { parse6decimal } from '../../../../common/testutil/types' import { IERC20Metadata, IMarket, IMarket__factory, IMarketFactory } from '../../../types/generated' -import { MarketParameterStruct, RiskParameterStruct } from '@equilibria/perennial-v2/types/generated/contracts/Market' +import { MarketParameterStruct, RiskParameterStruct } from '@perennial/core/types/generated/contracts/Market' export interface DeployProductParams extends Partial< diff --git a/packages/perennial-vault/test/integration/vault/Vault.test.ts b/packages/perennial-vault/test/integration/vault/Vault.test.ts index 295e85b11..2ed72ab4e 100644 --- a/packages/perennial-vault/test/integration/vault/Vault.test.ts +++ b/packages/perennial-vault/test/integration/vault/Vault.test.ts @@ -20,14 +20,10 @@ import { IMarketFactory, } from '../../../types/generated' import { BigNumber, constants } from 'ethers' -import { deployProtocol, fundWallet, settle } from '@equilibria/perennial-v2/test/integration/helpers/setupHelpers' +import { deployProtocol, fundWallet, settle } from '@perennial/core/test/integration/helpers/setupHelpers' import { OracleReceipt, DEFAULT_ORACLE_RECEIPT, parse6decimal } from '../../../../common/testutil/types' -import { - MarketFactory, - ProxyAdmin, - TransparentUpgradeableProxy__factory, -} from '@equilibria/perennial-v2/types/generated' -import { IOracle, IOracle__factory, OracleFactory } from '@equilibria/perennial-v2-oracle/types/generated' +import { MarketFactory, ProxyAdmin, TransparentUpgradeableProxy__factory } from '@perennial/core/types/generated' +import { IOracle, IOracle__factory, OracleFactory } from '@perennial/oracle/types/generated' const { ethers } = HRE use(smock.matchers) diff --git a/packages/perennial-verifier/package.json b/packages/perennial-verifier/package.json index 13f3f6bd5..3872bf5e8 100644 --- a/packages/perennial-verifier/package.json +++ b/packages/perennial-verifier/package.json @@ -1,5 +1,5 @@ { - "name": "@equilibria/perennial-v2-verifier", + "name": "@perennial/verifier", "version": "1.3.0", "description": "Perennial V2 Verifier", "files": [ diff --git a/packages/perennial/contracts/Market.sol b/packages/perennial/contracts/Market.sol index 7cf9fc1fe..d842e18e0 100644 --- a/packages/perennial/contracts/Market.sol +++ b/packages/perennial/contracts/Market.sol @@ -5,10 +5,10 @@ import { UFixed6, UFixed6Lib } from "@equilibria/root/number/types/UFixed6.sol"; import { UFixed18, UFixed18Lib } from "@equilibria/root/number/types/UFixed18.sol"; import { Fixed6, Fixed6Lib } from "@equilibria/root/number/types/Fixed6.sol"; import { Token18 } from "@equilibria/root/token/types/Token18.sol"; -import { IVerifier } from "@equilibria/perennial-v2-verifier/contracts/interfaces/IVerifier.sol"; +import { IVerifier } from "@perennial/verifier/contracts/interfaces/IVerifier.sol"; import { Instance } from "@equilibria/root/attribute/Instance.sol"; import { ReentrancyGuard } from "@equilibria/root/attribute/ReentrancyGuard.sol"; -import { Intent } from "@equilibria/perennial-v2-verifier/contracts/types/Intent.sol"; +import { Intent } from "@perennial/verifier/contracts/types/Intent.sol"; import { IMarket } from "./interfaces/IMarket.sol"; import { IMarketFactory } from "./interfaces/IMarketFactory.sol"; import { IOracleProvider } from "./interfaces/IOracleProvider.sol"; diff --git a/packages/perennial/contracts/MarketFactory.sol b/packages/perennial/contracts/MarketFactory.sol index fe400d9d4..fcaa7ab47 100644 --- a/packages/perennial/contracts/MarketFactory.sol +++ b/packages/perennial/contracts/MarketFactory.sol @@ -2,16 +2,16 @@ pragma solidity 0.8.24; import { UFixed6, UFixed6Lib } from "@equilibria/root/number/types/UFixed6.sol"; -import { IVerifier } from "@equilibria/perennial-v2-verifier/contracts/interfaces/IVerifier.sol"; +import { IVerifier } from "@perennial/verifier/contracts/interfaces/IVerifier.sol"; import { Factory, IFactory } from "@equilibria/root/attribute/Factory.sol"; import { IInstance } from "@equilibria/root/attribute/Instance.sol"; import { IMarket } from "./interfaces/IMarket.sol"; import { IOracleProvider } from "./interfaces/IOracleProvider.sol"; import { IMarketFactory } from "./interfaces/IMarketFactory.sol"; -import { OperatorUpdate } from "@equilibria/perennial-v2-verifier/contracts/types/OperatorUpdate.sol"; -import { SignerUpdate } from "@equilibria/perennial-v2-verifier/contracts/types/SignerUpdate.sol"; -import { AccessUpdate } from "@equilibria/perennial-v2-verifier/contracts/types/AccessUpdate.sol"; -import { AccessUpdateBatch } from "@equilibria/perennial-v2-verifier/contracts/types/AccessUpdateBatch.sol"; +import { OperatorUpdate } from "@perennial/verifier/contracts/types/OperatorUpdate.sol"; +import { SignerUpdate } from "@perennial/verifier/contracts/types/SignerUpdate.sol"; +import { AccessUpdate } from "@perennial/verifier/contracts/types/AccessUpdate.sol"; +import { AccessUpdateBatch } from "@perennial/verifier/contracts/types/AccessUpdateBatch.sol"; import { ProtocolParameter, ProtocolParameterStorage } from "./types/ProtocolParameter.sol"; /// @title MarketFactory diff --git a/packages/perennial/contracts/interfaces/IMarket.sol b/packages/perennial/contracts/interfaces/IMarket.sol index 18660c312..b73adc4c4 100644 --- a/packages/perennial/contracts/interfaces/IMarket.sol +++ b/packages/perennial/contracts/interfaces/IMarket.sol @@ -5,7 +5,7 @@ import { IInstance } from "@equilibria/root/attribute/interfaces/IInstance.sol"; import { UFixed6 } from "@equilibria/root/number/types/UFixed6.sol"; import { Fixed6 } from "@equilibria/root/number/types/Fixed6.sol"; import { Token18 } from "@equilibria/root/token/types/Token18.sol"; -import { Intent } from "@equilibria/perennial-v2-verifier/contracts/types/Intent.sol"; +import { Intent } from "@perennial/verifier/contracts/types/Intent.sol"; import { IOracleProvider } from "./IOracleProvider.sol"; import { OracleVersion } from "../types/OracleVersion.sol"; import { MarketParameter } from "../types/MarketParameter.sol"; diff --git a/packages/perennial/contracts/interfaces/IMarketFactory.sol b/packages/perennial/contracts/interfaces/IMarketFactory.sol index 93b2ed049..08b619b27 100644 --- a/packages/perennial/contracts/interfaces/IMarketFactory.sol +++ b/packages/perennial/contracts/interfaces/IMarketFactory.sol @@ -3,11 +3,11 @@ pragma solidity ^0.8.13; import { IFactory } from "@equilibria/root/attribute/interfaces/IFactory.sol"; import { UFixed6 } from "@equilibria/root/number/types/UFixed6.sol"; -import { IVerifier } from "@equilibria/perennial-v2-verifier/contracts/interfaces/IVerifier.sol"; -import { OperatorUpdate } from "@equilibria/perennial-v2-verifier/contracts/types/OperatorUpdate.sol"; -import { SignerUpdate } from "@equilibria/perennial-v2-verifier/contracts/types/SignerUpdate.sol"; -import { AccessUpdate } from "@equilibria/perennial-v2-verifier/contracts/types/AccessUpdate.sol"; -import { AccessUpdateBatch } from "@equilibria/perennial-v2-verifier/contracts/types/AccessUpdateBatch.sol"; +import { IVerifier } from "@perennial/verifier/contracts/interfaces/IVerifier.sol"; +import { OperatorUpdate } from "@perennial/verifier/contracts/types/OperatorUpdate.sol"; +import { SignerUpdate } from "@perennial/verifier/contracts/types/SignerUpdate.sol"; +import { AccessUpdate } from "@perennial/verifier/contracts/types/AccessUpdate.sol"; +import { AccessUpdateBatch } from "@perennial/verifier/contracts/types/AccessUpdateBatch.sol"; import { ProtocolParameter } from "../types/ProtocolParameter.sol"; import { IMarket } from "./IMarket.sol"; import { IOracleProvider } from "./IOracleProvider.sol"; diff --git a/packages/perennial/contracts/test/MockToken.sol b/packages/perennial/contracts/test/MockToken.sol index b2461ac22..1d8971365 100644 --- a/packages/perennial/contracts/test/MockToken.sol +++ b/packages/perennial/contracts/test/MockToken.sol @@ -4,7 +4,7 @@ pragma solidity ^0.8.13; import { UFixed6Lib } from "@equilibria/root/number/types/UFixed6.sol"; import { Fixed6Lib } from "@equilibria/root/number/types/Fixed6.sol"; import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; -import { Intent } from "@equilibria/perennial-v2-verifier/contracts/interfaces/IVerifier.sol"; +import { Intent } from "@perennial/verifier/contracts/interfaces/IVerifier.sol"; import { IMarket } from "../interfaces/IMarket.sol"; contract MockToken is ERC20 { diff --git a/packages/perennial/package.json b/packages/perennial/package.json index be6d4c0fa..c0e4a60d6 100644 --- a/packages/perennial/package.json +++ b/packages/perennial/package.json @@ -1,5 +1,5 @@ { - "name": "@equilibria/perennial-v2", + "name": "@perennial/core", "version": "1.3.0", "description": "Perennial V2 Core", "files": [ @@ -29,7 +29,7 @@ "license": "Apache-2.0", "dependencies": { "@chainlink/contracts": "0.3.1", - "@equilibria/perennial-v2-verifier": "1.3.0" + "@perennial/verifier": "1.3.0" }, "devDependencies": { "@ethersproject/abstract-provider": "^5", diff --git a/packages/perennial/test/integration/core/happyPath.test.ts b/packages/perennial/test/integration/core/happyPath.test.ts index ab88b4f96..607605f3b 100644 --- a/packages/perennial/test/integration/core/happyPath.test.ts +++ b/packages/perennial/test/integration/core/happyPath.test.ts @@ -23,7 +23,7 @@ import { expectGuaranteeEq, } from '../../../../common/testutil/types' import { Market__factory } from '../../../types/generated' -import { CHAINLINK_CUSTOM_CURRENCIES } from '@equilibria/perennial-v2-oracle/util/constants' +import { CHAINLINK_CUSTOM_CURRENCIES } from '@perennial/oracle/util/constants' import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { ChainlinkContext } from '../helpers/chainlinkHelpers' import { IntentStruct, RiskParameterStruct } from '../../../types/generated/contracts/Market' diff --git a/packages/perennial/test/integration/helpers/chainlinkHelpers.ts b/packages/perennial/test/integration/helpers/chainlinkHelpers.ts index fb1392e72..c5d7ac4fd 100644 --- a/packages/perennial/test/integration/helpers/chainlinkHelpers.ts +++ b/packages/perennial/test/integration/helpers/chainlinkHelpers.ts @@ -3,12 +3,8 @@ import { BigNumber } from 'ethers' import { smock, FakeContract } from '@defi-wonderland/smock' import { FeedRegistryInterface__factory, FeedRegistryInterface, IOracleProvider } from '../../../types/generated' -import { buildChainlinkRoundId } from '@equilibria/perennial-v2-oracle/util/buildChainlinkRoundId' -import { - IOracleFactory, - IOracleFactory__factory, - IPayoffProvider, -} from '@equilibria/perennial-v2-oracle/types/generated' +import { buildChainlinkRoundId } from '@perennial/oracle/util/buildChainlinkRoundId' +import { IOracleFactory, IOracleFactory__factory, IPayoffProvider } from '@perennial/oracle/types/generated' const { ethers, deployments } = HRE diff --git a/packages/perennial/test/integration/helpers/setupHelpers.ts b/packages/perennial/test/integration/helpers/setupHelpers.ts index 5bf4fa1b8..e6ae53175 100644 --- a/packages/perennial/test/integration/helpers/setupHelpers.ts +++ b/packages/perennial/test/integration/helpers/setupHelpers.ts @@ -29,7 +29,7 @@ import { } from '../../../types/generated' import { ChainlinkContext } from './chainlinkHelpers' import { parse6decimal } from '../../../../common/testutil/types' -import { CHAINLINK_CUSTOM_CURRENCIES } from '@equilibria/perennial-v2-oracle/util/constants' +import { CHAINLINK_CUSTOM_CURRENCIES } from '@perennial/oracle/util/constants' import { MarketParameterStruct, RiskParameterStruct } from '../../../types/generated/contracts/Market' import { OracleFactory, @@ -39,7 +39,7 @@ import { PowerTwo__factory, IPayoffProvider, IPayoffProvider__factory, -} from '@equilibria/perennial-v2-oracle/types/generated' +} from '@perennial/oracle/types/generated' import { Verifier, Verifier__factory } from '../../../../perennial-verifier/types/generated' const { deployments, ethers } = HRE