chore: add @VenusProtocol prefix

.github/workflows/ci.yaml

@@ -62,16 +62,16 @@ jobs:
 
       - name: Generate Core Pool graphql types
         run: |
-          docker exec -i subgraph-hardhat-node yarn workspace venus-subgraph run prepare:docker
-          docker exec -i subgraph-hardhat-node yarn workspace venus-subgraph run codegen
-          docker exec -i subgraph-hardhat-node yarn workspace venus-subgraph run create:docker
-          docker exec -i subgraph-hardhat-node yarn workspace venus-subgraph run deploy:docker
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/core-pool-subgraph run prepare:docker
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/core-pool-subgraph run codegen
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/core-pool-subgraph run create:docker
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/core-pool-subgraph run deploy:docker
           sleep 5s
-          docker exec -i subgraph-hardhat-node yarn workspace venus-subgraph run generate-subgraph-types
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/core-pool-subgraph run generate-subgraph-types
       
       - name: Run Core Pool integration tests
         run: |
-          docker exec -i subgraph-hardhat-node yarn workspace venus-subgraph run test:integration --bail
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/core-pool-subgraph run test:integration --bail
       
       - name: Stop containers
         if: always()
@@ -95,16 +95,16 @@ jobs:
 
       - name: Generate Isolated Pools graphql types
         run: |
-          docker exec -i subgraph-hardhat-node yarn workspace isolated-pools-subgraph run prepare:docker
-          docker exec -i subgraph-hardhat-node yarn workspace isolated-pools-subgraph run codegen
-          docker exec -i subgraph-hardhat-node yarn workspace isolated-pools-subgraph run create:docker
-          docker exec -i subgraph-hardhat-node yarn workspace isolated-pools-subgraph run deploy:docker
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/isolated-pools-subgraph run prepare:docker
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/isolated-pools-subgraph run codegen
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/isolated-pools-subgraph run create:docker
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/isolated-pools-subgraph run deploy:docker
           sleep 5s
-          docker exec -i subgraph-hardhat-node yarn workspace isolated-pools-subgraph run generate-subgraph-types
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/isolated-pools-subgraph run generate-subgraph-types
       
       - name: Run Isolated Pools integration tests
         run: |
-          docker exec -i subgraph-hardhat-node yarn workspace isolated-pools-subgraph run test:integration --bail
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/isolated-pools-subgraph run test:integration --bail
       
       - name: Stop containers
         if: always()
@@ -128,16 +128,16 @@ jobs:
 
       - name: Generate Governance graphql types
         run: |
-          docker exec -i subgraph-hardhat-node yarn workspace venus-governance-subgraph run prepare:docker
-          docker exec -i subgraph-hardhat-node yarn workspace venus-governance-subgraph run codegen
-          docker exec -i subgraph-hardhat-node yarn workspace venus-governance-subgraph run create:docker
-          docker exec -i subgraph-hardhat-node yarn workspace venus-governance-subgraph run deploy:docker
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/governance-subgraph run prepare:docker
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/governance-subgraph run codegen
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/governance-subgraph run create:docker
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/governance-subgraph run deploy:docker
           sleep 5s
-          docker exec -i subgraph-hardhat-node yarn workspace venus-governance-subgraph run generate-subgraph-types
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/governance-subgraph run generate-subgraph-types
 
       - name: Run Governance integration integration tests
         run: |
-          docker exec -i subgraph-hardhat-node yarn workspace venus-governance-subgraph run test:integration --bail
+          docker exec -i subgraph-hardhat-node yarn workspace @venusprotocol/governance-subgraph run test:integration --bail
 
       - name: Stop containers
         if: always()
@@ -169,7 +169,7 @@ jobs:
           GIT_COMMITTER_EMAIL: [email protected]
         run: |
           yarn workspace @venusprotocol/cross-chain-governance-subgraph run semantic-release
-          yarn workspace @venusprotocol/etherfi-promo run semantic-release
+          yarn workspace @venusprotocol/etherfi-promo-subgraph run semantic-release
           yarn workspace @venusprotocol/isolated-pools-subgraph run semantic-release
           yarn workspace @venusprotocol/protocol-reserve-subgraph run semantic-release
           yarn workspace @venusprotocol/core-pool-subgraph run semantic-release

