Update dkg submodule branch

consensusnetworks · Nov 9, 2023 · 422e17b · 422e17b
1 parent 2212492
commit 422e17b
Show file tree

Hide file tree

Showing 20 changed files with 146 additions and 77 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -28,8 +28,7 @@
         "space-before-blocks": ["error", "always"],
         "object-curly-spacing": ["error", "always"],
         "space-in-parens": ["error", "never"],
-        "keyword-spacing": ["error", { "before": true, "after": true }],
-        "array-element-newline": ["error", { "minItems": 3 }]
+        "keyword-spacing": ["error", { "before": true, "after": true }]
     },
     "ignorePatterns": [
         "**/node_modules/**",

diff --git a/.gitmodules b/.gitmodules
@@ -5,4 +5,4 @@
 [submodule "services/oracle/lib/dkg"]
 	path = services/oracle/lib/dkg
 	url = https://github.com/consensusnetworks/ssv-dkg.git
-	branch = feature/operator-env
+	branch = update/makefile
diff --git a/apps/web/src/composables/operators.ts b/apps/web/src/composables/operators.ts
@@ -101,14 +101,14 @@ export default function useOperators() {
                 const pools = await _getPools(operator.id, type)
                 // TODO: Replace these Public Nodes URLs once we have this working again
                 const operatorStore = {
-                    "208": "https://nodes.casimir.co/eth/goerli/dkg/1",
-                    "209": "https://nodes.casimir.co/eth/goerli/dkg/2",
-                    "210": "https://nodes.casimir.co/eth/goerli/dkg/3",
-                    "211": "https://nodes.casimir.co/eth/goerli/dkg/4",
-                    "212": "https://nodes.casimir.co/eth/goerli/dkg/5",
-                    "213": "https://nodes.casimir.co/eth/goerli/dkg/6",
-                    "214": "https://nodes.casimir.co/eth/goerli/dkg/7",
-                    "215": "https://nodes.casimir.co/eth/goerli/dkg/8"
+                    "208": "http://nodes.casimir.co:4031",
+                    "209": "http://nodes.casimir.co:4032",
+                    "210": "http://nodes.casimir.co:4033",
+                    "211": "http://nodes.casimir.co:4034",
+                    "212": "http://nodes.casimir.co:4035",
+                    "213": "http://nodes.casimir.co:4036",
+                    "214": "http://nodes.casimir.co:4037",
+                    "215": "http://nodes.casimir.co:4038"
                 }
                 const url = operatorStore[operator.id.toString() as keyof typeof operatorStore]
                 casimirOperators.push({

diff --git a/common/env/src/index.ts b/common/env/src/index.ts
@@ -1,12 +1,3 @@
-import MOCK_OPERATORS from "./mock/operators.json"
-import MOCK_RESHARES from "./mock/reshares.json"
-import MOCK_VALIDATORS from "./mock/validators.json"
-
-// Default CasimirManager contract deployed to 0xA279b2cD2fe7f71f3dD77deF9dedC114bBC0a68c
-// Default CasimirRegistry contract deployed to 0x2c6E6453c0AA873E81a9CFcFa2206E1b9E6C21e0
-// Default CasimirUpkeep contract deployed to 0xe4FB499e9D87dE483258BF757589310C137B97D9
-// Default CasimirViews contract deployed to 0x394042CBB8bF5444766496897982A5CDd01d5099
-
 const ETHEREUM_CONTRACTS = {
     TESTNET: {
         BEACON_LIBRARY_ADDRESS: "0x0295bfe577d6833882Ee0E1Bccc4a5825d1Df653",
@@ -17,6 +8,11 @@ const ETHEREUM_CONTRACTS = {
         VIEWS_BEACON_ADDRESS: "0x7B07be561eA274a78D9dC30FCFAcEeb2C6Ac3962",
         FACTORY_ADDRESS: "0xA6fd22c5633bCD82Ee25045de91351a8dfA2c76F",
 
+        DEFAULT_MANAGER_ADDRESS: "0xA279b2cD2fe7f71f3dD77deF9dedC114bBC0a68c",
+        DEFAULT_REGISTRY_ADDRESS: "0x2c6E6453c0AA873E81a9CFcFa2206E1b9E6C21e0",
+        DEFAULT_UPKEEP_ADDRESS: "0xe4FB499e9D87dE483258BF757589310C137B97D9",
+        DEFAULT_VIEWS_ADDRESS: "0x394042CBB8bF5444766496897982A5CDd01d5099",
+
         FUNCTIONS_BILLING_REGISTRY_ADDRESS: "0x566087488869A18767cBA3Adb19dfc713FE56Ac6",
         FUNCTIONS_ORACLE_ADDRESS: "0x914F29Ddb0b8A8201a58e6eeaf71d6df36429214",
         FUNCTIONS_ORACLE_FACTORY_ADDRESS: "0x1304Dc23DD83f5c374193839E880cCa5D040f5A7",
@@ -62,8 +58,5 @@ export {
     ETHEREUM_NETWORK_NAME,
     ETHEREUM_RPC_URL,
     ETHEREUM_SIGNERS,
-    HARDHAT_NETWORK_KEY,
-    MOCK_OPERATORS,
-    MOCK_RESHARES,
-    MOCK_VALIDATORS
+    HARDHAT_NETWORK_KEY
 }
diff --git a/common/env/src/mock/operators.json b/common/env/src/mock/operators.json
@@ -2,41 +2,41 @@
     {
         "id": 208,
         "public_key": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBdnppRS9lK21uYTZ6Zndac0NLMm0KcGtUMnVXUXNXMGQ2L0pkWHVTeVA3NFBBRU13UU51OUwxOUQ1eE4xczdhUFJjQmFNUDQxQzFPNG16RmlteUhmTQpxalh5Vm1kb1JKM0drZHRYVjBwYmsyaExPWW0wdWRyeVNpL1htTmhMeUtuS1JnZzRCYzcvZGpxYlU1bGhVRis1CmVKN0FQNElMV2hsWFAvRHkyUWp2TWp6dUhNVGFxUlh6QWl1RmVncGNFOWhEemJqUzBPZVNGQktsVXJBeWdTZTUKYkJLY0tmSkNjazByNk5qZ3lZZjJtSUN6OUcraVplaDFsUEdnVitkTHN5cmZGMlpQOHJTSmY3L280ckVDaUdVVwpMaFljcjUyZ2phWGxzeXNoejF1bCtFaUNKTFBDdUs3bzd6MnY5SzYrRHFkWm9qN2hnekE0UDFUV20zN01kSXpBCnd3SURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K",
-        "ip": "https://nodes.casimir.co/eth/goerli/dkg/1"
+        "ip": "http://nodes.casimir.co:4031"
     },
     {
         "id": 209,
         "public_key": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBbDVVaU9Qd2tWZzhUajA1cmlFSm4KZWVlZDZneE0yZjNWVGhJb0ZCWFdtZ2V0NUh6SXZTK1M3cEJ1QmhCOGdvYlBsRUJ3V0RGK2FEaVRIL0FvY2pmeApRMllrb3lSK052Y0JwaFRpaWpIYXZwbDhqRkdmRWE0ZURTNm9RaWZMMHN3c1FkNU0xNURhczJOOEpid3ZYRE5ICktIVkduNzN1dlVGYXdyYldFeSs2a1FZTTREd2ZsWEpCT2ZnQjFEdlQ1dlVBdUtmdEFEL2NiMU1DRXY4NExHbksKYmhHY1F4aWRVTmZ1QlRiY085b0ZxaGQvUkdqK3NycElnKzI3U3Q0OWRhUDJ3YUNESm9uNnovTDlONGpMd01uWgpkalFYTEpoaEozWVBOdnFCT1pSS2RQS3ZxelRXV1NGK2IyUWRSRnJaa2cvMmFOTkgvOFJReXZoUjNPanJMOWpkCkZ3SURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K",
-        "ip": "https://nodes.casimir.co/eth/goerli/dkg/2"
+        "ip": "http://nodes.casimir.co:4032"
     },
     {
         "id": 210,
         "public_key": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBNHJ2dWxacWY2NExZQ2RxL1BFa0oKWTEzajVsVi9CWVJPWXVJL213S1h3M2lvQXl5VTNuOWtCWjA0cjRSRHovL1VNeFdaa0xuNUg5VUxBVU5aR25vbApPT09aUFJobEtyTUhzTjNhcnpBK3hTbW9UMGl3L0JMdWtPTWxKMTc0eWw5TGJOR1N1Mk1LZXpaOVNpM2dsVStKCmpWR1BVeEN4MTR5UU5EZ0lmWmpncEYwNHhhTy81SGtubVdvQ3FmRDBTYlNPSzY2Q200YlVrQzdVQlhTdzRDSGIKSHVkc1ZxL3dpcGNvU0RGUTZCVW44RDgzV2QwdllvYzZVTWh6akUxcmVpMnYzUk93MUpMUkhaQ0dxd0J3THRoNApidk5PdmNtUzlZYnpYVWdIdVZLaFF4WVFwa3UxZE5WakNXMFhabzdpMDVhMWQrYVk4STlvWkI2TGZ6YTllZlFVCjZ3SURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K",
-        "ip": "https://nodes.casimir.co/eth/goerli/dkg/3"
+        "ip": "http://nodes.casimir.co:4033"
     },
     {
         "id": 211,
         "public_key": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBNWNxZE5aWjdmUUdUQ0htTXhYSmIKSGFTdUFlWkQrV3hQaEJ0d25INW9DRldBVUs5dXBiZnBIRFlzY3FYb2piN3pGelNhVnhSZnlUREZqVGVuRGZ1Vwp1Ty9PckV2Vzd2YTJHQkZtc0JJQnJBSVhSKy9SdHdCbXdkU0ZhVmV6OTNPWHZ3Y21XZkFCUG9nY2hoRjlSUVY5Ckp1RTRmOFI4OUpibFBjWGJHL2NZYzJYM1U5aERWUEw4ZllrR0FYTmtPY3YvWitPSFRiaVJCcEtTMTB2b0ZnOFgKbU9SamhreENVM2NUZ3dqYjBXUEF3KysvbXdENHEwRlBkRmsxODdCWDBtZ0thODB6UGI1NzZ5TER5YWlEMjZhegpLR3hHN3ZiQ29tSE9KMktSNElxMG42YlBBSkg5Y1dUTEs0UEFXY0dWQWIxUW8rNDRFT0NVeTAwQ21uNFB1SVRjCnFRSURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K",
-        "ip": "https://nodes.casimir.co/eth/goerli/dkg/4"
+        "ip": "http://nodes.casimir.co:4034"
     },
     {
         "id": 212,
         "public_key": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBNXZKSEIwSmduVEM2SFJiQkNON2IKbUpiNG9LMGlJci9wU0VZU1U0VzNYVTNmMWFoRFZ2TmF1U284TXlkUndtV0RUVzJHUWZuTnFjYUFCNk11cW4zQQpJTG5DRFVRcllpZ25YOGZRZnFrenY1TDNSK1dLOTJPcmp3citWVE5veEE3ZXlSeHhMYTVybEd4dkYwUk5MbGJRCnVlc01BeVVZTEVnZXdrRTFPa2tIcWlzQzJCVlRQZTJsQWprMFBmNU9TS0hkd2ttWXQ3TGhHTG1NekJXdzY0cFAKRk9HRTYxSEkxVklueXZnMVRqMWVQVStPTHJKYVVrMlZMeWhzcHBWNTk0RW9BYlQ5TU05cDJmcGtXMmpEV2ZabQpWc0dlUnNjOGFUZlpLUHp0MlkvRGUzTUhUQ3RHRCsraldCWDJ3Z0xGU0tkanhJbFVuNUZuRGpOcVNlQlZWalJwCmV3SURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K",
-        "ip": "https://nodes.casimir.co/eth/goerli/dkg/5"
+        "ip": "http://nodes.casimir.co:4035"
     },
     {
         "id": 213,
         "public_key": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBdHFkYXhuNDlHSVV5OE5XRlI0K3QKNktCREhyd0t4WFppRE5ZRVEySVBXQzZYWWN1TjZXN2Y3UUlONWxOWDYvY3VySkYvQjlzbC9jeGFlR0NWS3lnQwpNV1hjS29ENGQwVjk2STlBUU91WXNWaTB3VjZiUCtlUXBmU2xjL1JoNXorNll1ejRQYXJESVBzc2dPUEpKWkk2CjRWNktsdXlieVA4NFVldHU1SUVzRXhINUVJMFBHZHRwZ09NVFRkU1MvVU9ReCt1eVcrVUtpWGNkd0s4MFJFOXgKcVI2VHhwaWt3ZDVGT0MyNFNWeTAwYWgvM1d4YURIWUZkYXErYjR4VWpPV21GTTJYcjY5YnM0LzRydmd4NkdlYwpqVzJ1UC95UWZ2VWxmNmpvdkZiamdkUUdBWld5ZUR3SnhsdHdEZEZZNW43MjZSMnpybnphV2ZwRXdIWjJDUGoxCkd3SURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K",
-        "ip": "https://nodes.casimir.co/eth/goerli/dkg/6"
+        "ip": "http://nodes.casimir.co:4036"
     },
     {
         "id": 214,
         "public_key": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBdU94c1l4aWFseWRFZDI5VTV0UlkKclgxK0NrcFhRSngrME5qdFhwaUQrOE9pNGNNR0pTY09DemE1RG5oNHFqb3pkQiszU3lNM3pBTFRIYmpFNjNkSAoxVTFjeEFUSzJ6K2JxaWRSZ3NsSDZmakVNL3pBdDEreS9ZUThNMFB0d3VEYVZsTGZTQjdkVTRMLys0SlZCU0E0Cm1TUi9QbDFDL1NGdWMycThpK2ljUk9XazhXQnhUdnZFd1pVSnFONk5NUUZBc09BNzNVdXlMYkpiOWdCdGJvZnUKeUxkSlRzSU1sWlFYdENrdlQvVlFadklxdzVpLzFOazJTZVRjSS9Xd3ZaVU5tWks3Y2R2b0xveVpCenJFMDFqZQordi9nalVJOENGK0ZZVHJjRWI0U2Q1cWRKOUVCZ3dLQVo5YVd6ellnbS9OQ283QndWSzZzaFNuSGQzS2JmUVVMCkN3SURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K",
-        "ip": "https://nodes.casimir.co/eth/goerli/dkg/7"
+        "ip": "http://nodes.casimir.co:4037"
     },
     {
         "id": 215,
         "public_key": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBc0I3YjF5eGhiR1htZFJoaG41WE8KQlBQc2w3YlQvM1BQRm9EMFJadk9paUdXYnNTN1o3ZzZ1RGE4enI1b0xGbWVHdm1Ka1pKNnZJaWtUNmJWajZYWgpjRWc0OFFKYmlZOWpkOUJJWk9jcDkydlRoWU5GWWwxT1VTajdjQTlKRjd3THYzbHRoT1J5RWNQQ2JXM2ZXYXdYCkoyR2c3cTN4RDhERlhSb0gzMGY0ZW5sbHdGQkluQWFnc0RZWUl6Z1orbmpWNWtVWDkvVkk1U2hiOC80a0FtaVgKdVArazF1SGoreW5VcjhNaUdna2tmSnhpQ1VVQmFpOGdhdGc1TlloSjhYM3VDY1J6bDQwODZuYVNrMlFMUDRWVQpibkZBUTFFR0hxZXRYNnM3UDFRU3BYd0VXa21ka2xoNlJ4UkVnTHhrVWtQazFOTTk3ZGFPWEhLVHlMb2VVdlhmCkRRSURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K",
-        "ip": "https://nodes.casimir.co/eth/goerli/dkg/8"
+        "ip": "http://nodes.casimir.co:4038"
     }
 ]
diff --git a/common/env/src/mock/reshares.json b/common/env/src/mock/reshares.json