Skip to content

Commit

Permalink
feat: deployment on Ethereum
Browse files Browse the repository at this point in the history
  • Loading branch information
sogipec committed Jan 10, 2024
1 parent fd204ee commit fbf90e1
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"coverage": "FOUNDRY_PROFILE=dev forge coverage --report lcov && yarn lcov:clean && yarn lcov:generate-html",
"compile": "forge build",
"compile:dev": "FOUNDRY_PROFILE=dev forge build",
"deploy": "forge script --skip test --broadcast --verify --slow -vvvv --rpc-url polygonzkevm scripts/DeploySavings.s.sol",
"deploy": "forge script --skip test --broadcast --verify --slow -vvvv --rpc-url mainnet scripts/DeployTransmuterWithoutFacets.s.sol",
"deploy:fork": "source .env && forge script --skip test --slow --fork-url fork --broadcast scripts/DeployTransmuterWithoutFacets.s.sol -vvvv",
"generate": "FOUNDRY_PROFILE=dev forge script scripts/utils/GenerateSelectors.s.sol",
"deploy:check": "FOUNDRY_PROFILE=dev forge script --fork-url fork scripts/test/CheckTransmuter.s.sol",
Expand Down
2 changes: 1 addition & 1 deletion scripts/DeploySavingsNoImplem.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ contract DeploySavingsNoImplem is Utils {
1
);

MockTreasury(treasury).addMinter(agToken, saving);
MockTreasury(treasury).addMinter(saving);
vm.stopBroadcast();
}
}
13 changes: 5 additions & 8 deletions scripts/DeployTransmuterWithoutFacets.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,10 @@ contract DeployTransmuterWithoutFacets is TransmuterDeploymentHelper {
// TODO change before actual deployment and replace with actual addresses inherited from other
// deployment

address agToken = address(new MockToken("agUSD", "agUSD", 18));
address treasury = address(new MockTreasury());
address accessControlManager = ACCESS_CONTROL_MANAGER;
/*
address agToken = AGEUR;
address treasury = 0x5d34839A3d4051f630D36e26698d53c58DD39072;
*/
address agToken = 0x0000206329b97DB379d5E1Bf586BbDB969C63274;
address treasury = 0xf8588520E760BB0b3bDD62Ecb25186A28b0830ee;
address accessControlManager = 0x3fc5a1bd4d0A435c55374208A6A81535A1923039;

config = address(new ProductionUSD()); // Config
// Already deployed
address dummyImplementation = 0x5d34839A3d4051f630D36e26698d53c58DD39072;
Expand All @@ -61,7 +58,7 @@ contract DeployTransmuterWithoutFacets is TransmuterDeploymentHelper {

console.log("Transmuter deployed at: %s", address(transmuter));

MockTreasury(treasury).addMinter(agToken, address(transmuter));
MockTreasury(treasury).addMinter(address(transmuter));
vm.stopBroadcast();
// TODO: test minting afterwards
}
Expand Down
3 changes: 2 additions & 1 deletion scripts/utils/TransmuterDeploymentHelper.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ contract TransmuterDeploymentHelper is Utils {

bytes memory initCode = abi.encodePacked(type(DiamondProxy).creationCode, abi.encode(cut, _init, _calldata));
console.logBytes(initCode);
console.logBytes(abi.encode(cut, _init, _calldata));

// Deploy diamond
string memory jsonVanity = vm.readFile(JSON_VANITY_PATH);
Expand All @@ -171,7 +172,7 @@ contract TransmuterDeploymentHelper is Utils {

address computedAddress = create2Factory.findCreate2Address(salt, initCode);
console.log("Supposed to deploy: %s", address(computedAddress));
if (computedAddress != 0x222222924577c40Fc916D87e7A6f0c94Ab4a29CB) revert InvalidVanityAddress();
if (computedAddress != 0x222222fD79264BBE280b4986F6FEfBC3524d0137) revert InvalidVanityAddress();

transmuter = ITransmuter(create2Factory.safeCreate2(salt, initCode));
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/utils/VanityAddress.s.sol

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions scripts/vanity.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"init": 1533053,
"salt": "0xfda462548ce04282f4b6d6619823a7c64fdc018500000000000000000017647d"
"init": 1578073,
"salt": "0xfda462548ce04282f4b6d6619823a7c64fdc0185000000000000000000181459"
}
6 changes: 4 additions & 2 deletions test/mock/MockTreasury.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ interface IStablecoin {
}

contract MockTreasury {
function addMinter(address _agToken, address _minter) external {
IStablecoin(_agToken).addMinter(_minter);
uint256 public counter;

function addMinter(address) external {
counter += 1;
}
}

0 comments on commit fbf90e1

Please sign in to comment.