packages/utils/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "venus-subgraph-utils",
+  "name": "@venusprotocol/subgraph-utils",
   "version": "0.0.0",
   "license": "MIT",
   "main": "src",

subgraphs/cross-chain-governance/.releaserc

@@ -72,6 +72,12 @@
         ],
         "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
       }
+    ],
+    [
+      "@semantic-release/exec",
+      {
+        "prepareCmd": "./prepare.sh"
+      }
     ]
   ],
   "branches": [

subgraphs/cross-chain-governance/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "venus-cross-chain-governance-subgraph",
+  "name": "@venusprotocol/cross-chain-governance-subgraph",
   "version": "0.1.7",
   "license": "MIT",
   "repository": {
@@ -41,6 +41,7 @@
     "@graphprotocol/graph-cli": "^0.80.0",
     "@layerzerolabs/solidity-examples": "^1.0.0",
     "@venusprotocol/governance-contracts": "2.5.0-dev.4",
+    "@venusprotocol/subgraph-utils": "0.0.0",
     "apollo-fetch": "^0.7.0",
     "hardhat": "^2.10.2",
     "ts-node": "^10.9.2",

subgraphs/cross-chain-governance/prepare.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+# Install from root
+cd ../..
+yarn

subgraphs/etherfi-promo/.releaserc

@@ -72,6 +72,12 @@
         ],
         "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
       }
+    ],
+    [
+      "@semantic-release/exec",
+      {
+        "prepareCmd": "./prepare.sh"
+      }
     ]
   ],
   "branches": [

subgraphs/etherfi-promo/prepare.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+# Install from root
+cd ../..
+yarn

subgraphs/isolated-pools/.releaserc

@@ -72,6 +72,12 @@
         ],
         "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
       }
