Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 lib/forge-std
Submodule forge-std updated 48 files
+1 −0 .github/CODEOWNERS
+54 −100 .github/workflows/ci.yml
+193 −0 CONTRIBUTING.md
+20 −4 README.md
+3 −1 foundry.toml
+1 −1 package.json
+12 −1 scripts/vm.py
+16 −9 src/Base.sol
+1 −0 src/Script.sol
+142 −47 src/StdAssertions.sol
+30 −3 src/StdChains.sol
+17 −5 src/StdCheats.sol
+30 −0 src/StdConstants.sol
+104 −0 src/StdJson.sol
+3 −3 src/StdStorage.sol
+104 −0 src/StdToml.sol
+0 −18 src/StdUtils.sol
+1 −0 src/Test.sol
+780 −75 src/Vm.sol
+471 −463 src/console.sol
+1 −1 src/interfaces/IERC1155.sol
+3 −3 src/interfaces/IERC4626.sol
+72 −0 src/interfaces/IERC6909.sol
+1 −1 src/interfaces/IERC721.sol
+150 −0 src/interfaces/IERC7540.sol
+241 −0 src/interfaces/IERC7575.sol
+0 −234 src/mocks/MockERC20.sol
+0 −231 src/mocks/MockERC721.sol
+693 −4 src/safeconsole.sol
+44 −0 test/CommonBase.t.sol
+1 −5 test/StdAssertions.t.sol
+21 −20 test/StdChains.t.sol
+55 −34 test/StdCheats.t.sol
+38 −0 test/StdConstants.t.sol
+12 −12 test/StdError.t.sol
+1 −1 test/StdJson.t.sol
+4 −14 test/StdMath.t.sol
+33 −8 test/StdStorage.t.sol
+1 −1 test/StdStyle.t.sol
+1 −1 test/StdToml.t.sol
+12 −12 test/StdUtils.t.sol
+9 −6 test/Vm.t.sol
+1 −1 test/compilation/CompilationScript.sol
+1 −1 test/compilation/CompilationScriptBase.sol
+1 −1 test/compilation/CompilationTest.sol
+1 −1 test/compilation/CompilationTestBase.sol
+0 −441 test/mocks/MockERC20.t.sol
+0 −721 test/mocks/MockERC721.t.sol
2 changes: 1 addition & 1 deletion packages/automation-contracts/autowrap/test/Manager.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ contract ManagerTests is FoundrySuperfluidTester {
new Manager(address(sf.cfa), 2, 1);
}

