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: 2 additions & 2 deletions hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ const v8Settings = {
const config: HardhatUserConfig = {
solidity: {
compilers: [
{ version: '0.8.21', settings: v8Settings }, // PoCo Boost
{ version: '0.6.12', settings }, // PoCo contracts
{ version: '0.8.21', settings: v8Settings }, // PoCo contracts
{ version: '0.6.12', settings }, // External dependencies (@amxx/factory)
{ version: '0.4.24', settings }, // RLC contracts
],
},
Expand Down
52 changes: 0 additions & 52 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,13 @@
]
},
"dependencies": {
"@iexec/interface": "3.0.35-8",
"@iexec/solidity": "^0.1.1",
"@mudgen/diamond-1": "github:mudgen/diamond-1-hardhat#3da037b",
"@openzeppelin/contracts": "^5.0.2",
"@uniswap/v2-periphery": "1.1.0-beta.0",
"createx": "github:pcaversaccio/createx#v1.0.0",
"rlc-faucet-contract": "1.0.10"
},
"__dependenciesComments": {
"@iexec/solidity": "TODO replace with openzeppelin contracts when possible",
"rlc-faucet-contract": "TODO Replace with rlc-token if possible"
},
"devDependencies": {
Expand Down
4 changes: 1 addition & 3 deletions test/byContract/registries/registries.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@ import {
Dataset__factory,
IexecInterfaceNative,
IexecInterfaceNative__factory,
InitializableUpgradeabilityProxy__factory,
WorkerpoolRegistry,
WorkerpoolRegistry__factory,
Workerpool__factory,
} from '../../../typechain';
//import the correct InitializableUpgradeabilityProxy__factory from the local registry's proxy instead of @iexec/solidity
//TODO: merge with the previous import when @iexec/solidity will be removed
import { InitializableUpgradeabilityProxy__factory } from '../../../typechain/factories/contracts/registries/proxy/InitializableUpgradeabilityProxy__factory';
import config from '../../../utils/config';
import { MULTIADDR_BYTES } from '../../../utils/constants';
import { getIexecAccounts } from '../../../utils/poco-tools';
Expand Down