Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
[submodule "lib/@gearbox-protocol/core-v3"]
path = lib/@gearbox-protocol/core-v3
url = https://github.com/Gearbox-protocol/core-v3
[submodule "lib/@gearbox-protocol/oracles-v3"]
path = lib/@gearbox-protocol/oracles-v3
url = https://github.com/Gearbox-protocol/oracles-v3
[submodule "lib/@1inch/solidity-utils"]
path = lib/@1inch/solidity-utils
url = https://github.com/1inch/solidity-utils
Expand All @@ -16,4 +13,3 @@
[submodule "lib/@gearbox-protocol/permissionless"]
path = lib/@gearbox-protocol/permissionless
url = https://github.com/Gearbox-protocol/permissionless
branch = attach-test-base
4 changes: 2 additions & 2 deletions contracts/test/attach/IntegrationsAttachTestBase.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
import {ICreditFacadeV3, MultiCall} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditFacadeV3.sol";
import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";

import {ConstantPriceFeed} from "@gearbox-protocol/oracles-v3/contracts/oracles/ConstantPriceFeed.sol";
import {ConstantPriceFeed} from "@gearbox-protocol/permissionless/contracts/helpers/ConstantPriceFeed.sol";

import {AttachTestBase} from "@gearbox-protocol/permissionless/contracts/test/suite/AttachTestBase.sol";

Expand All @@ -31,7 +31,7 @@ abstract contract IntegrationsAttachTestBase is AttachTestBase {

zeroPriceFeed = priceFeedStore.zeroPriceFeed();
if (bytecodeRepository.getAllowedBytecodeHash("PRICE_FEED::CONSTANT", 3_10) == 0) {
// NOTE: this would fail on deployment if we bump `ConstantPriceFeed` to v3.1.1 in the oracles repo,
// NOTE: this would fail on deployment if we bump `ConstantPriceFeed` to v3.1.1 in the permissionless repo,
// but we assume that in this case v3.1.0 would already be uploaded to the bytecode repository
_uploadContract("PRICE_FEED::CONSTANT", 3_10, type(ConstantPriceFeed).creationCode);
}
Expand Down
1 change: 0 additions & 1 deletion contracts/test/attach/kelp/KelpLRT.attach.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ contract KelpLRTAttachTest is IntegrationsAttachTestBase {
mapping(address token => address) withdrawalTokens;

function setUp() public {
vm.setEvmVersion("osaka");
super._setUp();

vm.skip(block.chainid != 1, "Not Ethereum mainnet");
Expand Down
8 changes: 4 additions & 4 deletions contracts/test/suites/LiveTestHelper.sol
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
PendlePair
} from "@gearbox-protocol/core-v3/contracts/test/interfaces/ICreditConfig.sol";

import {PriceFeedDeployer} from "@gearbox-protocol/oracles-v3/contracts/test/suites/PriceFeedDeployer.sol";
// import {PriceFeedDeployer} from "@gearbox-protocol/oracles-v3/contracts/test/suites/PriceFeedDeployer.sol";
import {IntegrationTestHelper} from "@gearbox-protocol/core-v3/contracts/test/helpers/IntegrationTestHelper.sol";
import {AdapterDeployer} from "./AdapterDeployer.sol";

Expand Down Expand Up @@ -121,10 +121,10 @@ contract LiveTestHelper is IntegrationTestHelper {
_setupCore();
supportedContracts = new SupportedContracts(chainId);

PriceFeedDeployer priceFeedDeployer =
new PriceFeedDeployer(chainId, address(acl), tokenTestSuite, supportedContracts);
// PriceFeedDeployer priceFeedDeployer =
// new PriceFeedDeployer(chainId, address(acl), tokenTestSuite, supportedContracts);

priceFeedDeployer.addPriceFeeds(address(priceOracle));
// priceFeedDeployer.addPriceFeeds(address(priceOracle));

IPoolV3DeployConfig config = getDeployConfig(id);

Expand Down
10 changes: 2 additions & 8 deletions foundry.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,10 @@
"rev": "5144d61af7d117f86d3fa9b4e2aa05535e2e5433"
}
},
"lib/@gearbox-protocol/oracles-v3": {
"tag": {
"name": "v1.15.1",
"rev": "69c12f58da99281f03ac2c650c0793ba7c30ae38"
}
},
"lib/@gearbox-protocol/permissionless": {
"tag": {
"name": "v1.6.0",
"rev": "3ba16c017863ba2d68d957b32ffeed9778f481b8"
"name": "v1.7.0",
"rev": "0aab5ecec6de72176d7d2a8fae2cfa905d0206af"
}
},
"lib/@gearbox-protocol/sdk-gov": {
Expand Down
1 change: 0 additions & 1 deletion lib/@gearbox-protocol/oracles-v3
Submodule oracles-v3 deleted from 69c12f