refactor: Spoke Registrar

.github/workflows/certora_verification.yml

@@ -32,9 +32,9 @@ jobs:
 
       - name: Install solc
         run: |
-          wget https://github.com/ethereum/solidity/releases/download/v0.8.23/solc-static-linux
+          wget https://github.com/ethereum/solidity/releases/download/v0.8.26/solc-static-linux
           chmod +x solc-static-linux
-          sudo mv solc-static-linux /usr/local/bin/solc8.23
+          sudo mv solc-static-linux /usr/local/bin/solc8.26
       - name: Verify
         run: |
           sh certora/munge.sh

.github/workflows/coverage.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - spoke
   pull_request:
 
 permissions: write-all

.github/workflows/test-fuzz.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - spoke
   pull_request:
 
 permissions: write-all

.github/workflows/test-gas.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - spoke
   pull_request:
 
 permissions: write-all

.github/workflows/test-integration.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - spoke
   pull_request:
 
 permissions: write-all

.github/workflows/test-invariant.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - spoke
   pull_request:
 
 permissions: write-all

.gitmodules

@@ -2,9 +2,6 @@
 	path = lib/forge-std
 	url = git@github.com:foundry-rs/forge-std.git
 	branch = v1
-[submodule "lib/erc20-helper"]
-	path = lib/erc20-helper
-	url = git@github.com:maple-labs/erc20-helper.git
 [submodule "lib/common"]
 	path = lib/common
 	url = git@github.com:MZero-Labs/common.git

.prettierrc.json

@@ -1,10 +1,12 @@
 {
-  "plugins": ["prettier-plugin-solidity"],
+  "plugins": [
+    "prettier-plugin-solidity"
+  ],
   "overrides": [
     {
       "files": "*.sol",
       "options": {
-        "compiler": "0.8.23",
+        "compiler": "0.8.26",
         "parser": "solidity-parse",
         "tabWidth": 4,
         "singleQuote": false,

.solhint.json

@@ -1,18 +1,32 @@
 {
-  "extends": ["solhint:recommended"],
+  "extends": [
+    "solhint:recommended"
+  ],
   "plugins": [],
   "rules": {
     "not-rely-on-time": "off",
     "no-inline-assembly": "off",
-    "code-complexity": ["warn", 10],
-    "function-max-lines": ["warn", 100],
-    "max-line-length": ["warn", 120],
+    "code-complexity": [
+      "warn",
+      10
+    ],
+    "function-max-lines": [
+      "warn",
+      100
+    ],
+    "max-line-length": [
+      "warn",
+      120
+    ],
     "contract-name-camelcase": "warn",
     "no-unused-vars": "warn",
     "no-global-import": "warn",
     "no-unused-import": "warn",
     "comprehensive-interface": "off",
-    "quotes": ["error", "double"],
+    "quotes": [
+      "error",
+      "double"
+    ],
     "const-name-snakecase": "off",
     "event-name-camelcase": "warn",
     "func-name-mixedcase": "off",
@@ -29,7 +43,10 @@
     "imports-on-top": "error",
     "ordering": "warn",
     "visibility-modifier-order": "error",
-    "compiler-version": ["warn", "0.8.23"],
+    "compiler-version": [
+      "warn",
+      "0.8.26"
+    ],
     "func-visibility": [
       "warn",
       {

README.md

@@ -1,6 +1,6 @@
-# TTG (Two Token Governance)
+# M^0 Spoke Registrar
 
-A TTG, "Two Token Governance" is a governance mechanism that uses token voting to maintain lists and manage communal property. As its name implies, it primarily optimizes for token holder participation. A TTG is primarily used for **permissioning actors** and should not be used for funding/financing decisions.
+An immutable book of arbitrary key-value pairs and lists.
 
 ## Development
 
@@ -97,7 +97,3 @@ yarn doc
 ```
 
 The command will generate the documentation in the `docs` folder and spinup a local server on port `4000` to view the documentation.
-
-## TTG Smart Contract Architecture
-
-<img width="1098" alt="ttg" src="https://github.com/MZero-Labs/ttg/assets/1220854/58866111-26f6-495d-8949-9cef00783f7c">

certora/Makefile

@@ -1,31 +1,15 @@
 default: help
 
-PATCH         = applyHarness.patch
 MUNGED_DIR    = ./munged
 CONTRACTS_DIR = ../contracts/src
-file1_origin = ../src/StandardGovernor.sol
-file1_munged = ./munged/StandardGovernor.sol
-file1_copy = ./munged/StandardGovernor_origin.sol
 
 help:
 	@echo "usage:"
 	@echo "  make clean:  remove all generated files (those ignored by git)"
 	@echo "  make $(MUNGED_DIR): create $(MUNGED_DIR) directory by applying the patch file to $(CONTRACTS_DIR)"
-	@echo "  make record: record a new patch file capturing the differences between $(file1_munged) and $(file1_origin)"
 
 munge:
 	mkdir -p $(MUNGED_DIR)
-	cp $(file1_origin) $(file1_munged)
-	cp $(file1_origin) $(file1_copy)
-	patch -d $(MUNGED_DIR) < $(PATCH)
-	mv $(file1_munged) $(file1_origin)
-
-record:
-	diff -uN $(file1_origin) $(file1_munged) | sed 's+\$(file1_origin)/++g' | sed 's+$(file1_munged)++g' > $(PATCH)
-
-revert:
-	cp $(file1_origin) $(file1_munged)
-	mv $(file1_copy) $(file1_origin)
 
 clean:
 	git clean -fdX