Skip to content

codegen: use LibCodeGen.addressConstantString instead of a local copy #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thedavidmeister wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −20
Open

codegen: use LibCodeGen.addressConstantString instead of a local copy #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ forge-std = "1.16.1"
"rain-factory" = "0.1.1"
"rain-math-fixedpoint" = "0.2.0"
"rain-math-float" = "0.1.1"
"rain-sol-codegen" = "0.1.0"
"rain-sol-codegen" = "0.1.3"
"rain-solmem" = "0.1.3"
"rain-tofu-erc20-decimals" = "0.1.1"
"rain-vats" = "0.1.6"
Expand Down
2 changes: 1 addition & 1 deletion remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ rain-extrospection-0.1.1/=dependencies/rain-extrospection-0.1.1/
rain-factory-0.1.1/=dependencies/rain-factory-0.1.1/
rain-math-fixedpoint-0.2.0/=dependencies/rain-math-fixedpoint-0.2.0/
rain-math-float-0.1.1/=dependencies/rain-math-float-0.1.1/
rain-sol-codegen-0.1.0/=dependencies/rain-sol-codegen-0.1.0/
rain-sol-codegen-0.1.3/=dependencies/rain-sol-codegen-0.1.3/
rain-solmem-0.1.3/=dependencies/rain-solmem-0.1.3/
rain-tofu-erc20-decimals-0.1.1/=dependencies/rain-tofu-erc20-decimals-0.1.1/
rain-vats-0.1.6/=dependencies/rain-vats-0.1.6/
Expand Down
22 changes: 8 additions & 14 deletions script/BuildPointers.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ pragma solidity =0.8.25;

import {Script} from "forge-std-1.16.1/src/Script.sol";
import {VmSafe} from "forge-std-1.16.1/src/Vm.sol";
import {LibCodeGen} from "rain-sol-codegen-0.1.0/src/lib/LibCodeGen.sol";
import {LibFs} from "rain-sol-codegen-0.1.0/src/lib/LibFs.sol";
import {LibCodeGen} from "rain-sol-codegen-0.1.3/src/lib/LibCodeGen.sol";
import {LibFs} from "rain-sol-codegen-0.1.3/src/lib/LibFs.sol";
import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol";
import {StoxReceipt} from "../src/concrete/StoxReceipt.sol";
import {StoxReceiptVault} from "../src/concrete/StoxReceiptVault.sol";
Expand Down Expand Up @@ -51,17 +51,6 @@ contract BuildPointers is Script {
return tag;
}

function addressConstantString(address addr) internal pure returns (string memory) {
return string.concat(
"\n",
"/// @dev The deterministic deploy address of the contract when deployed via\n",
"/// the Zoltu factory.\n",
"address constant DEPLOYED_ADDRESS = address(",
vm.toString(addr),
");\n"
);
}

/// @notice Deploys a contract via the Zoltu factory and generates its
/// pointer file containing `DEPLOYED_ADDRESS`, `CREATION_CODE`, and
/// `RUNTIME_CODE` constants.
Expand All @@ -81,7 +70,12 @@ contract BuildPointers is Script {
deployed,
string.concat(deployTag(), "/", name),
string.concat(
addressConstantString(deployed),
LibCodeGen.addressConstantString(
vm,
"/// @dev The deterministic deploy address of the contract when deployed via\n/// the Zoltu factory.",
"DEPLOYED_ADDRESS",
deployed
),
LibCodeGen.bytesConstantString(
vm, "/// @dev The creation bytecode of the contract.", "CREATION_CODE", creationCode
),
Expand Down
8 changes: 4 additions & 4 deletions soldeer.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ integrity = "dccdd4406a37db6af690872b805084a7dbe5211c57961a61ef083a7912ddbdc9"

[[dependencies]]
name = "rain-sol-codegen"
version = "0.1.0"
url = "https://soldeer-revisions.s3.amazonaws.com/rain-sol-codegen/0_1_0_09-05-2026_20:30:25_rain.sol.zip"
checksum = "6b5abd394c5db86ac64214262b7a5115158f480b2fbd74442672dfe52bb67310"
integrity = "e22748ce2ba7eca3ce71e23b2271d1c0f370b989507e784b0a4850a7a9e52157"
version = "0.1.3"
url = "https://soldeer-revisions.s3.amazonaws.com/rain-sol-codegen/0_1_3_15-07-2026_08:55:10_rain.sol.zip"
checksum = "e9b8fa2e32ad2c5e2ea6c4f32a909c4d8969b207a486fdbe9d542f14b4125143"
integrity = "f78a6eee689ce93859736cb7d3b149802168e400688512b8865cf625e0bf3534"

[[dependencies]]
name = "rain-solmem"
Expand Down
Loading