From 76b07b0010024ae0cba0e5f36b80976134fa96c3 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 8 Mar 2024 19:31:28 -0700 Subject: [PATCH 1/3] build: bump i9r interface --- lib/rain.interpreter.interface | 2 +- src/interface/unstable/IFlowERC1155V5.sol | 2 +- src/interface/unstable/IFlowERC20V5.sol | 2 +- src/interface/unstable/IFlowERC721V5.sol | 2 +- src/lib/LibFlow.sol | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/rain.interpreter.interface b/lib/rain.interpreter.interface index dcdee287..dab8e3dd 160000 --- a/lib/rain.interpreter.interface +++ b/lib/rain.interpreter.interface @@ -1 +1 @@ -Subproject commit dcdee287da6dcc30739bc454b5de914d210c0b38 +Subproject commit dab8e3dd110ef984e0c056cee085a4d7ee99cbb7 diff --git a/src/interface/unstable/IFlowERC1155V5.sol b/src/interface/unstable/IFlowERC1155V5.sol index 5c0aad17..a83971ce 100644 --- 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 index 95223cb4..ba5dc2ce 100644 --- 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 index 152a5dad..d1f9864e 100644 --- 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 index c4c88bdb..7c560603 100644 --- 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"; From 932f300710ed3cbf3b69fd3ac2c3b20ce2e7dcbd Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 8 Mar 2024 19:34:13 -0700 Subject: [PATCH 2/3] fix: imports --- src/abstract/FlowCommon.sol | 2 +- src/concrete/erc1155/FlowERC1155.sol | 6 +++--- src/concrete/erc20/FlowERC20.sol | 4 ++-- src/concrete/erc721/FlowERC721.sol | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/abstract/FlowCommon.sol b/src/abstract/FlowCommon.sol index 4f338ce3..b7e8830e 100644 --- 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 index b08f576f..ddc9a77c 100644 --- 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 index a266d8d5..a30bd52b 100644 --- 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 index 958c438d..1529fc96 100644 --- 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"; From fb14035b77e173bc071d648d5ba4116f4fd00572 Mon Sep 17 00:00:00 2001 From: Matt Gabrenya Date: Fri, 8 Mar 2024 19:48:34 -0700 Subject: [PATCH 3/3] build: bump rain.solmem --- lib/rain.solmem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rain.solmem b/lib/rain.solmem index 7b2f04d6..6414ab88 160000 --- a/lib/rain.solmem +++ b/lib/rain.solmem @@ -1 +1 @@ -Subproject commit 7b2f04d6e0d7d4573e6b0a17bd9c7b84a7fde05f +Subproject commit 6414ab88a017eacf2b263e9e08d0787fbd677192