From 8a75dd736bae04cc9057909df16ec7afe04959f5 Mon Sep 17 00:00:00 2001 From: Dan Oved Date: Thu, 5 Oct 2023 06:42:23 -0400 Subject: [PATCH] can pull in protocol rewards --- package.json | 1 + packages/1155-contracts/foundry.toml | 1 + packages/protocol-rewards/foundry.toml | 2 +- yarn.lock | 9 ++------- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 7c08c759f..bb7788895 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "repository": "git@github.com:ourzora/zora-contracts.git", "scripts": { "build": "turbo run build", + "test": "turbo run test", "dev": "turbo run dev", "lint": "turbo run lint", "format": "prettier --write \"**/*.{ts,tsx,md}\"" diff --git a/packages/1155-contracts/foundry.toml b/packages/1155-contracts/foundry.toml index 53b2757a6..e69cfc703 100644 --- a/packages/1155-contracts/foundry.toml +++ b/packages/1155-contracts/foundry.toml @@ -1,6 +1,7 @@ [profile.default] fs_permissions = [{access = "read", path = "./addresses"}, {access = "read", path = "./chainConfigs"}, {access = "read", path = "./package.json"}, {access = "readwrite", path = "./deterministicConfig"}] libs = ['_imagine', 'node_modules', 'script'] +allow_paths = ["node_modules/@zoralabs/protocol-rewards"] optimizer = true optimizer_runs = 50 out = 'out' diff --git a/packages/protocol-rewards/foundry.toml b/packages/protocol-rewards/foundry.toml index b29abc147..62d40400e 100644 --- a/packages/protocol-rewards/foundry.toml +++ b/packages/protocol-rewards/foundry.toml @@ -2,7 +2,7 @@ auto_detect_solc = true fs_permissions = [{access = "read", path = "./addresses"}, {access = "read", path = "./package.json"}] fuzz_runs = 500 -libs = ['lib', '_imagine'] +libs = ['_imagine', 'node_modules', 'script'] optimizer = true optimizer_runs = 500000 out = 'out' diff --git a/yarn.lock b/yarn.lock index ad84c0151..69e2dbb30 100644 --- a/yarn.lock +++ b/yarn.lock @@ -788,7 +788,7 @@ loupe "^2.3.6" pretty-format "^27.5.1" -"@wagmi/cli@^1.0.1", "@wagmi/cli@^1.3.0": +"@wagmi/cli@^1.0.1": version "1.5.2" resolved "https://registry.yarnpkg.com/@wagmi/cli/-/cli-1.5.2.tgz#11e767b8c5d1cfb5045b6ec63df6fa5001189bc4" integrity sha512-UfLMYhW6mQBCjR8A5s01Chf9GpHzdpcuuBuzJ36QGXcMSJAxylz5ImVZWfCRV0ct1UruydjKVSW1QSI6azNxRQ== @@ -821,11 +821,6 @@ resolved "https://registry.yarnpkg.com/@zoralabs/openzeppelin-contracts-upgradeable/-/openzeppelin-contracts-upgradeable-4.8.4.tgz#130b69cd5ff70b1f67da11fe53fe8b2323464b84" integrity sha512-5vhL88tz00Gv2+NUhLdYBRqb9RRekfyQAodXTQxJU2LYxxy6jr1mPycTZempQ1kmw5wIwFbSIoYzpaxOx6UK6Q== -"@zoralabs/protocol-rewards@*": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@zoralabs/protocol-rewards/-/protocol-rewards-1.2.1.tgz#fe7f011748b036a1a3c8f3b43811307794d1c89a" - integrity sha512-Jf2aIHhyAsybCCv1byV5uP/YiwA/ZB3zTywDO6d15796Bf58zzC3D1ptKuh+z1Nba3dU2Hzqz0K7EEQOjoq+1A== - abitype@0.8.7: version "0.8.7" resolved "https://registry.yarnpkg.com/abitype/-/abitype-0.8.7.tgz#e4b3f051febd08111f486c0cc6a98fa72d033622" @@ -3206,7 +3201,7 @@ prettier@^2.7.1, prettier@^2.8.1, prettier@^2.8.8: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== -prettier@^3.0.0, prettier@^3.0.3: +prettier@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643" integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==