Update dependencies to `threshold-network` and `keep-network` projects #212

michalinacienciala · 2022-07-12T10:32:37Z

There was a couple of changes in the project dependencies that requuired
change of the configuration of package.json and contracts.yml:

coverage-pools became dependent on
@threshold-network/solidity-contracts package. This was already
reflected in the package.json, but not in the CI.
Version of the @threshold-network/solidity-contracts got bumped up
to 1.2.0-dev.x, which needed to be reflected in package.json
We started to prepare our projects for deployment on the goerli
testnet. This means that we will (or already did) publish packages
with the -goerli suffix. In order to use the -dev suffixed
packages in the NPM workflow we need to update the semver ranges so
that the versions could be resolved to the desired packages.

I hope that those changes will help with the problem with deployment of coverage-pools on ropsten (https://github.com/keep-network/coverage-pools/runs/7299602405?check_suite_focus=true).

There was a couple of changes in the project dependencies that requuired change of the configuration of `package.json` and `contracts.yml`: 1. `coverage-pools` became dependent on `@threshold-network/solidity-contracts` package. This was already reflected in the `package.json`, but not in the CI. 2. Version of the `@threshold-network/solidity-contracts` got bumped up to `1.2.0-dev.x`, which needed to be reflected in `package.json` 3. We started to prepare our projects for deployment on the `goerli` testnet. This means that we will (or already did) publish packages with the `-goerli` suffix. In order to use the `-dev` suffixed packages in the `NPM` workflow we need to update the semver ranges so that the versions could be resolved to the desired packages.

michalinacienciala · 2022-07-12T10:48:36Z

In https://github.com/keep-network/coverage-pools/actions/runs/2655950601 I'm verifying if the changes help for the ropsten deployment problem

michalinacienciala · 2022-07-12T11:13:53Z

In https://github.com/keep-network/coverage-pools/actions/runs/2655950601 I'm verifying if the changes help for the ropsten deployment problem

Unfortunately, now builds fails with INSUFFICIENT_FUNDS during execution of 04_deploy_underwriter_token.ts... I'm trying to figure out the root cause...

michalinacienciala · 2022-07-12T11:31:02Z

Unfortunately, now builds fails with INSUFFICIENT_FUNDS during execution of 04_deploy_underwriter_token.ts... I'm trying to figure out the root cause...

Deployer account needed a top-up. Verifying again after sending some ETH: https://github.com/keep-network/coverage-pools/actions/runs/2655950601.

michalinacienciala · 2022-07-13T09:05:51Z

Deployer account needed a top-up. Verifying again after sending some ETH: https://github.com/keep-network/coverage-pools/actions/runs/2655950601.

Back to UNPREDICTABLE_GAS_LIMIT error during execution of 05_deploy_asset_pool.ts. Looks that this error appeared after introduction of this piece of code in #206:

coverage-pools/contracts/AssetPool.sol

Lines 146 to 156 in 31d3af2

    
               initGovernance(_collateralToken); 
        
           } 
        
           /// @dev Overwrite to empty if collateral token used by the AssetPool 
        
           ///      does not support DAO checkpoints. Used for tests with KEEP token. 
        
           function initGovernance(ICollateralToken _collateralToken) 
        
               internal 
        
               virtual 
        
           { 
        
               _collateralToken.delegate(address(this)); 
        
           }

nkuba · 2022-08-11T21:11:36Z

package.json

    "@thesis/solidity-contracts": "github:thesis/solidity-contracts#4985bcf",
-    "@threshold-network/solidity-contracts": ">1.1.0-dev <1.1.0-ropsten",
+    "@threshold-network/solidity-contracts": ">1.2.0-dev <1.2.0-goerli",


Could we use development tag?

Suggested change

"@threshold-network/solidity-contracts": ">1.2.0-dev <1.2.0-goerli",

"@threshold-network/solidity-contracts": "development",

Same for other dependencies.

We now tag the `@threshold-network/solidity-contracts` package containing contracts meant for develoment with `development` tag. We can use it in the `package.json` to refer to the latest package meant for development.

We're adding a step that configures git to use `https://` protocol instead of `git://` when downloading files. We need this step because the `@keep-network/tbtc` which we update in next steps 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. See https://github.blog/2021-09-01-improving-git-protocol-security-github/. We also manually change the unauthenticated git protocol used for this sub-dependency in the `package.lock`.

nkuba · 2022-08-17T06:28:41Z

.github/workflows/contracts.yml

@@ -87,12 +114,14 @@ jobs:
          query: |
            keep-core-contracts-version = github.com/keep-network/keep-core/solidity-v1#version
            tbtc-contracts-version = github.com/keep-network/tbtc/solidity#version
+            solidity-contracts-version = github.com/threshold-network/solidity-contracts#version


Suggested change

solidity-contracts-version = github.com/threshold-network/solidity-contracts#version

threshold-contracts-version = github.com/threshold-network/solidity-contracts#version

nkuba · 2022-08-17T06:29:00Z

.github/workflows/contracts.yml


      - name: Resolve latest contracts
        run: |
          yarn upgrade \
            @keep-network/keep-core@${{ steps.upstream-builds-query.outputs.keep-core-contracts-version }} \
