Skip to content

Commit

Permalink
Fixes app whitelist and child parent req
Browse files Browse the repository at this point in the history
  • Loading branch information
@rrecuero
rrecuero committed Jan 8, 2024
1 parent 5be6ae1 commit cc537c5
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/apps/KintoAppRegistry.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ contract KintoAppRegistry is
address[] calldata appContracts,
uint256[4] calldata appLimits
) external override {
require(appLimits.length == 4, "Invalid app limits");
require(childToParentContract[parentContract] == address(0), "Parent contract already registered as a child");
_updateMetadata(_name, parentContract, appContracts, appLimits);
appCount++;
_safeMint(msg.sender, appCount);
Expand Down
1 change: 1 addition & 0 deletions src/wallet/KintoWallet.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ contract KintoWallet is Initializable, BaseAccount, TokenCallbackHandler, IKinto
function setAppWhitelist(address[] calldata apps, bool[] calldata flags) external override onlySelf {
require(apps.length == flags.length, "KW-apw: invalid array");
for (uint256 i = 0; i < apps.length; i++) {
require(appRegistry.getAppMetadata(apps[i]).admin != address(0), "KW-apw: app must be registered");
appWhitelist[apps[i]] = flags[i];
}
}
Expand Down
31 changes: 29 additions & 2 deletions test/KintoWallet.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ contract KintoWalletTest is AATestScaffolding, UserOp {
// deploy the counter contract
Counter counter = new Counter();
assertEq(counter.count(), 0);
address[] memory childContracts = new address[](0);
createApp(_owner, "test", address(counter), childContracts);

// send a transaction to the counter contract through our wallet
// without a paymaster and without prefunding the wallet
Expand All @@ -185,7 +187,8 @@ contract KintoWalletTest is AATestScaffolding, UserOp {
// deploy the counter contract
Counter counter = new Counter();
assertEq(counter.count(), 0);

address[] memory childContracts = new address[](0);
createApp(_owner, "test", address(counter), childContracts);
// prefund wallet
vm.deal(address(_kintoWalletv1), 1 ether);

Expand Down Expand Up @@ -257,6 +260,8 @@ contract KintoWalletTest is AATestScaffolding, UserOp {
assertEq(counter.count(), 0);
vm.stopPrank();
_fundPaymasterForContract(address(counter));
address[] memory childContracts = new address[](0);
createApp(_owner, "test", address(counter), childContracts);
vm.startPrank(_owner);
// Let's send a transaction to the counter contract through our wallet
uint256 nonce = _kintoWalletv1.getNonce();
Expand Down Expand Up @@ -295,6 +300,8 @@ contract KintoWalletTest is AATestScaffolding, UserOp {
assertEq(counter.count(), 0);
uint256 nonce = _kintoWalletv1.getNonce();
vm.stopPrank();
address[] memory childContracts = new address[](0);
createApp(_owner, "test", address(counter), childContracts);
vm.startPrank(_owner);
_fundPaymasterForContract(address(counter));
// Let's send a transaction to the counter contract through our wallet
Expand Down Expand Up @@ -337,6 +344,8 @@ contract KintoWalletTest is AATestScaffolding, UserOp {
assertEq(counter.count(), 0);
uint256 nonce = _kintoWalletv1.getNonce();
vm.stopPrank();
address[] memory childContracts = new address[](0);
createApp(_owner, "test", address(counter), childContracts);
vm.startPrank(_owner);
_fundPaymasterForContract(address(counter));
address[] memory targets = new address[](3);
Expand Down Expand Up @@ -378,6 +387,9 @@ contract KintoWalletTest is AATestScaffolding, UserOp {
// only fund counter
_fundPaymasterForContract(address(counter));

address[] memory childContracts = new address[](0);
createApp(_owner, "test", address(counter), childContracts);

// prep batch
address[] memory targets = new address[](3);
targets[0] = address(_kintoWalletv1);
Expand Down Expand Up @@ -709,6 +721,8 @@ contract KintoWalletTest is AATestScaffolding, UserOp {

// (4). fund paymaster for Counter contract
_fundPaymasterForContract(address(counter));
address[] memory childContracts = new address[](0);
createApp(_owner, "test", address(counter), childContracts);

// (5). Set private keys
privateKeys = new uint256[](2);
Expand Down Expand Up @@ -776,6 +790,8 @@ contract KintoWalletTest is AATestScaffolding, UserOp {

// (4). fund paymaster for Counter contract
_fundPaymasterForContract(address(counter));
address[] memory childContracts = new address[](0);
createApp(_owner, "test", address(counter), childContracts);

// (5). Create 2 user ops:
userOps = new UserOperation[](2);
Expand Down Expand Up @@ -841,6 +857,8 @@ contract KintoWalletTest is AATestScaffolding, UserOp {

// (4). fund paymaster for Counter contract
_fundPaymasterForContract(address(counter));
address[] memory childContracts = new address[](0);
createApp(_owner, "test", address(counter), childContracts);

// (5). Set private keys
privateKeys = new uint256[](3);
Expand Down Expand Up @@ -883,6 +901,8 @@ contract KintoWalletTest is AATestScaffolding, UserOp {

// (2). fund paymaster for Counter contract
_fundPaymasterForContract(address(counter));
address[] memory childContracts = new address[](0);
createApp(_owner, "test", address(counter), childContracts);

// (3). Create 2 user ops:
UserOperation[] memory userOps = new UserOperation[](1);
Expand Down Expand Up @@ -949,6 +969,8 @@ contract KintoWalletTest is AATestScaffolding, UserOp {

// (4). fund paymaster for Counter contract
_fundPaymasterForContract(address(counter));
address[] memory childContracts = new address[](0);
createApp(_owner, "test", address(counter), childContracts);

// (5). Set private keys
privateKeys = new uint256[](2);
Expand Down Expand Up @@ -1168,6 +1190,8 @@ contract KintoWalletTest is AATestScaffolding, UserOp {

function test_RevertWhen_SettingAppKeyNoWhitelist() public {
address app = address(_engenCredits);
address[] memory childContracts = new address[](0);
createApp(_owner, "test", address(_engenCredits), childContracts);
UserOperation memory userOp = this.createUserOperationWithPaymaster(
_chainID,
address(_kintoWalletv1),
Expand Down Expand Up @@ -1197,6 +1221,8 @@ contract KintoWalletTest is AATestScaffolding, UserOp {
function testSettingAppKey() public {
address app = address(_engenCredits);
uint256 nonce = _kintoWalletv1.getNonce();
address[] memory childContracts = new address[](0);
createApp(_owner, "test", address(_engenCredits), childContracts);

UserOperation[] memory userOps = new UserOperation[](2);
userOps[0] = createWhitelistAppOp(
Expand All @@ -1221,7 +1247,6 @@ contract KintoWalletTest is AATestScaffolding, UserOp {

function testMultisigTransactionWith2SignersWithAppkey() public {
vm.startPrank(_owner);

// set 2 owners
address[] memory owners = new address[](2);
owners[0] = _owner;
Expand Down Expand Up @@ -1250,6 +1275,8 @@ contract KintoWalletTest is AATestScaffolding, UserOp {
Counter counter = new Counter();
assertEq(counter.count(), 0);
vm.stopPrank();
address[] memory childContracts = new address[](0);
createApp(_owner, "test", address(counter), childContracts);

// Fund counter contract
vm.startPrank(_owner);
Expand Down
15 changes: 15 additions & 0 deletions test/helpers/AATestScaffolding.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,21 @@ abstract contract AATestScaffolding is KYCSignature {
vm.stopPrank();
}

function createApp(address _owner, string memory name, address parentContract, address[] memory appContracts)
public
{
vm.startPrank(_owner);
uint256[] memory appLimits = new uint256[](4);
appLimits[0] = _kintoApp.RATE_LIMIT_PERIOD();
appLimits[1] = _kintoApp.RATE_LIMIT_THRESHOLD();
appLimits[2] = _kintoApp.GAS_LIMIT_PERIOD();
appLimits[3] = _kintoApp.GAS_LIMIT_THRESHOLD();
_kintoApp.registerApp(
name, parentContract, appContracts, [appLimits[0], appLimits[1], appLimits[2], appLimits[3]]
);
vm.stopPrank();
}

////// helper methods to assert the revert reason on UserOperationRevertReason events ////

// string reasons
Expand Down

0 comments on commit cc537c5

Please sign in to comment.