Skip to content

Setup for tests with prool #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Jun 13, 2024
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 .github/actions/install-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ runs:
- name: Set up Bun
uses: oven-sh/setup-bun@v1
with:
bun-version: 1.0.26
bun-version: 1.0.30

- name: Set up foundry
uses: foundry-rs/foundry-toolchain@v1
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/on-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,16 @@ jobs:
- name: Install dependencies
uses: ./.github/actions/install-dependencies

- uses: actions/setup-node@v4
with:
node-version: "v22.2.0"

- name: Build
run: bun run build:permissionless

- name: Start Docker
run: docker compose -f "packages/permissionless-test/mock-aa-infra/docker-compose.yml" up -d

- name: Run tests & coverage
run: bun run test:ci

- name: Stop containers
if: always()
run: docker compose -f "packages/permissionless-test/mock-aa-infra/docker-compose.yml" down

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
env:
Expand Down
2 changes: 1 addition & 1 deletion biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"javascript": {
"formatter": {
"semicolons": "asNeeded",
"trailingComma": "none"
"trailingCommas": "none"
}
}
}
Binary file modified bun.lockb
Binary file not shown.
21 changes: 15 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"workspaces": ["packages/*"],
"workspaces": [
"packages/permissionless",
"packages/wagmi",
"packages/wagmi-test-demo",
"packages/create-permissionless-app"
],
"private": true,
"author": "Pimlico",
"type": "module",
Expand All @@ -18,13 +23,15 @@
"simple-git-hooks": "^2.9.0",
"size-limit": "^9.0.0",
"tslib": "^2.6.2",
"@pimlico/alto": "^0.0.4",
"prool": "^0.0.12",
"typescript": "^5.2.2"
},
"description": "",
"keywords": [],
"license": "MIT",
"scripts": {
"build": "bun run build:permissionless && bun run build:wagmi",
"build": "bun run build:permissionless",
"build:permissionless": "bun run clean:permissionless && bun run build:cjs && bun run build:esm && bun run build:types",
"build:wagmi": "bun run clean:wagmi && bun run build:wagmi:cjs && bun run build:wagmi:esm && bun run build:wagmi:types",
"build:cjs": "tsc --project ./tsconfig/tsconfig.permissionless.cjs.json && tsc-alias -p ./tsconfig/tsconfig.permissionless.cjs.json && printf '{\"type\":\"commonjs\"}' > ./packages/permissionless/_cjs/package.json",
Expand All @@ -38,9 +45,9 @@
"changeset:version": "changeset version && bun install --lockfile-only",
"format": "biome format . --write",
"lint": "biome check .",
"lint:fix": "bun run lint --apply",
"test": "bun run --cwd packages/permissionless-test test",
"test:ci": "bun run --cwd packages/permissionless-test test:ci",
"lint:fix": "bun run lint --write",
"test": "vitest dev -c ./packages/permissionless/vitest.config.ts",
"test:ci": "CI=true && vitest -c ./packages/permissionless/vitest.config.ts --coverage --pool=forks",
"wagmi-demo": "bun run --cwd packages/wagmi-demo dev",
"build:wagmi:cjs": "tsc --project ./tsconfig/tsconfig.wagmi.cjs.json && tsc-alias -p ./tsconfig/tsconfig.wagmi.cjs.json && printf '{\"type\":\"commonjs\"}' > ./packages/wagmi/_cjs/package.json",
"build:wagmi:esm": "tsc --project ./tsconfig/tsconfig.wagmi.esm.json && tsc-alias -p ./tsconfig/tsconfig.wagmi.esm.json && printf '{\"type\": \"module\",\"sideEffects\":false}' > ./packages/wagmi/_esm/package.json",
Expand All @@ -51,7 +58,9 @@
"pre-commit": "bun run format && bun run lint:fix"
},
"dependencies": {
"async-mutex": "^0.5.0",
"get-port": "^7.0.0",
"tsc-alias": "^1.8.8"
"tsc-alias": "^1.8.8",
"viem": "^2.13.8"
}
}
29 changes: 0 additions & 29 deletions packages/permissionless-test/README.md

This file was deleted.

2 changes: 0 additions & 2 deletions packages/permissionless-test/mock-aa-infra/alto/.dockerignore

This file was deleted.

