From be13d01d13d753a22ca4f9d0457e3e61785a1f61 Mon Sep 17 00:00:00 2001 From: Michael Heuer <20623991+Michael-A-Heuer@users.noreply.github.com> Date: Mon, 22 Apr 2024 16:55:13 +0200 Subject: [PATCH 1/2] chore: bump osx-commons-sdk version (#62) --- packages/contracts/package.json | 2 +- packages/contracts/yarn.lock | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 3009a901..bf6e12ac 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -21,7 +21,7 @@ "devDependencies": { "@aragon/osx-commons-configs": "0.4.0", "@aragon/osx-ethers": "1.4.0-alpha.0", - "@aragon/osx-commons-sdk": "0.0.1-alpha.8", + "@aragon/osx-commons-sdk": "0.0.1-alpha.9", "@ethersproject/abi": "^5.7.0", "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", diff --git a/packages/contracts/yarn.lock b/packages/contracts/yarn.lock index b32ed327..369a115c 100644 --- a/packages/contracts/yarn.lock +++ b/packages/contracts/yarn.lock @@ -17,12 +17,13 @@ "@openzeppelin/contracts" "4.9.6" "@openzeppelin/contracts-upgradeable" "4.9.6" -"@aragon/osx-commons-sdk@0.0.1-alpha.8": - version "0.0.1-alpha.8" - resolved "https://registry.yarnpkg.com/@aragon/osx-commons-sdk/-/osx-commons-sdk-0.0.1-alpha.8.tgz#c75d9f9c8f6f90e76ff00d07081f5a5231fc66d3" - integrity sha512-zWr/Fr3Sz0fxfDOKT8FLrQVDQhAyyo7LwWg/wXlasjw1XjoJwfasCjs2gssG6KJz7XzNUVHPjKJmWfvfbTuOAw== +"@aragon/osx-commons-sdk@0.0.1-alpha.9": + version "0.0.1-alpha.9" + resolved "https://registry.yarnpkg.com/@aragon/osx-commons-sdk/-/osx-commons-sdk-0.0.1-alpha.9.tgz#bd2fe77a847a35b675443db60269fa44af73c5d3" + integrity sha512-FJKMLTlFRJ11cL03tEzOCm2Zn4IL+bJkXBQiIWzrCc3U2KdbYfmYLKN9l7103AJhc6slb6jJgGARE0VZvnYgbg== dependencies: "@aragon/osx-commons-configs" "^0.4.0" + "@ethersproject/address" "^5.7.0" "@ethersproject/bignumber" "^5.7.0" "@ethersproject/contracts" "^5.7.0" "@ethersproject/hash" "^5.7.0" From 3e9e3b49aa5fb93bc2a969268362b78382bc6707 Mon Sep 17 00:00:00 2001 From: Michael Heuer <20623991+Michael-A-Heuer@users.noreply.github.com> Date: Tue, 23 Apr 2024 16:16:38 +0200 Subject: [PATCH 2/2] chore: sync with `osx-commons` (#63) * chore: bump osx-commons-sdk version * chore: bump osx-commons * fix: yarn lock --- packages/contracts/package.json | 16 ++++++++-------- packages/contracts/yarn.lock | 31 ++++++++++++++++--------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/packages/contracts/package.json b/packages/contracts/package.json index bf6e12ac..4c2c5cbf 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -14,19 +14,19 @@ "clean": "rimraf ./artifacts ./cache ./coverage ./typechain ./types ./coverage.json && yarn typechain" }, "dependencies": { - "@aragon/osx-commons-contracts": "1.4.0-alpha.4", + "@aragon/osx-commons-contracts": "1.4.0-alpha.5", "@openzeppelin/contracts": "^4.9.6", "@openzeppelin/contracts-upgradeable": "^4.9.6" }, "devDependencies": { "@aragon/osx-commons-configs": "0.4.0", "@aragon/osx-ethers": "1.4.0-alpha.0", - "@aragon/osx-commons-sdk": "0.0.1-alpha.9", - "@ethersproject/abi": "^5.7.0", - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/providers": "^5.7.2", + "@aragon/osx-commons-sdk": "0.0.1-alpha.11", + "@ethersproject/abi": "5.7.0", + "@ethersproject/abstract-signer": "5.7.0", + "@ethersproject/bignumber": "5.7.0", + "@ethersproject/bytes": "5.7.0", + "@ethersproject/providers": "5.7.2", "@nomicfoundation/hardhat-chai-matchers": "^1.0.6", "@nomicfoundation/hardhat-network-helpers": "^1.0.8", "@nomicfoundation/hardhat-toolbox": "^2.0.2", @@ -41,7 +41,7 @@ "chai": "^4.3.7", "cross-env": "^7.0.3", "dotenv": "^16.3.1", - "ethers": "^5.7.2", + "ethers": "5.7.2", "hardhat": "^2.13.1", "hardhat-deploy": "^0.11.26", "hardhat-gas-reporter": "^1.0.9", diff --git a/packages/contracts/yarn.lock b/packages/contracts/yarn.lock index 369a115c..26598cfa 100644 --- a/packages/contracts/yarn.lock +++ b/packages/contracts/yarn.lock @@ -9,25 +9,26 @@ dependencies: tslib "^2.6.2" -"@aragon/osx-commons-contracts@1.4.0-alpha.4": - version "1.4.0-alpha.4" - resolved "https://registry.yarnpkg.com/@aragon/osx-commons-contracts/-/osx-commons-contracts-1.4.0-alpha.4.tgz#87bb8cbbd401683add9b3dc4cbee3eb0c20f7785" - integrity sha512-RBkynt/XA1U8dapinFDycCvbTnXXRPNKGUklBdHys/MDOe57hEDjbXyFSKM562KC0s4hocTFx6U9sGNKp+90hw== +"@aragon/osx-commons-contracts@1.4.0-alpha.5": + version "1.4.0-alpha.5" + resolved "https://registry.yarnpkg.com/@aragon/osx-commons-contracts/-/osx-commons-contracts-1.4.0-alpha.5.tgz#37a28085677c21216628ba0a05f5fe09489eb71c" + integrity sha512-F2JWWxmUNmiJsaXcTDyd6F2GUIgnc313vvWTp/cSmSVkccT2pfMleWqxIi4LIodX3ueFUYfE02rLj8Gjp1jljA== dependencies: "@openzeppelin/contracts" "4.9.6" "@openzeppelin/contracts-upgradeable" "4.9.6" -"@aragon/osx-commons-sdk@0.0.1-alpha.9": - version "0.0.1-alpha.9" - resolved "https://registry.yarnpkg.com/@aragon/osx-commons-sdk/-/osx-commons-sdk-0.0.1-alpha.9.tgz#bd2fe77a847a35b675443db60269fa44af73c5d3" - integrity sha512-FJKMLTlFRJ11cL03tEzOCm2Zn4IL+bJkXBQiIWzrCc3U2KdbYfmYLKN9l7103AJhc6slb6jJgGARE0VZvnYgbg== +"@aragon/osx-commons-sdk@0.0.1-alpha.11": + version "0.0.1-alpha.11" + resolved "https://registry.yarnpkg.com/@aragon/osx-commons-sdk/-/osx-commons-sdk-0.0.1-alpha.11.tgz#1e3e39aac3351b6649921a5e373a5146b86b2c92" + integrity sha512-/FgTLnS73QY0JxZYQlHwpd2ZuMPkPKdIlci9T4jgH9E4Eyyxh6GX7fJK+HekCcf6oMS5tTZ/Cb3sVyyzoO95iw== dependencies: "@aragon/osx-commons-configs" "^0.4.0" - "@ethersproject/address" "^5.7.0" - "@ethersproject/bignumber" "^5.7.0" - "@ethersproject/contracts" "^5.7.0" - "@ethersproject/hash" "^5.7.0" - "@ethersproject/providers" "^5.7.0" + "@ethersproject/address" "5.7.0" + "@ethersproject/bignumber" "5.7.0" + "@ethersproject/contracts" "5.7.0" + "@ethersproject/hash" "5.7.0" + "@ethersproject/logger" "5.7.0" + "@ethersproject/providers" "5.7.2" ipfs-http-client "^51.0.0" "@aragon/osx-ethers@1.4.0-alpha.0": @@ -318,7 +319,7 @@ dependencies: "@ethersproject/logger" "^5.7.0" -"@ethersproject/providers@5.7.2", "@ethersproject/providers@^5.7.0", "@ethersproject/providers@^5.7.1", "@ethersproject/providers@^5.7.2": +"@ethersproject/providers@5.7.2", "@ethersproject/providers@^5.7.1", "@ethersproject/providers@^5.7.2": version "5.7.2" resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.2.tgz#f8b1a4f275d7ce58cf0a2eec222269a08beb18cb" integrity sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg== @@ -2399,7 +2400,7 @@ ethereumjs-util@^7.0.3, ethereumjs-util@^7.1.4: ethereum-cryptography "^0.1.3" rlp "^2.2.4" -ethers@^5.6.2, ethers@^5.7.0, ethers@^5.7.1, ethers@^5.7.2: +ethers@5.7.2, ethers@^5.6.2, ethers@^5.7.0, ethers@^5.7.1, ethers@^5.7.2: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==