diff --git a/packages/protocol-deployments/addresses/999999999.json b/packages/protocol-deployments/addresses/999999999.json index 854d2901e..e50d37652 100644 --- a/packages/protocol-deployments/addresses/999999999.json +++ b/packages/protocol-deployments/addresses/999999999.json @@ -1,13 +1,14 @@ { - "CONTRACT_1155_IMPL": "0x8f99FcF39C9f0B967daFcb5f85E182eb6677DdaB", - "CONTRACT_1155_IMPL_VERSION": "2.1.1-premint-api.0", - "FACTORY_IMPL": "0x3D6887CC977cAfBf7A6cCd78f587Fb77B97564E6", + "CONTRACT_1155_IMPL": "0xc98479777c2A03c963Ae733410c7bB81dB94243f", + "CONTRACT_1155_IMPL_VERSION": "2.4.0", + "FACTORY_IMPL": "0xd77783B9df27BC9ABd438d1ddE67e3afB64618e0", "FACTORY_PROXY": "0x777777C338d93e2C7adf08D102d45CA7CC4Ed021", "FIXED_PRICE_SALE_STRATEGY": "0x6d28164C3CE04A190D5F9f0f8881fc807EAD975A", "MERKLE_MINT_SALE_STRATEGY": "0x5e5fD4b758076BAD940db0284b711A67E8a3B88c", "PREMINTER_IMPL": "0xC2EB55e7FAdC2289CFd063b1ec7c566EC2F0DA63", "PREMINTER_PROXY": "0x7777773606e7e46C8Ba8B98C08f5cD218e31d340", "REDEEM_MINTER_FACTORY": "0x25cFb6dd9cDE8425e781d6718a29Ccbca3F038d6", - "timestamp": 1698699941, - "commit": "ad16b9b" + "UPGRADE_GATE": "0x0000000000000000000000000000000000000000", + "timestamp": 1700006288, + "commit": "489f3eb7" } \ No newline at end of file diff --git a/packages/protocol-deployments/package.json b/packages/protocol-deployments/package.json index 2fd39565b..4d5c1a4ea 100644 --- a/packages/protocol-deployments/package.json +++ b/packages/protocol-deployments/package.json @@ -20,7 +20,7 @@ "link-contracts": "rm -rf ./node_modules && cd .. && yarn" }, "dependencies": { - "@zoralabs/zora-1155-contracts": "*", + "@zoralabs/zora-1155-contracts": "2.4.0", "ds-test": "https://github.com/dapphub/ds-test#cd98eff28324bfac652e63a239a60632a761790b", "forge-std": "https://github.com/foundry-rs/forge-std#705263c95892a906d7af65f0f73ce8a4a0c80b80", "solmate": "^6.1.0" diff --git a/yarn.lock b/yarn.lock index 453419b39..d87b849dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -839,6 +839,19 @@ resolved "https://registry.yarnpkg.com/@zoralabs/openzeppelin-contracts-upgradeable/-/openzeppelin-contracts-upgradeable-4.8.4.tgz#130b69cd5ff70b1f67da11fe53fe8b2323464b84" integrity sha512-5vhL88tz00Gv2+NUhLdYBRqb9RRekfyQAodXTQxJU2LYxxy6jr1mPycTZempQ1kmw5wIwFbSIoYzpaxOx6UK6Q== +"@zoralabs/zora-1155-contracts@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@zoralabs/zora-1155-contracts/-/zora-1155-contracts-2.4.0.tgz#bf7fbdf9ea697fcccb0d93ec20786310cdeac255" + integrity sha512-qTWw34rGQpJg7Dn+JSWDYN6ORap0O94Rv++3/ma9ezg2R4ieM+16a6PyTp08qlGcRv5ThmGkZCWqCoZ1yy1t/w== + dependencies: + "@openzeppelin/contracts" "4.9.2" + "@zoralabs/openzeppelin-contracts-upgradeable" "4.8.4" + "@zoralabs/protocol-rewards" "*" + ds-test "https://github.com/dapphub/ds-test#cd98eff28324bfac652e63a239a60632a761790b" + forge-std "https://github.com/foundry-rs/forge-std#705263c95892a906d7af65f0f73ce8a4a0c80b80" + solady "^0.0.123" + solmate "^6.1.0" + abitype@0.8.7: version "0.8.7" resolved "https://registry.yarnpkg.com/abitype/-/abitype-0.8.7.tgz#e4b3f051febd08111f486c0cc6a98fa72d033622" @@ -1471,6 +1484,11 @@ dotenv@^16.0.3: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e" integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ== +"ds-test@git+https://github.com/dapphub/ds-test.git#cd98eff28324bfac652e63a239a60632a761790b": + version "1.0.0" + uid cd98eff28324bfac652e63a239a60632a761790b + resolved "git+https://github.com/dapphub/ds-test.git#cd98eff28324bfac652e63a239a60632a761790b" + "ds-test@https://github.com/dapphub/ds-test#cd98eff28324bfac652e63a239a60632a761790b": version "1.0.0" resolved "https://github.com/dapphub/ds-test#cd98eff28324bfac652e63a239a60632a761790b" @@ -1910,6 +1928,11 @@ foreground-child@^3.1.0: cross-spawn "^7.0.0" signal-exit "^4.0.1" +"forge-std@git+https://github.com/foundry-rs/forge-std.git#705263c95892a906d7af65f0f73ce8a4a0c80b80": + version "1.6.0" + uid "705263c95892a906d7af65f0f73ce8a4a0c80b80" + resolved "git+https://github.com/foundry-rs/forge-std.git#705263c95892a906d7af65f0f73ce8a4a0c80b80" + "forge-std@https://github.com/foundry-rs/forge-std#705263c95892a906d7af65f0f73ce8a4a0c80b80": version "1.6.0" resolved "https://github.com/foundry-rs/forge-std#705263c95892a906d7af65f0f73ce8a4a0c80b80"