function testDeploymentCheckData() public {
function testDeploymentCheckData() public view {
assertEq(address(manager.cfaV1()), address(sf.cfa), "manager.cfaV1 not equal");
assertEq(manager.owner(), admin, "manager.owner not equal");
assertEq(manager.minLower(), MIN_LOWER, "manager.minLower not equal");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ contract WrapStrategyTests is FoundrySuperfluidTester {

// SuperToken

function testSupportedSuperToken() public {
function testSupportedSuperToken() public view {
assertTrue(
wrapStrategy.isSupportedSuperToken(superToken),
"SuperToken should be supported"
);
}

function testCannotNonSupportedSuperToken() public {
function testCannotNonSupportedSuperToken() public view {
assertTrue(
!wrapStrategy.isSupportedSuperToken(nativeSuperToken),
"Native SuperToken shouldn't be supported"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ contract VestingSchedulerV2 is IVestingSchedulerV2, SuperAppBase {
if (!disableClaimCheck && schedule.claimValidityDate != 0)
revert ScheduleNotClaimed();

// Ensure that the claming date is after the cliff/flow date and before the claim validity date
// Ensure that the claiming date is after the cliff/flow date and before the claim validity date
if (schedule.cliffAndFlowDate > block.timestamp ||
_lteDateToExecuteCliffAndFlow(schedule) < block.timestamp)
revert TimeWindowInvalid();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ using SuperTokenV1Library for ISuperToken;
* The contract uses ERC-20 allowance and Superfluid ACL flow operator permissions
* to automate the vesting on behalf of the sender.
* The contract is designed to be used with an off-chain automation to execute the vesting start and end.
* The start and end executions are permisionless.
* The start and end executions are permissionless.
* Execution delays are handled with token transfer compensations, but watch out for complete expiries!
* @custom:metadata The official addresses and subgraphs can be found from @superfluid-finance/metadata package.
*/
Expand Down Expand Up @@ -760,7 +760,7 @@ contract VestingSchedulerV3 is IVestingSchedulerV3, IRelayRecipient {
revert ScheduleNotClaimed();
}

// Ensure that the claming date is after the cliff/flow date and before the claim validity date
// Ensure that the claiming date is after the cliff/flow date and before the claim validity date
if (schedule.cliffAndFlowDate > block.timestamp || _lteDateToExecuteCliffAndFlow(schedule) < block.timestamp) {
revert TimeWindowInvalid();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ contract FlowSchedulerTest is FoundrySuperfluidTester {
bytes userData
);

/// @dev This is required by solidity for using the SupertTokenV1Library in the tester
/// @dev This is required by solidity for using the SuperTokenV1Library in the tester
using SuperTokenV1Library for SuperToken;
constructor() FoundrySuperfluidTester(3) {}
FlowScheduler internal flowScheduler;
Expand Down Expand Up @@ -232,7 +232,7 @@ contract FlowSchedulerTest is FoundrySuperfluidTester {
superToken, alice, defaultStartDate, uint32(1000), int96(1000), defaultStartAmount, defaultStartDate + uint32(3600), "", ""
);

vm.expectRevert(0xa3eab6ac); // error CFA_ACL_OPERATOR_NO_CREATE_PERMISSIONS() -> 0xa3eab6ac
vm.expectRevert(bytes4(0xa3eab6ac)); // error CFA_ACL_OPERATOR_NO_CREATE_PERMISSIONS() -> 0xa3eab6ac
vm.warp(defaultStartDate + 1000);
vm.prank(admin);
flowScheduler.executeCreateFlow(superToken, bob,alice,"");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ contract FlowSchedulerResolverTest is FoundrySuperfluidTester {
expectUnexecutable();
}

function testDeleteNonExistantStreamAfterEndDate() public {
function testDeleteNonExistentStreamAfterEndDate() public {
vm.startPrank(alice);

uint32 defaultEndDate = defaultStartDate + uint32(3600);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ contract VestingSchedulerV2Tests is FoundrySuperfluidTester {
address superToken,
address sender,
address receiver
) public {
) public view {
VestingSchedulerV2.VestingSchedule memory schedule = vestingScheduler.getVestingSchedule(superToken, sender, receiver);
VestingSchedulerV2.VestingSchedule memory deletedSchedule;

Expand Down Expand Up @@ -2418,7 +2418,7 @@ contract VestingSchedulerV2Tests is FoundrySuperfluidTester {

uint32 newEndDate = type(uint32).max - 1234;

// Setting up a batch call. Superfluid Protocol will replace the emtpy context with data about the sender. That's where the sender is retrieved from.
// Setting up a batch call. Superfluid Protocol will replace the empty context with data about the sender. That's where the sender is retrieved from.
ISuperfluid.Operation[] memory ops = new ISuperfluid.Operation[](1);
ops[0] = ISuperfluid.Operation({
operationType: BatchOperation.OPERATION_TYPE_SUPERFLUID_CALL_APP_ACTION,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ describe("IDAv1 | Non-Callback Tests", function () {
);
});

it("#1.1.3 publisher should fail to query non-existant index", async () => {
it("#1.1.3 publisher should fail to query non-existent index", async () => {
const idata = await t.contracts.ida.getIndex(
superToken.address,
alice,
Expand Down
Loading