Merge branch 'develop' into patch-1

Author: cedric25

.drone.yml

@@ -646,19 +646,18 @@ steps:
       target:
         - subgraph-deployer-docker-dev
 
-  - name: docker-dry-run
+  - name: docker-publish
     image: plugins/docker
     pull: always
     settings:
       context: .
       dockerfile: packages/subgraph/deployer.Dockerfile
-      registry: docker-regis.iex.ec
-      repo: docker-regis.iex.ec/product/dataprotector-subgraph-deployer
+      repo: iexechub/dataprotector-subgraph-deployer
       pull_image: true
       username:
-        from_secret: nexus-user
+        from_secret: dockerhub-user
       password:
-        from_secret: nexus-password
+        from_secret: dockerhub-password
 
 ---
 kind: pipeline

packages/sharing-smart-contract/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## Next
+
+### Changed
+
+- update blockscout url
+
 ## [2.0.0]
 
 ### Changed

packages/sharing-smart-contract/hardhat.config.cjs

@@ -64,8 +64,8 @@ module.exports = {
         network: 'bellecour',
         chainId: 134,
         urls: {
-          apiURL: 'https://blockscout-v6.bellecour.iex.ec/api',
-          browserURL: 'https://blockscout-v6.bellecour.iex.ec',
+          apiURL: 'https://blockscout.bellecour.iex.ec/api',
+          browserURL: 'https://blockscout.bellecour.iex.ec',
         },
       },
     ],

packages/sharing-smart-contract/test/e2e/consumeProtectedData.test.js

@@ -101,8 +101,8 @@ describe('ConsumeProtectedData', () => {
         value: ethers.parseUnits(subscriptionParams.price.toString(), 'gwei'),
       }); // value sent should be in wei
       await dataProtectorSharingContract.connect(addr2).subscribeToCollection(collectionTokenId, subscriptionParams);
-      // advance time by one hour and mine a new block
-      await time.increase(subscriptionParams.duration);
+      // advance time to reach end of subscription and mine a new block
+      await time.increase(subscriptionParams.duration + 1);
 
       await expect(
         dataProtectorSharingContract
@@ -127,8 +127,8 @@ describe('ConsumeProtectedData', () => {
         value: ethers.parseUnits(rentingParams.price.toString(), 'gwei'),
       }); // value sent should be in wei
       await dataProtectorSharingContract.connect(addr2).rentProtectedData(protectedDataAddress, rentingParams);
-      // advance time by one hour and mine a new block
-      await time.increase(rentingParams.duration);
+      // advance time to reach end of renting and mine a new block
+      await time.increase(rentingParams.duration + 1);
 
       await expect(
         dataProtectorSharingContract

packages/smart-contract/CHANGELOG.md

@@ -2,4 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## Next
+
+### Changed
+
+- update blockscout url
+
 ## [0.1.0] Initial release

packages/smart-contract/hardhat.config.ts

@@ -34,8 +34,8 @@ const config: HardhatUserConfig = {
         network: 'bellecour',
         chainId: 134,
         urls: {
-          apiURL: 'https://blockscout-bellecour.iex.ec/api',
-          browserURL: 'https://blockscout-bellecour.iex.ec',
+          apiURL: 'https://blockscout.bellecour.iex.ec/api',
+          browserURL: 'https://blockscout.bellecour.iex.ec',
         },
       },
     ],