fix bug in canChange() logic locked check;

contracts/core/struct.sol

@@ -578,7 +578,7 @@ library AngelCoreStruct {
     Revoke
   }
 
-  function canTakeAction(
+  function delegateIsValid(
     Delegate storage delegate,
     address sender,
     uint256 envTime
@@ -594,13 +594,12 @@ library AngelCoreStruct {
     address owner,
     uint256 envTime
   ) public view returns (bool) {
-    // can be changed if:
-    // 1. sender is a valid delegate address and their powers have not expired
-    // 2. sender is the endow owner && (no set delegate || an expired delegate) (ie. owner must first revoke their delegation)
-    return
-      !permissions.locked ||
-      canTakeAction(permissions.delegate, sender, envTime) ||
-      sender == owner;
+    // Can be changed if both critera are satisfied:
+    // 1. permission is not locked forever (read: `locked` == true)
+    // 2. sender is a valid delegate address and their powers have not expired OR
+    //    sender is the endow owner (ie. owner must first revoke their delegation)
+    return (!permissions.locked &&
+      (delegateIsValid(permissions.delegate, sender, envTime) || sender == owner));
   }
 
   struct SettingsPermission {

typechain-types/factories/contracts/core/accounts/diamond/upgradeInitializers/DiamondInit__factory.ts

@@ -31,7 +31,7 @@ const _abi = [
 ] as const;
 
 const _bytecode =
-  "0x60808060405234610016576102e8908161001c8239f35b600080fdfe6080604090808252600436101561001557600080fd5b600091823560e01c63f09a40161461002c57600080fd5b346102965780600319360112610296576004356001600160a01b0381811693848303610292576024359182169283830361028e576301ffc9a760e01b87527fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131f6020528487208054600160ff1991821681179092556307e4c70760e21b895286892080548216831790556348e2b09360e01b895286892080548216831790556307f5828d60e41b8952868920805490911690911790556100ea9061029a565b1561024c57506100f99061029a565b15610208577ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d4480546001600160a01b031990811690941790557ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d4680546001600160c01b031916909117600160a01b17905560017ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d4755805167ffffffffffffffff9181019182119110176101f4577ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d4b90815416905560647ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d4c5580f35b634e487b7160e01b82526041600452602482fd5b815162461bcd60e51b815260206004820152601f60248201527f456e74657220612076616c6964207265676973747261722061646472657373006044820152606490fd5b62461bcd60e51b815260206004820152601b60248201527f456e74657220612076616c6964206f776e6572206164647265737300000000006044820152606490fd5b8680fd5b8580fd5b8280fd5b6001600160a01b0316156102ad57600190565b60009056fea26469706673582212201dd0f839c501009fa165df021c4862898dbf40f98ab5a07f5785eb65f7cf562964736f6c63430008120033";
+  "0x60808060405234610016576102e8908161001c8239f35b600080fdfe6080604090808252600436101561001557600080fd5b600091823560e01c63f09a40161461002c57600080fd5b346102965780600319360112610296576004356001600160a01b0381811693848303610292576024359182169283830361028e576301ffc9a760e01b87527fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131f6020528487208054600160ff1991821681179092556307e4c70760e21b895286892080548216831790556348e2b09360e01b895286892080548216831790556307f5828d60e41b8952868920805490911690911790556100ea9061029a565b1561024c57506100f99061029a565b15610208577ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d4480546001600160a01b031990811690941790557ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d4680546001600160c01b031916909117600160a01b17905560017ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d4755805167ffffffffffffffff9181019182119110176101f4577ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d4b90815416905560647ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d4c5580f35b634e487b7160e01b82526041600452602482fd5b815162461bcd60e51b815260206004820152601f60248201527f456e74657220612076616c6964207265676973747261722061646472657373006044820152606490fd5b62461bcd60e51b815260206004820152601b60248201527f456e74657220612076616c6964206f776e6572206164647265737300000000006044820152606490fd5b8680fd5b8580fd5b8280fd5b6001600160a01b0316156102ad57600190565b60009056fea26469706673582212202a6f0c39e9df4ddb0695de5c8bcf2ed750d12d46228406fe4c45b39f9a7ec08e64736f6c63430008120033";
 
 type DiamondInitConstructorParams =
   | [signer?: Signer]

typechain-types/factories/contracts/core/accounts/facets/AccountsAllowance__factory.ts

@@ -2169,7 +2169,7 @@ const _abi = [
 ] as const;
 
 const _bytecode =
-  "0x6080806040523461001657610a61908161001c8239f35b600080fdfe60406080815260048036101561001457600080fd5b600091823560e01c80636a8ff29e146104c25763efabb0f81461003657600080fd5b346104be5760a03660031901126104be5761004f6107d0565b9060249182359160028310156104ba576001600160a01b03946044803587811696919492908790036104b6576100836107e8565b9460843592610090610953565b63ffffffff85168b526020977ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d428952868c209760ff60066100d089610833565b01541661047f578b1697881561044e5760088101548d9c90421161037c578154895163bb37a28360e01b8152602d84018882019081523360208201529183166001600160a01b031660408301524260608301528f918d9082908190608001038173__$2e6ee47b30d794e0597b4af30f16ddb84c$__5af4908115610372578291610165918f60199592610345575b50506108b8565b92018054925b83811061030a575b50505050909192939495969798995b156102d757600181036101ef575050505050907f6b971ea39e8577fb801a8bc943b125455bd10844efce115e0fcd41cf2d62f08a946101c460609594936107fe565b818852845281872083885284528682812055815193338552840152820152a15b6101ec6109f4565b80f35b9798976102a2578315610273575050509161024a82608096946102347f2c97423f769ac7753b170a8e16c73b4492af23f16d7a9092136f2e523d3c68249997956107fe565b868b528752838a20858b528752838a20556107fe565b8388528452808720828852845280872054928151943386528501528301526060820152a16101e4565b855162461bcd60e51b8152928301899052600b908301526a16995c9bc8185b5bdd5b9d60aa1b90820152606490fd5b855162461bcd60e51b81529283018990526011908301527024b73b30b634b21027b832b930ba34b7b760791b90820152606490fd5b865162461bcd60e51b81528085018a9052600f818401526e24b73b30b634b21029b832b73232b960891b81850152606490fd5b8d836103168385610918565b90549060031b1c16146103315761032c906108f3565b61016b565b5060019d5038925082915081905080610173565b6103649250803d1061036b575b61035c8183610868565b8101906108a0565b388f61015e565b503d610352565b8b513d84823e3d90fd5b8154895163bb37a28360e01b8152603384018882019081523360208201529183166001600160a01b031660408301524260608301528f918d9082908190608001038173__$2e6ee47b30d794e0597b4af30f16ddb84c$__5af49081156103725782916103f2918f601b95926103455750506108b8565b92018054925b838110610413575b5050505090919293949596979899610182565b8d8361041f8385610918565b90549060031b1c161461043a57610435906108f3565b6103f8565b5060019d5038925082915081905080610400565b875162461bcd60e51b81528086018b9052600d818501526c24b73b30b634b2102a37b5b2b760991b81860152606490fd5b875162461bcd60e51b81528086018b905260138185015272115b991bdddb595b9d081a5cc818db1bdcd959606a1b81860152606490fd5b8880fd5b8580fd5b8280fd5b50346104be5760803660031901126104be576104dc6107d0565b6001600160a01b0391602491908235848116908190036107cc576044948535906105046107e8565b61050c610953565b83156107935716801561075257811561072357610528856107fe565b94338a526020958652848a20848b528652848a2054156106e25761054b816107fe565b338b528652848a20848b52865282858b2054111561068f57600561056e82610833565b01848b528652848a205483101561065a5785929160056105b483888e6105948e976107fe565b33825289528181208a82528952206105ad878254610946565b9055610833565b01858c528452858b206105c8848254610946565b90558a8651958694859363a9059cbb60e01b85528d8501528a8401525af1908115610650578791610633575b501561060357856101ec6109f4565b5162461bcd60e51b815293840152600f908301526e151c985b9cd9995c8819985a5b1959608a1b90820152606490fd5b61064a9150833d851161036b5761035c8183610868565b386105f4565b82513d89823e3d90fd5b845162461bcd60e51b8152808a0187905260118189015270496e73756666696369656e7446756e647360781b818a0152606490fd5b845162461bcd60e51b8152808a018790526029818901527f416d6f756e74207265716573746564206578636565647320616c6c6f77616e63818a015268652062616c616e636560b81b6064820152608490fd5b845162461bcd60e51b8152808a018790526018818901527f416c6c6f77616e636520646f6573206e6f742065786973740000000000000000818a0152606490fd5b835162461bcd60e51b81526020818a0152600b818801526a16995c9bc8105b5bdd5b9d60aa1b81890152606490fd5b835162461bcd60e51b81526020818a01526019818801527f496e76616c696420726563697069656e7420616464726573730000000000000081890152606490fd5b845162461bcd60e51b81526020818b015260158189015274496e76616c696420746f6b656e206164647265737360581b818a0152606490fd5b8680fd5b6004359063ffffffff821682036107e357565b600080fd5b606435906001600160a01b03821682036107e357565b63ffffffff166000527ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d43602052604060002090565b63ffffffff166000527ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d41602052604060002090565b90601f8019910116810190811067ffffffffffffffff82111761088a57604052565b634e487b7160e01b600052604160045260246000fd5b908160209103126107e3575180151581036107e35790565b156108bf57565b60405162461bcd60e51b815260206004820152600c60248201526b155b985d5d1a1bdc9a5e995960a21b6044820152606490fd5b60001981146109025760010190565b634e487b7160e01b600052601160045260246000fd5b80548210156109305760005260206000200190600090565b634e487b7160e01b600052603260045260246000fd5b9190820391821161090257565b7ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d4a805460ff8160a01c161580156109eb575b156109a657333003610995575050565b60ff60a01b1916600160a01b179055565b60405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606490fd5b50333014610985565b3330036109fd57565b7ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d4a805460ff60a01b1916905556fea2646970667358221220774bc369f0f04ddede88afb80e2561385892fa0642c446df4517623f05c26f4d64736f6c63430008120033";
+  "0x6080806040523461001657610a61908161001c8239f35b600080fdfe60406080815260048036101561001457600080fd5b600091823560e01c80636a8ff29e146104c25763efabb0f81461003657600080fd5b346104be5760a03660031901126104be5761004f6107d0565b9060249182359160028310156104ba576001600160a01b03946044803587811696919492908790036104b6576100836107e8565b9460843592610090610953565b63ffffffff85168b526020977ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d428952868c209760ff60066100d089610833565b01541661047f578b1697881561044e5760088101548d9c90421161037c578154895163bb37a28360e01b8152602d84018882019081523360208201529183166001600160a01b031660408301524260608301528f918d9082908190608001038173__$2e6ee47b30d794e0597b4af30f16ddb84c$__5af4908115610372578291610165918f60199592610345575b50506108b8565b92018054925b83811061030a575b50505050909192939495969798995b156102d757600181036101ef575050505050907f6b971ea39e8577fb801a8bc943b125455bd10844efce115e0fcd41cf2d62f08a946101c460609594936107fe565b818852845281872083885284528682812055815193338552840152820152a15b6101ec6109f4565b80f35b9798976102a2578315610273575050509161024a82608096946102347f2c97423f769ac7753b170a8e16c73b4492af23f16d7a9092136f2e523d3c68249997956107fe565b868b528752838a20858b528752838a20556107fe565b8388528452808720828852845280872054928151943386528501528301526060820152a16101e4565b855162461bcd60e51b8152928301899052600b908301526a16995c9bc8185b5bdd5b9d60aa1b90820152606490fd5b855162461bcd60e51b81529283018990526011908301527024b73b30b634b21027b832b930ba34b7b760791b90820152606490fd5b865162461bcd60e51b81528085018a9052600f818401526e24b73b30b634b21029b832b73232b960891b81850152606490fd5b8d836103168385610918565b90549060031b1c16146103315761032c906108f3565b61016b565b5060019d5038925082915081905080610173565b6103649250803d1061036b575b61035c8183610868565b8101906108a0565b388f61015e565b503d610352565b8b513d84823e3d90fd5b8154895163bb37a28360e01b8152603384018882019081523360208201529183166001600160a01b031660408301524260608301528f918d9082908190608001038173__$2e6ee47b30d794e0597b4af30f16ddb84c$__5af49081156103725782916103f2918f601b95926103455750506108b8565b92018054925b838110610413575b5050505090919293949596979899610182565b8d8361041f8385610918565b90549060031b1c161461043a57610435906108f3565b6103f8565b5060019d5038925082915081905080610400565b875162461bcd60e51b81528086018b9052600d818501526c24b73b30b634b2102a37b5b2b760991b81860152606490fd5b875162461bcd60e51b81528086018b905260138185015272115b991bdddb595b9d081a5cc818db1bdcd959606a1b81860152606490fd5b8880fd5b8580fd5b8280fd5b50346104be5760803660031901126104be576104dc6107d0565b6001600160a01b0391602491908235848116908190036107cc576044948535906105046107e8565b61050c610953565b83156107935716801561075257811561072357610528856107fe565b94338a526020958652848a20848b528652848a2054156106e25761054b816107fe565b338b528652848a20848b52865282858b2054111561068f57600561056e82610833565b01848b528652848a205483101561065a5785929160056105b483888e6105948e976107fe565b33825289528181208a82528952206105ad878254610946565b9055610833565b01858c528452858b206105c8848254610946565b90558a8651958694859363a9059cbb60e01b85528d8501528a8401525af1908115610650578791610633575b501561060357856101ec6109f4565b5162461bcd60e51b815293840152600f908301526e151c985b9cd9995c8819985a5b1959608a1b90820152606490fd5b61064a9150833d851161036b5761035c8183610868565b386105f4565b82513d89823e3d90fd5b845162461bcd60e51b8152808a0187905260118189015270496e73756666696369656e7446756e647360781b818a0152606490fd5b845162461bcd60e51b8152808a018790526029818901527f416d6f756e74207265716573746564206578636565647320616c6c6f77616e63818a015268652062616c616e636560b81b6064820152608490fd5b845162461bcd60e51b8152808a018790526018818901527f416c6c6f77616e636520646f6573206e6f742065786973740000000000000000818a0152606490fd5b835162461bcd60e51b81526020818a0152600b818801526a16995c9bc8105b5bdd5b9d60aa1b81890152606490fd5b835162461bcd60e51b81526020818a01526019818801527f496e76616c696420726563697069656e7420616464726573730000000000000081890152606490fd5b845162461bcd60e51b81526020818b015260158189015274496e76616c696420746f6b656e206164647265737360581b818a0152606490fd5b8680fd5b6004359063ffffffff821682036107e357565b600080fd5b606435906001600160a01b03821682036107e357565b63ffffffff166000527ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d43602052604060002090565b63ffffffff166000527ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d41602052604060002090565b90601f8019910116810190811067ffffffffffffffff82111761088a57604052565b634e487b7160e01b600052604160045260246000fd5b908160209103126107e3575180151581036107e35790565b156108bf57565b60405162461bcd60e51b815260206004820152600c60248201526b155b985d5d1a1bdc9a5e995960a21b6044820152606490fd5b60001981146109025760010190565b634e487b7160e01b600052601160045260246000fd5b80548210156109305760005260206000200190600090565b634e487b7160e01b600052603260045260246000fd5b9190820391821161090257565b7ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d4a805460ff8160a01c161580156109eb575b156109a657333003610995575050565b60ff60a01b1916600160a01b179055565b60405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606490fd5b50333014610985565b3330036109fd57565b7ff42c870234ce1595c214fdf331f4ac5d8ba4c010e9f64d466736c93812624d4a805460ff60a01b1916905556fea264697066735822122027fa81820da4724246d591c76ec5750a6fee888e7636c7335fd8d2d621210be264736f6c63430008120033";
 
 type AccountsAllowanceConstructorParams =
   | [linkLibraryAddresses: AccountsAllowanceLibraryAddresses, signer?: Signer]