Merge pull request #19 from mattyg/2024-03-08-bump-i9r-interface

2024 03 08 bump i9r interface
rainlanguage · Mar 12, 2024 · 4393d1f · 4393d1f
2 parents 6ea14fa + fb14035
commit 4393d1f
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/lib/rain.interpreter.interface b/lib/rain.interpreter.interface
diff --git a/lib/rain.solmem b/lib/rain.solmem
diff --git a/src/abstract/FlowCommon.sol b/src/abstract/FlowCommon.sol
@@ -17,7 +17,7 @@ import {
     IInterpreterV2,
     IInterpreterStoreV2,
     DEFAULT_STATE_NAMESPACE
-} from "rain.interpreter.interface/interface/unstable/IInterpreterV2.sol";
+} from "rain.interpreter.interface/interface/IInterpreterV2.sol";
 import {MulticallUpgradeable as Multicall} from
     "openzeppelin-contracts-upgradeable/contracts/utils/MulticallUpgradeable.sol";
 import {ERC721HolderUpgradeable as ERC721Holder} from

diff --git a/src/concrete/erc1155/FlowERC1155.sol b/src/concrete/erc1155/FlowERC1155.sol
@@ -25,11 +25,11 @@ import {
 import {LibBytecode} from "rain.interpreter.interface/lib/bytecode/LibBytecode.sol";
 import {
     IInterpreterV2, DEFAULT_STATE_NAMESPACE
-} from "rain.interpreter.interface/interface/unstable/IInterpreterV2.sol";
-import {IInterpreterStoreV2} from "rain.interpreter.interface/interface/unstable/IInterpreterStoreV2.sol";
+} from "rain.interpreter.interface/interface/IInterpreterV2.sol";
+import {IInterpreterStoreV2} from "rain.interpreter.interface/interface/IInterpreterStoreV2.sol";
 import {Pointer} from "rain.solmem/lib/LibPointer.sol";
 import {LibFlow} from "../../lib/LibFlow.sol";
-import {SourceIndexV2} from "rain.interpreter.interface/interface/unstable/IInterpreterV2.sol";
+import {SourceIndexV2} from "rain.interpreter.interface/interface/IInterpreterV2.sol";
 import {FlowCommon, ERC1155Receiver} from "../../abstract/FlowCommon.sol";
 import {LibContext} from "rain.interpreter.interface/lib/caller/LibContext.sol";
 import {LibNamespace, StateNamespace} from "rain.interpreter.interface/lib/ns/LibNamespace.sol";

diff --git a/src/concrete/erc20/FlowERC20.sol b/src/concrete/erc20/FlowERC20.sol
@@ -27,8 +27,8 @@ import {
     SourceIndexV2,
     IInterpreterV2,
     DEFAULT_STATE_NAMESPACE
-} from "rain.interpreter.interface/interface/unstable/IInterpreterV2.sol";
-import {IInterpreterStoreV2} from "rain.interpreter.interface/interface/unstable/IInterpreterStoreV2.sol";
+} from "rain.interpreter.interface/interface/IInterpreterV2.sol";
+import {IInterpreterStoreV2} from "rain.interpreter.interface/interface/IInterpreterStoreV2.sol";
 import {Pointer} from "rain.solmem/lib/LibPointer.sol";
 import {EvaluableV2} from "rain.interpreter.interface/lib/caller/LibEvaluable.sol";
 import {LibContext} from "rain.interpreter.interface/lib/caller/LibContext.sol";

diff --git a/src/concrete/erc721/FlowERC721.sol b/src/concrete/erc721/FlowERC721.sol
@@ -25,14 +25,14 @@ import {
     RAIN_FLOW_SENTINEL
 } from "../../interface/unstable/IFlowERC721V5.sol";
 import {LibBytecode} from "rain.interpreter.interface/lib/bytecode/LibBytecode.sol";
-import {SourceIndexV2} from "rain.interpreter.interface/interface/unstable/IInterpreterV2.sol";
+import {SourceIndexV2} from "rain.interpreter.interface/interface/IInterpreterV2.sol";
 import {LibFlow} from "../../lib/LibFlow.sol";
 import {FlowCommon, LibContext, ERC1155Receiver} from "../../abstract/FlowCommon.sol";
 import {EvaluableV2} from "rain.interpreter.interface/lib/caller/LibEvaluable.sol";
 import {
     IInterpreterV2, DEFAULT_STATE_NAMESPACE
-} from "rain.interpreter.interface/interface/unstable/IInterpreterV2.sol";
-import {IInterpreterStoreV2} from "rain.interpreter.interface/interface/unstable/IInterpreterStoreV2.sol";
+} from "rain.interpreter.interface/interface/IInterpreterV2.sol";
+import {IInterpreterStoreV2} from "rain.interpreter.interface/interface/IInterpreterStoreV2.sol";
 import {Pointer} from "rain.solmem/lib/LibPointer.sol";
 import {BurnerNotOwner} from "../../error/ErrFlow.sol";
 import {LibNamespace, StateNamespace} from "rain.interpreter.interface/lib/ns/LibNamespace.sol";

