From 10236b5e0f656d2d32de4cdaaef2cb8937c10ac0 Mon Sep 17 00:00:00 2001 From: Paul Razvan Berg Date: Fri, 7 Jul 2023 14:44:28 +0300 Subject: [PATCH 1/2] build: bump node.js deps --- package.json | 8 ++++---- pnpm-lock.yaml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index d57c5b01..60a93d82 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@openzeppelin/contracts": "4.9.2", - "@prb/proxy": "4.0.0-beta.6", - "@sablier/v2-core": "1.0.0-rc.0", + "@prb/proxy": "4.0.0", + "@sablier/v2-core": "1.0.0", "@uniswap/permit2": "github:sablier-labs/permit2#abd5832c931ebdce2dd04e81f353d23324d341be" }, "devDependencies": { @@ -41,8 +41,8 @@ ], "peerDependencies": { "@openzeppelin/contracts": "4.9.2", - "@prb/proxy": "4.0.0-beta.6", - "@sablier/v2-core": "1.0.0-rc.0" + "@prb/proxy": "4.0.0", + "@sablier/v2-core": "1.0.0" }, "publishConfig": { "access": "public" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2c3fdc96..21d04bee 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,11 +9,11 @@ dependencies: specifier: 4.9.2 version: 4.9.2 '@prb/proxy': - specifier: 4.0.0-beta.6 - version: 4.0.0-beta.6 + specifier: 4.0.0 + version: 4.0.0 '@sablier/v2-core': - specifier: 1.0.0-rc.0 - version: 1.0.0-rc.0(@openzeppelin/contracts@4.9.2)(@prb/math@4.0.1) + specifier: 1.0.0 + version: 1.0.0(@openzeppelin/contracts@4.9.2)(@prb/math@4.0.1) '@uniswap/permit2': specifier: github:sablier-labs/permit2#abd5832c931ebdce2dd04e81f353d23324d341be version: github.com/sablier-labs/permit2/abd5832c931ebdce2dd04e81f353d23324d341be @@ -57,12 +57,12 @@ packages: resolution: {integrity: sha512-ANTz2KMV+dMdZ57mWgDTR6jZo5uQzUczQEHCxd7CvJZZ9yafnfPhUUILHvvigIOZ85fZbTPVkC8YoRG1z5Qf7g==} dev: false - /@prb/proxy@4.0.0-beta.6: - resolution: {integrity: sha512-RO8TleA/fAZun6GeM5eHZl5cBTr+09JMM4eLqLbAEWD0BiWkW6RsvemYtI4cwKnDB/bKJge4wI7RiywfN1lC8g==} + /@prb/proxy@4.0.0: + resolution: {integrity: sha512-KL6ssNOSIOhMQnRHUOA5U6lY/WMvVmno6X4laxMUof6C8VBmt6gSuYndeofLHa7Nlb96VrXwjvY6OKhDG0pM2A==} dev: false - /@sablier/v2-core@1.0.0-rc.0(@openzeppelin/contracts@4.9.2)(@prb/math@4.0.1): - resolution: {integrity: sha512-6VHl4rgvrrlmSzhZAfyWervs7jKCGpdUzbBpHeN9L59snb5BMQFKzRYtzM1MERprfU8FoZ0T0FpNEu1V26AQAQ==} + /@sablier/v2-core@1.0.0(@openzeppelin/contracts@4.9.2)(@prb/math@4.0.1): + resolution: {integrity: sha512-3Es3T2mSrMrnR5BA332qScG+tMZMvCqnpHYwY1U6z1jBw15/W5iB9NMivzh+F2B301zO0fB6zASAU83f93WAtg==} peerDependencies: '@openzeppelin/contracts': 4.9.2 '@prb/math': 4.0.1 From d9d879160de7911befd0fe80edbf0c19d67efea5 Mon Sep 17 00:00:00 2001 From: Paul Razvan Berg Date: Fri, 7 Jul 2023 14:53:44 +0300 Subject: [PATCH 2/2] build: bump submodules build: pin permit2 to "release" branch build: pin v2-core to "release" branch --- .gitmodules | 4 ++-- lib/permit2 | 2 +- lib/prb-proxy | 2 +- lib/solady | 2 +- lib/v2-core | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 67c8ff57..3a55d923 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,7 +7,7 @@ path = "lib/openzeppelin-contracts" url = "https://github.com/OpenZeppelin/openzeppelin-contracts" [submodule "lib/permit2"] - branch = "main" + branch = "release" path = "lib/permit2" url = "https://github.com/sablier-labs/permit2" [submodule "lib/prb-proxy"] @@ -23,6 +23,6 @@ path = "lib/solady" url = "https://github.com/Vectorized/solady" [submodule "lib/v2-core"] - branch = "main" + branch = "release" path = "lib/v2-core" url = "https://github.com/sablier-labs/v2-core" diff --git a/lib/permit2 b/lib/permit2 index 576f549a..abd5832c 160000 --- a/lib/permit2 +++ b/lib/permit2 @@ -1 +1 @@ -Subproject commit 576f549a7351814f112edcc42f3f8472d1712673 +Subproject commit abd5832c931ebdce2dd04e81f353d23324d341be diff --git a/lib/prb-proxy b/lib/prb-proxy index 82d14b9d..27594d50 160000 --- a/lib/prb-proxy +++ b/lib/prb-proxy @@ -1 +1 @@ -Subproject commit 82d14b9d0b0f6be3df43268c41cffec4701368f8 +Subproject commit 27594d50f049330c5acfa6cf45448152a2932ecf diff --git a/lib/solady b/lib/solady index 7175c21f..c863813a 160000 --- a/lib/solady +++ b/lib/solady @@ -1 +1 @@ -Subproject commit 7175c21f95255dc7711ce84cc32080a41864abd6 +Subproject commit c863813a6fa2068e1ec834ebc037ededb99a6f97 diff --git a/lib/v2-core b/lib/v2-core index f25aad3a..412ec3d3 160000 --- a/lib/v2-core +++ b/lib/v2-core @@ -1 +1 @@ -Subproject commit f25aad3a3bff37b7b095aa77bfdc8a91add09382 +Subproject commit 412ec3d3998a766507de96afdb26c797d2ae491d