-            @keep-network/tbtc@${{ steps.upstream-builds-query.outputs.tbtc-contracts-version }}
+            @keep-network/tbtc@${{ steps.upstream-builds-query.outputs.tbtc-contracts-version }} \
+            @threshold-network/solidity-contracts@${{ steps.upstream-builds-query.outputs.solidity-contracts-version }}


Suggested change

@threshold-network/solidity-contracts@${{ steps.upstream-builds-query.outputs.solidity-contracts-version }}

@threshold-network/solidity-contracts@${{ steps.upstream-builds-query.outputs.threshold-contracts-version }}

nkuba · 2022-08-17T06:30:45Z

package.json

+    "@keep-network/keep-core": ">1.8.0-dev <1.8.0-goerli",
+    "@keep-network/tbtc": ">1.1.2-dev <1.1.2-goerli",


Could we use the development tag here as well?

Suggested change

"@keep-network/keep-core": ">1.8.0-dev <1.8.0-goerli",

"@keep-network/tbtc": ">1.1.2-dev <1.1.2-goerli",

"@keep-network/keep-core": "development",

"@keep-network/tbtc": "development",

nkuba · 2022-08-17T06:32:27Z

.github/workflows/npm.yml

+      - 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 \


Let's pin to exact dependencies versions. (see keep-network/keep-core#3083 for explaination)

Suggested change

yarn upgrade \

yarn upgrade --exact \

michalinacienciala requested a review from nkuba July 12, 2022 10:32

michalinacienciala force-pushed the ci-update-dependencies branch from e9353f6 to 2ec3621 Compare July 12, 2022 10:42

michalinacienciala force-pushed the ci-update-dependencies branch from 2ec3621 to 7bbb6f6 Compare July 12, 2022 10:42

michalinacienciala force-pushed the ci-update-dependencies branch 3 times, most recently from c4928e6 to 7bbb6f6 Compare July 12, 2022 15:12

nkuba reviewed Aug 11, 2022

View reviewed changes

michalinacienciala added 2 commits August 16, 2022 17:19

Use development tag for solidity-contracts dependency

71f44ba

We now tag the `@threshold-network/solidity-contracts` package containing contracts meant for develoment with `development` tag. We can use it in the `package.json` to refer to the latest package meant for development.

michalinacienciala mentioned this pull request Aug 16, 2022

Add support for deployment on Goerli testnet #215

Draft

3 tasks

michalinacienciala requested a review from nkuba August 16, 2022 18:42

michalinacienciala mentioned this pull request Aug 16, 2022

Görli contracts deployment #214

Open

nkuba requested changes Aug 17, 2022

View reviewed changes

michalinacienciala mentioned this pull request Jan 11, 2023

Adjust CI to support deployments of contracts on Goerli testnet #231

Draft

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update dependencies to `threshold-network` and `keep-network` projects #212

Update dependencies to `threshold-network` and `keep-network` projects #212

michalinacienciala commented Jul 12, 2022

michalinacienciala commented Jul 12, 2022 •

edited

Loading

michalinacienciala commented Jul 12, 2022

michalinacienciala commented Jul 12, 2022

michalinacienciala commented Jul 13, 2022

nkuba Aug 11, 2022

michalinacienciala Aug 16, 2022

nkuba Aug 17, 2022

nkuba Aug 17, 2022

nkuba Aug 17, 2022

nkuba Aug 17, 2022

	"@threshold-network/solidity-contracts": ">1.2.0-dev <1.2.0-goerli",
	"@threshold-network/solidity-contracts": "development",

	solidity-contracts-version = github.com/threshold-network/solidity-contracts#version
	threshold-contracts-version = github.com/threshold-network/solidity-contracts#version

	@threshold-network/solidity-contracts@${{ steps.upstream-builds-query.outputs.solidity-contracts-version }}
	@threshold-network/solidity-contracts@${{ steps.upstream-builds-query.outputs.threshold-contracts-version }}

		"@keep-network/keep-core": ">1.8.0-dev <1.8.0-goerli",
		"@keep-network/tbtc": ">1.1.2-dev <1.1.2-goerli",

Update dependencies to threshold-network and keep-network projects #212

Are you sure you want to change the base?

Update dependencies to threshold-network and keep-network projects #212

Conversation

michalinacienciala commented Jul 12, 2022

michalinacienciala commented Jul 12, 2022 • edited Loading

michalinacienciala commented Jul 12, 2022

michalinacienciala commented Jul 12, 2022

michalinacienciala commented Jul 13, 2022

nkuba Aug 11, 2022

Choose a reason for hiding this comment

michalinacienciala Aug 16, 2022

Choose a reason for hiding this comment

nkuba Aug 17, 2022

Choose a reason for hiding this comment

nkuba Aug 17, 2022

Choose a reason for hiding this comment

nkuba Aug 17, 2022

Choose a reason for hiding this comment

nkuba Aug 17, 2022

Choose a reason for hiding this comment

Update dependencies to `threshold-network` and `keep-network` projects #212

Update dependencies to `threshold-network` and `keep-network` projects #212

michalinacienciala commented Jul 12, 2022 •

edited

Loading