feat: remove across contracts (UMAprotocol#3775)

Woodpile37 · Feb 7, 2022 · 84c053b · 84c053b
1 parent 4b2ff2f
commit 84c053b
Show file tree

Hide file tree

Showing 62 changed files with 145 additions and 7,760 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -24,6 +24,7 @@ jobs:
     docker:
       - image: circleci/node:lts
     working_directory: ~/protocol
+    resource_class: large
     steps:
       - restore_cache:
           key: protocol-{{ .Environment.CIRCLE_SHA1 }}

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -28,7 +28,7 @@
     "/dist/**/*"
   ],
   "dependencies": {
-    "@across-protocol/contracts": "^0.1.2",
+    "@across-protocol/contracts": "^0.1.4",
     "@eth-optimism/hardhat-ovm": "^0.2.2",
     "@ethersproject/bignumber": "^5.0.5",
     "@google-cloud/kms": "^2.3.1",

diff --git a/packages/common/src/hardhat/plugins/ExtendedWeb3.ts b/packages/common/src/hardhat/plugins/ExtendedWeb3.ts
@@ -96,7 +96,13 @@ extendEnvironment((_hre) => {
   const hre = _hre as HRE;
   hre._artifactCache = {};
   hre.getContract = (name, artifactOverrides = {}) => {
-    if (!hre._artifactCache[name]) hre._artifactCache[name] = hre.artifacts.readArtifactSync(name);
+    if (!hre._artifactCache[name]) {
+      // Allows for the caller to bypass the hardhat lookup.
+      // This is a bit of a hack and will not work for library linking unless linkReferences is provided.
+      if (artifactOverrides.abi && artifactOverrides.bytecode)
+        hre._artifactCache[name] = { contractName: name, ...artifactOverrides } as Artifact;
+      else hre._artifactCache[name] = hre.artifacts.readArtifactSync(name);
+    }
     const artifact = { ...hre._artifactCache[name], ...artifactOverrides };
 
     const deployed = async () => {

diff --git a/packages/common/src/hardhat/tasks/acrossPool.ts b/packages/common/src/hardhat/tasks/acrossPool.ts
diff --git a/packages/common/src/hardhat/tasks/artifacts.ts b/packages/common/src/hardhat/tasks/artifacts.ts
@@ -129,7 +129,10 @@ task("generate-contracts-frontend", "Generate typescipt for the contracts-fronte
     );
 
     artifacts.forEach(({ contractName, packageName }) => {
-      if (fs.existsSync(`typechain/${packageName}/ethers/${contractName}.d.ts`))
+      if (
+        fs.existsSync(`typechain/${packageName}/ethers/${contractName}.d.ts`) ||
+        fs.existsSync(`typechain/${packageName}/ethers/${contractName}.ts`)
+      )
         fs.appendFileSync(
           out,
           `export type { ${contractName} as ${contractName}Ethers } from "../typechain/${packageName}/ethers";\n`
@@ -146,7 +149,10 @@ task("generate-contracts-frontend", "Generate typescipt for the contracts-fronte
 
     // Write Web3 contract types.
     artifacts.forEach(({ contractName, packageName }) => {
-      if (fs.existsSync(`typechain/${packageName}/web3/${contractName}.d.ts`))
+      if (
+        fs.existsSync(`typechain/${packageName}/web3/${contractName}.d.ts`) ||
+        fs.existsSync(`typechain/${packageName}/web3/${contractName}.ts`)
+      )
         fs.appendFileSync(
           out,
           `export type { ${normalizeClassName(contractName)} as ${normalizeClassName(
@@ -216,7 +222,10 @@ task("generate-contracts-node", "Generate typescipt for the contracts-node packa
     );
 
     artifacts.forEach(({ contractName, packageName }) => {
-      if (fs.existsSync(`typechain/${packageName}/ethers/${contractName}.d.ts`))
+      if (
+        fs.existsSync(`typechain/${packageName}/ethers/${contractName}.d.ts`) ||
+        fs.existsSync(`typechain/${packageName}/ethers/${contractName}.ts`)
+      )
         fs.appendFileSync(
           out,
           `export type { ${contractName} as ${contractName}Ethers } from "../typechain/${packageName}/ethers";\n`
@@ -233,7 +242,10 @@ task("generate-contracts-node", "Generate typescipt for the contracts-node packa
 
     // Write Web3 contract types.
     artifacts.forEach(({ contractName, packageName }) => {
-      if (fs.existsSync(`typechain/${packageName}/web3/${contractName}.d.ts`))
+      if (
+        fs.existsSync(`typechain/${packageName}/web3/${contractName}.d.ts`) ||
+        fs.existsSync(`typechain/${packageName}/web3/${contractName}.ts`)
+      )
         fs.appendFileSync(
           out,
           `export type { ${normalizeClassName(contractName)} as ${normalizeClassName(

diff --git a/packages/contracts-frontend/package.json b/packages/contracts-frontend/package.json
@@ -3,7 +3,7 @@
   "version": "0.2.1",
   "description": "UMA smart contracts and unit tests",
   "devDependencies": {
-    "@across-protocol/contracts": "^0.1.2",
+    "@across-protocol/contracts": "^0.1.4",
     "@ethersproject/abi": "^5.4.0",
     "@ethersproject/abstract-provider": "^5.4.0",
     "@ethersproject/contracts": "^5.4.0",
@@ -35,7 +35,7 @@
     "clean": "rm -rf dist generated typechain",
     "copy-across-types": "mkdir -p typechain/@across-protocol/contracts && rsync -a $(dirname $(node -p 'require.resolve(\"@across-protocol/contracts/package.json\")'))/contract-types/ typechain/@across-protocol/contracts",
     "generate-ts": "yarn clean && mkdir -p generated typechain/core && cp -R ../core/contract-types/* typechain/core/ && yarn copy-across-types && yarn hardhat generate-contracts-frontend --out ./generated/index.ts",
-    "build": "yarn generate-ts && yarn tsc && rsync -R ./typechain/**/**/*.d.ts ./dist",
+    "build": "yarn generate-ts && yarn tsc && rsync -a --include '*/' --include '*.d.ts' --exclude '*' ./typechain ./dist/",
     "prepublish": "yarn build"
   },
   "bugs": {

diff --git a/packages/contracts-frontend/tsconfig.json b/packages/contracts-frontend/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "include": ["generated/index.ts"],
+  "include": ["generated/index.ts", "typechain/**/*"],
   "compilerOptions": {
     "outDir": "./dist",
     "declaration": true,

diff --git a/packages/contracts-node/package.json b/packages/contracts-node/package.json
@@ -3,7 +3,7 @@
   "version": "0.2.1",
   "description": "UMA smart contracts and unit tests",
   "devDependencies": {
-    "@across-protocol/contracts": "^0.1.2",
+    "@across-protocol/contracts": "^0.1.4",
     "@ethersproject/abi": "^5.4.0",
     "@ethersproject/abstract-provider": "^5.4.0",
     "@ethersproject/contracts": "^5.4.0",
@@ -35,7 +35,7 @@
     "clean": "rm -rf dist generated typechain",
     "copy-across-types": "mkdir -p typechain/@across-protocol/contracts && rsync -a $(dirname $(node -p 'require.resolve(\"@across-protocol/contracts/package.json\")'))/contract-types/ typechain/@across-protocol/contracts",
     "generate-ts": "yarn clean && mkdir -p generated typechain/core && cp -R ../core/contract-types/* typechain/core/ && yarn copy-across-types && yarn hardhat generate-contracts-node --out ./generated/index.ts",
-    "build": "yarn generate-ts && yarn tsc && rsync -R ./typechain/**/**/*.d.ts ./dist/packages/contracts-node",
+    "build": "yarn generate-ts && yarn tsc && rsync -a --include '*/' --include '*.d.ts' --exclude '*' ./typechain ./dist/packages/contracts-node/",
     "prepublish": "yarn build"
   },
   "bugs": {

diff --git a/packages/contracts-node/tsconfig.json b/packages/contracts-node/tsconfig.json
@@ -3,7 +3,9 @@
   "esModuleInterop": true,
   "include": [
     "generated/index.ts",
+    "typechain/**/*",
     "../core/artifacts/**/*.json",
+    "../../node_modules/@across-protocol/contracts/artifacts/**/*.json",
     "../../node_modules/@across-protocol/contracts/artifacts/**/*.json"
   ],
   "exclude": [