fix: add CANNON_REGISTRY_PRIORITY env, and others (#1804)

* fix: add CANNON_REGISTRY_PRIORITY env * fix: setup cannon registry priority * feat: add cannon registry to commands * add CANNON_REGISTRY_PRIORITY to oracle manager * fix: circle ci env * update config circleci * echo cannon registry * try * use oracle-manager testable for synthetix testable otherwise the build can come out wierd * fix deps * have to upgrade hardhat too * fix unnecessary await causing hang --------- Co-authored-by: Daniel Beal <[email protected]> Co-authored-by: dbeal <[email protected]>
Synthetixio · Sep 2, 2023 · 60b2df0 · 60b2df0
1 parent aadd241
commit 60b2df0
Show file tree

Hide file tree

Showing 40 changed files with 190 additions and 188 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -151,7 +151,7 @@ jobs:
       - restore_cache:
           keys:
             - testable-hardhat-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "/tmp/version--contracts.txt" }}
-      - run: yarn workspaces foreach --topological-dev --verbose run build-testable
+      - run: CANNON_REGISTRY_PRIORITY=local yarn workspaces foreach --topological-dev --verbose run build-testable
       - save_cache:
           key: testable-hardhat-cache-{{ .Environment.CACHE_VERSION }}-{{ checksum "/tmp/version--contracts.txt" }}
           paths:

diff --git a/.env.sample b/.env.sample
@@ -3,4 +3,5 @@ INFURA_API_KEY=
 INFURA_IPFS_ID=
 INFURA_IPFS_SECRET=
 ETHERSCAN_API_KEY=
-OVM_ETHERSCAN_API_KEY=
+OVM_ETHERSCAN_API_KEY=
+CANNON_REGISTRY_PRIORITY=
diff --git a/...block-npm-5.0.1-36ba33b8af-02591bc9ba.zip → ...block-npm-5.0.2-4d950628bb-7ff744f44a.zip b/...block-npm-5.0.1-36ba33b8af-02591bc9ba.zip → ...block-npm-5.0.2-4d950628bb-7ff744f44a.zip
diff --git a/...chain-npm-7.0.1-70afb79069-8b7a4e3613.zip → ...chain-npm-7.0.2-d9705709ea-b7e440dcd7.zip b/...chain-npm-7.0.1-70afb79069-8b7a4e3613.zip → ...chain-npm-7.0.2-d9705709ea-b7e440dcd7.zip
diff --git a/...ommon-npm-4.0.1-db8034d032-af5b599bcc.zip → ...ommon-npm-4.0.2-2a486d4209-f0d84704d6.zip b/...ommon-npm-4.0.1-db8034d032-af5b599bcc.zip → ...ommon-npm-4.0.2-2a486d4209-f0d84704d6.zip
diff --git a/...thash-npm-3.0.1-1306100131-beeec9788a.zip → ...thash-npm-3.0.2-cc0ebd2006-e4011e4019.zip b/...thash-npm-3.0.1-1306100131-beeec9788a.zip → ...thash-npm-3.0.2-cc0ebd2006-e4011e4019.zip
diff --git a/...s-evm-npm-2.0.1-d5164cbc38-0aa2e1460e.zip → ...s-evm-npm-2.0.2-f0d731b2a8-a23cf57083.zip b/...s-evm-npm-2.0.1-d5164cbc38-0aa2e1460e.zip → ...s-evm-npm-2.0.2-f0d731b2a8-a23cf57083.zip
diff --git a/...s-rlp-npm-5.0.1-57535e6ba3-5a51d2cf92.zip → ...s-rlp-npm-5.0.2-4779aec89a-a74434cade.zip b/...s-rlp-npm-5.0.1-57535e6ba3-5a51d2cf92.zip → ...s-rlp-npm-5.0.2-4779aec89a-a74434cade.zip
diff --git a/...nager-npm-2.0.1-2dbc89ff8f-157b503fa3.zip → ...nager-npm-2.0.2-5465bc8cbc-3ab6578e25.zip b/...nager-npm-2.0.1-2dbc89ff8f-157b503fa3.zip → ...nager-npm-2.0.2-5465bc8cbc-3ab6578e25.zip
diff --git a/...-trie-npm-6.0.1-d6e8b61c63-7001c32041.zip → ...-trie-npm-6.0.2-405eaf4fb6-d4da918d33.zip b/...-trie-npm-6.0.1-d6e8b61c63-7001c32041.zip → ...-trie-npm-6.0.2-405eaf4fb6-d4da918d33.zip
diff --git a/...js-tx-npm-5.0.1-25e56e165c-aa3829e4a4.zip → ...js-tx-npm-5.0.2-d7824094e9-0bbcea7578.zip b/...js-tx-npm-5.0.1-25e56e165c-aa3829e4a4.zip → ...js-tx-npm-5.0.2-d7824094e9-0bbcea7578.zip
diff --git a/...-util-npm-9.0.1-6715066745-5f8a50a25c.zip → ...-util-npm-9.0.2-8b4899e586-3a08f7b880.zip b/...-util-npm-9.0.1-6715066745-5f8a50a25c.zip → ...-util-npm-9.0.2-8b4899e586-3a08f7b880.zip
diff --git a/...js-vm-npm-7.0.1-01921364a3-0f63731632.zip → ...js-vm-npm-7.0.2-cd9b4fb94e-1c25ba4d06.zip b/...js-vm-npm-7.0.1-01921364a3-0f63731632.zip → ...js-vm-npm-7.0.2-cd9b4fb94e-1c25ba4d06.zip
diff --git a/.yarn/cache/@usecannon-builder-npm-2.5.1-50cae24e32-f884038063.zip b/.yarn/cache/@usecannon-builder-npm-2.5.1-50cae24e32-f884038063.zip
diff --git a/.yarn/cache/@usecannon-builder-npm-2.5.4-5c364633a3-01d4145622.zip b/.yarn/cache/@usecannon-builder-npm-2.5.4-5c364633a3-01d4145622.zip
diff --git a/...n-cli-npm-2.5.1-85b9f517e8-7b31ace8d8.zip → ...n-cli-npm-2.5.4-3421c6bd88-bc20b04b38.zip b/...n-cli-npm-2.5.1-85b9f517e8-7b31ace8d8.zip → ...n-cli-npm-2.5.4-3421c6bd88-bc20b04b38.zip
diff --git a/...annon-npm-2.5.1-966d2a1418-043c553eda.zip → ...annon-npm-2.5.4-1759dec3e7-3ec2208fca.zip b/...annon-npm-2.5.1-966d2a1418-043c553eda.zip → ...annon-npm-2.5.4-1759dec3e7-3ec2208fca.zip
diff --git a/.yarn/cache/hardhat-npm-2.15.0-8314009c1c-46767f0eb7.zip b/.yarn/cache/hardhat-npm-2.15.0-8314009c1c-46767f0eb7.zip
diff --git a/.yarn/cache/hardhat-npm-2.17.2-1d415d2ac1-7c80f45354.zip b/.yarn/cache/hardhat-npm-2.17.2-1d415d2ac1-7c80f45354.zip
diff --git a/markets/legacy-market/package.json b/markets/legacy-market/package.json
@@ -23,7 +23,7 @@
     "@synthetixio/router": "^3.1.3",
     "@synthetixio/wei": "2.74.4",
     "ethers": "^5.7.2",
