diff --git a/lib/rain.metadata b/lib/rain.metadata index 879bd885a..f9fb7d828 160000 --- a/lib/rain.metadata +++ b/lib/rain.metadata @@ -1 +1 @@ -Subproject commit 879bd885a13fa6233b44cf68ee3e94bec47d1751 +Subproject commit f9fb7d8288659c06cae886226395b8c2e06db9e1 diff --git a/script/Deploy.sol b/script/Deploy.sol index 10659f68d..b295eacfb 100644 --- a/script/Deploy.sol +++ b/script/Deploy.sol @@ -9,7 +9,7 @@ import { RainterpreterExpressionDeployerNPE2, RainterpreterExpressionDeployerNPE2ConstructionConfigV2 } from "../src/concrete/RainterpreterExpressionDeployerNPE2.sol"; -import {IMetaBoardV1} from "rain.metadata/interface/IMetaBoardV1.sol"; +import {IMetaBoardV1_2} from "rain.metadata/interface/unstable/IMetaBoardV1_2.sol"; import {LibDescribedByMeta} from "rain.metadata/lib/LibDescribedByMeta.sol"; /// @title Deploy @@ -19,7 +19,7 @@ contract Deploy is Script { function run() external { uint256 deployerPrivateKey = vm.envUint("DEPLOYMENT_KEY"); bytes memory constructionMeta = vm.readFileBinary("meta/RainterpreterExpressionDeployerNPE2.rain.meta"); - IMetaBoardV1 metaboard = IMetaBoardV1(vm.envAddress("DEPLOY_METABOARD_ADDRESS")); + IMetaBoardV1_2 metaboard = IMetaBoardV1_2(vm.envAddress("DEPLOY_METABOARD_ADDRESS")); vm.startBroadcast(deployerPrivateKey); diff --git a/src/abstract/BaseRainterpreterSubParserNPE2.sol b/src/abstract/BaseRainterpreterSubParserNPE2.sol index 5c7d0499d..f01134929 100644 --- a/src/abstract/BaseRainterpreterSubParserNPE2.sol +++ b/src/abstract/BaseRainterpreterSubParserNPE2.sol @@ -11,7 +11,7 @@ import {CMASK_RHS_WORD_TAIL} from "../lib/parse/LibParseCMask.sol"; import {LibParse, Operand} from "../lib/parse/LibParse.sol"; import {LibParseMeta} from "rain.interpreter.interface/lib/parse/LibParseMeta.sol"; import {LibParseOperand} from "../lib/parse/LibParseOperand.sol"; -import {IDescribedByMetaV1} from "rain.metadata/interface/unstable/IDescribedByMetaV1.sol"; +import {IDescribedByMetaV1} from "rain.metadata/interface/IDescribedByMetaV1.sol"; import {IParserToolingV1} from "rain.sol.codegen/interface/IParserToolingV1.sol"; import {ISubParserToolingV1} from "rain.sol.codegen/interface/ISubParserToolingV1.sol"; diff --git a/src/concrete/RainterpreterExpressionDeployerNPE2.sol b/src/concrete/RainterpreterExpressionDeployerNPE2.sol index e32a4c8b4..517b0596d 100644 --- a/src/concrete/RainterpreterExpressionDeployerNPE2.sol +++ b/src/concrete/RainterpreterExpressionDeployerNPE2.sol @@ -19,7 +19,7 @@ import { import {IParserV1View} from "rain.interpreter.interface/interface/deprecated/IParserV1View.sol"; import {IInterpreterV3} from "rain.interpreter.interface/interface/IInterpreterV3.sol"; import {IInterpreterStoreV2} from "rain.interpreter.interface/interface/IInterpreterStoreV2.sol"; -import {IDescribedByMetaV1} from "rain.metadata/interface/unstable/IDescribedByMetaV1.sol"; +import {IDescribedByMetaV1} from "rain.metadata/interface/IDescribedByMetaV1.sol"; import {LibIntegrityCheckNP} from "../lib/integrity/LibIntegrityCheckNP.sol"; import {LibInterpreterStateDataContractNP} from "../lib/state/LibInterpreterStateDataContractNP.sol"; diff --git a/test/src/abstract/BaseRainterpreterSubParserNPE2.ierc165.t.sol b/test/src/abstract/BaseRainterpreterSubParserNPE2.ierc165.t.sol index 2d6c88a29..e1682a487 100644 --- a/test/src/abstract/BaseRainterpreterSubParserNPE2.ierc165.t.sol +++ b/test/src/abstract/BaseRainterpreterSubParserNPE2.ierc165.t.sol @@ -5,7 +5,7 @@ import {Test} from "forge-std/Test.sol"; import {IERC165} from "openzeppelin-contracts/contracts/utils/introspection/IERC165.sol"; import {ISubParserV3} from "rain.interpreter.interface/interface/ISubParserV3.sol"; import {BaseRainterpreterSubParserNPE2} from "src/abstract/BaseRainterpreterSubParserNPE2.sol"; -import {IDescribedByMetaV1} from "rain.metadata/interface/unstable/IDescribedByMetaV1.sol"; +import {IDescribedByMetaV1} from "rain.metadata/interface/IDescribedByMetaV1.sol"; /// @dev We need a contract that is deployable in order to test the abstract /// base contract. diff --git a/test/src/concrete/RainterpreterExpressionDeployerNPE2.ierc165.t.sol b/test/src/concrete/RainterpreterExpressionDeployerNPE2.ierc165.t.sol index 15b3ac177..45e1a0846 100644 --- a/test/src/concrete/RainterpreterExpressionDeployerNPE2.ierc165.t.sol +++ b/test/src/concrete/RainterpreterExpressionDeployerNPE2.ierc165.t.sol @@ -11,7 +11,7 @@ import { import {IParserPragmaV1} from "rain.interpreter.interface/interface/IParserPragmaV1.sol"; import {IParserV2} from "rain.interpreter.interface/interface/IParserV2.sol"; import {IExpressionDeployerV4} from "rain.interpreter.interface/interface/deprecated/IExpressionDeployerV4.sol"; -import {IDescribedByMetaV1} from "rain.metadata/interface/unstable/IDescribedByMetaV1.sol"; +import {IDescribedByMetaV1} from "rain.metadata/interface/IDescribedByMetaV1.sol"; import {RainterpreterNPE2} from "src/concrete/RainterpreterNPE2.sol"; import {RainterpreterParserNPE2} from "src/concrete/RainterpreterParserNPE2.sol"; import {RainterpreterStoreNPE2} from "src/concrete/RainterpreterStoreNPE2.sol"; diff --git a/test/src/concrete/RainterpreterReferenceExternNPE2.ierc165.t.sol b/test/src/concrete/RainterpreterReferenceExternNPE2.ierc165.t.sol index 004d1a0a8..44de71d68 100644 --- a/test/src/concrete/RainterpreterReferenceExternNPE2.ierc165.t.sol +++ b/test/src/concrete/RainterpreterReferenceExternNPE2.ierc165.t.sol @@ -7,7 +7,7 @@ import {IERC165} from "openzeppelin-contracts/contracts/utils/introspection/IERC import {IInterpreterExternV3} from "rain.interpreter.interface/interface/IInterpreterExternV3.sol"; import {ISubParserV3} from "rain.interpreter.interface/interface/ISubParserV3.sol"; import {RainterpreterReferenceExternNPE2} from "src/concrete/extern/RainterpreterReferenceExternNPE2.sol"; -import {IDescribedByMetaV1} from "rain.metadata/interface/unstable/IDescribedByMetaV1.sol"; +import {IDescribedByMetaV1} from "rain.metadata/interface/IDescribedByMetaV1.sol"; contract RainterpreterReferenceExternNPE2IERC165Test is Test { /// Test that ERC165 is implemented for the reference extern contract. diff --git a/test/src/lib/op/evm/LibOpBlockNumberNP.t.sol b/test/src/lib/op/evm/LibOpBlockNumberNP.t.sol index 253271539..ce6021847 100644 --- a/test/src/lib/op/evm/LibOpBlockNumberNP.t.sol +++ b/test/src/lib/op/evm/LibOpBlockNumberNP.t.sol @@ -11,7 +11,7 @@ import { FullyQualifiedNamespace } from "rain.interpreter.interface/interface/deprecated/IInterpreterV2.sol"; import {LibStackPointer} from "rain.solmem/lib/LibStackPointer.sol"; -import {IMetaV1} from "rain.metadata/interface/IMetaV1.sol"; +import {IMetaV1} from "rain.metadata/interface/deprecated/IMetaV1.sol"; import {IInterpreterStoreV2} from "rain.interpreter.interface/interface/IInterpreterStoreV2.sol"; import {LibInterpreterStateNP, InterpreterStateNP} from "src/lib/state/LibInterpreterStateNP.sol"; import {IntegrityCheckStateNP, BadOpInputsLength} from "src/lib/integrity/LibIntegrityCheckNP.sol"; diff --git a/test/src/lib/op/evm/LibOpChainIdNP.t.sol b/test/src/lib/op/evm/LibOpChainIdNP.t.sol index e0e34b557..1470fa4a3 100644 --- a/test/src/lib/op/evm/LibOpChainIdNP.t.sol +++ b/test/src/lib/op/evm/LibOpChainIdNP.t.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {Pointer} from "rain.solmem/lib/LibPointer.sol"; import {LibStackPointer} from "rain.solmem/lib/LibStackPointer.sol"; -import {IMetaV1} from "rain.metadata/interface/IMetaV1.sol"; +import {IMetaV1} from "rain.metadata/interface/deprecated/IMetaV1.sol"; import {OpTest} from "test/abstract/OpTest.sol"; import {INVALID_BYTECODE} from "test/lib/etch/LibEtch.sol";