Skip to content

Commit

Permalink
Fix deploy scripts and re-deploy to Sepolia and Base Sepolia (#184)
Browse files Browse the repository at this point in the history
Fixes our deploy scripts and deploys contracts to Sepolia and Base Sepolia.

### Deployed Addressess
With the exception of `QuarkFactory`, all addresses should be the same on both networks.

```
# Sepolia

  Code Jar Address:  0x028B589136886841D9C75842b864167c55E3A729
  =============================================================
  Deploying Quark Factory
  Quark Factory Deployed: 0x784738b9cf8A57A4C1548edc3Ca9eb22227ce960
  Code Jar Deployed: 0x028B589136886841D9C75842b864167c55E3A729
  Quark State Manager Deployed: 0x0Ef26cd5f4514c0881cC4ee9020Db100fDcc1fD4
  Quark Wallet Implementation Deployed: 0x9B7d53e7C0321455991C4a2692c801d0B1d00105
  Quark Wallet Proxy Factory Deployed: 0xFd80f61AC5a952F5c7DCfd12A0Bd24f68589CC5d
  Batch Executor Deployed: 0x3a0599F559B0356bfce075EF361d880fB4c6a337
  Deploying Core Scripts
  Ethcall Deployed: 0x293255a6857EE7Fe461B3451bFef0b3BF300a756
  Multicall Deployed: 0x31f1445c111ef74DDb47FDCa816d371262D55ed5
  =============================================================

  Code Jar Address:  0x028B589136886841D9C75842b864167c55E3A729
  =============================================================
  Deploying Terminal Scripts
  CometSupplyActions Deployed: 0xe2e9518353D09BD50372115fE97979D33Fd52060
  CometWithdrawActions Deployed: 0xFaab563C02A084602B3d7dF05516Cb27B8a17eB5
  UniswapSwapActions Deployed: 0x1Dd5eB9B957D39eA74B6c8c57E09e2d7D304C036
  TransferActions Deployed: 0x91fbA8AA5D059C52269D1345c221A505B70e3bce
  CometClaimRewards Deployed: 0xa21038f22b9F5bE4Da1Ab1714Ad03B1933EB4318
  CometSupplyMultipleAssetsAndBorrow Deployed: 0x3456F297198e5b17365e98A6fE763d9644CBc913
  CometRepayAndWithdrawMultipleAssets Deployed: 0xaE59cf7EfF1C83fE99ADcC79897e93abAdD52948
  =============================================================

# Base Sepolia

  Code Jar Address:  0x028B589136886841D9C75842b864167c55E3A729
  =============================================================
  Deploying Quark Factory
  Quark Factory Deployed: 0x68793eA49297eB75DFB4610B68e076D2A5c7646C
  Quark State Manager Deployed: 0x0Ef26cd5f4514c0881cC4ee9020Db100fDcc1fD4
  Quark Wallet Implementation Deployed: 0x9B7d53e7C0321455991C4a2692c801d0B1d00105
  Quark Wallet Proxy Factory Deployed: 0xFd80f61AC5a952F5c7DCfd12A0Bd24f68589CC5d
  Batch Executor Deployed: 0x3a0599F559B0356bfce075EF361d880fB4c6a337
  Deploying Core Scripts
  Ethcall Deployed: 0x293255a6857EE7Fe461B3451bFef0b3BF300a756
  Multicall Deployed: 0x31f1445c111ef74DDb47FDCa816d371262D55ed5
  =============================================================

  Code Jar Address:  0x028B589136886841D9C75842b864167c55E3A729
  =============================================================
  Deploying Terminal Scripts
  CometSupplyActions Deployed: 0xe2e9518353D09BD50372115fE97979D33Fd52060
  CometWithdrawActions Deployed: 0xFaab563C02A084602B3d7dF05516Cb27B8a17eB5
  UniswapSwapActions Deployed: 0x1Dd5eB9B957D39eA74B6c8c57E09e2d7D304C036
  TransferActions Deployed: 0x91fbA8AA5D059C52269D1345c221A505B70e3bce
  CometClaimRewards Deployed: 0xa21038f22b9F5bE4Da1Ab1714Ad03B1933EB4318
  CometSupplyMultipleAssetsAndBorrow Deployed: 0x3456F297198e5b17365e98A6fE763d9644CBc913
  CometRepayAndWithdrawMultipleAssets Deployed: 0xaE59cf7EfF1C83fE99ADcC79897e93abAdD52948
  =============================================================
```
  • Loading branch information
kevincheng96 authored Mar 22, 2024
1 parent 4f9560b commit 61da2c3
Show file tree
Hide file tree
Showing 28 changed files with 4,097 additions and 100 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ docs/

# Node modules
node_modules/

# Quark releases
/quark-out.release-v*.zip
39 changes: 39 additions & 0 deletions broadcast/DeployCodeJarFactory.s.sol/11155111/run-1710535573.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"transactions": [
{
"hash": "0xed37945bd365978657ca93c8a8359184a4adb9624ab822c5407b3c42fb392f90",
"transactionType": "CREATE",
"contractName": "CodeJarFactory",
"contractAddress": "0xff98889A2Cf036a735dFc1E9e590AA0C728b7bf5",
"function": null,
"arguments": null,
"transaction": {
"type": "0x02",
"from": "0xd7bcc7d2832d55fc3075cfac963af700ea00aeb0",
"gas": "0x530ab",
"value": "0x0",
"data": "0x60a08060405234610073576102a381810191906001600160401b0383118284101761005d57600092829161011a8339039082f580156100515760805260405160a1908161007982396080518160380152f35b6040513d6000823e3d90fd5b634e487b7160e01b600052604160045260246000fd5b600080fdfe6080806040526004361015601257600080fd5b600090813560e01c63614848cc14602857600080fd5b34606757816003193601126067577f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5080fdfea26469706673582212206cf6b73953893b67c29516bdbdcc8d4539b8f28fe8435772dfa37ea233847cfb64736f6c634300081700336080806040523461001657610287908161001c8239f35b600080fdfe6080604052600436101561001257600080fd5b6000803560e01c90816332a518c61461004a57508063d6d38d3f146100455763fe9e9edf1461004057600080fd5b6101a2565b610178565b346100c35760203660031901126100c3576004359067ffffffffffffffff908183116100c357366023840112156100c35782600401359182116100c35736602483850101116100c3576100bf6100ac6100a73685602488016100dc565b6101f7565b604051903b151581529081906020820190565b0390f35b80fd5b634e487b7160e01b600052604160045260246000fd5b92919267ffffffffffffffff918281116101345760405192601f8201601f19908116603f01168401908111848210176101345760405282948184528183011161012f578281602093846000960137010152565b600080fd5b6100c6565b602060031982011261012f576004359067ffffffffffffffff821161012f578060238301121561012f57816024610175936004013591016100dc565b90565b3461012f57602061019061018b36610139565b6101b5565b6040516001600160a01b039091168152f35b3461012f5760206101906100a736610139565b6101be816101f7565b90813b156101ca575090565b6000816020829351910182f56001600160a01b03838116908216036101f3573b156100c3575090565b5080fd5b6020815191012060405190602082019060ff60f81b82523060601b6021840152600060358401526055830152605582526080820182811067ffffffffffffffff82111761013457604052905190206001600160a01b03169056fea2646970667358221220bce996c33325b98013170bef4f70f4661964d47b63b87b3c34a701d3ffa460ee64736f6c63430008170033",
"nonce": "0x0",
"accessList": []
},
"additionalContracts": [
{
"transactionType": "CREATE2",
"address": "0x028B589136886841D9C75842b864167c55E3A729",
"initCode": "0x6080806040523461001657610287908161001c8239f35b600080fdfe6080604052600436101561001257600080fd5b6000803560e01c90816332a518c61461004a57508063d6d38d3f146100455763fe9e9edf1461004057600080fd5b6101a2565b610178565b346100c35760203660031901126100c3576004359067ffffffffffffffff908183116100c357366023840112156100c35782600401359182116100c35736602483850101116100c3576100bf6100ac6100a73685602488016100dc565b6101f7565b604051903b151581529081906020820190565b0390f35b80fd5b634e487b7160e01b600052604160045260246000fd5b92919267ffffffffffffffff918281116101345760405192601f8201601f19908116603f01168401908111848210176101345760405282948184528183011161012f578281602093846000960137010152565b600080fd5b6100c6565b602060031982011261012f576004359067ffffffffffffffff821161012f578060238301121561012f57816024610175936004013591016100dc565b90565b3461012f57602061019061018b36610139565b6101b5565b6040516001600160a01b039091168152f35b3461012f5760206101906100a736610139565b6101be816101f7565b90813b156101ca575090565b6000816020829351910182f56001600160a01b03838116908216036101f3573b156100c3575090565b5080fd5b6020815191012060405190602082019060ff60f81b82523060601b6021840152600060358401526055830152605582526080820182811067ffffffffffffffff82111761013457604052905190206001600160a01b03169056fea2646970667358221220bce996c33325b98013170bef4f70f4661964d47b63b87b3c34a701d3ffa460ee64736f6c63430008170033"
}
],
"isFixedGasLimit": false
}
],
"receipts": [],
"libraries": [],
"pending": [
"0xed37945bd365978657ca93c8a8359184a4adb9624ab822c5407b3c42fb392f90"
],
"returns": {},
"timestamp": 1710535573,
"chain": 11155111,
"multi": false,
"commit": "b2ab0d6"
}
54 changes: 54 additions & 0 deletions broadcast/DeployCodeJarFactory.s.sol/11155111/run-1710535597.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"transactions": [
{
"hash": "0xed37945bd365978657ca93c8a8359184a4adb9624ab822c5407b3c42fb392f90",
"transactionType": "CREATE",
"contractName": "CodeJarFactory",
"contractAddress": "0xff98889A2Cf036a735dFc1E9e590AA0C728b7bf5",
"function": null,
"arguments": null,
"transaction": {
"type": "0x02",
"from": "0xd7bcc7d2832d55fc3075cfac963af700ea00aeb0",
"gas": "0x530ab",
"value": "0x0",
"data": "0x60a08060405234610073576102a381810191906001600160401b0383118284101761005d57600092829161011a8339039082f580156100515760805260405160a1908161007982396080518160380152f35b6040513d6000823e3d90fd5b634e487b7160e01b600052604160045260246000fd5b600080fdfe6080806040526004361015601257600080fd5b600090813560e01c63614848cc14602857600080fd5b34606757816003193601126067577f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5080fdfea26469706673582212206cf6b73953893b67c29516bdbdcc8d4539b8f28fe8435772dfa37ea233847cfb64736f6c634300081700336080806040523461001657610287908161001c8239f35b600080fdfe6080604052600436101561001257600080fd5b6000803560e01c90816332a518c61461004a57508063d6d38d3f146100455763fe9e9edf1461004057600080fd5b6101a2565b610178565b346100c35760203660031901126100c3576004359067ffffffffffffffff908183116100c357366023840112156100c35782600401359182116100c35736602483850101116100c3576100bf6100ac6100a73685602488016100dc565b6101f7565b604051903b151581529081906020820190565b0390f35b80fd5b634e487b7160e01b600052604160045260246000fd5b92919267ffffffffffffffff918281116101345760405192601f8201601f19908116603f01168401908111848210176101345760405282948184528183011161012f578281602093846000960137010152565b600080fd5b6100c6565b602060031982011261012f576004359067ffffffffffffffff821161012f578060238301121561012f57816024610175936004013591016100dc565b90565b3461012f57602061019061018b36610139565b6101b5565b6040516001600160a01b039091168152f35b3461012f5760206101906100a736610139565b6101be816101f7565b90813b156101ca575090565b6000816020829351910182f56001600160a01b03838116908216036101f3573b156100c3575090565b5080fd5b6020815191012060405190602082019060ff60f81b82523060601b6021840152600060358401526055830152605582526080820182811067ffffffffffffffff82111761013457604052905190206001600160a01b03169056fea2646970667358221220bce996c33325b98013170bef4f70f4661964d47b63b87b3c34a701d3ffa460ee64736f6c63430008170033",
"nonce": "0x0",
"accessList": []
},
"additionalContracts": [
{
"transactionType": "CREATE2",
"address": "0x028B589136886841D9C75842b864167c55E3A729",
"initCode": "0x6080806040523461001657610287908161001c8239f35b600080fdfe6080604052600436101561001257600080fd5b6000803560e01c90816332a518c61461004a57508063d6d38d3f146100455763fe9e9edf1461004057600080fd5b6101a2565b610178565b346100c35760203660031901126100c3576004359067ffffffffffffffff908183116100c357366023840112156100c35782600401359182116100c35736602483850101116100c3576100bf6100ac6100a73685602488016100dc565b6101f7565b604051903b151581529081906020820190565b0390f35b80fd5b634e487b7160e01b600052604160045260246000fd5b92919267ffffffffffffffff918281116101345760405192601f8201601f19908116603f01168401908111848210176101345760405282948184528183011161012f578281602093846000960137010152565b600080fd5b6100c6565b602060031982011261012f576004359067ffffffffffffffff821161012f578060238301121561012f57816024610175936004013591016100dc565b90565b3461012f57602061019061018b36610139565b6101b5565b6040516001600160a01b039091168152f35b3461012f5760206101906100a736610139565b6101be816101f7565b90813b156101ca575090565b6000816020829351910182f56001600160a01b03838116908216036101f3573b156100c3575090565b5080fd5b6020815191012060405190602082019060ff60f81b82523060601b6021840152600060358401526055830152605582526080820182811067ffffffffffffffff82111761013457604052905190206001600160a01b03169056fea2646970667358221220bce996c33325b98013170bef4f70f4661964d47b63b87b3c34a701d3ffa460ee64736f6c63430008170033"
}
],
"isFixedGasLimit": false
}
],
"receipts": [
{
"transactionHash": "0xed37945bd365978657ca93c8a8359184a4adb9624ab822c5407b3c42fb392f90",
"transactionIndex": "0x12",
"blockHash": "0x27aee20be69b2cd915880e2eaa59605f344f8670346b9ba8d1ff861a8aed842d",
"blockNumber": "0x53d20a",
"from": "0xD7bCC7D2832d55FC3075CFaC963Af700EA00aEb0",
"to": null,
"cumulativeGasUsed": "0x10f739",
"gasUsed": "0x3fe76",
"contractAddress": "0xff98889A2Cf036a735dFc1E9e590AA0C728b7bf5",
"logs": [],
"status": "0x1",
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"type": "0x2",
"effectiveGasPrice": "0xdf841d64"
}
],
"libraries": [],
"pending": [],
"returns": {},
"timestamp": 1710535597,
"chain": 11155111,
"multi": false,
"commit": "b2ab0d6"
}
54 changes: 54 additions & 0 deletions broadcast/DeployCodeJarFactory.s.sol/11155111/run-1710535646.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"transactions": [
{
"hash": "0xed37945bd365978657ca93c8a8359184a4adb9624ab822c5407b3c42fb392f90",
"transactionType": "CREATE",
"contractName": "CodeJarFactory",
"contractAddress": "0xff98889A2Cf036a735dFc1E9e590AA0C728b7bf5",
"function": null,
"arguments": null,
"transaction": {
"type": "0x02",
"from": "0xd7bcc7d2832d55fc3075cfac963af700ea00aeb0",
"gas": "0x530ab",
"value": "0x0",
"data": "0x60a08060405234610073576102a381810191906001600160401b0383118284101761005d57600092829161011a8339039082f580156100515760805260405160a1908161007982396080518160380152f35b6040513d6000823e3d90fd5b634e487b7160e01b600052604160045260246000fd5b600080fdfe6080806040526004361015601257600080fd5b600090813560e01c63614848cc14602857600080fd5b34606757816003193601126067577f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5080fdfea26469706673582212206cf6b73953893b67c29516bdbdcc8d4539b8f28fe8435772dfa37ea233847cfb64736f6c634300081700336080806040523461001657610287908161001c8239f35b600080fdfe6080604052600436101561001257600080fd5b6000803560e01c90816332a518c61461004a57508063d6d38d3f146100455763fe9e9edf1461004057600080fd5b6101a2565b610178565b346100c35760203660031901126100c3576004359067ffffffffffffffff908183116100c357366023840112156100c35782600401359182116100c35736602483850101116100c3576100bf6100ac6100a73685602488016100dc565b6101f7565b604051903b151581529081906020820190565b0390f35b80fd5b634e487b7160e01b600052604160045260246000fd5b92919267ffffffffffffffff918281116101345760405192601f8201601f19908116603f01168401908111848210176101345760405282948184528183011161012f578281602093846000960137010152565b600080fd5b6100c6565b602060031982011261012f576004359067ffffffffffffffff821161012f578060238301121561012f57816024610175936004013591016100dc565b90565b3461012f57602061019061018b36610139565b6101b5565b6040516001600160a01b039091168152f35b3461012f5760206101906100a736610139565b6101be816101f7565b90813b156101ca575090565b6000816020829351910182f56001600160a01b03838116908216036101f3573b156100c3575090565b5080fd5b6020815191012060405190602082019060ff60f81b82523060601b6021840152600060358401526055830152605582526080820182811067ffffffffffffffff82111761013457604052905190206001600160a01b03169056fea2646970667358221220bce996c33325b98013170bef4f70f4661964d47b63b87b3c34a701d3ffa460ee64736f6c63430008170033",
"nonce": "0x0",
"accessList": []
},
"additionalContracts": [
{
"transactionType": "CREATE2",
"address": "0x028B589136886841D9C75842b864167c55E3A729",
"initCode": "0x6080806040523461001657610287908161001c8239f35b600080fdfe6080604052600436101561001257600080fd5b6000803560e01c90816332a518c61461004a57508063d6d38d3f146100455763fe9e9edf1461004057600080fd5b6101a2565b610178565b346100c35760203660031901126100c3576004359067ffffffffffffffff908183116100c357366023840112156100c35782600401359182116100c35736602483850101116100c3576100bf6100ac6100a73685602488016100dc565b6101f7565b604051903b151581529081906020820190565b0390f35b80fd5b634e487b7160e01b600052604160045260246000fd5b92919267ffffffffffffffff918281116101345760405192601f8201601f19908116603f01168401908111848210176101345760405282948184528183011161012f578281602093846000960137010152565b600080fd5b6100c6565b602060031982011261012f576004359067ffffffffffffffff821161012f578060238301121561012f57816024610175936004013591016100dc565b90565b3461012f57602061019061018b36610139565b6101b5565b6040516001600160a01b039091168152f35b3461012f5760206101906100a736610139565b6101be816101f7565b90813b156101ca575090565b6000816020829351910182f56001600160a01b03838116908216036101f3573b156100c3575090565b5080fd5b6020815191012060405190602082019060ff60f81b82523060601b6021840152600060358401526055830152605582526080820182811067ffffffffffffffff82111761013457604052905190206001600160a01b03169056fea2646970667358221220bce996c33325b98013170bef4f70f4661964d47b63b87b3c34a701d3ffa460ee64736f6c63430008170033"
}
],
"isFixedGasLimit": false
}
],
"receipts": [
{
"transactionHash": "0xed37945bd365978657ca93c8a8359184a4adb9624ab822c5407b3c42fb392f90",
"transactionIndex": "0x12",
"blockHash": "0x27aee20be69b2cd915880e2eaa59605f344f8670346b9ba8d1ff861a8aed842d",
"blockNumber": "0x53d20a",
"from": "0xD7bCC7D2832d55FC3075CFaC963Af700EA00aEb0",
"to": null,
"cumulativeGasUsed": "0x10f739",
"gasUsed": "0x3fe76",
"contractAddress": "0xff98889A2Cf036a735dFc1E9e590AA0C728b7bf5",
"logs": [],
"status": "0x1",
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"type": "0x2",
"effectiveGasPrice": "0xdf841d64"
}
],
"libraries": [],
"pending": [],
"returns": {},
"timestamp": 1710535646,
"chain": 11155111,
"multi": false,
"commit": "b2ab0d6"
}
Loading

0 comments on commit 61da2c3

Please sign in to comment.