Merge branch 'lsp-monorepo' into packages/lsp16

lukso-network · Jan 26, 2024 · 6fc8b8c · 6fc8b8c
2 parents c843e30 + b54b1d9
commit 6fc8b8c
Show file tree

Hide file tree

Showing 30 changed files with 3,472 additions and 11,400 deletions.
diff --git a/.github/workflows/build-lint-test.yml b/.github/workflows/build-lint-test.yml
@@ -47,9 +47,6 @@ jobs:
             contracts.ts
           key: ${{ github.run_id }}
 
-      - name: 🧪 run import/requires tests
-        run: npm run test:importRequire
-
       - name: 📚 generate ABI docs
         run: npm run build:docs
 

diff --git a/.github/workflows/solc_version.yml b/.github/workflows/solc_version.yml
@@ -80,9 +80,11 @@ jobs:
               --allow-paths $(pwd)/node_modules/,$(pwd)/packages/ \
               @=node_modules/@ \
               solidity-bytes-utils/=node_modules/solidity-bytes-utils/ \
-              ../=$(pwd)/contracts/
+              ../=$(pwd)/contracts/ \
+              lsp25/=packages/LSP25ExecuteRelayCall/
           else
             solc contracts/**/*.sol \
               @=node_modules/@ \
-              solidity-bytes-utils/=node_modules/solidity-bytes-utils/
+              solidity-bytes-utils/=node_modules/solidity-bytes-utils/ \
+              lsp25/=packages/LSP25ExecuteRelayCall/
           fi;
diff --git a/contracts/LSP6KeyManager/LSP6KeyManagerCore.sol b/contracts/LSP6KeyManager/LSP6KeyManagerCore.sol
@@ -15,7 +15,7 @@ import {
 } from "../LSP20CallVerification/ILSP20CallVerifier.sol";
 import {
     ILSP25ExecuteRelayCall as ILSP25
-} from "../LSP25ExecuteRelayCall/ILSP25ExecuteRelayCall.sol";
+} from "lsp25/contracts/ILSP25ExecuteRelayCall.sol";
 
 // modules
 import {ILSP14Ownable2Step} from "../LSP14Ownable2Step/ILSP14Ownable2Step.sol";
@@ -29,7 +29,7 @@ import {
 import {LSP6OwnershipModule} from "./LSP6Modules/LSP6OwnershipModule.sol";
 import {
     LSP25MultiChannelNonce
-} from "../LSP25ExecuteRelayCall/LSP25MultiChannelNonce.sol";
+} from "lsp25/contracts/LSP25MultiChannelNonce.sol";
 
 // libraries
 import {BytesLib} from "solidity-bytes-utils/contracts/BytesLib.sol";
@@ -69,7 +69,7 @@ import {
     _LSP20_VERIFY_CALL_SUCCESS_VALUE_WITH_POST_VERIFICATION,
     _LSP20_VERIFY_CALL_RESULT_SUCCESS_VALUE
 } from "../LSP20CallVerification/LSP20Constants.sol";
