Skip to content

Commit

Permalink
remove default custodian address to achieve ETH alignment✨
Browse files Browse the repository at this point in the history
  • Loading branch information
@0xgregthedev
0xgregthedev committed Jan 19, 2024
1 parent a6aaccb commit 8fdda92
Show file tree
Hide file tree
Showing 10 changed files with 156 additions and 158 deletions.
274 changes: 137 additions & 137 deletions .gas-snapshot
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/forge-std
Submodule forge-std updated 27 files
+1 −0 .gitattributes
+48 −6 .github/workflows/ci.yml
+1 −1 package.json
+666 −0 scripts/vm.py
+4 −3 src/Script.sol
+18 −5 src/StdChains.sol
+156 −15 src/StdCheats.sol
+16 −1 src/StdInvariant.sol
+18 −14 src/StdJson.sol
+54 −3 src/StdStorage.sol
+2 −2 src/StdStyle.sol
+62 −34 src/StdUtils.sol
+4 −3 src/Test.sol
+955 −368 src/Vm.sol
+216 −0 src/mocks/MockERC20.sol
+221 −0 src/mocks/MockERC721.sol
+93 −77 test/StdAssertions.t.sol
+93 −37 test/StdChains.t.sol
+167 −64 test/StdCheats.t.sol
+13 −11 test/StdError.t.sol
+27 −12 test/StdMath.t.sol
+66 −34 test/StdStorage.t.sol
+4 −4 test/StdStyle.t.sol
+66 −36 test/StdUtils.t.sol
+15 −0 test/Vm.t.sol
+441 −0 test/mocks/MockERC20.t.sol
+721 −0 test/mocks/MockERC721.t.sol
2 changes: 1 addition & 1 deletion lib/seaport
Submodule seaport updated 61 files
+22 −0 .github/workflows/docs.yml
+2 −2 .github/workflows/stale.yml
+2 −23 .github/workflows/test.yml
+284 −6 README.md
+127 −0 contracts/helpers/navigator/SeaportNavigator.sol
+20 −0 contracts/helpers/navigator/lib/CriteriaHelper.sol
+66 −12 contracts/helpers/navigator/lib/CriteriaHelperLib.sol
+18 −0 contracts/helpers/navigator/lib/ExecutionsHelper.sol
+18 −0 contracts/helpers/navigator/lib/FulfillmentsHelper.sol
+10 −0 contracts/helpers/navigator/lib/HelperInterface.sol
+194 −0 contracts/helpers/navigator/lib/HelperItemLib.sol
+43 −11 contracts/helpers/navigator/lib/MerkleLib.sol
+300 −0 contracts/helpers/navigator/lib/NavigatorAdvancedOrderLib.sol
+64 −0 contracts/helpers/navigator/lib/NavigatorContextLib.sol
+44 −0 contracts/helpers/navigator/lib/NavigatorCriteriaResolverLib.sol
+41 −0 contracts/helpers/navigator/lib/NavigatorDetailsLib.sol
+116 −0 contracts/helpers/navigator/lib/NavigatorExecutionsLib.sol
+51 −0 contracts/helpers/navigator/lib/NavigatorFulfillmentsLib.sol
+44 −0 contracts/helpers/navigator/lib/NavigatorRequestValidatorLib.sol
+36 −0 contracts/helpers/navigator/lib/NavigatorSeaportValidatorLib.sol
+434 −0 contracts/helpers/navigator/lib/NavigatorSuggestedActionLib.sol
+0 −0 contracts/helpers/navigator/lib/OrderAvailabilityLib.sol
+18 −0 contracts/helpers/navigator/lib/OrderDetailsHelper.sol
+25 −22 contracts/helpers/navigator/lib/OrderStructureLib.sol
+20 −0 contracts/helpers/navigator/lib/RequestValidator.sol
+43 −0 contracts/helpers/navigator/lib/SeaportNavigatorInterface.sol
+68 −55 contracts/helpers/navigator/lib/SeaportNavigatorTypes.sol
+18 −0 contracts/helpers/navigator/lib/SuggestedActionHelper.sol
+20 −0 contracts/helpers/navigator/lib/ValidatorHelper.sol
+0 −296 contracts/helpers/order-helper/SeaportOrderHelper.sol
+0 −718 contracts/helpers/order-helper/lib/OrderHelperLib.sol
+0 −184 contracts/helpers/order-helper/lib/SeaportOrderHelperInterface.sol
+15 −80 contracts/helpers/order-validator/SeaportValidator.sol
+722 −0 contracts/helpers/order-validator/lib/ReadOnlyOrderValidator.sol
+1 −17 contracts/helpers/order-validator/lib/SeaportValidatorInterface.sol
+10 −0 docs/AuditLink.md
+12 −3 docs/Deployment.md
+9 −0 docs/FunctionSignatures.md
+104 −71 docs/OrderValidator.md
+9 −0 docs/Overview.md
+10 −0 docs/SeaportDiagramLink.md
+9 −0 docs/SeaportDocumentation.md
+9 −0 docs/ZoneDocumentation.md
+1 −1 lib/seaport-sol
+1 −1 package.json
+92 −0 script/CallNavigator.s.sol
+217 −0 script/NavigatorDeployer.s.sol
+12 −5 test/foundry/FulfillOrderTest.t.sol
+0 −28 test/foundry/new/BaseOrderTest.sol
+9 −4 test/foundry/new/FuzzGenerators.t.sol
+669 −0 test/foundry/new/SeaportNavigator.t.sol
+61 −0 test/foundry/new/SeaportNavigatorTest.sol
+0 −669 test/foundry/new/SeaportOrderHelper.t.sol
+7 −37 test/foundry/new/SeaportValidator.t.sol
+33 −0 test/foundry/new/SeaportValidatorTest.sol
+90 −41 test/foundry/new/helpers/FuzzEngine.sol
+7 −7 test/foundry/new/helpers/FuzzEngineLib.sol
+7 −8 test/foundry/new/helpers/FuzzGenerators.sol
+12 −12 test/foundry/new/helpers/FuzzTestContextLib.sol
+2 −11 test/foundry/offerers/ContractOffersNativeTokenOfferItems.t.sol
+25 −32 yarn.lock
2 changes: 1 addition & 1 deletion lib/solady
Submodule solady updated 13 files
+62 −61 .gas-snapshot
+1 −1 package.json
+26 −1 src/accounts/ERC4337.sol
+1 −1 src/accounts/ERC4337Factory.sol
+1 −1 src/accounts/ERC6551.sol
+1 −1 src/accounts/ERC6551Proxy.sol
+4 −4 src/tokens/ERC6909.sol
+0 −1 src/utils/ERC1967Factory.sol
+0 −4 src/utils/LibClone.sol
+6 −7 src/utils/LibPRNG.sol
+7 −0 test/ERC4337.t.sol
+3 −3 test/ERC6909.t.sol
+2 −2 test/utils/mocks/MockERC6909.sol
2 changes: 1 addition & 1 deletion lib/solmate
Submodule solmate updated 14 files
+211 −181 .gas-snapshot
+1 −0 README.md
+1 −1 package-lock.json
+1 −1 package.json
+26 −1 src/test/CREATE3.t.sol
+378 −0 src/test/ERC6909.t.sol
+1 −2 src/test/SafeCastLib.t.sol
+14 −0 src/test/SignedWadMath.t.sol
+22 −0 src/test/utils/mocks/MockERC6909.sol
+118 −0 src/tokens/ERC6909.sol
+5 −1 src/utils/CREATE3.sol
+1 −1 src/utils/SafeCastLib.sol
+7 −7 src/utils/SafeTransferLib.sol
+12 −2 src/utils/SignedWadMath.sol
2 changes: 0 additions & 2 deletions src/Starport.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ contract Starport is PausableNonReentrant {

Stargate public immutable SG;
uint256 public immutable chainId;
address public immutable defaultCustodian;
bytes32 public immutable DEFAULT_CUSTODIAN_CODE_HASH;
bytes32 public immutable CACHED_DOMAIN_SEPARATOR;

Expand Down Expand Up @@ -173,7 +172,6 @@ contract Starport is PausableNonReentrant {
assembly ("memory-safe") {
defaultCustodianCodeHash := extcodehash(custodian)
}
defaultCustodian = custodian;
DEFAULT_CUSTODIAN_CODE_HASH = defaultCustodianCodeHash;
_initializeOwner(msg.sender);
}
Expand Down
2 changes: 1 addition & 1 deletion test/StarportTest.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ contract StarportTest is BaseOrderTest, Stargate {
fulfiller = makeAndAllocateAccount("fulfiller");

SP = new Starport(address(consideration), Stargate(address(this)));
custodian = Custodian(payable(SP.defaultCustodian()));
custodian = new Custodian(SP, address(consideration));
SO = new StrategistOriginator(SP, strategist.addr, 1e16, address(this));
pricing = new SimpleInterestPricing(SP);
settlement = new FixedTermDutchAuctionSettlement(SP);
Expand Down
2 changes: 1 addition & 1 deletion test/fuzz-testing/TestFuzzStarport.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ contract TestFuzzStarport is StarportTest, Bound, DeepEq {

loan.debt = debt;
loan.borrower = borrower.addr;
loan.custodian = SP.defaultCustodian();
loan.custodian = address(custodian);
loan.issuer = lender.addr;
return loan;
}
Expand Down
8 changes: 4 additions & 4 deletions test/integration-testing/TestNewLoan.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ contract TestNewLoan is StarportTest {
Starport.Loan memory loan = generateDefaultLoanTerms();

StrategistOriginator.Details memory newLoanDetails = StrategistOriginator.Details({
custodian: SP.defaultCustodian(),
custodian: address(custodian),
issuer: lender.addr,
deadline: block.number + 8,
offer: StrategistOriginator.Offer({
Expand Down Expand Up @@ -311,14 +311,14 @@ contract TestNewLoan is StarportTest {
);
assert(erc20s[0].balanceOf(borrower.addr) == borrowerBalanceBefore + loan.debt[0].amount);
assert(erc20s[0].balanceOf(lender.addr) == lenderBalanceBefore - loan.debt[0].amount);
assert(erc721s[0].ownerOf(loan.collateral[0].identifier) == address(SP.defaultCustodian()));
assert(erc721s[0].ownerOf(loan.collateral[0].identifier) == address(address(custodian)));
}

function testNewLoanViaOriginatorBorrowerApprovalAndLenderApproval() public {
Starport.Loan memory loan = generateDefaultLoanTerms();

StrategistOriginator.Details memory newLoanDetails = StrategistOriginator.Details({
custodian: SP.defaultCustodian(),
custodian: address(custodian),
issuer: lender.addr,
deadline: block.number + 8,
offer: StrategistOriginator.Offer({
Expand Down Expand Up @@ -354,7 +354,7 @@ contract TestNewLoan is StarportTest {
);
assert(erc20s[0].balanceOf(borrower.addr) == borrowerBalanceBefore + loan.debt[0].amount);
assert(erc20s[0].balanceOf(lender.addr) == lenderBalanceBefore - loan.debt[0].amount);
assert(erc721s[0].ownerOf(loan.collateral[0].identifier) == address(SP.defaultCustodian()));
assert(erc721s[0].ownerOf(loan.collateral[0].identifier) == address(address(custodian)));
}

event log_receivedItems(ReceivedItem[] items);
Expand Down
18 changes: 9 additions & 9 deletions test/unit-testing/TestStrategistOriginator.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ contract TestStrategistOriginator is StarportTest, DeepEq {
Starport.Loan memory loan = generateDefaultLoanTerms();

StrategistOriginator.Details memory newLoanDetails = StrategistOriginator.Details({
custodian: SP.defaultCustodian(),
custodian: address(custodian),
issuer: lender.addr,
deadline: block.timestamp + 8,
offer: StrategistOriginator.Offer({
Expand Down Expand Up @@ -108,7 +108,7 @@ contract TestStrategistOriginator is StarportTest, DeepEq {
Starport.Loan memory loan = generateDefaultLoanTerms();

StrategistOriginator.Details memory newLoanDetails = StrategistOriginator.Details({
custodian: SP.defaultCustodian(),
custodian: address(custodian),
issuer: lender.addr,
deadline: block.timestamp + 8,
offer: StrategistOriginator.Offer({
Expand Down Expand Up @@ -151,7 +151,7 @@ contract TestStrategistOriginator is StarportTest, DeepEq {
Starport.Loan memory loan = generateDefaultLoanTerms();

StrategistOriginator.Details memory newLoanDetails = StrategistOriginator.Details({
custodian: SP.defaultCustodian(),
custodian: address(custodian),
issuer: lender.addr,
deadline: block.timestamp + 8,
offer: StrategistOriginator.Offer({
Expand Down Expand Up @@ -194,7 +194,7 @@ contract TestStrategistOriginator is StarportTest, DeepEq {
Starport.Loan memory loan = generateDefaultLoanTerms();

StrategistOriginator.Details memory newLoanDetails = StrategistOriginator.Details({
custodian: SP.defaultCustodian(),
custodian: address(custodian),
issuer: lender.addr,
deadline: block.timestamp + 8,
offer: StrategistOriginator.Offer({
Expand Down Expand Up @@ -238,7 +238,7 @@ contract TestStrategistOriginator is StarportTest, DeepEq {
loan.debt[0].amount = 0;

StrategistOriginator.Details memory newLoanDetails = StrategistOriginator.Details({
custodian: SP.defaultCustodian(),
custodian: address(custodian),
issuer: lender.addr,
deadline: block.timestamp + 8,
offer: StrategistOriginator.Offer({
Expand Down Expand Up @@ -280,7 +280,7 @@ contract TestStrategistOriginator is StarportTest, DeepEq {
Starport.Loan memory loan = generateDefaultLoanTerms();

StrategistOriginator.Details memory newLoanDetails = StrategistOriginator.Details({
custodian: SP.defaultCustodian(),
custodian: address(custodian),
issuer: lender.addr,
deadline: block.timestamp + 8,
offer: StrategistOriginator.Offer({
Expand Down Expand Up @@ -322,7 +322,7 @@ contract TestStrategistOriginator is StarportTest, DeepEq {
Starport.Loan memory loan = generateDefaultLoanTerms();

StrategistOriginator.Details memory newLoanDetails = StrategistOriginator.Details({
custodian: SP.defaultCustodian(),
custodian: address(custodian),
issuer: lender.addr,
deadline: block.timestamp + 8,
offer: StrategistOriginator.Offer({
Expand Down Expand Up @@ -366,7 +366,7 @@ contract TestStrategistOriginator is StarportTest, DeepEq {
Starport.Loan memory loan = generateDefaultLoanTerms();

StrategistOriginator.Details memory newLoanDetails = StrategistOriginator.Details({
custodian: SP.defaultCustodian(),
custodian: address(custodian),
issuer: lender.addr,
deadline: block.timestamp + 8,
offer: StrategistOriginator.Offer({
Expand Down Expand Up @@ -410,7 +410,7 @@ contract TestStrategistOriginator is StarportTest, DeepEq {
Starport.Loan memory loan = generateDefaultLoanTerms();

StrategistOriginator.Details memory newLoanDetails = StrategistOriginator.Details({
custodian: SP.defaultCustodian(),
custodian: address(custodian),
issuer: lender.addr,
deadline: block.timestamp + 8,
offer: StrategistOriginator.Offer({
Expand Down

0 comments on commit 8fdda92

Please sign in to comment.