Skip to content

Commit

Permalink
Merge pull request #220 from Axis-Fi/env-cleanup
Browse files Browse the repository at this point in the history 
Improvements to Deployment Addresses
  • Loading branch information
@Oighty
Oighty authored Jul 11, 2024
2 parents 947dd4b + 497979b commit 4171e11
Show file tree
Hide file tree
Showing 11 changed files with 488 additions and 410 deletions.
190 changes: 129 additions & 61 deletions script/deploy/Deploy.s.sol
View file

Large diffs are not rendered by default.

54 changes: 27 additions & 27 deletions script/deploy/DeployBlast.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ contract DeployBlast is Deploy {
console2.log("");
console2.log("Deploying BlastAtomicAuctionHouse");

address owner = _getAddressNotZero("axis.OWNER");
address protocol = _getAddressNotZero("axis.PROTOCOL");
address permit2 = _getAddressNotZero("axis.PERMIT2");
address blast = _getAddressNotZero("blast.blast");
address blastWeth = _getAddressNotZero("blast.weth");
address blastUsdb = _getAddressNotZero("blast.usdb");
address owner = _getAddressNotZero("constants.axis.OWNER");
address protocol = _getAddressNotZero("constants.axis.PROTOCOL");
address permit2 = _getAddressNotZero("constants.axis.PERMIT2");
address blast = _getAddressNotZero("constants.blast.blast");
address blastWeth = _getAddressNotZero("constants.blast.weth");
address blastUsdb = _getAddressNotZero("constants.blast.usdb");

// Get the salt
bytes32 salt_ = _getSalt(
Expand Down Expand Up @@ -60,12 +60,12 @@ contract DeployBlast is Deploy {
console2.log("");
console2.log("Deploying BlastBatchAuctionHouse");

address owner = _getAddressNotZero("axis.OWNER");
address protocol = _getAddressNotZero("axis.PROTOCOL");
address permit2 = _getAddressNotZero("axis.PERMIT2");
address blast = _getAddressNotZero("blast.blast");
address blastWeth = _getAddressNotZero("blast.weth");
address blastUsdb = _getAddressNotZero("blast.usdb");
address owner = _getAddressNotZero("constants.axis.OWNER");
address protocol = _getAddressNotZero("constants.axis.PROTOCOL");
address permit2 = _getAddressNotZero("constants.axis.PERMIT2");
address blast = _getAddressNotZero("constants.blast.blast");
address blastWeth = _getAddressNotZero("constants.blast.weth");
address blastUsdb = _getAddressNotZero("constants.blast.usdb");

// Get the salt
bytes32 salt_ = _getSalt(
Expand Down Expand Up @@ -103,8 +103,8 @@ contract DeployBlast is Deploy {
console2.log("");
console2.log("Deploying BlastEMP (Encrypted Marginal Price)");

address batchAuctionHouse = _getAddressNotZero("axis.BatchAuctionHouse");
address blast = _getAddressNotZero("blast.blast");
address batchAuctionHouse = _getAddressNotZero("deployments.BatchAuctionHouse");
address blast = _getAddressNotZero("constants.blast.blast");

// Get the salt
bytes32 salt_ =
Expand All @@ -123,16 +123,16 @@ contract DeployBlast is Deploy {
}
console2.log(" BlastEMP deployed at:", address(amEmp));

return (address(amEmp), _PREFIX_AXIS);
return (address(amEmp), _PREFIX_AUCTION_MODULES);
}

function deployFixedPriceSale(bytes memory) public override returns (address, string memory) {
// No args used
console2.log("");
console2.log("Deploying BlastFPS (Fixed Price Sale)");

address atomicAuctionHouse = _getAddressNotZero("axis.AtomicAuctionHouse");
address blast = _getAddressNotZero("blast.blast");
address atomicAuctionHouse = _getAddressNotZero("deployments.AtomicAuctionHouse");
address blast = _getAddressNotZero("constants.blast.blast");

// Get the salt
bytes32 salt_ =
Expand All @@ -151,16 +151,16 @@ contract DeployBlast is Deploy {
}
console2.log(" BlastFPS deployed at:", address(amFps));

return (address(amFps), _PREFIX_AXIS);
return (address(amFps), _PREFIX_AUCTION_MODULES);
}

function deployFixedPriceBatch(bytes memory) public override returns (address, string memory) {
// No args used
console2.log("");
console2.log("Deploying BlastFPB (Fixed Price Batch)");

address batchAuctionHouse = _getAddressNotZero("axis.BatchAuctionHouse");
address blast = _getAddressNotZero("blast.blast");
address batchAuctionHouse = _getAddressNotZero("deployments.BatchAuctionHouse");
address blast = _getAddressNotZero("constants.blast.blast");

// Get the salt
bytes32 salt_ =
Expand All @@ -179,7 +179,7 @@ contract DeployBlast is Deploy {
}
console2.log(" BlastFPB deployed at:", address(amFpb));

return (address(amFpb), _PREFIX_AXIS);
return (address(amFpb), _PREFIX_AUCTION_MODULES);
}

function deployAtomicLinearVesting(bytes memory)
Expand All @@ -191,8 +191,8 @@ contract DeployBlast is Deploy {
console2.log("");
console2.log("Deploying BlastLinearVesting (Atomic)");

address atomicAuctionHouse = _getAddressNotZero("axis.AtomicAuctionHouse");
address blast = _getAddressNotZero("blast.blast");
address atomicAuctionHouse = _getAddressNotZero("deployments.AtomicAuctionHouse");
address blast = _getAddressNotZero("constants.blast.blast");

// Get the salt
bytes32 salt_ = _getSalt(
Expand All @@ -214,7 +214,7 @@ contract DeployBlast is Deploy {
}
console2.log(" LinearVesting (Atomic) deployed at:", address(dmAtomicLinearVesting));

return (address(dmAtomicLinearVesting), _PREFIX_AXIS);
return (address(dmAtomicLinearVesting), _PREFIX_DERIVATIVE_MODULES);
}

function deployBatchLinearVesting(bytes memory)
Expand All @@ -226,8 +226,8 @@ contract DeployBlast is Deploy {
console2.log("");
console2.log("Deploying LinearVesting (Batch)");

address batchAuctionHouse = _getAddressNotZero("axis.BatchAuctionHouse");
address blast = _getAddressNotZero("blast.blast");
address batchAuctionHouse = _getAddressNotZero("deployments.BatchAuctionHouse");
address blast = _getAddressNotZero("constants.blast.blast");

// Get the salt
bytes32 salt_ = _getSalt(
Expand All @@ -249,6 +249,6 @@ contract DeployBlast is Deploy {
}
console2.log(" LinearVesting (Batch) deployed at:", address(dmBatchLinearVesting));

return (address(dmBatchLinearVesting), _PREFIX_AXIS);
return (address(dmBatchLinearVesting), _PREFIX_DERIVATIVE_MODULES);
}
}
8 changes: 6 additions & 2 deletions script/deploy/sequences/origin.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@
},
{
"name": "EncryptedMarginalPrice",
"installBatchAuctionHouse": true
"installBatchAuctionHouse": true,
"maxReferrerFee": 1000,
"maxCuratorFee": 1000
},
{
"name": "FixedPriceBatch",
"installBatchAuctionHouse": true
"installBatchAuctionHouse": true,
"maxReferrerFee": 1000,
"maxCuratorFee": 1000
},
{
"name": "BatchLinearVesting",
Expand Down
Loading

0 comments on commit 4171e11

Please sign in to comment.