Skip to content

Commit

Permalink
Merge pull request #251 from pimlicolabs/fix/update-bash-script
Browse files Browse the repository at this point in the history
Fix/update bash script
  • Loading branch information
mouseless0x authored Jun 11, 2024
2 parents e7988da + e0be780 commit e46882c
Show file tree
Hide file tree
Showing 13 changed files with 475 additions and 200 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
"engines": {
"node": ">=18.0.0"
},
"workspaces": ["src/", "test/e2e/*"],
"workspaces": ["src/", "test/e2e/*", "scripts/localDeployer"],
"packageManager": "[email protected]+sha256.cea6d0bdf2de3a0549582da3983c70c92ffc577ff4410cbf190817ddc35137c2"
}
33 changes: 14 additions & 19 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
packages:
- 'src'
- 'scripts/localDeployer'
# all packages in subdirs of components/
- 'components/**'
# exclude packages that are inside test directories
- '!**/test/**'
- '!**/lib/**'
- '!**/lib/**'
1 change: 0 additions & 1 deletion scripts/.bundle-bulker.bytecode

This file was deleted.

1 change: 0 additions & 1 deletion scripts/.entrypoint.bytecode

This file was deleted.

1 change: 0 additions & 1 deletion scripts/.simple-account-factory.bytecode

This file was deleted.

14 changes: 4 additions & 10 deletions scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ both flags `-r` (rpc url) and `-b` (block number) are required for forked mode.
#### Running in local mode

Local mode runs alto tied to a standard anvil instance. And is specified with the `-l` flag.
Local mode will deploy the following contracts:
- [EntryPoint](https://github.com/eth-infinitism/account-abstraction/blob/develop/contracts/core/EntryPoint.sol) to address `0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789`
- [SimpleAccountFactory](https://github.com/eth-infinitism/account-abstraction/blob/develop/contracts/samples/SimpleAccount.sol) to address `0x9406Cc6185a346906296840746125a0E44976454`
- [BundleBulker](https://github.com/daimo-eth/bulk/blob/master/src/BundleBulker.sol) to address `0x000000000091A1F34f51CE866bEd8983dB51a97E`
Local mode will deploy all 4337 related contracts.

```console
./run-local-instance.sh -l
Expand All @@ -34,21 +31,18 @@ Local mode will deploy the following contracts:
### Cli Flags + Options

```console
Usage: ./run-local-instance.sh [OPTIONS]
Utility to spawn a local alto instances linked to an anvil node.
Usage: ./scripts/run-local-instance.sh [OPTIONS]

Utility to quickly spawn a local alto instance linked to an anvil node.
*Must* be ran with either -l or -f flags.

Alto Options
-e EntryPoint contract address, 0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789 (DEFAULT)
-l Local mode
-f Fork mode (used for debugging)

Anvil Options
-r <rpc-url> RPC url to fork from
-b <block-num> Fork block number
-p <port>
-h <host>
-c <address>,<bytecode-file>

Misc Options
-t Launch anvil + alto in a tmux split
Expand Down
19 changes: 19 additions & 0 deletions scripts/config.local.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"network-name": "local",
"rpc-url": "http://127.0.0.1:8545",
"min-entity-stake": 1,
"min-executor-balance": "1000000000000000000",
"min-entity-unstake-delay": 1,
"max-bundle-wait": 3,
"max-bundle-size": 3,
"port": 3000,
"executor-private-keys": "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
"utility-private-key": "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
"entrypoints": "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789,0x0000000071727De22E5E9d8BAf0edAc6f37da032",
"entrypoint-simulation-contract": "0x74Cb5e4eE81b86e70f9045036a1C5477de69eE87",
"enable-debug-endpoints": true,
"expiration-check": false,
"safe-mode": false,
"api-version": "v1,v2",
"public-client-log-level": "error"
}
64 changes: 0 additions & 64 deletions scripts/deploy_entry_point.ts

This file was deleted.

101 changes: 101 additions & 0 deletions scripts/localDeployer/constants.ts

Large diffs are not rendered by default.

Loading

0 comments on commit e46882c

Please sign in to comment.