@towns-protocol/contracts 0.0.346 → 0.0.348
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md
CHANGED
|
@@ -109,7 +109,7 @@ If you want to interact with anvil via a front end, you will need to add the loc
|
|
|
109
109
|
**To start a local base blockchain and river blockchain:**
|
|
110
110
|
|
|
111
111
|
```shell
|
|
112
|
-
|
|
112
|
+
./scripts/bc-all-start.sh
|
|
113
113
|
```
|
|
114
114
|
|
|
115
115
|
## Deployment
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@towns-protocol/contracts",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.348",
|
|
4
4
|
"packageManager": "yarn@3.8.0",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build-types": "bash scripts/build-contract-types.sh",
|
|
@@ -24,6 +24,7 @@
|
|
|
24
24
|
"@prb/math": "^4.1.0",
|
|
25
25
|
"@towns-protocol/diamond": "^0.6.3",
|
|
26
26
|
"@uniswap/permit2": "https://github.com/towns-protocol/permit2/archive/refs/tags/v1.0.0.tar.gz",
|
|
27
|
+
"account-abstraction": "https://github.com/eth-infinitism/account-abstraction/archive/refs/tags/v0.7.0.tar.gz",
|
|
27
28
|
"crypto-lib": "https://github.com/towns-protocol/crypto-lib/archive/refs/tags/v1.0.0.tar.gz",
|
|
28
29
|
"modular-account": "https://github.com/towns-protocol/modular-account/archive/refs/tags/v1.0.0.tar.gz",
|
|
29
30
|
"solady": "^0.1.24"
|
|
@@ -34,10 +35,9 @@
|
|
|
34
35
|
"@layerzerolabs/oapp-evm": "^0.3.2",
|
|
35
36
|
"@openzeppelin/merkle-tree": "^1.0.8",
|
|
36
37
|
"@prb/test": "^0.6.4",
|
|
37
|
-
"@towns-protocol/prettier-config": "^0.0.
|
|
38
|
+
"@towns-protocol/prettier-config": "^0.0.348",
|
|
38
39
|
"@typechain/ethers-v5": "^10.1.1",
|
|
39
40
|
"@wagmi/cli": "^2.2.0",
|
|
40
|
-
"account-abstraction": "https://github.com/eth-infinitism/account-abstraction/archive/refs/tags/v0.7.0.tar.gz",
|
|
41
41
|
"forge-std": "github:foundry-rs/forge-std#v1.10.0",
|
|
42
42
|
"prettier": "^3.5.3",
|
|
43
43
|
"prettier-plugin-solidity": "^1.4.2",
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
"publishConfig": {
|
|
58
58
|
"access": "public"
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "9d7daa617491dac9ea70b18ae5622b5ebb695119"
|
|
61
61
|
}
|
|
@@ -6,8 +6,8 @@ pragma solidity ^0.8.23;
|
|
|
6
6
|
//libraries
|
|
7
7
|
|
|
8
8
|
//contracts
|
|
9
|
-
import {EntryPoint} from "account-abstraction/core/EntryPoint.sol";
|
|
10
|
-
import {SimpleAccountFactory} from "account-abstraction/samples/SimpleAccountFactory.sol";
|
|
9
|
+
import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
|
|
10
|
+
import {SimpleAccountFactory} from "@eth-infinitism/account-abstraction/samples/SimpleAccountFactory.sol";
|
|
11
11
|
import {Deployer} from "scripts/common/Deployer.s.sol";
|
|
12
12
|
|
|
13
13
|
contract DeployAccountFactory is Deployer {
|
|
@@ -6,7 +6,7 @@ pragma solidity ^0.8.23;
|
|
|
6
6
|
//libraries
|
|
7
7
|
|
|
8
8
|
//contracts
|
|
9
|
-
import {EntryPoint} from "account-abstraction/core/EntryPoint.sol";
|
|
9
|
+
import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
|
|
10
10
|
import {Deployer} from "scripts/common/Deployer.s.sol";
|
|
11
11
|
|
|
12
12
|
contract DeployEntrypoint is Deployer {
|
|
@@ -3,14 +3,13 @@ pragma solidity ^0.8.29;
|
|
|
3
3
|
|
|
4
4
|
// interfaces
|
|
5
5
|
import {IModule} from "@erc6900/reference-implementation/interfaces/IModule.sol";
|
|
6
|
-
import {
|
|
6
|
+
import {IModularAccount} from "@erc6900/reference-implementation/interfaces/IModularAccount.sol";
|
|
7
7
|
import {IValidationHookModule} from "@erc6900/reference-implementation/interfaces/IValidationHookModule.sol";
|
|
8
|
-
import {
|
|
8
|
+
import {IValidationModule} from "@erc6900/reference-implementation/interfaces/IValidationModule.sol";
|
|
9
9
|
import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
|
|
10
|
-
import {
|
|
10
|
+
import {ISubscriptionModule} from "./ISubscriptionModule.sol";
|
|
11
11
|
|
|
12
12
|
// libraries
|
|
13
|
-
import {Subscription, SubscriptionModuleStorage} from "./SubscriptionModuleStorage.sol";
|
|
14
13
|
import {PackedUserOperation} from "@eth-infinitism/account-abstraction/interfaces/PackedUserOperation.sol";
|
|
15
14
|
import {EnumerableSetLib} from "solady/utils/EnumerableSetLib.sol";
|
|
16
15
|
import {LibCall} from "solady/utils/LibCall.sol";
|
|
@@ -18,6 +17,7 @@ import {ValidationLocatorLib} from "modular-account/src/libraries/ValidationLoca
|
|
|
18
17
|
import {ReentrancyGuardTransient} from "solady/utils/ReentrancyGuardTransient.sol";
|
|
19
18
|
import {CustomRevert} from "../../../utils/libraries/CustomRevert.sol";
|
|
20
19
|
import {Validator} from "../../../utils/libraries/Validator.sol";
|
|
20
|
+
import {Subscription, SubscriptionModuleStorage} from "./SubscriptionModuleStorage.sol";
|
|
21
21
|
|
|
22
22
|
// contracts
|
|
23
23
|
import {ModuleBase} from "modular-account/src/modules/ModuleBase.sol";
|