Update dependencies to threshold-network and keep-network projects
#212
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,15 @@ jobs: | |
| node-version: "14" | ||
| cache: "yarn" | ||
|
|
||
| # We need this step because the `@keep-network/tbtc` which we install in | ||
| # next step has a dependency to `@summa-tx/relay-sol@2.0.2` package, which | ||
| # downloads one of its sub-dependencies via unathenticated `git://` | ||
| # protocol. That protocol is no longer supported. Thanks to this step | ||
| # `https://` is used instead of `git://`. | ||
| - name: Configure git to don't use unauthenticated protocol | ||
| shell: bash | ||
| run: git config --global url."https://".insteadOf git:// | ||
|
|
||
| - name: Install dependencies | ||
| run: yarn install | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -24,11 +24,21 @@ jobs: | |||||
| registry-url: "https://registry.npmjs.org" | ||||||
| cache: "yarn" | ||||||
|
|
||||||
| # We need this step because the `@keep-network/tbtc` which we update in | ||||||
| # next step has a dependency to `@summa-tx/relay-sol@2.0.2` package, which | ||||||
| # downloads one of its sub-dependencies via unathenticated `git://` | ||||||
| # protocol. That protocol is no longer supported. Thanks to this step | ||||||
| # `https://` is used instead of `git://`. | ||||||
| - name: Configure git to don't use unauthenticated protocol | ||||||
| shell: bash | ||||||
| run: git config --global url."https://".insteadOf git:// | ||||||
|
|
||||||
| - name: Resolve latest contracts | ||||||
| run: | | ||||||
| yarn upgrade \ | ||||||
|
Member
There was a problem hiding this comment. Let's pin to exact dependencies versions. (see threshold-network/keep-core#3083 for explaination)
Suggested change
|
||||||
| @keep-network/keep-core \ | ||||||
| @keep-network/tbtc \ | ||||||
| @threshold-network/solidity-contracts | ||||||
|
|
||||||
| # Deploy contracts to a local network to generate deployment artifacts that | ||||||
| # are required by dashboard compilation. | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -89,6 +89,19 @@ yarn build | |
| ``` | ||
| Compiled contracts will land in the `build/` directory. | ||
|
|
||
| *NOTE:* The `coverage-pools` package contains an indirect dependency to | ||
| `@summa-tx/relay-sol@2.0.2` package, which downloads one of its sub-dependencies | ||
| via unathenticated `git://` protocol. That protocol is no longer supported by | ||
| GitHub. This means that in certain situations installation of the package or | ||
| update of its dependencies using Yarn may result in `The unauthenticated git | ||
| protocol on port 9418 is no longer supported` or `fatal: unable to connect to | ||
| github.com:` error. + | ||
| As a workaround, we advise changing Git configuration to use `https://` protocol | ||
| instead of `git://` by executing: | ||
| ``` | ||
| git config --global url."https://".insteadOf git:// | ||
| ``` | ||
|
|
||
| === Test contracts | ||
|
|
||
| There are multiple test scenarios living in the `test` directory. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -35,10 +35,10 @@ | |||||||||
| "prepublishOnly": "./scripts/prepare-artifacts.sh --network $npm_config_network" | ||||||||||
| }, | ||||||||||
| "dependencies": { | ||||||||||
| "@keep-network/keep-core": ">1.8.0-dev <1.8.0-goerli", | ||||||||||
| "@keep-network/tbtc": ">1.1.2-dev <1.1.2-goerli", | ||||||||||
|
Comment on lines
+38
to
+39
Member
There was a problem hiding this comment. Could we use the
Suggested change
|
||||||||||
| "@thesis/solidity-contracts": "github:thesis/solidity-contracts#4985bcf", | ||||||||||
| "@threshold-network/solidity-contracts": "development", | ||||||||||
| "@openzeppelin/contracts": "^4.3", | ||||||||||
| "@tenderly/hardhat-tenderly": "^1.0.12" | ||||||||||
| }, | ||||||||||
|
|
||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1151,10 +1151,18 @@ | |
| "@openzeppelin/upgrades" "^2.7.2" | ||
| openzeppelin-solidity "2.4.0" | ||
|
|
||
| "@keep-network/keep-core@>1.8.0-dev <1.8.0-goerli": | ||
| version "1.8.0-dev.11" | ||
| resolved "https://registry.yarnpkg.com/@keep-network/keep-core/-/keep-core-1.8.0-dev.11.tgz#cf607c6b9f86b545d8110ea4857b2eef5f3de737" | ||
| integrity sha512-NWsG0RqsJm+ZTbSUTWXgmJe6tSyNmHVhx7tQO/7d3/A31hEpbeJeC2H8ro7Pj88M6JDHSvor7svn8bL0KlIy1A== | ||
| dependencies: | ||
| "@openzeppelin/upgrades" "^2.7.2" | ||
| openzeppelin-solidity "2.4.0" | ||
|
|
||
| "@keep-network/keep-core@>1.8.1-dev <1.8.1-goerli": | ||
| version "1.8.1-dev.0" | ||
| resolved "https://registry.yarnpkg.com/@keep-network/keep-core/-/keep-core-1.8.1-dev.0.tgz#d95864b25800214de43d8840376a68336cb12055" | ||
| integrity sha512-gFXkgN4PYOYCZ14AskL7fZHEFW5mu3BDd+TJKBuKZc1q9CgRMOK+dxpJnSctxmSH1tV+Ln9v9yqlSkfPCoiBHw== | ||
| dependencies: | ||
| "@openzeppelin/upgrades" "^2.7.2" | ||
| openzeppelin-solidity "2.4.0" | ||
|
|
@@ -1169,6 +1177,10 @@ | |
| "@openzeppelin/upgrades" "^2.7.2" | ||
| openzeppelin-solidity "2.3.0" | ||
|
|
||
| "@keep-network/prettier-config-keep@github:keep-network/prettier-config-keep": | ||
| version "0.0.1" | ||
| resolved "https://codeload.github.com/keep-network/prettier-config-keep/tar.gz/a1a333e7ac49928a0f6ed39421906dd1e46ab0f3" | ||
|
|
||
| "@keep-network/prettier-config-keep@github:keep-network/prettier-config-keep#d6ec02e": | ||
| version "0.0.1" | ||
| resolved "https://codeload.github.com/keep-network/prettier-config-keep/tar.gz/d6ec02e80dd76edfba073ca58ef99aee39002c2c" | ||
|
|
@@ -1180,10 +1192,10 @@ | |
| dependencies: | ||
| "@openzeppelin/contracts" "^2.4.0" | ||
|
|
||
| "@keep-network/tbtc@>1.1.2-dev <1.1.2-goerli": | ||
| version "1.1.2-dev.1" | ||
| resolved "https://registry.yarnpkg.com/@keep-network/tbtc/-/tbtc-1.1.2-dev.1.tgz#dd1e734c0fed50474c74d7170c8749127231d1f9" | ||
| integrity sha512-IRa0j1D7JBG8UpduaFxkaq2Ii6F61HhNMUBmxr7kAIZwj/yx8sYXWi921mn0L2Z+hAYNcwEUVhCM91VKQH29pQ== | ||
| dependencies: | ||
| "@celo/contractkit" "^1.0.2" | ||
| "@keep-network/keep-ecdsa" ">1.9.0-dev <1.9.0-ropsten" | ||
|
|
@@ -1286,10 +1298,10 @@ | |
| "@types/sinon-chai" "^3.2.3" | ||
| "@types/web3" "1.0.19" | ||
|
|
||
| "@openzeppelin/contracts-upgradeable@~4.5.2": | ||
| version "4.5.2" | ||
| resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.5.2.tgz#90d9e47bacfd8693bfad0ac8a394645575528d05" | ||
| integrity sha512-xgWZYaPlrEOQo3cBj97Ufiuv79SPd8Brh4GcFYhPgb6WvAq4ppz8dWKL6h+jLAK01rUqMRp/TS9AdXgAeNvCLA== | ||
|
|
||
| "@openzeppelin/contracts@^2.4.0": | ||
| version "2.5.1" | ||
|
|
@@ -1306,10 +1318,10 @@ | |
| resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.3.2.tgz#ff80affd6d352dbe1bbc5b4e1833c41afd6283b6" | ||
| integrity sha512-AybF1cesONZStg5kWf6ao9OlqTZuPqddvprc0ky7lrUVOjXeKpmQ2Y9FK+6ygxasb+4aic4O5pneFBfwVsRRRg== | ||
|
|
||
| "@openzeppelin/contracts@~4.5.0": | ||
| version "4.5.0" | ||
| resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.5.0.tgz#3fd75d57de172b3743cdfc1206883f56430409cc" | ||
| integrity sha512-fdkzKPYMjrRiPK6K4y64e6GzULR7R7RwxSigHS8DDp7aWDeoReqsQI+cxHV1UuhAqX69L1lAaWDxenfP+xiqzA== | ||
|
|
||
| "@openzeppelin/upgrades@^2.7.2": | ||
| version "2.8.0" | ||
|
|
@@ -1589,13 +1601,14 @@ | |
| dependencies: | ||
| "@openzeppelin/contracts" "^4.1.0" | ||
|
|
||
| "@threshold-network/solidity-contracts@development": | ||
| version "1.2.0-dev.18" | ||
| resolved "https://registry.yarnpkg.com/@threshold-network/solidity-contracts/-/solidity-contracts-1.2.0-dev.18.tgz#814721dea03e47c3fe2f21644802e99d49dd9260" | ||
| integrity sha512-ao6Kngc8Q9rPg42/DlSlsOi2k/GH0DfdAOB4fmzcQSBl4H4D+dP0k0ymqvK6zfeMgxYmjRYP2KI5kDLPpaF2jg== | ||
| dependencies: | ||
| "@keep-network/keep-core" ">1.8.1-dev <1.8.1-goerli" | ||
| "@openzeppelin/contracts" "~4.5.0" | ||
| "@openzeppelin/contracts-upgradeable" "~4.5.2" | ||
| "@thesis/solidity-contracts" "github:thesis/solidity-contracts#4985bcf" | ||
|
|
||
| "@truffle/error@^0.0.14": | ||
|
|
@@ -4494,12 +4507,13 @@ eslint-config-google@^0.13.0: | |
| version "0.3.0" | ||
| resolved "https://codeload.github.com/keep-network/eslint-config-keep/tar.gz/0c27ade54e725f980e971c3d91ea88bab76b2330" | ||
| dependencies: | ||
| "@keep-network/prettier-config-keep" "github:keep-network/prettier-config-keep" | ||
| eslint-config-google "^0.13.0" | ||
| eslint-config-prettier "^6.15.0" | ||
| eslint-plugin-no-only-tests "^2.3.1" | ||
| eslint-plugin-prettier "^3.1.2" | ||
|
|
||
| eslint-config-prettier@^6.15.0: | ||
| version "6.15.0" | ||
| resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9" | ||
| integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw== | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.