Remove abacus- prefix from directories (#267)

.github/workflows/node.yml

@@ -84,7 +84,7 @@ jobs:
           key: ${{ github.sha }}
 
       - name: test
-        run: npm --prefix ./typescript/abacus-deploy run test
+        run: npm --prefix ./typescript/deploy run test
 
   test-sol:
     env:
@@ -101,6 +101,6 @@ jobs:
           key: ${{ github.sha }}
 
       - name: core
-        run: npm --prefix ./solidity/abacus-core run test
+        run: npm --prefix ./solidity/core run test
       - name: xapps
-        run: npm --prefix ./solidity/abacus-xapps run test
+        run: npm --prefix ./solidity/apps run test

contract-inheritance.md

@@ -1,47 +0,0 @@
-# Contract Inheritance
-
-## Core Contracts
-
-- Home (initializes Common, OwnableUpgradeable)
-  - MerkleTreeManager
-  - Common (initializes QueueManager)
-    - QueueManager
-  - OwnableUpgradeable
-- Replica (initializes Common)
-  -Common (initializes QueueManager)
-  -QueueManager
-- UpdaterManager
-  - Ownable
-  - IUpdaterManager
-- XAppConnectionManager
-  - Ownable
-- MerkleTreeManager
-
-### Upgrade
-
-- UpgradeBeacon
-- UpgradeBeaconController
-  - Ownable
-- UpgradeBeaconProxy
-
-### Governance
-
-- GovernanceRouter
-  - Initializable
-  - IMessageRecipient
-
-## xApps
-
-### Token Bridge
-
-- BridgeRouter (initializes TokenRegistry and XAppConnectionClient)
-  - TokenRegistry
-    - Initializable
-  - Router (no initializer)
-    - XAppConnectionClient (initializes OwnableUpgradeable)
-      - OwnableUpgradeable
-- BridgeToken (initializes OwnableUpgradeable)
-  - ERC20
-  - OwnableUpgradeable
-  - IBridgeToken
-- ETHHelper

package-lock.json

@@ -7,16 +7,16 @@
       "name": "@abacus-network/monorepo",
       "workspaces": [
         "typescript/utils",
-        "solidity/abacus-core",
+        "solidity/core",
         "typescript/hardhat",
-        "solidity/abacus-xapps",
-        "typescript/abacus-sdk",
+        "solidity/apps",
+        "typescript/sdk",
         "typescript/contract-metrics",
-        "typescript/abacus-deploy"
+        "typescript/deploy"
       ]
     },
     "node_modules/@abacus-network/apps": {
-      "resolved": "solidity/abacus-xapps",
+      "resolved": "solidity/apps",
       "link": true
     },
     "node_modules/@abacus-network/contract-metrics": {
@@ -24,11 +24,11 @@
       "link": true
     },
     "node_modules/@abacus-network/core": {
-      "resolved": "solidity/abacus-core",
+      "resolved": "solidity/core",
       "link": true
     },
     "node_modules/@abacus-network/deploy": {
-      "resolved": "typescript/abacus-deploy",
+      "resolved": "typescript/deploy",
       "link": true
     },
     "node_modules/@abacus-network/hardhat": {
@@ -36,7 +36,7 @@
       "link": true
     },
     "node_modules/@abacus-network/sdk": {
-      "resolved": "typescript/abacus-sdk",
+      "resolved": "typescript/sdk",
       "link": true
     },
     "node_modules/@abacus-network/utils": {
@@ -24785,6 +24785,7 @@
     "solidity/abacus-core": {
       "name": "@abacus-network/core",
       "version": "0.0.1",
+      "extraneous": true,
       "license": "MIT OR Apache-2.0",
       "dependencies": {
         "@abacus-network/utils": "^0.0.5",
@@ -24816,6 +24817,7 @@
     "solidity/abacus-xapps": {
       "name": "@abacus-network/apps",
       "version": "0.0.0",
+      "extraneous": true,
       "license": "MIT OR Apache-2.0",
       "dependencies": {
         "@abacus-network/core": "file:../core",
@@ -24846,15 +24848,74 @@
         "typescript": "^4.3.5"
       }
     },
-    "solidity/abacus-xapps/node_modules/@abacus-network/core": {
-      "resolved": "solidity/core",
-      "link": true
+    "solidity/apps": {
+      "name": "@abacus-network/apps",
+      "version": "0.0.0",
+      "license": "MIT OR Apache-2.0",
+      "dependencies": {
+        "@abacus-network/core": "file:../core",
+        "@abacus-network/hardhat": "^0.0.5",
+        "@abacus-network/utils": "^0.0.5",
+        "@openzeppelin/contracts": "~3.4.2",
+        "@openzeppelin/contracts-upgradeable": "~3.4.2",
+        "@summa-tx/memview-sol": "^2.0.0"
+      },
+      "devDependencies": {
+        "@nomiclabs/hardhat-ethers": "^2.0.1",
+        "@nomiclabs/hardhat-waffle": "^2.0.1",
+        "@typechain/ethers-v5": "~7.0.0",
+        "@typechain/hardhat": "^2.0.1",
+        "chai": "^4.3.0",
+        "eslint": "^7.20.0",
+        "ethereum-waffle": "^3.2.2",
+        "ethers": "^5.4.4",
+        "hardhat": "^2.8.3",
+        "hardhat-gas-reporter": "^1.0.7",
+        "prettier": "^2.2.1",
+        "prettier-plugin-solidity": "^1.0.0-beta.5",
+        "solhint": "^3.3.2",
+        "solhint-plugin-prettier": "^0.0.5",
+        "solidity-coverage": "^0.7.14",
+        "ts-node": "^10.1.0",
+        "typechain": "^5.0.0",
+        "typescript": "^4.3.5"
+      }
+    },
+    "solidity/core": {
+      "name": "@abacus-network/core",
+      "version": "0.0.1",
+      "license": "MIT OR Apache-2.0",
+      "dependencies": {
+        "@abacus-network/utils": "^0.0.5",
+        "@openzeppelin/contracts": "^3.4.2",
+        "@openzeppelin/contracts-upgradeable": "~3.4.2",
+        "@summa-tx/memview-sol": "^2.0.0",
+        "ts-generator": "^0.1.1"
+      },
+      "devDependencies": {
+        "@nomiclabs/hardhat-ethers": "^2.0.1",
+        "@nomiclabs/hardhat-waffle": "^2.0.1",
+        "@typechain/ethers-v5": "~7.0.0",
+        "@typechain/hardhat": "^2.0.1",
+        "chai": "^4.3.0",
+        "eslint": "^7.20.0",
+        "ethereum-waffle": "^3.2.2",
+        "ethers": "^5.4.4",
+        "hardhat": "^2.8.3",
+        "hardhat-gas-reporter": "^1.0.7",
+        "prettier": "^2.2.1",
+        "prettier-plugin-solidity": "^1.0.0-beta.5",
+        "solhint": "^3.3.2",
+        "solhint-plugin-prettier": "^0.0.5",
+        "solidity-coverage": "^0.7.14",
+        "ts-node": "^10.1.0",
+        "typechain": "^5.0.0"
+      }
     },
-    "solidity/apps": {},
-    "solidity/core": {},
     "typescript/abacus-deploy": {
       "name": "@abacus-network/deploy",
       "version": "0.0.5",
+      "extraneous": true,
       "license": "MIT OR Apache-2.0",
       "dependencies": {
         "@abacus-network/apps": "file:../../solidity/apps",
@@ -24887,21 +24948,10 @@
         "typescript": "^4.3.2"
       }
     },
-    "typescript/abacus-deploy/node_modules/@abacus-network/apps": {
-      "resolved": "solidity/apps",
-      "link": true
-    },
-    "typescript/abacus-deploy/node_modules/@abacus-network/core": {
-      "resolved": "solidity/core",
-      "link": true
-    },
-    "typescript/abacus-deploy/node_modules/@types/node": {
-      "version": "16.11.26",
-      "license": "MIT"
-    },
     "typescript/abacus-sdk": {
       "name": "@abacus-network/sdk",
       "version": "0.0.1",
+      "extraneous": true,
       "license": "MIT OR Apache-2.0",
       "dependencies": {
         "@abacus-network/apps": "file:../../solidity/apps",
@@ -24923,19 +24973,6 @@
         "typescript": "^4.4.3"
       }
     },
-    "typescript/abacus-sdk/node_modules/@abacus-network/apps": {
-      "resolved": "solidity/apps",
-      "link": true
-    },
-    "typescript/abacus-sdk/node_modules/@abacus-network/core": {
-      "resolved": "solidity/core",
-      "link": true
-    },
-    "typescript/abacus-sdk/node_modules/@types/node": {
-      "version": "16.11.26",
-      "dev": true,
-      "license": "MIT"
-    },
     "typescript/contract-metrics": {
       "name": "@abacus-network/contract-metrics",
       "version": "0.0.0",
@@ -24968,14 +25005,50 @@
         "prettier": "^2.4.1"
       }
     },
-    "typescript/contract-metrics/node_modules/@abacus-network/apps": {
-      "resolved": "solidity/apps",
-      "link": true
-    },
     "typescript/contract-metrics/node_modules/@types/node": {
       "version": "16.11.26",
       "license": "MIT"
     },
+    "typescript/deploy": {
+      "name": "@abacus-network/deploy",
+      "version": "0.0.5",
+      "license": "MIT OR Apache-2.0",
+      "dependencies": {
+        "@abacus-network/apps": "file:../../solidity/apps",
+        "@abacus-network/core": "file:../../solidity/core",
+        "@abacus-network/sdk": "^0.0.1",
+        "@aws-sdk/client-kms": "3.48.0",
+        "@ethersproject/experimental": "^5.3.0",
+        "@nomiclabs/hardhat-etherscan": "^3.0.3",
+        "@types/mocha": "^9.1.0",
+        "@types/node": "^16.9.1",
+        "@types/yargs": "^17.0.8",
+        "asn1.js": "5.4.1",
+        "axios": "^0.21.3",
+        "chai": "^4.3.4",
+        "dotenv": "^10.0.0",
+        "yargs": "^17.3.1"
+      },
+      "devDependencies": {
+        "@nomiclabs/hardhat-ethers": "^2.0.5",
+        "@nomiclabs/hardhat-waffle": "^2.0.2",
+        "@typechain/ethers-v5": "~7.0.0",
+        "@typechain/hardhat": "^2.0.1",
+        "@types/chai": "^4.2.21",
+        "ethereum-waffle": "^3.2.2",
+        "ethers": "^5.4.7",
+        "hardhat": "^2.8.4",
+        "prettier": "^2.3.1",
+        "ts-node": "^10.1.0",
+        "typechain": "^5.0.0",
+        "typescript": "^4.3.2"
+      }
+    },
+    "typescript/deploy/node_modules/@types/node": {
+      "version": "16.11.26",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz",
+      "integrity": "sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ=="
+    },
     "typescript/hardhat": {
       "name": "@abacus-network/hardhat",
       "version": "0.0.5",
@@ -24995,9 +25068,35 @@
         "typescript": "^4.3.2"
       }
     },
-    "typescript/hardhat/node_modules/@abacus-network/core": {
-      "resolved": "solidity/core",
-      "link": true
+    "typescript/sdk": {
+      "name": "@abacus-network/sdk",
+      "version": "0.0.1",
+      "license": "MIT OR Apache-2.0",
+      "dependencies": {
+        "@abacus-network/apps": "file:../../solidity/apps",
+        "@abacus-network/core": "file:../../solidity/core",
+        "@ethersproject/bignumber": "^5.5.0",
+        "@ethersproject/bytes": "^5.5.0",
+        "celo-ethers-provider": "0.0.0",
+        "ethers": "^5.4.7"
+      },
+      "devDependencies": {
+        "@types/node": "^16.9.1",
+        "@typescript-eslint/eslint-plugin": "^4.33.0",
+        "@typescript-eslint/parser": "^4.33.0",
+        "dotenv": "^10.0.0",
+        "eslint": "^7.32.0",
+        "eslint-config-prettier": "^8.3.0",
+        "fs": "0.0.1-security",
+        "prettier": "^2.4.1",
+        "typescript": "^4.4.3"
+      }
+    },
+    "typescript/sdk/node_modules/@types/node": {
+      "version": "16.11.26",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz",
+      "integrity": "sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ==",
+      "dev": true
     },
     "typescript/utils": {
       "name": "@abacus-network/utils",
@@ -25011,7 +25110,7 @@
   },
   "dependencies": {
     "@abacus-network/apps": {
-      "version": "file:solidity/abacus-xapps",
+      "version": "file:solidity/apps",
       "requires": {
         "@abacus-network/core": "file:../core",
         "@abacus-network/hardhat": "^0.0.5",
@@ -25037,11 +25136,6 @@
         "ts-node": "^10.1.0",
         "typechain": "^5.0.0",
         "typescript": "^4.3.5"
-      },
-      "dependencies": {
-        "@abacus-network/core": {
-          "version": "file:solidity/core"
-        }
       }
     },
     "@abacus-network/contract-metrics": {
@@ -25073,16 +25167,13 @@
         "typescript": "^4.4.3"
       },
       "dependencies": {
-        "@abacus-network/apps": {
-          "version": "file:solidity/apps"
-        },
         "@types/node": {
           "version": "16.11.26"
         }
       }
     },
     "@abacus-network/core": {
-      "version": "file:solidity/abacus-core",
+      "version": "file:solidity/core",
       "requires": {
         "@abacus-network/utils": "^0.0.5",
         "@nomiclabs/hardhat-ethers": "^2.0.1",
@@ -25109,7 +25200,7 @@
       }
     },
     "@abacus-network/deploy": {
-      "version": "file:typescript/abacus-deploy",
+      "version": "file:typescript/deploy",
       "requires": {
         "@abacus-network/apps": "file:../../solidity/apps",
         "@abacus-network/core": "file:../../solidity/core",
@@ -25139,14 +25230,10 @@
         "yargs": "^17.3.1"
       },
       "dependencies": {
-        "@abacus-network/apps": {
-          "version": "file:solidity/apps"
-        },
-        "@abacus-network/core": {
-          "version": "file:solidity/core"
-        },
         "@types/node": {
-          "version": "16.11.26"
+          "version": "16.11.26",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz",
+          "integrity": "sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ=="
         }
       }
     },
@@ -25165,15 +25252,10 @@
         "ts-node": "^10.1.0",
         "typechain": "^5.0.0",
         "typescript": "^4.3.2"
-      },
-      "dependencies": {
-        "@abacus-network/core": {
-          "version": "file:solidity/core"
-        }
       }
     },
     "@abacus-network/sdk": {
-      "version": "file:typescript/abacus-sdk",
+      "version": "file:typescript/sdk",
       "requires": {
         "@abacus-network/apps": "file:../../solidity/apps",
         "@abacus-network/core": "file:../../solidity/core",
@@ -25192,14 +25274,10 @@
         "typescript": "^4.4.3"
       },
       "dependencies": {
-        "@abacus-network/apps": {
-          "version": "file:solidity/apps"
-        },
-        "@abacus-network/core": {
-          "version": "file:solidity/core"
-        },
         "@types/node": {
           "version": "16.11.26",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz",
+          "integrity": "sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ==",
           "dev": true
         }
       }

package.json

@@ -7,11 +7,11 @@
   },
   "workspaces": [
     "typescript/utils",
-    "solidity/abacus-core",
+    "solidity/core",
     "typescript/hardhat",
-    "solidity/abacus-xapps",
-    "typescript/abacus-sdk",
+    "solidity/apps",
+    "typescript/sdk",
     "typescript/contract-metrics",
-    "typescript/abacus-deploy"
+    "typescript/deploy"
   ]
 }