diff --git a/.gitmodules b/.gitmodules index 5d4ffc22..96a79cb0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,10 +19,6 @@ path = lib/openzeppelin-contracts url = https://github.com/OpenZeppelin/openzeppelin-contracts branch = release-v4.9 - -[submodule "lib/pyth-sdk-solidity"] - path = lib/pyth-sdk-solidity - url = https://github.com/pyth-network/pyth-sdk-solidity [submodule "lib/ethereum-vault-connector"] path = lib/ethereum-vault-connector url = https://github.com/euler-xyz/ethereum-vault-connector diff --git a/foundry.toml b/foundry.toml index e6c0d9a9..69ac4669 100644 --- a/foundry.toml +++ b/foundry.toml @@ -2,7 +2,7 @@ src = "src" out = "out" test = "test" -libs = ["lib"] +libs = ["lib", "node_modules"] solc = "0.8.23" evm_version = "cancun" optimizer = true diff --git a/lib/pyth-sdk-solidity b/lib/pyth-sdk-solidity deleted file mode 160000 index c24b3e01..00000000 --- a/lib/pyth-sdk-solidity +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c24b3e0173a5715c875ae035c20e063cb900f481 diff --git a/package-lock.json b/package-lock.json index 0899752f..e3364b84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "1.0.0", "license": "GPL-2.0-or-later", "dependencies": { + "@pythnetwork/pyth-sdk-solidity": "^4.1.0", "@redstone-finance/evm-connector": "^0.4.0" } }, @@ -788,6 +789,11 @@ "integrity": "sha512-z0zMCjyhhp4y7XKAcDAi3Vgms4T2PstwBdahiO0+9NaGICQKjynK3wduSRplTgk4LXmoO1yfDGO5RbjKYxtuxA==", "license": "MIT" }, + "node_modules/@pythnetwork/pyth-sdk-solidity": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@pythnetwork/pyth-sdk-solidity/-/pyth-sdk-solidity-4.1.0.tgz", + "integrity": "sha512-SPqaWH1fKwYbdTsyTLGuSqCYDEEgCXw0SFW0KaOFRgzcGYcdZY/DYWhedCzFNb9lY/1RTk+ucgTtxO5e3Z1fIg==" + }, "node_modules/@redstone-finance/evm-connector": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/@redstone-finance/evm-connector/-/evm-connector-0.4.0.tgz", diff --git a/package.json b/package.json index 9e8b641d..609f6ae3 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "author": "Euler Labs", "license": "GPL-2.0-or-later", "dependencies": { - "@redstone-finance/evm-connector": "^0.4.0" + "@redstone-finance/evm-connector": "^0.4.0", + "@pythnetwork/pyth-sdk-solidity": "^4.1.0" } } diff --git a/remappings.txt b/remappings.txt index a7bf9eda..2cb4a87b 100644 --- a/remappings.txt +++ b/remappings.txt @@ -3,6 +3,6 @@ @uniswap/v3-periphery/=lib/v3-periphery/ @redstone/evm-connector/=lib/redstone-oracles-monorepo/packages/evm-connector/contracts/ @openzeppelin/contracts=lib/openzeppelin-contracts/contracts/ -@pyth/=lib/pyth-sdk-solidity/ +@pyth/=node_modules/@pythnetwork/pyth-sdk-solidity/ ethereum-vault-connector/=lib/ethereum-vault-connector/src/ @pendle/core-v2/=lib/pendle-core-v2-public/contracts/ \ No newline at end of file