From 917f73f5d0232b339bdb08e54494df89ab2ba557 Mon Sep 17 00:00:00 2001 From: thedavidmeister Date: Wed, 28 Feb 2024 03:05:03 +0400 Subject: [PATCH 1/4] rm i9r --- .gitmodules | 3 --- lib/rain.interpreter | 1 - 2 files changed, 4 deletions(-) delete mode 160000 lib/rain.interpreter diff --git a/.gitmodules b/.gitmodules index 0c2e0650..7c32ef05 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,6 +13,3 @@ [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 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 From d7e64b30805c18449e27ce09ea5ad3b3f7ad507c Mon Sep 17 00:00:00 2001 From: thedavidmeister Date: Wed, 28 Feb 2024 04:33:23 +0400 Subject: [PATCH 2/4] wip on interface --- src/concrete/erc1155/FlowERC1155.sol | 2 +- src/concrete/erc20/FlowERC20.sol | 2 +- src/concrete/erc721/FlowERC721.sol | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/concrete/erc1155/FlowERC1155.sol b/src/concrete/erc1155/FlowERC1155.sol index e8226915..f0e3aa69 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 "lib/rain.interpreter/src/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..a671d405 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 "lib/rain.interpreter/src/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..2496b866 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 "lib/rain.interpreter/src/lib/bytecode/LibBytecode.sol"; import {SourceIndex} from "rain.interpreter/src/interface/IInterpreterV1.sol"; import {LibFlow} from "../../lib/LibFlow.sol"; import { From 61541af310e5b37e4dc6d3787f07b04adb896b80 Mon Sep 17 00:00:00 2001 From: thedavidmeister Date: Wed, 28 Feb 2024 04:33:44 +0400 Subject: [PATCH 3/4] forge install: rain.interpreter.interface --- .gitmodules | 3 +++ lib/rain.interpreter.interface | 1 + 2 files changed, 4 insertions(+) create mode 160000 lib/rain.interpreter.interface diff --git a/.gitmodules b/.gitmodules index 7c32ef05..07cb22d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "lib/rain.solmem"] path = lib/rain.solmem url = https://github.com/rainprotocol/rain.solmem +[submodule "lib/rain.interpreter.interface"] + path = lib/rain.interpreter.interface + url = https://github.com/rainlanguage/rain.interpreter.interface 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 From 970624c222686d847ae66be5a1e29f77fc590650 Mon Sep 17 00:00:00 2001 From: thedavidmeister Date: Wed, 28 Feb 2024 04:35:13 +0400 Subject: [PATCH 4/4] use rain interpreter interface --- src/concrete/erc1155/FlowERC1155.sol | 2 +- src/concrete/erc20/FlowERC20.sol | 2 +- src/concrete/erc721/FlowERC721.sol | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/concrete/erc1155/FlowERC1155.sol b/src/concrete/erc1155/FlowERC1155.sol index f0e3aa69..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 a671d405..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 2496b866..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 {