+    ],
+    [
+      "@semantic-release/exec",
+      {
+        "prepareCmd": "./prepare.sh"
+      }
     ]
   ],
   "branches": [

subgraphs/isolated-pools/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "isolated-pools-subgraph",
+  "name": "@venusprotocol/isolated-pools-subgraph",
   "version": "0.3.0",
   "license": "MIT",
   "repository": {
@@ -49,12 +49,12 @@
   "devDependencies": {
     "@graphprotocol/client-cli": "3.0.0",
     "@graphprotocol/graph-cli": "^0.80.0",
+    "@venusprotocol/subgraph-utils": "0.0.0",
     "apollo-fetch": "^0.7.0",
     "hardhat": "^2.10.2",
     "semantic-release": "^23.1.1",
     "semantic-release-monorepo": "^8.0.2",
     "ts-node": "^10.9.2",
-    "urql": "^3.0.3",
-    "venus-subgraph-utils": "0.0.0"
+    "urql": "^3.0.3"
   }
 }

subgraphs/isolated-pools/prepare.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+# Install from root
+cd ../..
+yarn

subgraphs/isolated-pools/tests/integration/pool.ts

@@ -1,6 +1,6 @@
+import { scaleValue, waitForSubgraphToBeSynced } from '@venusprotocol/subgraph-utils';
 import { expect } from 'chai';
 import { ethers } from 'hardhat';
-import { scaleValue, waitForSubgraphToBeSynced } from 'venus-subgraph-utils';
 
 import subgraphClient from '../../subgraph-client';
 import { defaultMarkets } from './constants';

subgraphs/isolated-pools/tests/integration/poolRegistry.ts

@@ -1,8 +1,8 @@
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
+import { waitForSubgraphToBeSynced } from '@venusprotocol/subgraph-utils';
 import { expect } from 'chai';
 import { Contract } from 'ethers';
 import { ethers } from 'hardhat';
-import { waitForSubgraphToBeSynced } from 'venus-subgraph-utils';
 
 import subgraphClient from '../../subgraph-client';
 

subgraphs/isolated-pools/tests/integration/setup.ts

@@ -1,4 +1,4 @@
-import { deploy } from 'venus-subgraph-utils';
+import { deploy } from '@venusprotocol/subgraph-utils';
 
 import { SUBGRAPH_ACCOUNT, SUBGRAPH_NAME, SYNC_DELAY } from './constants';
 
@@ -8,7 +8,7 @@ describe('Deploy Subgraph', function () {
 
     await deploy({
       root,
-      packageName: 'isolated-pools-subgraph',
+      packageName: '@venusprotocol/isolated-pools-subgraph',
       subgraphAccount: SUBGRAPH_ACCOUNT,
       subgraphName: SUBGRAPH_NAME,
       syncDelay: SYNC_DELAY,

subgraphs/isolated-pools/tests/integration/unlistMarkets.ts

@@ -1,7 +1,7 @@
+import { waitForSubgraphToBeSynced } from '@venusprotocol/subgraph-utils';
 import { expect } from 'chai';
 import { Contract } from 'ethers';
 import { ethers } from 'hardhat';
-import { waitForSubgraphToBeSynced } from 'venus-subgraph-utils';
 
 import subgraphClient from '../../subgraph-client';
 

subgraphs/isolated-pools/tests/integration/utils/deploy.ts

@@ -1,4 +1,4 @@
-import { exec, fetchSubgraph, waitForSubgraphToBeSynced } from 'venus-subgraph-utils';
+import { exec, fetchSubgraph, waitForSubgraphToBeSynced } from '@venusprotocol/subgraph-utils';
 
 import { SUBGRAPH_ACCOUNT, SUBGRAPH_NAME, SYNC_DELAY } from '../constants';
 

subgraphs/isolated-pools/tests/integration/vTokens.ts

@@ -1,8 +1,8 @@
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
+import { waitForSubgraphToBeSynced } from '@venusprotocol/subgraph-utils';
 import { expect } from 'chai';
 import { Contract } from 'ethers';
 import { ethers } from 'hardhat';
-import { waitForSubgraphToBeSynced } from 'venus-subgraph-utils';
 
 import subgraphClient from '../../subgraph-client';
 import { checkAccountVToken, checkMarket } from './checkEntities';

subgraphs/protocol-reserve/.releaserc

@@ -72,6 +72,12 @@
         ],
         "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
       }
+    ],
+    [
+      "@semantic-release/exec",
+      {
+        "prepareCmd": "./prepare.sh"
+      }
     ]
   ],
   "branches": [

subgraphs/protocol-reserve/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "protocol-reserve-subgraph",
+  "name": "@venusprotocol/protocol-reserve-subgraph",
   "version": "0.0.5",
   "license": "MIT",
   "repository": {
@@ -32,11 +32,11 @@
   },
   "devDependencies": {
     "@graphprotocol/graph-cli": "^0.80.0",
+    "@venusprotocol/subgraph-utils": "0.0.0",
     "apollo-fetch": "^0.7.0",
     "semantic-release": "^23.1.1",
     "semantic-release-monorepo": "^8.0.2",
     "ts-node": "^10.9.2",
-    "urql": "^3.0.3",
-    "venus-subgraph-utils": "0.0.0"
+    "urql": "^3.0.3"
   }
 }

subgraphs/protocol-reserve/prepare.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+# Install from root
+cd ../..
+yarn

subgraphs/venus-governance/.releaserc

@@ -72,6 +72,12 @@
         ],
         "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
       }
+    ],
+    [
+      "@semantic-release/exec",
+      {
+        "prepareCmd": "./prepare.sh"
+      }
     ]
   ],
   "branches": [

subgraphs/venus-governance/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "venus-governance-subgraph",
+  "name": "@venusprotocol/governance-subgraph",
   "version": "0.1.0",
   "license": "MIT",
   "repository": {
@@ -29,12 +29,12 @@
     "@graphprotocol/client-cli": "3.0.0",
     "@graphprotocol/graph-cli": "^0.80.0",
     "@venusprotocol/governance-contracts": "2.5.0-dev.3",
+    "@venusprotocol/subgraph-utils": "0.0.0",
     "apollo-fetch": "^0.7.0",
     "hardhat": "^2.10.2",
     "semantic-release": "^23.1.1",
     "semantic-release-monorepo": "^8.0.2",
     "ts-node": "^10.9.2",
-    "urql": "^3.0.3",
-    "venus-subgraph-utils": "0.0.0"
+    "urql": "^3.0.3"
   }
 }

subgraphs/venus-governance/prepare.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+# Install from root
+cd ../..
+yarn