21 changes: 0 additions & 21 deletions packages/permissionless-test/mock-aa-infra/alto/Dockerfile

This file was deleted.

19 changes: 0 additions & 19 deletions packages/permissionless-test/mock-aa-infra/alto/alto-config.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const BICONOMY_SINGLETON_FACTORY_BYTECODE: Hex =
"0x608060405234801561001057600080fd5b50600436106100365760003560e01c8063bb34534c1461003b578063cdcb760a1461006a575b600080fd5b61004e61004936600461033f565b61007f565b6040516001600160a01b03909116815260200160405180910390f35b61007d610078366004610358565b610090565b005b600061008a8261010f565b92915050565b60006100d28484848080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506101fe92505050565b6040519091506001600160a01b038216907f8ffcdc15a283d706d38281f500270d8b5a656918f555de0913d7455e3e6bc1bf90600090a250505050565b6000806101a8836040517fff0000000000000000000000000000000000000000000000000000000000000060208201526bffffffffffffffffffffffff193060601b166021820152603581018290527f21c35dbe1b344a2488cf3321d6ce542f8e9f305544ff09e4993a62319a497c1f605582015260009060750160408051601f19818403018152919052805160209091012092915050565b6040516135a560f21b60208201526bffffffffffffffffffffffff19606083901b166022820152600160f81b603682015290915060370160408051601f1981840301815291905280516020909101209392505050565b600061020c83836000610213565b9392505050565b60408051808201909152601081527f67363d3d37363d34f03d5260086018f30000000000000000000000000000000060208201526000906102538561010f565b9150813b156102755760405163cd43efa160e01b815260040160405180910390fd5b6000858251602084016000f590506001600160a01b0381166102aa5760405163bbd2fe8760e01b815260040160405180910390fd5b6000816001600160a01b031685876040516102c591906103d4565b60006040518083038185875af1925050503d8060008114610302576040519150601f19603f3d011682016040523d82523d6000602084013e610307565b606091505b505090508015806103175750833b155b15610335576040516353de54b960e01b815260040160405180910390fd5b5050509392505050565b60006020828403121561035157600080fd5b5035919050565b60008060006040848603121561036d57600080fd5b83359250602084013567ffffffffffffffff8082111561038c57600080fd5b818601915086601f8301126103a057600080fd5b8135818111156103af57600080fd5b8760208285010111156103c157600080fd5b6020830194508093505050509250925092565b6000825160005b818110156103f557602081860181015185830152016103db565b50600092019182525091905056fea26469706673582212207886676dff8e9b5ec182bd3d55512921e83b71170648ce1692043a572fa2954964736f6c63430008110033"

