build: fix Foundry compile failing using different version

lukso-network · Oct 22, 2024 · d04f129 · d04f129
1 parent 110f073
commit d04f129
Show file tree

Hide file tree

Showing 7 changed files with 196 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -62,6 +62,9 @@
     "test:reentrancy": "hardhat test --no-compile packages/lsp-smart-contracts/tests/Reentrancy/Reentrancy.test.ts",
     "test:reentrancyinit": "hardhat test --no-compile packages/lsp-smart-contracts/tests/Reentrancy/ReentrancyInit.test.ts"
   },
+  "dependencies": {
+    "@erc725/smart-contracts-v8": "npm:@erc725/smart-contracts@8.0.0"
+  },
   "devDependencies": {
     "@b00ste/hardhat-dodoc": "^0.3.16",
     "@erc725/erc725.js": "0.23.0",

diff --git a/packages/lsp0-contracts/constants.ts b/packages/lsp0-contracts/constants.ts
@@ -1,6 +1,6 @@
 // ERC165 Interface ID
 // ----------
-export const INTERFACE_ID_LSP0ERC725Account = '0x24871b3d';
+export const INTERFACE_ID_LSP0 = '0x24871b3d';
 
 // ERC1271
 // ----------

diff --git a/packages/lsp4-contracts/contracts/LSP4DigitalAssetMetadata.sol b/packages/lsp4-contracts/contracts/LSP4DigitalAssetMetadata.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.4;
 
 // modules
-import {ERC725Y} from "@erc725/smart-contracts/contracts/ERC725Y.sol";
+import {ERC725Y} from "@erc725/smart-contracts-v8/contracts/ERC725Y.sol";
 
 // constants
 import {

diff --git a/packages/lsp4-contracts/contracts/LSP4DigitalAssetMetadataInitAbstract.sol b/packages/lsp4-contracts/contracts/LSP4DigitalAssetMetadataInitAbstract.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.4;
 // modules
 import {
     ERC725YInitAbstract
-} from "@erc725/smart-contracts/contracts/ERC725YInitAbstract.sol";
+} from "@erc725/smart-contracts-v8/contracts/ERC725YInitAbstract.sol";
 
 // constants
 import {

diff --git a/packages/lsp4-contracts/package.json b/packages/lsp4-contracts/package.json
@@ -46,7 +46,7 @@
     "lint:solidity": "solhint 'contracts/**/*.sol' && prettier --check 'contracts/**/*.sol'"
   },
   "dependencies": {
-    "@erc725/smart-contracts": "^8.0.0",
+    "@erc725/smart-contracts-v8": "npm:@erc725/smart-contracts@8.0.0",
     "@lukso/lsp2-contracts": "*"
   }
 }
diff --git a/packages/lsp6-contracts/constants.ts b/packages/lsp6-contracts/constants.ts
@@ -1,6 +1,6 @@
 import { LSP2ArrayKey } from '@lukso/lsp2-contracts';
 
-export const INTERFACE_ID_LSP6KEYMANAGER = '0x23f34c62';
+export const INTERFACE_ID_LSP6 = '0x23f34c62';
 
 /**
  * @dev values returned by the `isValidSignature` function of the ERC1271 standard.