diff --git a/.gitmodules b/.gitmodules index 0c2e0650..07cb22d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,6 +13,6 @@ [submodule "lib/rain.solmem"] path = lib/rain.solmem url = https://github.com/rainprotocol/rain.solmem -[submodule "lib/rain.interpreter"] - path = lib/rain.interpreter - url = https://github.com/rainprotocol/rain.interpreter +[submodule "lib/rain.interpreter.interface"] + path = lib/rain.interpreter.interface + url = https://github.com/rainlanguage/rain.interpreter.interface diff --git a/lib/rain.interpreter b/lib/rain.interpreter deleted file mode 160000 index 9788541b..00000000 --- a/lib/rain.interpreter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9788541bf9d03f8091894f5225fea8bc83843bcc diff --git a/lib/rain.interpreter.interface b/lib/rain.interpreter.interface new file mode 160000 index 00000000..7a782504 --- /dev/null +++ b/lib/rain.interpreter.interface @@ -0,0 +1 @@ +Subproject commit 7a78250485c9dd45fc8d877832b547f85223bbe0 diff --git a/src/concrete/erc1155/FlowERC1155.sol b/src/concrete/erc1155/FlowERC1155.sol index e8226915..f86aa2ce 100644 --- a/src/concrete/erc1155/FlowERC1155.sol +++ b/src/concrete/erc1155/FlowERC1155.sol @@ -21,7 +21,7 @@ import { FLOW_ERC1155_HANDLE_TRANSFER_MIN_OUTPUTS, FLOW_ERC1155_MIN_FLOW_SENTINELS } from "../../interface/unstable/IFlowERC1155V4.sol"; -import {LibBytecode} from "lib/rain.interpreter/src/lib/bytecode/LibBytecode.sol"; +import {LibBytecode} from "rain.interpreter.interface/lib/bytecode/LibBytecode.sol"; import {IInterpreterV1} from "rain.interpreter/src/interface/IInterpreterV1.sol"; import {IInterpreterStoreV1} from "rain.interpreter/src/interface/IInterpreterStoreV1.sol"; import {Evaluable, DEFAULT_STATE_NAMESPACE} from "rain.interpreter/src/lib/caller/LibEvaluable.sol"; diff --git a/src/concrete/erc20/FlowERC20.sol b/src/concrete/erc20/FlowERC20.sol index 961ff47c..eb8faf6e 100644 --- a/src/concrete/erc20/FlowERC20.sol +++ b/src/concrete/erc20/FlowERC20.sol @@ -18,7 +18,7 @@ import { RAIN_FLOW_SENTINEL, FLOW_ERC20_MIN_FLOW_SENTINELS } from "../../interface/unstable/IFlowERC20V4.sol"; -import {LibBytecode} from "lib/rain.interpreter/src/lib/bytecode/LibBytecode.sol"; +import {LibBytecode} from "rain.interpreter.interface/lib/bytecode/LibBytecode.sol"; import {EncodedDispatch, LibEncodedDispatch} from "rain.interpreter/src/lib/caller/LibEncodedDispatch.sol"; import {Sentinel, LibStackSentinel} from "rain.solmem/lib/LibStackSentinel.sol"; import {LibFlow} from "../../lib/LibFlow.sol"; diff --git a/src/concrete/erc721/FlowERC721.sol b/src/concrete/erc721/FlowERC721.sol index 8d8e9379..6b1fddda 100644 --- a/src/concrete/erc721/FlowERC721.sol +++ b/src/concrete/erc721/FlowERC721.sol @@ -23,7 +23,7 @@ import { FLOW_ERC721_HANDLE_TRANSFER_ENTRYPOINT, FLOW_ERC721_MIN_FLOW_SENTINELS } from "../../interface/unstable/IFlowERC721V4.sol"; -import {LibBytecode} from "lib/rain.interpreter/src/lib/bytecode/LibBytecode.sol"; +import {LibBytecode} from "rain.interpreter.interface/lib/bytecode/LibBytecode.sol"; import {SourceIndex} from "rain.interpreter/src/interface/IInterpreterV1.sol"; import {LibFlow} from "../../lib/LibFlow.sol"; import {