// Will deploy V0.6 BICONOMY_ECDSA_OWNERSHIP_REGISTRY_MODULE to 0x0000001c5b32F37F5beA87BDD5374eB2aC54eA8e
export const BICONOMY_ECDSA_OWNERSHIP_REGISTRY_MOUDULE_CREATECALL: Hex =
export const BICONOMY_ECDSA_OWNERSHIP_REGISTRY_MODULE_CREATECALL: Hex =
"0xcdcb760aa141e6dec8c9b10eb36022b4f82d2ffe43a3b172ad899d71e2dd80b0ee4c5b7c0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000090960808060405234610016576108ed908161001c8239f35b600080fdfe6040608081526004908136101561001557600080fd5b6000803560e01c80631626ba7e146104065780632ede3bc014610384578063715018a614610314578063a3f4df7e146102c1578063f2fde38b1461020b578063f44c339d14610183578063fa5441611461012b578063ffa1ad74146100d45763fff35b721461008357600080fd5b346100cd576003199082823601126100cd5783359167ffffffffffffffff83116100d0576101609083360301126100cd57506020926100c6916024359101610543565b9051908152f35b80fd5b5080fd5b5090346100d057816003193601126100d057610127906100f2610446565b90600582527f302e322e30000000000000000000000000000000000000000000000000000000602083015251918291826104fa565b0390f35b5082346100d05760203660031901126100d0576001600160a01b0383816101506104e4565b16938481528060205220541691821561016d576020838551908152f35b8351633d3fff5360e21b81529182015260249150fd5b5091346102075760603660031901126102075760243567ffffffffffffffff8111610203576101b5903690830161047c565b90604435936001600160a01b03851685036100cd5750926101d991602094356105d8565b90517fffffffff000000000000000000000000000000000000000000000000000000009091168152f35b8380fd5b8280fd5b50919034610207576020366003190112610207576102276104e4565b803b6102a2576001600160a01b0380911692831561029457503384528360205281842054169083208273ffffffffffffffffffffffffffffffffffffffff19825416179055337fc8894f26f396ce8c004245c8b7cd1b92103a6e4302fcbab883987149ac01b7ec8480a480f35b82516307e179e960e31b8152fd5b826001600160a01b0360249351926377817ac360e01b84521690820152fd5b5090346100d057816003193601126100d057610127906102df610446565b90601f82527f4543445341204f776e657273686970205265676973747279204d6f64756c6500602083015251918291826104fa565b50809134610381578160031936011261038157338252816020526001600160a01b03818320541690822073ffffffffffffffffffffffffffffffffffffffff198154169055337fc8894f26f396ce8c004245c8b7cd1b92103a6e4302fcbab883987149ac01b7ec8380a480f35b50fd5b5091346102075760203660031901126102075761039f6104e4565b338452836020526001600160a01b03908184862054166103f05716908115610294575081602093338152808552209073ffffffffffffffffffffffffffffffffffffffff1982541617905551308152f35b8351632c4dfb7d60e21b81523381850152602490fd5b50346100cd57816003193601126100cd576024359067ffffffffffffffff82116100cd575060209261043e6101d9923690830161047c565b3391356105d8565b604051906040820182811067ffffffffffffffff82111761046657604052565b634e487b7160e01b600052604160045260246000fd5b81601f820112156104df5780359067ffffffffffffffff928383116104665760405193601f8401601f19908116603f011685019081118582101761046657604052828452602083830101116104df57816000926020809301838601378301015290565b600080fd5b600435906001600160a01b03821682036104df57565b6020808252825181830181905290939260005b82811061052f57505060409293506000838284010152601f8019910116010190565b81810186015184820160400152850161050d565b610140810135601e19823603018112156104df57810167ffffffffffffffff81358181116104df57602083019080360382136104df578301906040848303126104df57359182116104df576040916020806105a293019185010161047c565b910135916001600160a01b0392838116036104df573591821682036104df576105ca92610616565b6105d357600190565b600090565b906105e39291610616565b61060b577fffffffff0000000000000000000000000000000000000000000000000000000090565b630b135d3f60e11b90565b916001600160a01b038091169160009383855284602052826040862054169384156106c4575060418251106106b2577f19457468657265756d205369676e6564204d6573736167653a0a333200000000855280601c528261068561067d84603c89206107f6565b9190916106dc565b1684146106a8576106999161067d916107f6565b16146106a25790565b50600190565b5050505050600190565b604051632bb1a9c560e11b8152600490fd5b60249060405190633d3fff5360e21b82526004820152fd5b60058110156107e057806106ed5750565b6001810361073a5760405162461bcd60e51b815260206004820152601860248201527f45434453413a20696e76616c6964207369676e617475726500000000000000006044820152606490fd5b600281036107875760405162461bcd60e51b815260206004820152601f60248201527f45434453413a20696e76616c6964207369676e6174757265206c656e677468006044820152606490fd5b60031461079057565b60405162461bcd60e51b815260206004820152602260248201527f45434453413a20696e76616c6964207369676e6174757265202773272076616c604482015261756560f01b6064820152608490fd5b634e487b7160e01b600052602160045260246000fd5b90604181511460001461082457610820916020820151906060604084015193015160001a9061082e565b9091565b5050600090600290565b9291907f7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a083116108ab5791608094939160ff602094604051948552168484015260408301526060820152600093849182805260015afa1561089e5781516001600160a01b038116156106a2579190565b50604051903d90823e3d90fd5b5050505060009060039056fea2646970667358221220d77d1372dac830175d3da0f00a91bc884b7cab72695fa25594e2902bca4a7bd964736f6c634300081100330000000000000000000000000000000000000000000000"

// Will deploy V0.6 BICONOMY_ACCOUNT_V2_0_LOGIC to 0x0000002512019Dafb59528B82CB92D3c5D2423ac
Expand Down
Loading
Loading