-    "hardhat": "2.15.0",
+    "hardhat": "2.17.2",
     "solidity-docgen": "0.6.0-beta.35"
   },
   "depcheck": {

diff --git a/markets/perps-market/package.json b/markets/perps-market/package.json
@@ -5,12 +5,12 @@
   "scripts": {
     "build": "yarn build:contracts",
     "build:contracts": "hardhat compile --force && hardhat storage:verify && hardhat cannon:build",
-    "build-testable": "hardhat cannon:build cannonfile.test.toml",
+    "build-testable": "CANNON_REGISTRY_PRIORITY=local hardhat cannon:build cannonfile.test.toml",
     "check:storage": "git diff --exit-code storage.dump.sol",
     "start": "yarn build && yarn cannon-build",
     "clean": "hardhat clean",
     "cannon-build": "hardhat cannon:build",
-    "test": "hardhat test",
+    "test": "CANNON_REGISTRY_PRIORITY=local hardhat test",
     "coverage": "hardhat test",
     "coverage1": "hardhat coverage --network hardhat",
     "compile-contracts": "hardhat compile",
@@ -33,9 +33,9 @@
     "@synthetixio/router": "^3.1.3",
     "@synthetixio/spot-market": "workspace:*",
     "@synthetixio/wei": "2.74.4",
-    "@usecannon/cli": "^2.5.1",
+    "@usecannon/cli": "^2.5.4",
     "ethers": "^5.7.2",
-    "hardhat": "2.15.0",
+    "hardhat": "2.17.2",
     "solidity-docgen": "0.6.0-beta.35",
     "ts-node": "10.9.1",
     "typescript": "4.9.3"

diff --git a/markets/perps-market/subgraph/package.json b/markets/perps-market/subgraph/package.json
@@ -22,7 +22,7 @@
   "devDependencies": {
     "@graphprotocol/graph-cli": "^0.50.1",
     "@graphprotocol/graph-ts": "^0.30.0",
-    "@usecannon/cli": "^2.5.1",
+    "@usecannon/cli": "^2.5.4",
     "ethers": "^5.7.2",
     "matchstick-as": "^0.5.2",
     "prettier": "^2.8.8"

diff --git a/markets/spot-market/hardhat.config.ts b/markets/spot-market/hardhat.config.ts
@@ -26,7 +26,7 @@ const config = {
     },
   },
   mocha: {
-    timeout: 200_000,
+    timeout: 30_000,
   },
 };
 

diff --git a/markets/spot-market/package.json b/markets/spot-market/package.json
@@ -4,13 +4,13 @@
   "description": "Spot Market implementation",
   "scripts": {
     "build": "yarn build:contracts",
-    "build:contracts": "rm -rf contracts/generated && hardhat storage:verify && hardhat cannon:build",
-    "build-testable": "hardhat cannon:build cannonfile.test.toml",
+    "build:contracts": "rm -rf contracts/generated && hardhat storage:verify && CANNON_REGISTRY_PRIORITY=local hardhat cannon:build",
+    "build-testable": "CANNON_REGISTRY_PRIORITY=local hardhat cannon:build cannonfile.test.toml",
     "check:storage": "git diff --exit-code storage.dump.sol",
     "start": "yarn build && yarn cannon-build",
     "clean": "hardhat clean",
     "cannon-build": "hardhat cannon:build",
-    "test": "hardhat test",
+    "test": "CANNON_REGISTRY_PRIORITY=local hardhat test",
     "test:fork": "hardhat test test-fork/AsyncOrdersModule.e2e.test.ts",
     "coverage": "hardhat test",
     "coverage1": "hardhat coverage --network hardhat",
@@ -34,9 +34,9 @@
     "@synthetixio/router": "^3.1.3",
     "@synthetixio/wei": "2.74.4",
     "@types/node-fetch": "2.6.4",
-    "@usecannon/cli": "^2.5.1",
+    "@usecannon/cli": "^2.5.4",
     "ethers": "^5.7.2",
-    "hardhat": "2.15.0",
+    "hardhat": "2.17.2",
     "node-fetch": "2.6.9",
     "solidity-docgen": "0.6.0-beta.35",
     "ts-node": "10.9.1",

diff --git a/markets/spot-market/subgraph/package.json b/markets/spot-market/subgraph/package.json
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@graphprotocol/graph-cli": "^0.50.1",
     "@graphprotocol/graph-ts": "^0.30.0",
-    "@usecannon/cli": "^2.5.1",
+    "@usecannon/cli": "^2.5.4",
     "ethers": "^5.7.2",
     "prettier": "^2.8.8"
   }

diff --git a/package.json b/package.json
@@ -16,8 +16,8 @@
   "scripts": {
     "clean": "yarn workspaces foreach --parallel --verbose run clean",
     "build-prerelease-dev": "git diff --exit-code && yarn lerna exec -- npm version prepatch --no-git-tag-version --no-workspaces-update && yarn && yarn build && git stash && yarn",
-    "build": "yarn workspaces foreach --topological-dev --verbose run build",
-    "test": "yarn workspaces foreach --parallel --verbose run test",
+    "build": "CANNON_REGISTRY_PRIORITY=local yarn workspaces foreach --topological-dev --verbose run build",
+    "test": "CANNON_REGISTRY_PRIORITY=local yarn workspaces foreach --parallel --verbose run test",
     "coverage": "yarn workspaces foreach --verbose run coverage",
     "lint:progress": "ESLINT_PROGRESS=true eslint --max-warnings=0 .",
     "lint:js": "prettier --check '**/*.{t,j}s' && eslint --max-warnings=0 '**/*.{t,j}s'",
@@ -52,7 +52,7 @@
     "@types/node": "18.11.10",
     "@typescript-eslint/eslint-plugin": "5.45.0",
     "@typescript-eslint/parser": "5.45.0",
-    "@usecannon/cli": "^2.5.1",
+    "@usecannon/cli": "^2.5.4",
     "eslint": "8.29.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-no-only-tests": "3.1.0",

diff --git a/protocol/governance/package.json b/protocol/governance/package.json
@@ -18,7 +18,7 @@
     "@synthetixio/core-utils": "workspace:*",
     "@synthetixio/docgen": "workspace:*",
     "@synthetixio/router": "^3.1.3",
-    "hardhat": "2.15.0",
+    "hardhat": "2.17.2",
     "solidity-docgen": "0.6.0-beta.35"
   }
 }