subgraphs/venus-governance/tests/integration/accessControlManager.ts

@@ -1,8 +1,8 @@
 import '@nomiclabs/hardhat-ethers';
+import { waitForSubgraphToBeSynced } from '@venusprotocol/subgraph-utils';
 import { expect } from 'chai';
 import { Contract } from 'ethers';
 import { ethers } from 'hardhat';
-import { waitForSubgraphToBeSynced } from 'venus-subgraph-utils';
 
 import subgraphClient from '../../subgraph-client/index';
 import { SYNC_DELAY, nullAddress } from './utils/constants';

subgraphs/venus-governance/tests/integration/alpha.ts

@@ -1,10 +1,10 @@
 import { mine } from '@nomicfoundation/hardhat-network-helpers';
 import '@nomiclabs/hardhat-ethers';
 import type { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
+import { scaleValue, waitForSubgraphToBeSynced } from '@venusprotocol/subgraph-utils';
 import { expect } from 'chai';
 import { Contract } from 'ethers';
 import { ethers } from 'hardhat';
-import { scaleValue, waitForSubgraphToBeSynced } from 'venus-subgraph-utils';
 
 import subgraphClient from '../../subgraph-client/index';
 import { SYNC_DELAY } from './utils/constants';

subgraphs/venus-governance/tests/integration/bravo.ts

@@ -1,10 +1,10 @@
 import { mine } from '@nomicfoundation/hardhat-network-helpers';
 import '@nomiclabs/hardhat-ethers';
 import type { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
+import { scaleValue, waitForSubgraphToBeSynced } from '@venusprotocol/subgraph-utils';
 import { expect } from 'chai';
 import { Contract } from 'ethers';
 import { ethers, network } from 'hardhat';
-import { scaleValue, waitForSubgraphToBeSynced } from 'venus-subgraph-utils';
 
 import subgraphClient from '../../subgraph-client/index';
 import { SYNC_DELAY, mockAddress } from './utils/constants';

subgraphs/venus-governance/tests/integration/omnichainProposalSender.ts

@@ -1,8 +1,8 @@
 import '@nomiclabs/hardhat-ethers';
+import { numberToByteId, waitForSubgraphToBeSynced } from '@venusprotocol/subgraph-utils';
 import { expect } from 'chai';
 import { Contract } from 'ethers';
 import { ethers } from 'hardhat';
-import { numberToByteId, waitForSubgraphToBeSynced } from 'venus-subgraph-utils';
 
 import subgraphClient from '../../subgraph-client/index';
 import { SYNC_DELAY } from './utils/constants';

subgraphs/venus-governance/tests/integration/setup.ts

@@ -1,4 +1,4 @@
-import { deploy } from 'venus-subgraph-utils';
+import { deploy } from '@venusprotocol/subgraph-utils';
 
 import { SUBGRAPH_ACCOUNT, SUBGRAPH_NAME, SYNC_DELAY } from './utils/constants';
 
@@ -8,7 +8,7 @@ describe('Deploy Subgraph', function () {
 
     await deploy({
       root,
-      packageName: 'venus-governance-subgraph',
+      packageName: '@venusprotocol/governance-subgraph',
       subgraphAccount: SUBGRAPH_ACCOUNT,
       subgraphName: SUBGRAPH_NAME,
       syncDelay: SYNC_DELAY,

subgraphs/venus-governance/tests/integration/xvsVault.ts

@@ -1,9 +1,9 @@
 import '@nomiclabs/hardhat-ethers';
 import type { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
+import { scaleValue, waitForSubgraphToBeSynced } from '@venusprotocol/subgraph-utils';
 import { expect } from 'chai';
 import { Contract } from 'ethers';
 import { ethers } from 'hardhat';
-import { scaleValue, waitForSubgraphToBeSynced } from 'venus-subgraph-utils';
 
 import subgraphClient from '../../subgraph-client/index';
 import { SYNC_DELAY } from './utils/constants';

subgraphs/venus/.releaserc

@@ -72,6 +72,12 @@
         ],
         "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
       }
+    ],
+    [
+      "@semantic-release/exec",
+      {
+        "prepareCmd": "./prepare.sh"
+      }
     ]
   ],
   "branches": [