diff --git a/src/interface/unstable/IFlowERC1155V5.sol b/src/interface/unstable/IFlowERC1155V5.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: CAL
 pragma solidity ^0.8.18;
 
-import {SourceIndexV2} from "rain.interpreter.interface/interface/unstable/IInterpreterV2.sol";
+import {SourceIndexV2} from "rain.interpreter.interface/interface/IInterpreterV2.sol";
 import {SignedContextV1, EvaluableConfigV3} from "rain.interpreter.interface/interface/IInterpreterCallerV2.sol";
 import {EvaluableV2} from "rain.interpreter.interface/lib/caller/LibEvaluable.sol";
 import {Sentinel} from "rain.solmem/lib/LibStackSentinel.sol";

diff --git a/src/interface/unstable/IFlowERC20V5.sol b/src/interface/unstable/IFlowERC20V5.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: CAL
 pragma solidity ^0.8.18;
 
-import {SourceIndexV2} from "rain.interpreter.interface/interface/unstable/IInterpreterV2.sol";
+import {SourceIndexV2} from "rain.interpreter.interface/interface/IInterpreterV2.sol";
 import {SignedContextV1, EvaluableConfigV3} from "rain.interpreter.interface/interface/IInterpreterCallerV2.sol";
 import {EvaluableV2} from "rain.interpreter.interface/lib/caller/LibEvaluable.sol";
 import {Sentinel} from "rain.solmem/lib/LibStackSentinel.sol";

diff --git a/src/interface/unstable/IFlowERC721V5.sol b/src/interface/unstable/IFlowERC721V5.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.18;
 
 import {SignedContextV1, EvaluableConfigV3} from "rain.interpreter.interface/interface/IInterpreterCallerV2.sol";
 import {EvaluableV2} from "rain.interpreter.interface/lib/caller/LibEvaluable.sol";
-import {SourceIndexV2} from "rain.interpreter.interface/interface/unstable/IInterpreterV2.sol";
+import {SourceIndexV2} from "rain.interpreter.interface/interface/IInterpreterV2.sol";
 import {
     FlowERC721IOV1,
     ERC721SupplyChange,

diff --git a/src/lib/LibFlow.sol b/src/lib/LibFlow.sol
@@ -4,9 +4,9 @@ pragma solidity ^0.8.18;
 import {IFlowV5, RAIN_FLOW_SENTINEL} from "../interface/unstable/IFlowV5.sol";
 import {Pointer} from "rain.solmem/lib/LibPointer.sol";
 import {FlowTransferV1, ERC20Transfer, ERC721Transfer, ERC1155Transfer} from "../interface/unstable/IFlowV5.sol";
-import {IInterpreterStoreV2} from "rain.interpreter.interface/interface/unstable/IInterpreterStoreV2.sol";
+import {IInterpreterStoreV2} from "rain.interpreter.interface/interface/IInterpreterStoreV2.sol";
 import {LibStackSentinel} from "rain.solmem/lib/LibStackSentinel.sol";
-import {DEFAULT_STATE_NAMESPACE} from "rain.interpreter.interface/interface/unstable/IInterpreterV2.sol";
+import {DEFAULT_STATE_NAMESPACE} from "rain.interpreter.interface/interface/IInterpreterV2.sol";
 
 import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 import {SafeERC20} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
+0 −0		src/interface/IExpressionDeployerV3.sol
+3 −3		src/interface/IInterpreterCallerV2.sol
+1 −1		src/interface/IInterpreterExternV3.sol
+1 −1		src/interface/IInterpreterStoreV2.sol
+1 −1		src/interface/IInterpreterV2.sol
+1 −1		src/interface/ISubParserV2.sol
+1 −1		src/interface/deprecated/IDebugExpressionDeployerV1.sol
+1 −1		src/interface/deprecated/IDebugInterpreterV1.sol
+1 −1		src/interface/deprecated/IDebugInterpreterV2.sol
+1 −1		src/interface/deprecated/IExpressionDeployerV1.sol
+1 −1		src/interface/deprecated/IExpressionDeployerV2.sol
+1 −1		src/interface/deprecated/IInterpreterCallerV1.sol
+1 −1		src/interface/deprecated/IInterpreterStoreV1.sol
+1 −1		src/interface/deprecated/IInterpreterV1.sol
+6 −0		src/interface/unstable/IAnalyzerV1.sol
+17 −0		src/interface/unstable/IInterpreterV3.sol
+6 −0		src/interface/unstable/IParserV2.sol
+3 −3		src/lib/caller/LibDeployerDiscoverable.sol
+1 −1		src/lib/caller/LibEncodedDispatch.sol
+3 −3		src/lib/caller/LibEvaluable.sol
+1 −1		src/lib/ns/LibNamespace.sol
+3 −3		test/src/lib/caller/LibDeployerV3Discoverable.t.sol
+1 −1		test/src/lib/caller/LibEncodedDispatch.t.sol
+2 −2		test/src/lib/caller/LibEvaluable.t.sol
+1 −1		test/src/lib/ns/LibNamespaceSlow.sol