diff --git a/protocol/oracle-manager/package.json b/protocol/oracle-manager/package.json
@@ -6,12 +6,12 @@
     "access": "public"
   },
   "scripts": {
-    "test": "hardhat test",
+    "test": "CANNON_REGISTRY_PRIORITY=local hardhat test",
     "coverage": "hardhat coverage --network hardhat",
     "clean": "hardhat clean",
     "build": "yarn build:contracts",
     "build:contracts": "hardhat storage:verify && hardhat cannon:build",
-    "build-testable": "hardhat cannon:build cannonfile.test.toml",
+    "build-testable": "CANNON_REGISTRY_PRIORITY=local hardhat cannon:build cannonfile.test.toml",
     "check:storage": "git diff --exit-code storage.dump.sol",
     "compile-contracts": "hardhat compile",
     "size-contracts": "hardhat compile && hardhat size-contracts",
@@ -32,7 +32,7 @@
     "@synthetixio/wei": "2.74.4",
     "@types/node": "18.11.10",
     "ethers": "^5.7.2",
-    "hardhat": "2.15.0",
+    "hardhat": "2.17.2",
     "solidity-docgen": "0.6.0-beta.35",
     "ts-node": "10.9.1",
     "typescript": "4.9.3"

diff --git a/protocol/synthetix/cannonfile.test.toml b/protocol/synthetix/cannonfile.test.toml
@@ -6,6 +6,11 @@ include = [
   "cannonfile.toml"
 ]
 
+# use the testable oracle manager
+[setting.oracle_manager_source]
+defaultValue = "oracle-manager:<%= package.version %>-testable"
+
+
 # Test Modules
 [contract.TestableAccountStorage]
 artifact = "contracts/generated/test/TestableAccountStorage.sol:TestableAccountStorage"
@@ -166,4 +171,4 @@ args = [[
   "0x7d632bd2<%= defaultAbiCoder.encode(['bytes32', 'bool'], [formatBytes32String('createPool'), true]).slice(2) %>",
 ]]
 
-depends = ["invoke.upgrade_core_proxy"]
+depends = ["invoke.upgrade_core_proxy"]
diff --git a/protocol/synthetix/package.json b/protocol/synthetix/package.json
@@ -10,9 +10,9 @@
     "build": "yarn build:contracts",
     "build:contracts": "hardhat storage:verify && hardhat cannon:build",
     "generate-testable": "rm -rf contracts/generated && hardhat generate-testable",
-    "build-testable": "hardhat cannon:build cannonfile.test.toml",
+    "build-testable": "CANNON_REGISTRY_PRIORITY=local hardhat cannon:build cannonfile.test.toml",
     "check:storage": "git diff --exit-code storage.dump.sol",
-    "test": "hardhat test",
+    "test": "CANNON_REGISTRY_PRIORITY=local hardhat test",
     "coverage": "hardhat coverage --network hardhat",
     "compile-contracts": "hardhat compile",
     "size-contracts": "hardhat compile && hardhat size-contracts",
@@ -32,9 +32,9 @@
     "@synthetixio/oracle-manager": "workspace:*",
     "@synthetixio/router": "^3.1.3",
     "@synthetixio/wei": "2.74.4",
-    "@usecannon/builder": "^2.5.1",
+    "@usecannon/builder": "^2.5.4",
     "ethers": "^5.7.2",
-    "hardhat": "2.15.0",
+    "hardhat": "2.17.2",
     "solidity-ast": "0.4.46",
     "solidity-docgen": "0.6.0-beta.35",
     "ts-node": "10.9.1"

diff --git a/protocol/synthetix/subgraph/package.json b/protocol/synthetix/subgraph/package.json
@@ -34,7 +34,7 @@
   "devDependencies": {
     "@graphprotocol/graph-cli": "^0.50.1",
     "@graphprotocol/graph-ts": "^0.30.0",
-    "@usecannon/cli": "^2.5.1",
+    "@usecannon/cli": "^2.5.4",
     "ethers": "^5.7.2",
     "matchstick-as": "^0.5.2",
     "prettier": "^2.8.8"

diff --git a/protocol/synthetix/test/common/stakedPool.ts b/protocol/synthetix/test/common/stakedPool.ts
@@ -38,17 +38,15 @@ export const createStakedPool = (
 
   before('configure collateral', async () => {
     // add collateral
-    await (
-      await r.systems().Core.connect(r.owner()).configureCollateral({
-        tokenAddress: r.systems().CollateralMock.address,
-        oracleNodeId,
-        issuanceRatioD18: '5000000000000000000',
-        liquidationRatioD18: '1500000000000000000',
-        liquidationRewardD18: '20000000000000000000',
-        minDelegationD18: '20000000000000000000',
-        depositingEnabled: true,
-      })
-    ).wait();
+    await r.systems().Core.connect(r.owner()).configureCollateral({
+      tokenAddress: r.systems().CollateralMock.address,
+      oracleNodeId,
+      issuanceRatioD18: '5000000000000000000',
+      liquidationRatioD18: '1500000000000000000',
+      liquidationRewardD18: '20000000000000000000',
+      minDelegationD18: '20000000000000000000',
+      depositingEnabled: true,
+    });
   });
 
   before('create pool', async () => {

diff --git a/utils/common-config/package.json b/utils/common-config/package.json
@@ -15,11 +15,11 @@
     "@synthetixio/hardhat-storage": "workspace:*",
     "@typechain/ethers-v5": "10.1.0",
     "@typechain/hardhat": "6.1.3",
-    "@usecannon/builder": "^2.5.1",
+    "@usecannon/builder": "^2.5.4",
     "cannon-plugin-router": "^1.0.16",
     "dotenv": "16.0.1",
-    "hardhat": "2.15.0",
-    "hardhat-cannon": "2.5.1",
+    "hardhat": "2.17.2",
+    "hardhat-cannon": "2.5.4",
     "hardhat-contract-sizer": "2.10.0",
     "hardhat-gas-reporter": "1.0.9",
     "hardhat-ignore-warnings": "0.2.9",

diff --git a/utils/core-contracts/package.json b/utils/core-contracts/package.json
@@ -31,7 +31,7 @@
     "@synthetixio/core-utils": "workspace:*",
     "@synthetixio/router": "^3.1.3",
     "ethers": "^5.7.2",
-    "hardhat": "2.15.0"
+    "hardhat": "2.17.2"
   },
   "gitHead": "af79d976af56150c628a885cc94a94f5bcc2c862",
   "depcheck": {

diff --git a/utils/core-modules/package.json b/utils/core-modules/package.json
@@ -25,7 +25,7 @@
     "@synthetixio/core-utils": "workspace:*",
     "@synthetixio/router": "^3.1.3",
     "ethers": "^5.7.2",
-    "hardhat": "2.15.0"
+    "hardhat": "2.17.2"
   },
   "gitHead": "af79d976af56150c628a885cc94a94f5bcc2c862"
 }
diff --git a/utils/core-utils/package.json b/utils/core-utils/package.json
@@ -40,7 +40,7 @@
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@types/prompts": "2.0.14",
     "ethers": "^5.7.2",
-    "hardhat": "2.15.0",
+    "hardhat": "2.17.2",
     "mocha": "10.2.0",
     "multimatch": "6.0.0",
     "nyc": "15.1.0",

diff --git a/utils/docgen/package.json b/utils/docgen/package.json
@@ -12,7 +12,7 @@
     "docgen:contracts": "./docgen-contracts.sh"
   },
   "devDependencies": {
-    "@usecannon/cli": "^2.5.1",
+    "@usecannon/cli": "^2.5.4",
     "handlebars": "4.7.7",
     "prettier": "^2.8.8",
     "solidity-ast": "0.4.46",

diff --git a/utils/hardhat-storage/package.json b/utils/hardhat-storage/package.json
@@ -38,7 +38,7 @@
   "devDependencies": {
     "@types/jest": "29.2.3",
     "@types/mustache": "4.2.2",
-    "hardhat": "2.15.0",
+    "hardhat": "2.17.2",
     "jest": "29.4.3",
     "ts-jest": "29.0.5",
     "typescript": "4.9.3"

diff --git a/utils/sample-project/package.json b/utils/sample-project/package.json
@@ -18,11 +18,11 @@
     "@synthetixio/core-utils": "workspace:*",
     "@synthetixio/hardhat-storage": "workspace:*",
     "@synthetixio/router": "^3.1.3",
-    "@usecannon/builder": "^2.5.1",
+    "@usecannon/builder": "^2.5.4",
     "cannon-plugin-router": "^1.0.16",
     "ethers": "^5.7.2",
-    "hardhat": "2.15.0",
-    "hardhat-cannon": "2.5.1",
+    "hardhat": "2.17.2",
+    "hardhat-cannon": "2.5.4",
     "solidity-coverage": "0.8.2"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ const config = { @@
         },
       },
       mocha: {
-        timeout: 200_000,
+        timeout: 30_000,
       },
     };
@@ Expand Down @@