-import {_INTERFACEID_LSP25} from "../LSP25ExecuteRelayCall/LSP25Constants.sol";
+import {_INTERFACEID_LSP25} from "lsp25/contracts/LSP25Constants.sol";
 
 /**
  * @title Core implementation of the LSP6 Key Manager standard.

diff --git a/contracts/Mocks/ERC165Interfaces.sol b/contracts/Mocks/ERC165Interfaces.sol
@@ -57,7 +57,7 @@ import {
 } from "../LSP20CallVerification/ILSP20CallVerifier.sol";
 import {
     ILSP25ExecuteRelayCall as ILSP25
-} from "../LSP25ExecuteRelayCall/ILSP25ExecuteRelayCall.sol";
+} from "lsp25/contracts/ILSP25ExecuteRelayCall.sol";
 
 // constants
 import {_INTERFACEID_LSP0} from "../LSP0ERC725Account/LSP0Constants.sol";
@@ -83,7 +83,7 @@ import {
     _INTERFACEID_LSP20_CALL_VERIFICATION,
     _INTERFACEID_LSP20_CALL_VERIFIER
 } from "../LSP20CallVerification/LSP20Constants.sol";
-import {_INTERFACEID_LSP25} from "../LSP25ExecuteRelayCall/LSP25Constants.sol";
+import {_INTERFACEID_LSP25} from "lsp25/contracts/LSP25Constants.sol";
 
 // libraries
 import {

diff --git a/contracts/Mocks/Reentrancy/BatchReentrancyRelayer.sol b/contracts/Mocks/Reentrancy/BatchReentrancyRelayer.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.4;
 // interfaces
 import {
     ILSP25ExecuteRelayCall
-} from "../../LSP25ExecuteRelayCall/ILSP25ExecuteRelayCall.sol";
+} from "lsp25/contracts/ILSP25ExecuteRelayCall.sol";
 
 contract BatchReentrancyRelayer {
     bytes[] private _signatures;

diff --git a/contracts/Mocks/Reentrancy/SingleReentrancyRelayer.sol b/contracts/Mocks/Reentrancy/SingleReentrancyRelayer.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.4;
 // interfaces
 import {
     ILSP25ExecuteRelayCall
-} from "../../LSP25ExecuteRelayCall/ILSP25ExecuteRelayCall.sol";
+} from "lsp25/contracts/ILSP25ExecuteRelayCall.sol";
 
 contract SingleReentrancyRelayer {
     bytes private _signature;

diff --git a/docs/_interface_ids_table.mdx b/docs/_interface_ids_table.mdx
diff --git a/docs/contracts/ERC725/ERC725.md → ...rc725/smart-contracts/contracts/ERC725.md b/docs/contracts/ERC725/ERC725.md → ...rc725/smart-contracts/contracts/ERC725.md
diff --git a/...xecuteRelayCall/LSP25MultiChannelNonce.md → ...lsp25/contracts/LSP25MultiChannelNonce.md b/...xecuteRelayCall/LSP25MultiChannelNonce.md → ...lsp25/contracts/LSP25MultiChannelNonce.md
@@ -5,12 +5,12 @@
 
 :::info Standard Specifications
 
-[`LSP-25-ExecuteRelayCall`](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-25-ExecuteRelayCall.md)
+[`LSP-25-MultiChannelNonce.sol`](https://github.com/lukso-network/lips/tree/main/LSPs/LSP-25-MultiChannelNonce.sol.md)
 
 :::
 :::info Solidity implementation
 
-[`LSP25MultiChannelNonce.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/contracts/LSP25ExecuteRelayCall/LSP25MultiChannelNonce.sol)
+[`LSP25MultiChannelNonce.sol`](https://github.com/lukso-network/lsp-smart-contracts/blob/develop/lsp25/contracts/LSP25MultiChannelNonce.sol)
 
 :::
 

diff --git a/...2ERC725YJSONSchema/contracts/LSP2Utils.md → ...2ERC725YJSONSchema/contracts/LSP2Utils.md b/...2ERC725YJSONSchema/contracts/LSP2Utils.md → ...2ERC725YJSONSchema/contracts/LSP2Utils.md
diff --git a/dodoc/config.ts b/dodoc/config.ts
@@ -20,7 +20,7 @@ export const dodocConfig = {
     'contracts/LSP20CallVerification/LSP20CallVerification.sol',
     'contracts/LSP23LinkedContractsFactory/LSP23LinkedContractsFactory.sol',
     'contracts/LSP23LinkedContractsFactory/IPostDeploymentModule.sol',
-    'contracts/LSP25ExecuteRelayCall/LSP25MultiChannelNonce.sol',
+    'lsp25/contracts/LSP25MultiChannelNonce.sol',
 
     // tokens
     'contracts/LSP4DigitalAssetMetadata/LSP4DigitalAssetMetadata.sol',
@@ -48,6 +48,8 @@ export const dodocConfig = {
 
     // external --------------------
     '@erc725/smart-contracts/contracts/ERC725.sol',
+    // 'solidity-bytes-utils/contracts/BytesLib.sol',
+    '@openzeppelin/contracts/token/ERC20/ERC20.sol',
   ],
   libraries: [
     'contracts/LSP1UniversalReceiver/LSP1Utils.sol',
@@ -335,13 +337,14 @@ const generateContractSpecsDetails = (contractName: string) => {
     if (value.endsWith(`${contractName}.sol`)) return value;
   })[0];
 
-  const specs = contractPath.split('/')[1];
+  const specsIndex = contractPath.startsWith('lsp') ? 2 : 1;
+  const specs = contractPath.split('/')[specsIndex];
 
-  const specsName = `LSP-${specs.match(/\d+/)[0]}-${specs.split(/LSP\d+/)[1]}`;
+  const lspNumber = specs.match(/\d+/)[0];
+  const lspName = specs.split(/LSP\d+/)[1];
 
-  const specsLink = `${linkBase}lips/tree/main/LSPs/LSP-${specs.match(/\d+/)[0]}-${
-    specs.split(/LSP\d+/)[1]
-  }.md`;
+  const specsName = `LSP-${lspNumber}-${lspName}`;
+  const specsLink = `${linkBase}lips/tree/main/LSPs/LSP-${lspNumber}-${lspName}.md`;
 
   return { specsName, specsLink };
 };