diff --git a/foundry.toml b/foundry.toml index 79c99fd..372ee38 100644 --- a/foundry.toml +++ b/foundry.toml @@ -68,14 +68,15 @@ runs = 2048 # `recursive_deps` is off, so every package an import resolves through is # declared here, including the ones reached only transitively through # `rain-math-float` (the concrete compiles `LibFormatDecimalFloat` → -# `@openzeppelin-contracts` Strings, `LibParseDecimalFloat` → `rain-string` → -# `rain-solmem`). +# `@openzeppelin-contracts` Strings and `LibParseDecimalFloat` → `rain-string`) +# and via `rain-datacontract` (`LibDataContract` re-exports `rain-solmem`'s +# `LibPointer`). [dependencies] forge-std = "1.16.2" "@openzeppelin-contracts" = "5.6.1" -"rain-solmem" = "0.1.3" +"rain-solmem" = "0.1.26" "rain-string" = "0.2.0" -"rain-datacontract" = "0.1.0" +"rain-datacontract" = "0.1.3" "rain-deploy" = "0.1.7" "rain-sol-codegen" = "0.1.36" # The library half. Provides LibDecimalFloat, LibDecimalFloatImplementation, diff --git a/script/lib/LibEtchLogTables.sol b/script/lib/LibEtchLogTables.sol index 6f35e2c..5faa305 100644 --- a/script/lib/LibEtchLogTables.sol +++ b/script/lib/LibEtchLogTables.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.25; import {Vm} from "forge-std-1.16.2/src/Vm.sol"; -import {LibDataContract} from "rain-datacontract-0.1.0/src/lib/LibDataContract.sol"; +import {LibDataContract} from "rain-datacontract-0.1.3/src/lib/LibDataContract.sol"; import {LibDecimalFloatDeploy} from "src/lib/deploy/LibDecimalFloatDeploy.sol"; /// @notice Shared logic for planting the log-tables data contract at its diff --git a/soldeer.lock b/soldeer.lock index c23a33d..77b7311 100644 --- a/soldeer.lock +++ b/soldeer.lock @@ -14,10 +14,10 @@ integrity = "5fb4325b60d7d4194bd0481e2f94398cf1d9c6561dd12a66fb2748ef4a68205f" [[dependencies]] name = "rain-datacontract" -version = "0.1.0" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-datacontract/0_1_0_09-05-2026_20:00:31_rain.zip" -checksum = "81f6369a5e57da280d4598f0e909a66a432a1a8468c2f06b68dfdc2fe36745bd" -integrity = "f2e43fcbe27e7251ff981285271eec0a5ad49e1425dd02213f8a03df404f6670" +version = "0.1.3" +url = "https://soldeer-revisions.s3.amazonaws.com/rain-datacontract/0_1_3_19-08-2026_18:14:02_rain.zip" +checksum = "da3a03e3b7c9b8a412d845c1883d3cd314b6b6658f135d873a4555ed27104c0c" +integrity = "4f1f3506f2ed77dac66a5996776ff434b1769a316efc26d878a2948dcc4bbcc1" [[dependencies]] name = "rain-deploy" @@ -42,10 +42,10 @@ integrity = "164e2655ac8b66bcf52c799421706d3dfaab987addaaeadd74574e70fd2eb6ed" [[dependencies]] name = "rain-solmem" -version = "0.1.3" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-solmem/0_1_3_09-05-2026_19:49:33_rain.zip" -checksum = "1d405bb81f7c9e56d1717de0d60da918d2fc2fa4db083efd2abe9906378d019f" -integrity = "e879d2743f9d884f647b9dd489889a83f2cea5f76eb69409a113e1baa69d3643" +version = "0.1.26" +url = "https://soldeer-revisions.s3.amazonaws.com/rain-solmem/0_1_26_18-08-2026_16:20:17_rain.zip" +checksum = "291a0acf805b8acd65dfb9e848e6670bde158120bb5b0bcdeeaf17c4084a134c" +integrity = "54e56c1b10d05df72c1c3dcc8df92b99b9f01cd946363158b077c779ce4d20fa" [[dependencies]] name = "rain-string" diff --git a/src/abstract/DecimalFloatDeploySuites.sol b/src/abstract/DecimalFloatDeploySuites.sol index ba28149..fe2a1c1 100644 --- a/src/abstract/DecimalFloatDeploySuites.sol +++ b/src/abstract/DecimalFloatDeploySuites.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.25; import {DeployCandidate, DeploySuite, RainDeploySuitesBase} from "./RainDeploySuitesBase.sol"; -import {LibDataContract} from "rain-datacontract-0.1.0/src/lib/LibDataContract.sol"; +import {LibDataContract} from "rain-datacontract-0.1.3/src/lib/LibDataContract.sol"; import {DecimalFloat} from "../concrete/DecimalFloat.sol"; import { CREATION_CODE as LOG_TABLES_CREATION_CODE_CANDIDATE, diff --git a/test/abstract/LogTest.sol b/test/abstract/LogTest.sol index 6b148e3..74ff53c 100644 --- a/test/abstract/LogTest.sol +++ b/test/abstract/LogTest.sol @@ -5,13 +5,11 @@ pragma solidity =0.8.25; // Re-export console2 here for convenience. // forge-lint: disable-next-line(unused-import) import {Test, console2} from "forge-std-1.16.2/src/Test.sol"; -import {DataContractMemoryContainer, LibDataContract} from "rain-datacontract-0.1.0/src/lib/LibDataContract.sol"; +import {LibDataContract} from "rain-datacontract-0.1.3/src/lib/LibDataContract.sol"; import {LibDecimalFloatDeploy} from "src/lib/deploy/LibDecimalFloatDeploy.sol"; import {LibEtchLogTables} from "script/lib/LibEtchLogTables.sol"; abstract contract LogTest is Test { - using LibDataContract for DataContractMemoryContainer; - address sTables; /// Etch the log tables runtime at the Zoltu-deterministic deployment diff --git a/test/src/lib/deploy/LibDecimalFloatDeploy.checkLogTablesDeployed.t.sol b/test/src/lib/deploy/LibDecimalFloatDeploy.checkLogTablesDeployed.t.sol index 73f99c1..6c55420 100644 --- a/test/src/lib/deploy/LibDecimalFloatDeploy.checkLogTablesDeployed.t.sol +++ b/test/src/lib/deploy/LibDecimalFloatDeploy.checkLogTablesDeployed.t.sol @@ -4,7 +4,7 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibDecimalFloatDeploy} from "src/lib/deploy/LibDecimalFloatDeploy.sol"; -import {LibDataContract} from "rain-datacontract-0.1.0/src/lib/LibDataContract.sol"; +import {LibDataContract} from "rain-datacontract-0.1.3/src/lib/LibDataContract.sol"; import {LogTablesNotDeployed} from "rain-math-float-0.1.7/src/error/ErrDecimalFloat.sol"; /// Direct tests for `LibDecimalFloatDeploy.checkLogTablesDeployed`. These diff --git a/test/src/lib/deploy/LibDecimalFloatDeploy.t.sol b/test/src/lib/deploy/LibDecimalFloatDeploy.t.sol index 54a9828..82e8060 100644 --- a/test/src/lib/deploy/LibDecimalFloatDeploy.t.sol +++ b/test/src/lib/deploy/LibDecimalFloatDeploy.t.sol @@ -6,7 +6,7 @@ import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {LibDecimalFloatDeploy} from "src/lib/deploy/LibDecimalFloatDeploy.sol"; import {DecimalFloat} from "src/concrete/DecimalFloat.sol"; -import {LibDataContract} from "rain-datacontract-0.1.0/src/lib/LibDataContract.sol"; +import {LibDataContract} from "rain-datacontract-0.1.3/src/lib/LibDataContract.sol"; contract LibDecimalFloatDeployTest is Test { /// `LibRainDeploy.etchZoltuFactory` puts the factory bytecode at the diff --git a/test/src/lib/deploy/LibDecimalFloatDeployCandidate.t.sol b/test/src/lib/deploy/LibDecimalFloatDeployCandidate.t.sol index 170ccf5..b814977 100644 --- a/test/src/lib/deploy/LibDecimalFloatDeployCandidate.t.sol +++ b/test/src/lib/deploy/LibDecimalFloatDeployCandidate.t.sol @@ -4,7 +4,7 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; -import {LibDataContract} from "rain-datacontract-0.1.0/src/lib/LibDataContract.sol"; +import {LibDataContract} from "rain-datacontract-0.1.3/src/lib/LibDataContract.sol"; import { BYTECODE_HASH as LOG_TABLES_BYTECODE_HASH, DEPLOYED_ADDRESS as LOG_TABLES_DEPLOYED_ADDRESS,