diff --git a/deterministicConfig/factoryProxy/params.json b/deterministicConfig/factoryProxy/params.json index c381e5307..d123b62d4 100644 --- a/deterministicConfig/factoryProxy/params.json +++ b/deterministicConfig/factoryProxy/params.json @@ -1,10 +1,10 @@ { "deployerAddress": "0x680E26B472d8cae8148ee21FCAd6A69D73766436", - "deterministicProxyAddress": "0x7777776498a66b4e797144cAF4C7814Aa26204aD", + "deterministicProxyAddress": "0x777777Fb6E0485a7E7C314c2d063b21e27A236c4", "proxyCreationCode": "0x604060808152346102185761041b908138038061001b8161021d565b93843982019181818403126102185780516001600160a01b038116808203610218576020838101516001600160401b0394919391858211610218570186601f820112156102185780519061007661007183610258565b61021d565b91808352858301988682840101116102185788866100949301610273565b813b156101be577f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b031916841790556000927fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b8480a28051158015906101b7575b610110575b855160d1908161034a8239f35b85519460608601908111868210176101a35786978492839261018d9952602788527f416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c87890152660819985a5b195960ca1b8a8901525190845af4913d15610199573d9061017f61007183610258565b91825281943d92013e610296565b50803880808080610103565b5060609250610296565b634e487b7160e01b84526041600452602484fd5b50826100fe565b855162461bcd60e51b815260048101859052602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608490fd5b600080fd5b6040519190601f01601f191682016001600160401b0381118382101761024257604052565b634e487b7160e01b600052604160045260246000fd5b6001600160401b03811161024257601f01601f191660200190565b60005b8381106102865750506000910152565b8181015183820152602001610276565b919290156102f857508151156102aa575090565b3b156102b35790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b82519091501561030b5750805190602001fd5b6044604051809262461bcd60e51b82526020600483015261033b8151809281602486015260208686019101610273565b601f01601f19168101030190fdfe608060405236156054577f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc54600090819081906001600160a01b0316368280378136915af43d82803e156050573d90f35b3d90fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc54600090819081906001600160a01b0316368280378136915af43d82803e156050573d90f3fea264697066735822122057ab35b6823832a60a9bd7f2d07631c1ef3c14938b89339ee8ba8c146d0ee14e64736f6c63430008110033", "proxyDeployerAddress": "0x40d0109519031cEf1d70C38A932Ac00DBd9a2045", "proxyDeployerCreationCode": "0x61016080604052346200016157620000178162000166565b601a8152602081017f44657465726d696e697374696350726f78794465706c6f796572000000000000815260405191620000518362000166565b6001835260208301603160f81b81526200006b8262000182565b926101209384526200007d8562000355565b92610140938452519020938460e05251902091610100938385524660a0526040519360208501917f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f8352604086015260608501524660808501523060a085015260a0845260c084019380851060018060401b038611176200014b57846040525190206080523060c052611647938462000503853960805184610be4015260a05184610caf015260c05184610bae015260e05184610c3301525183610c590152518260e8015251816101120152f35b634e487b7160e01b600052604160045260246000fd5b600080fd5b604081019081106001600160401b038211176200014b57604052565b8051602091908281101562000221575090601f825111620001c05780825192015190808310620001b157501790565b82600019910360031b1b161790565b90604051809263305a27a960e01b82528060048301528251908160248401526000935b82851062000207575050604492506000838284010152601f80199101168101030190fd5b8481018201518686016044015293810193859350620001e3565b6001600160401b0381116200014b576000928354926001938481811c911680156200034a575b838210146200033657601f811162000300575b5081601f841160011462000299575092829391839286946200028d575b50501b916000199060031b1c191617905560ff90565b01519250388062000277565b919083601f1981168780528488209488905b88838310620002e55750505010620002cb575b505050811b01905560ff90565b015160001960f88460031b161c19169055388080620002be565b858701518855909601959485019487935090810190620002ab565b85805284601f848820920160051c820191601f860160051c015b8281106200032a5750506200025a565b8781550185906200031a565b634e487b7160e01b86526022600452602486fd5b90607f169062000247565b805160209081811015620003e35750601f825111620003825780825192015190808310620001b157501790565b90604051809263305a27a960e01b82528060048301528251908160248401526000935b828510620003c9575050604492506000838284010152601f80199101168101030190fd5b8481018201518686016044015293810193859350620003a5565b9192916001600160401b0381116200014b5760019182548381811c91168015620004f7575b82821014620004e157601f8111620004a8575b5080601f83116001146200045b5750819293946000926200044f575b5050600019600383901b1c191690821b17905560ff90565b01519050388062000437565b90601f198316958460005282600020926000905b888210620004905750508385969710620002cb57505050811b01905560ff90565b8087859682949686015181550195019301906200046f565b8360005283601f83600020920160051c820191601f850160051c015b828110620004d45750506200041b565b60008155018490620004c4565b634e487b7160e01b600052602260045260246000fd5b90607f16906200040856fe6040608081526004908136101561001557600080fd5b600091823560e01c80633486f857146104fe5780634e486aab146104a95780637621fd67146104465780637ff95ee8146101ef57806384b0196e146100d15763a2c8dd9e1461006357600080fd5b346100cd5760603660031901126100cd576001600160401b036024358181116100c957610093903690840161060c565b9190946044359182116100c6575091602094916100b66100bf943690840161060c565b93909235610cd5565b9051908152f35b80fd5b8480fd5b8280fd5b5090346100cd57826003193601126100cd5761010c7f0000000000000000000000000000000000000000000000000000000000000000610717565b926101367f000000000000000000000000000000000000000000000000000000000000000061081f565b90825192602092838501958587106001600160401b038811176101da57509280610190838896610183998b9996528686528151998a99600f60f81b8b5260e0868c015260e08b019061068d565b91898303908a015261068d565b924660608801523060808801528460a088015286840360c088015251928381520193925b8281106101c357505050500390f35b8351855286955093810193928101926001016101b4565b604190634e487b7160e01b6000525260246000fd5b5090346100cd5760e03660031901126100cd5760248035928035916001600160401b036044358181116103f057610229903690850161060c565b94909161023461063e565b9761023d610654565b9360a4359760018060a01b0394858a16998a81036104425760c43586811161043e576102a161029986610293898f6102a6978f8b61028261028b948d9b36910161060c565b9790958b610af8565b9236916108ef565b90610a3b565b919091610926565b610e09565b8a5161075f808201908282108883111761042b578f928092602092610eb38339308152030191f5908115610421578a51928660208501931683528b808501528d60608501526060845260808401958487109087111761040f576020610343948f88958f868c9b9761033e978d9c99610332945260a087013784019160a08301938452845193849161066a565b010380855201836106f6565b610d61565b98169716968088036103f45750863b156103f0578551631b2ce7f360e11b815291168382015286818381838a5af180156103e6576103d1575b50908591853b156100cd57845193849263189acdbd60e31b84528301528183875af180156103c7576103b3575b6020838351908152f35b6103bd84916106b2565b6100cd57826103a9565b82513d86823e3d90fd5b6103de90969192966106b2565b94903861037c565b85513d89823e3d90fd5b8780fd5b8488856044938a51936312ae30e560e01b8552840152820152fd5b634e487b7160e01b8e5260418a52888efd5b8a513d8e823e3d90fd5b50634e487b7160e01b8f5260418b52898ffd5b8e80fd5b8d80fd5b5082346100c657826003193601126100c657602435906001600160401b0382116100c6576020610499856104918661048a6104833689840161060c565b36916108ef565b9035610a3b565b929092610926565b516001600160a01b039091168152f35b5091346100c65760a03660031901126100c657604435906001600160401b0382116100c657506020926104e26100bf923690830161060c565b6104ea61063e565b916104f3610654565b936024359035610af8565b50919034610608576080366003190112610608576001600160401b039183356024358481116100cd57610534903690870161060c565b91906044358681116100c95761054d903690890161060c565b9390966064359081116106045792610594859361059a93610483846102a16102998f9b8f610293908f9e8f9e61028b916105899136910161060c565b9490928a8c8a610cd5565b90610d61565b9581865192839283378101838152039082875af1903d156105fe573d906105c0826108d4565b916105cd855193846106f6565b825260203d92013e5b156105ef57516001600160a01b03909116815260209150f35b5163dc94ae4b60e01b81529050fd5b506105d6565b8580fd5b5080fd5b9181601f84011215610639578235916001600160401b038311610639576020838186019501011161063957565b600080fd5b606435906001600160a01b038216820361063957565b608435906001600160a01b038216820361063957565b60005b83811061067d5750506000910152565b818101518382015260200161066d565b906020916106a68151809281855285808601910161066a565b601f01601f1916010190565b6001600160401b0381116106c557604052565b634e487b7160e01b600052604160045260246000fd5b604081019081106001600160401b038211176106c557604052565b90601f801991011681019081106001600160401b038211176106c557604052565b60ff81146107555760ff811690601f82116107435760405191610739836106db565b8252602082015290565b604051632cd44ac360e21b8152600490fd5b506040516000805490600182811c90808416938415610815575b602094858410811461080157838752869493929181156107e157506001146107a3575b50506107a0925003826106f6565b90565b600080805285812095935091905b8183106107c95750506107a093508201013880610792565b855487840185015294850194869450918301916107b1565b9150506107a094925060ff191682840152151560051b8201013880610792565b634e487b7160e01b85526022600452602485fd5b91607f169161076f565b60ff81146108415760ff811690601f82116107435760405191610739836106db565b50604051600060019081549182811c908084169384156108ca575b602094858410811461080157838752869493929181156107e1575060011461088c5750506107a0925003826106f6565b600081815285812095935091905b8183106108b25750506107a093508201013880610792565b8554878401850152948501948694509183019161089a565b91607f169161085c565b6001600160401b0381116106c557601f01601f191660200190565b9291926108fb826108d4565b9161090960405193846106f6565b829481845281830111610639578281602093846000960137010152565b6005811015610a2557806109375750565b6001810361097f5760405162461bcd60e51b815260206004820152601860248201527745434453413a20696e76616c6964207369676e617475726560401b6044820152606490fd5b600281036109cc5760405162461bcd60e51b815260206004820152601f60248201527f45434453413a20696e76616c6964207369676e6174757265206c656e677468006044820152606490fd5b6003146109d557565b60405162461bcd60e51b815260206004820152602260248201527f45434453413a20696e76616c6964207369676e6174757265202773272076616c604482015261756560f01b6064820152608490fd5b634e487b7160e01b600052602160045260246000fd5b906041815114600014610a6957610a65916020820151906060604084015193015160001a90610a73565b9091565b5050600090600290565b9291906fa2a8918ca85bafe22016d0b997e4df60600160ff1b038311610aec5791608094939160ff602094604051948552168484015260408301526060820152600093849182805260015afa15610adf5781516001600160a01b03811615610ad9579190565b50600190565b50604051903d90823e3d90fd5b50505050600090600390565b939291610b0891959236916108ef565b602081519101206040519460208601947f4f2bfcc23c1adbe54973f469f111f1848a62d32cc4a906c7a5ced17481b366ea865260408701526060860152608085015260018060a01b0380921660a08501521660c083015260c0825260e08201918083106001600160401b038411176106c5576107a0926040525190205b604290610b90610bab565b906040519161190160f01b8352600283015260228201522090565b307f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03161480610cac575b15610c06577f000000000000000000000000000000000000000000000000000000000000000090565b60405160208101907f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f82527f000000000000000000000000000000000000000000000000000000000000000060408201527f000000000000000000000000000000000000000000000000000000000000000060608201524660808201523060a082015260a0815260c081018181106001600160401b038211176106c55760405251902090565b507f00000000000000000000000000000000000000000000000000000000000000004614610bdd565b9290610ce690610cf59336916108ef565b602081519101209336916108ef565b602081519101206040519260208401927f11ebd6670048529a84d03c14cb6bf8539a7ce6288dd624a22bb7111cacc9358e84526040850152606084015260808301526080825260a08201918083106001600160401b038411176106c5576107a092604052519020610b85565b90805115610dc5576020815191016000f5906001600160a01b03821615610d8457565b60405162461bcd60e51b8152602060048201526019602482015278437265617465323a204661696c6564206f6e206465706c6f7960381b6044820152606490fd5b606460405162461bcd60e51b815260206004820152602060248201527f437265617465323a2062797465636f6465206c656e677468206973207a65726f6044820152fd5b60018060a01b03168160601c14908115610e9f575b5015610e2657565b60405162461bcd60e51b815260206004820152604560248201527f496e76616c69642073616c74202d206669727374203230206279746573206f6660448201527f207468652073616c74206d757374206d617463682063616c6c696e67206164646064820152643932b9b99760d91b608482015260a490fd5b6001600160601b03191615905038610e1e56fe60c03461008b57601f61075f38819003918201601f19168301916001600160401b038311848410176100905780849260209460405283398101031261008b57516001600160a01b038116810361008b573060805260a0526040516106b890816100a782396080518181816058015281816101270152610393015260a05181818161016c01526103d90152f35b600080fd5b634e487b7160e01b600052604160045260246000fdfe608060408181526004918236101561001657600080fd5b600090813560e01c9081633659cfe614610369575080634f1ef286146100ad576352d1902d1461004557600080fd5b346100aa57806003193601126100aa57507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316300361009d57602090516000805160206106638339815191528152f35b51635e4c25f160e01b8152fd5b80fd5b509080600319360112610365576100c2610585565b906024356001600160401b03811161036157366023820112156103615780850135906100ed826105d7565b6100f9845191826105a0565b8281526020928382019236602483830101116103025781889260248793018637830101526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000008116903082146103515760008051602061066383398151915291818354160361034157807f000000000000000000000000000000000000000000000000000000000000000016330361030d577f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156101d0575050505050506101cd9192506105f2565b80f35b86979597169087516352d1902d60e01b815285818b81865afa8791816102da575b5061020657885163e5ec176960e01b81528a90fd5b989293949698979597036102cb5761021d886105f2565b8451907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b8880a28251158015906102c3575b61025f575b505050505050905080f35b873b156102b757505093809581926102a09651915af4903d156102ad573d610292610289826105d7565b925192836105a0565b81528481933d92013e610639565b5080388080808080610254565b5060609150610639565b63369891e760e01b8152fd5b50600161024f565b5083516308373ebf60e41b8152fd5b9091508681813d8311610306575b6102f281836105a0565b81010312610302575190386101f1565b8780fd5b503d6102e8565b855162461bcd60e51b8152808a01869052600e60248201526d1b9bdd08185d5d1a1bdc9a5e995960921b6044820152606490fd5b85516364cd8d1960e01b81528990fd5b8551631932df4560e01b81528990fd5b8380fd5b5080fd5b91929050346105815760208060031936011261036157610387610585565b926001600160a01b03907f0000000000000000000000000000000000000000000000000000000000000000821690308214610573575060008051602061066383398151915290828254160361056357817f000000000000000000000000000000000000000000000000000000000000000016330361052f57835190838201928284106001600160401b0385111761051c578386528783527f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff1615610459575050505050506101cd9192506105f2565b86979597169087516352d1902d60e01b815285818b81865afa8791816104ed575b5061048f57885163e5ec176960e01b81528a90fd5b989293949698979597036102cb576104a6886105f2565b8451907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b8880a28251158015906104e65761025f57505050505050905080f35b508661024f565b9091508681813d8311610515575b61050581836105a0565b810103126103025751903861047a565b503d6104fb565b634e487b7160e01b885260418952602488fd5b835162461bcd60e51b8152808801849052600e60248201526d1b9bdd08185d5d1a1bdc9a5e995960921b6044820152606490fd5b83516364cd8d1960e01b81528790fd5b631932df4560e01b81528790fd5b8280fd5b600435906001600160a01b038216820361059b57565b600080fd5b90601f801991011681019081106001600160401b038211176105c157604052565b634e487b7160e01b600052604160045260246000fd5b6001600160401b0381116105c157601f01601f191660200190565b803b156106275760008051602061066383398151915280546001600160a01b0319166001600160a01b03909216919091179055565b60405163529880eb60e01b8152600490fd5b156106415790565b80511561065057805190602001fd5b6040516350a28c9b60e11b8152600490fdfe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbca26469706673582212202a31e5df741ee89d8b94ce215f4d605f6f18a2507df30b0895f6194dcca63a7564736f6c63430008110033a264697066735822122033a4bf6be876ffc6d7f592fa6a4fbe4748f5093dfce539b5d618211b85bc76ab64736f6c63430008110033", "proxyDeployerSalt": "0x0000000000000000000000000000000000000000668d7f9ec18e35000dbaba0e", - "proxySalt": "0xef74a7d972db83a754c61473ac9021a0dab6ccbe2ac549e6152a67c4418d1839", + "proxySalt": "0x6f0b6e093ff6b80722b775e3c9b0cd91b587a737b4f5028d0a683a5fd611aa92", "proxyShimSalt": "0x680e26b472d8cae8148ee21fcad6a69d73766436000000000000000000000064" } \ No newline at end of file diff --git a/deterministicConfig/factoryProxy/signatures.json b/deterministicConfig/factoryProxy/signatures.json index 67d9a0692..a8ce5cf85 100644 --- a/deterministicConfig/factoryProxy/signatures.json +++ b/deterministicConfig/factoryProxy/signatures.json @@ -1,13 +1,13 @@ { - "1": "0xec189a90cd7ca89b702211b8239db19ebb151eac7c3ad9da2c3a4a3e1df209d97c3b8fe98ac4dad5eae4fc82d120122201e7f43b02a22294603df7e61e6088b51c", - "5": "0x78b89a2faa656773408e010c9bd76972c2762266158787a428b456dbeab0e4805cf6eb76c09b00d74e3e7d9df2f54380f94e4cce4474c594f2f306885ed95ea81c", - "10": "0xa5f78132d291907b9846ed947c392a131be5afe8cab7f50280947a96ef09803e7e8721e7c55f59b1de782b06f95cab31931a6e54e06fe6876d75db1b44e1c63a1c", - "420": "0x49fba2406866d9b8b0c2416b04dd71692476988cd56bf9a3a3b336477d5ac0ce6f8b0359e1164242d9e9157b4e4fe52612a4023d43d18f43880e08434cb0c5001b", - "424": "0x4493a833dd3740f16f4e075e0525f12c51de1c623799216b7fc6315e2921fffa2f0d95d06b3a6d28a4e3a901de4d6bc6d81d5dfe122b2233d4d14a27658ce3591b", - "999": "0x502d78f6784a72145c6c05c16eaaadfcff160d311ac6db510ff030c2ffa711db6e743b72ffc84a705aba71cb28ddc5b5dea7f9c867f1f0904f5e2e91033211a41c", - "8453": "0x7d62526d2a6a398f39bffe18fcc87a5c90641e3fb4fc684074d40f52779e8d5d6b5b59a42e9c7c176ccc3eb654065cc9637522f33f6782f2e4e60f6595efa03e1b", - "58008": "0xd90b42a66da5b053a7a8e4986b549139fd282a03fd7381edb6b7f689f3348078128dbc3bb8d29d0bd70ed43e73c3d5d8287054e518926038492633f50a8f660b1b", - "84531": "0x5850b92120e015fd3af068441e44052f7d0eb4b370ab2dd2fd6c5d5621188f1d0b72988c7fc86bbcac3822055af06637448e3e667098d22e454320cc57ed34e81c", - "7777777": "0x48a3a5ddf9f07318830814ca85cf05843751a93fec70d9ff1312529ec118f39e085bdf8a634cdfe68028d0b425e60af9f9a28aa5c73c994cb49cfd20091961861c", - "11155111": "0x8c8154fa5f5bd7e6fd13b03426e479cea2679debd34c92069ce62332a39e95fc46db54b09bc30524d40a20aae954258211e894704330ec22b99075f6d2873ef11b" + "1": "0x7ee64db9954dc0ba048661de99b8dcf740564dfadafb531caaf999943693cda01943af8dbd406ac27e7122c45a43de75e4a55d42342382fdcb38320ed775ec6f1b", + "5": "0xe18ab241ea9dd2199bf281d84150d7530a3f61996bf289b0a568154a57a7688877c2db237fc07064403570fb24b2ca3182af08e94e2f7005d8044b6c3a8e2eaf1c", + "10": "0x2db4d62ac6064d7940b0107c206acb54f90d866c62e592ac756e315e88ccaa894ee5bab7f5ae56aa60456997634f6e4f3cca1c7446aaae15d746705e2e6e7eb21c", + "420": "0x2618b5f93c53ab5c2d193c044d66c9e31abbc06e308252074fa13ffb66b31654191a7a87b19a820615a990ae32e84e50d2aa476543e394c6bd1b815b232383061b", + "424": "0x14d1c2f701b9fee37e5939dc807cf881d55c2ac78749aadcd784953ba07f8ec337dc18994b6124753ac42539a5a238f0604cc1bf8aad57a4a8c178e60248f42e1b", + "999": "0xd92c5183ae051331c1b8e8814555495277611f972d8b93e1b2bfae230539434520f855fe4f4207ebcddcec376738cca5d8b4ff6eb6136b4347747ba1416b523a1c", + "8453": "0x37403d373750a882d46a3054cdcba35f8f296f7569620a4273ef89a038184c045d4dad7520f11cd82a39652d7217e0ff4da217e09c06d2a05cc869466262165a1c", + "58008": "0x405ef871eb02b5105d948c5e5d6ab15d4fa7661de2bbdf0b5664261613d773e34b4f2f6a535e97102146cf0fc7a1933668021593a3985f8fb3505fc62e785df91b", + "84531": "0xf17a56601582461f37e5afb1e6fb86f3f0655ead874d6e029d3a547abfaba545786de341d7c8e30f8003aff51cd2a71748e6b3a578a33b9e904f4d641233e5101c", + "7777777": "0x5781069ae7faba16d78b1407f61bb1b49f03298c812ec999a6cec0df8f7632ab6197e45d90f1d4748aca33dfa852e7bb63ca0c45af412ff483edb960afda5b261b", + "11155111": "0xfaceb3736979498c5d663954abdd65bd8e56ab7437dfb556ee37cdf910d55d107ea57a983f9d18f466982ab76a88c78dac770ef2634fcd94ccb64e782c7d9e301c" } \ No newline at end of file diff --git a/deterministicConfig/premintExecutorProxy/params.json b/deterministicConfig/premintExecutorProxy/params.json index 5a34e628d..a3c2be0b3 100644 --- a/deterministicConfig/premintExecutorProxy/params.json +++ b/deterministicConfig/premintExecutorProxy/params.json @@ -1,10 +1,10 @@ { "deployerAddress": "0x680E26B472d8cae8148ee21FCAd6A69D73766436", - "deterministicProxyAddress": "0x7777772f9C1f2bf096C18c119Ca7de94e0a09dE6", + "deterministicProxyAddress": "0x7777778CFe1D28E7057Bb68A1c1282F4C8Ed32B2", "proxyCreationCode": "0x604060808152346102185761041b908138038061001b8161021d565b93843982019181818403126102185780516001600160a01b038116808203610218576020838101516001600160401b0394919391858211610218570186601f820112156102185780519061007661007183610258565b61021d565b91808352858301988682840101116102185788866100949301610273565b813b156101be577f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b031916841790556000927fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b8480a28051158015906101b7575b610110575b855160d1908161034a8239f35b85519460608601908111868210176101a35786978492839261018d9952602788527f416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c87890152660819985a5b195960ca1b8a8901525190845af4913d15610199573d9061017f61007183610258565b91825281943d92013e610296565b50803880808080610103565b5060609250610296565b634e487b7160e01b84526041600452602484fd5b50826100fe565b855162461bcd60e51b815260048101859052602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608490fd5b600080fd5b6040519190601f01601f191682016001600160401b0381118382101761024257604052565b634e487b7160e01b600052604160045260246000fd5b6001600160401b03811161024257601f01601f191660200190565b60005b8381106102865750506000910152565b8181015183820152602001610276565b919290156102f857508151156102aa575090565b3b156102b35790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b82519091501561030b5750805190602001fd5b6044604051809262461bcd60e51b82526020600483015261033b8151809281602486015260208686019101610273565b601f01601f19168101030190fdfe608060405236156054577f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc54600090819081906001600160a01b0316368280378136915af43d82803e156050573d90f35b3d90fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc54600090819081906001600160a01b0316368280378136915af43d82803e156050573d90f3fea26469706673582212203ff1366f8a9e12c1ab3f867c031b57773cbe5da430d1986fdc7dc2d8ac8c9f4164736f6c63430008110033", "proxyDeployerAddress": "0x40d0109519031cEf1d70C38A932Ac00DBd9a2045", "proxyDeployerCreationCode": "0x61016080604052346200016157620000178162000166565b601a8152602081017f44657465726d696e697374696350726f78794465706c6f796572000000000000815260405191620000518362000166565b6001835260208301603160f81b81526200006b8262000182565b926101209384526200007d8562000355565b92610140938452519020938460e05251902091610100938385524660a0526040519360208501917f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f8352604086015260608501524660808501523060a085015260a0845260c084019380851060018060401b038611176200014b57846040525190206080523060c052611647938462000503853960805184610be4015260a05184610caf015260c05184610bae015260e05184610c3301525183610c590152518260e8015251816101120152f35b634e487b7160e01b600052604160045260246000fd5b600080fd5b604081019081106001600160401b038211176200014b57604052565b8051602091908281101562000221575090601f825111620001c05780825192015190808310620001b157501790565b82600019910360031b1b161790565b90604051809263305a27a960e01b82528060048301528251908160248401526000935b82851062000207575050604492506000838284010152601f80199101168101030190fd5b8481018201518686016044015293810193859350620001e3565b6001600160401b0381116200014b576000928354926001938481811c911680156200034a575b838210146200033657601f811162000300575b5081601f841160011462000299575092829391839286946200028d575b50501b916000199060031b1c191617905560ff90565b01519250388062000277565b919083601f1981168780528488209488905b88838310620002e55750505010620002cb575b505050811b01905560ff90565b015160001960f88460031b161c19169055388080620002be565b858701518855909601959485019487935090810190620002ab565b85805284601f848820920160051c820191601f860160051c015b8281106200032a5750506200025a565b8781550185906200031a565b634e487b7160e01b86526022600452602486fd5b90607f169062000247565b805160209081811015620003e35750601f825111620003825780825192015190808310620001b157501790565b90604051809263305a27a960e01b82528060048301528251908160248401526000935b828510620003c9575050604492506000838284010152601f80199101168101030190fd5b8481018201518686016044015293810193859350620003a5565b9192916001600160401b0381116200014b5760019182548381811c91168015620004f7575b82821014620004e157601f8111620004a8575b5080601f83116001146200045b5750819293946000926200044f575b5050600019600383901b1c191690821b17905560ff90565b01519050388062000437565b90601f198316958460005282600020926000905b888210620004905750508385969710620002cb57505050811b01905560ff90565b8087859682949686015181550195019301906200046f565b8360005283601f83600020920160051c820191601f850160051c015b828110620004d45750506200041b565b60008155018490620004c4565b634e487b7160e01b600052602260045260246000fd5b90607f16906200040856fe6040608081526004908136101561001557600080fd5b600091823560e01c80633486f857146104fe5780634e486aab146104a95780637621fd67146104465780637ff95ee8146101ef57806384b0196e146100d15763a2c8dd9e1461006357600080fd5b346100cd5760603660031901126100cd576001600160401b036024358181116100c957610093903690840161060c565b9190946044359182116100c6575091602094916100b66100bf943690840161060c565b93909235610cd5565b9051908152f35b80fd5b8480fd5b8280fd5b5090346100cd57826003193601126100cd5761010c7f0000000000000000000000000000000000000000000000000000000000000000610717565b926101367f000000000000000000000000000000000000000000000000000000000000000061081f565b90825192602092838501958587106001600160401b038811176101da57509280610190838896610183998b9996528686528151998a99600f60f81b8b5260e0868c015260e08b019061068d565b91898303908a015261068d565b924660608801523060808801528460a088015286840360c088015251928381520193925b8281106101c357505050500390f35b8351855286955093810193928101926001016101b4565b604190634e487b7160e01b6000525260246000fd5b5090346100cd5760e03660031901126100cd5760248035928035916001600160401b036044358181116103f057610229903690850161060c565b94909161023461063e565b9761023d610654565b9360a4359760018060a01b0394858a16998a81036104425760c43586811161043e576102a161029986610293898f6102a6978f8b61028261028b948d9b36910161060c565b9790958b610af8565b9236916108ef565b90610a3b565b919091610926565b610e09565b8a5161075f808201908282108883111761042b578f928092602092610eb38339308152030191f5908115610421578a51928660208501931683528b808501528d60608501526060845260808401958487109087111761040f576020610343948f88958f868c9b9761033e978d9c99610332945260a087013784019160a08301938452845193849161066a565b010380855201836106f6565b610d61565b98169716968088036103f45750863b156103f0578551631b2ce7f360e11b815291168382015286818381838a5af180156103e6576103d1575b50908591853b156100cd57845193849263189acdbd60e31b84528301528183875af180156103c7576103b3575b6020838351908152f35b6103bd84916106b2565b6100cd57826103a9565b82513d86823e3d90fd5b6103de90969192966106b2565b94903861037c565b85513d89823e3d90fd5b8780fd5b8488856044938a51936312ae30e560e01b8552840152820152fd5b634e487b7160e01b8e5260418a52888efd5b8a513d8e823e3d90fd5b50634e487b7160e01b8f5260418b52898ffd5b8e80fd5b8d80fd5b5082346100c657826003193601126100c657602435906001600160401b0382116100c6576020610499856104918661048a6104833689840161060c565b36916108ef565b9035610a3b565b929092610926565b516001600160a01b039091168152f35b5091346100c65760a03660031901126100c657604435906001600160401b0382116100c657506020926104e26100bf923690830161060c565b6104ea61063e565b916104f3610654565b936024359035610af8565b50919034610608576080366003190112610608576001600160401b039183356024358481116100cd57610534903690870161060c565b91906044358681116100c95761054d903690890161060c565b9390966064359081116106045792610594859361059a93610483846102a16102998f9b8f610293908f9e8f9e61028b916105899136910161060c565b9490928a8c8a610cd5565b90610d61565b9581865192839283378101838152039082875af1903d156105fe573d906105c0826108d4565b916105cd855193846106f6565b825260203d92013e5b156105ef57516001600160a01b03909116815260209150f35b5163dc94ae4b60e01b81529050fd5b506105d6565b8580fd5b5080fd5b9181601f84011215610639578235916001600160401b038311610639576020838186019501011161063957565b600080fd5b606435906001600160a01b038216820361063957565b608435906001600160a01b038216820361063957565b60005b83811061067d5750506000910152565b818101518382015260200161066d565b906020916106a68151809281855285808601910161066a565b601f01601f1916010190565b6001600160401b0381116106c557604052565b634e487b7160e01b600052604160045260246000fd5b604081019081106001600160401b038211176106c557604052565b90601f801991011681019081106001600160401b038211176106c557604052565b60ff81146107555760ff811690601f82116107435760405191610739836106db565b8252602082015290565b604051632cd44ac360e21b8152600490fd5b506040516000805490600182811c90808416938415610815575b602094858410811461080157838752869493929181156107e157506001146107a3575b50506107a0925003826106f6565b90565b600080805285812095935091905b8183106107c95750506107a093508201013880610792565b855487840185015294850194869450918301916107b1565b9150506107a094925060ff191682840152151560051b8201013880610792565b634e487b7160e01b85526022600452602485fd5b91607f169161076f565b60ff81146108415760ff811690601f82116107435760405191610739836106db565b50604051600060019081549182811c908084169384156108ca575b602094858410811461080157838752869493929181156107e1575060011461088c5750506107a0925003826106f6565b600081815285812095935091905b8183106108b25750506107a093508201013880610792565b8554878401850152948501948694509183019161089a565b91607f169161085c565b6001600160401b0381116106c557601f01601f191660200190565b9291926108fb826108d4565b9161090960405193846106f6565b829481845281830111610639578281602093846000960137010152565b6005811015610a2557806109375750565b6001810361097f5760405162461bcd60e51b815260206004820152601860248201527745434453413a20696e76616c6964207369676e617475726560401b6044820152606490fd5b600281036109cc5760405162461bcd60e51b815260206004820152601f60248201527f45434453413a20696e76616c6964207369676e6174757265206c656e677468006044820152606490fd5b6003146109d557565b60405162461bcd60e51b815260206004820152602260248201527f45434453413a20696e76616c6964207369676e6174757265202773272076616c604482015261756560f01b6064820152608490fd5b634e487b7160e01b600052602160045260246000fd5b906041815114600014610a6957610a65916020820151906060604084015193015160001a90610a73565b9091565b5050600090600290565b9291906fa2a8918ca85bafe22016d0b997e4df60600160ff1b038311610aec5791608094939160ff602094604051948552168484015260408301526060820152600093849182805260015afa15610adf5781516001600160a01b03811615610ad9579190565b50600190565b50604051903d90823e3d90fd5b50505050600090600390565b939291610b0891959236916108ef565b602081519101206040519460208601947f4f2bfcc23c1adbe54973f469f111f1848a62d32cc4a906c7a5ced17481b366ea865260408701526060860152608085015260018060a01b0380921660a08501521660c083015260c0825260e08201918083106001600160401b038411176106c5576107a0926040525190205b604290610b90610bab565b906040519161190160f01b8352600283015260228201522090565b307f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03161480610cac575b15610c06577f000000000000000000000000000000000000000000000000000000000000000090565b60405160208101907f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f82527f000000000000000000000000000000000000000000000000000000000000000060408201527f000000000000000000000000000000000000000000000000000000000000000060608201524660808201523060a082015260a0815260c081018181106001600160401b038211176106c55760405251902090565b507f00000000000000000000000000000000000000000000000000000000000000004614610bdd565b9290610ce690610cf59336916108ef565b602081519101209336916108ef565b602081519101206040519260208401927f11ebd6670048529a84d03c14cb6bf8539a7ce6288dd624a22bb7111cacc9358e84526040850152606084015260808301526080825260a08201918083106001600160401b038411176106c5576107a092604052519020610b85565b90805115610dc5576020815191016000f5906001600160a01b03821615610d8457565b60405162461bcd60e51b8152602060048201526019602482015278437265617465323a204661696c6564206f6e206465706c6f7960381b6044820152606490fd5b606460405162461bcd60e51b815260206004820152602060248201527f437265617465323a2062797465636f6465206c656e677468206973207a65726f6044820152fd5b60018060a01b03168160601c14908115610e9f575b5015610e2657565b60405162461bcd60e51b815260206004820152604560248201527f496e76616c69642073616c74202d206669727374203230206279746573206f6660448201527f207468652073616c74206d757374206d617463682063616c6c696e67206164646064820152643932b9b99760d91b608482015260a490fd5b6001600160601b03191615905038610e1e56fe60c03461008b57601f61075f38819003918201601f19168301916001600160401b038311848410176100905780849260209460405283398101031261008b57516001600160a01b038116810361008b573060805260a0526040516106b890816100a782396080518181816058015281816101270152610393015260a05181818161016c01526103d90152f35b600080fd5b634e487b7160e01b600052604160045260246000fdfe608060408181526004918236101561001657600080fd5b600090813560e01c9081633659cfe614610369575080634f1ef286146100ad576352d1902d1461004557600080fd5b346100aa57806003193601126100aa57507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316300361009d57602090516000805160206106638339815191528152f35b51635e4c25f160e01b8152fd5b80fd5b509080600319360112610365576100c2610585565b906024356001600160401b03811161036157366023820112156103615780850135906100ed826105d7565b6100f9845191826105a0565b8281526020928382019236602483830101116103025781889260248793018637830101526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000008116903082146103515760008051602061066383398151915291818354160361034157807f000000000000000000000000000000000000000000000000000000000000000016330361030d577f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156101d0575050505050506101cd9192506105f2565b80f35b86979597169087516352d1902d60e01b815285818b81865afa8791816102da575b5061020657885163e5ec176960e01b81528a90fd5b989293949698979597036102cb5761021d886105f2565b8451907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b8880a28251158015906102c3575b61025f575b505050505050905080f35b873b156102b757505093809581926102a09651915af4903d156102ad573d610292610289826105d7565b925192836105a0565b81528481933d92013e610639565b5080388080808080610254565b5060609150610639565b63369891e760e01b8152fd5b50600161024f565b5083516308373ebf60e41b8152fd5b9091508681813d8311610306575b6102f281836105a0565b81010312610302575190386101f1565b8780fd5b503d6102e8565b855162461bcd60e51b8152808a01869052600e60248201526d1b9bdd08185d5d1a1bdc9a5e995960921b6044820152606490fd5b85516364cd8d1960e01b81528990fd5b8551631932df4560e01b81528990fd5b8380fd5b5080fd5b91929050346105815760208060031936011261036157610387610585565b926001600160a01b03907f0000000000000000000000000000000000000000000000000000000000000000821690308214610573575060008051602061066383398151915290828254160361056357817f000000000000000000000000000000000000000000000000000000000000000016330361052f57835190838201928284106001600160401b0385111761051c578386528783527f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff1615610459575050505050506101cd9192506105f2565b86979597169087516352d1902d60e01b815285818b81865afa8791816104ed575b5061048f57885163e5ec176960e01b81528a90fd5b989293949698979597036102cb576104a6886105f2565b8451907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b8880a28251158015906104e65761025f57505050505050905080f35b508661024f565b9091508681813d8311610515575b61050581836105a0565b810103126103025751903861047a565b503d6104fb565b634e487b7160e01b885260418952602488fd5b835162461bcd60e51b8152808801849052600e60248201526d1b9bdd08185d5d1a1bdc9a5e995960921b6044820152606490fd5b83516364cd8d1960e01b81528790fd5b631932df4560e01b81528790fd5b8280fd5b600435906001600160a01b038216820361059b57565b600080fd5b90601f801991011681019081106001600160401b038211176105c157604052565b634e487b7160e01b600052604160045260246000fd5b6001600160401b0381116105c157601f01601f191660200190565b803b156106275760008051602061066383398151915280546001600160a01b0319166001600160a01b03909216919091179055565b60405163529880eb60e01b8152600490fd5b156106415790565b80511561065057805190602001fd5b6040516350a28c9b60e11b8152600490fdfe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbca26469706673582212202a31e5df741ee89d8b94ce215f4d605f6f18a2507df30b0895f6194dcca63a7564736f6c63430008110033a264697066735822122033a4bf6be876ffc6d7f592fa6a4fbe4748f5093dfce539b5d618211b85bc76ab64736f6c63430008110033", "proxyDeployerSalt": "0x0000000000000000000000000000000000000000668d7f9ec18e35000dbaba0e", - "proxySalt": "0xf8d7ca54ceeac56933787b31002f42c5e5df5382a5a796cfee33bddd521ec6d1", + "proxySalt": "0xcfdd4ee5feac7f69c2cb61f5ef983d26e95490688622f6e5b1caa8c8dfe02262", "proxyShimSalt": "0x680e26b472d8cae8148ee21fcad6a69d737664360000000000000000000000c8" } \ No newline at end of file diff --git a/deterministicConfig/premintExecutorProxy/signatures.json b/deterministicConfig/premintExecutorProxy/signatures.json index f8723eb1e..4605cc869 100644 --- a/deterministicConfig/premintExecutorProxy/signatures.json +++ b/deterministicConfig/premintExecutorProxy/signatures.json @@ -1,3 +1,3 @@ { - "999": "0x65cf648eec9d657fbd96f9cba260ae19d733cd02fc2c7c20c26b830be6f3d7632d5e587d9acb444af20d2078fc0c6bda7e18d0c590fc36f21dfa0881ba434c381b" + "999": "0x44e637a5f01934cd4f79cd783328d9f2afb2a0c9641e83b872024ed8e2fc07977d0bf34c27ee975b61d3aed8aa2cbcc6009f4dad11899c20d1ac29101239e7431c" } \ No newline at end of file diff --git a/script/DeployAllToNewChain.s.sol b/script/DeployAllToNewChain.s.sol index d679d81e2..a0445a68e 100644 --- a/script/DeployAllToNewChain.s.sol +++ b/script/DeployAllToNewChain.s.sol @@ -54,6 +54,8 @@ contract DeployAllToNewChain is ZoraDeployerBase, DeterministicDeployerScript, D chain: chain }); + console2.log("create test contract for verification"); + ZoraDeployerUtils.deployTestContractForVerification(factoryProxyAddress, makeAddr("admin")); console2.log("Deployed new contract for verification purposes"); @@ -77,12 +79,14 @@ contract DeployAllToNewChain is ZoraDeployerBase, DeterministicDeployerScript, D deployment.preminterImpl = preminterImpl; deployment.preminterProxy = preminterProxyAddress; + console2.log("testing premint"); + + signAndExecutePremint(preminterProxyAddress); + vm.stopBroadcast(); // now test signing and executing premint - signAndExecutePremint(preminterProxyAddress); - return getDeploymentJSON(deployment); } } diff --git a/src/deployment/DeterministicDeployerScript.sol b/src/deployment/DeterministicDeployerScript.sol index 3168d7564..1d470f0b6 100644 --- a/src/deployment/DeterministicDeployerScript.sol +++ b/src/deployment/DeterministicDeployerScript.sol @@ -216,6 +216,8 @@ contract DeterministicDeployerScript is Script { ); require(resultAddress == params.deterministicProxyAddress, "DeterministicDeployerScript: proxy address mismatch"); + + return resultAddress; } function deployUpgradeGate(uint256 chain, address upgradeGateOwner) internal returns (address) { @@ -237,5 +239,7 @@ contract DeterministicDeployerScript is Script { }); require(resultAddress == vm.parseJsonAddress(upgradeGateParams, ".upgradeGateAddress"), "DeterministicDeployerScript: upgrade gate address mismatch"); + + return resultAddress; } }