Skip to content

Commit

Permalink
redeploy after fixing script
Browse files Browse the repository at this point in the history
  • Loading branch information
0xvv committed Feb 19, 2024
1 parent 663f66c commit 20438fc
Show file tree
Hide file tree
Showing 11 changed files with 200 additions and 192 deletions.
8 changes: 8 additions & 0 deletions deploy/2_deploy_staking_contract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ const getMaxFeeBps = (network: string): number => {
switch (network) {
case "goerli_consensys":
return 5000;
case "goerli_consensys_dev":
return 5000;
case "goerli_vault":
return 5000;
case "goerli_live":
Expand All @@ -28,6 +30,8 @@ const getMaxOperatorFeeBps = (network: string): number => {
switch (network) {
case "goerli_consensys":
return 5000;
case "goerli_consensys_dev":
return 5000;
case "goerli_vault":
return 5000;
case "goerli_live":
Expand All @@ -49,6 +53,8 @@ const getFeeBps = (network: string): number => {
switch (network) {
case "goerli_consensys":
return 500;
case "goerli_consensys_dev":
return 500;
case "goerli_vault":
return 700;
case "goerli_live":
Expand All @@ -70,6 +76,8 @@ const getOperatorFeeBps = (network: string): number => {
switch (network) {
case "goerli_consensys":
return 500;
case "goerli_consensys_dev":
return 500;
case "goerli_vault":
return 0;
case "goerli_live":
Expand Down
54 changes: 27 additions & 27 deletions deployments/goerli_consensys_dev/ConsensusLayerFeeDispatcher.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"address": "0xE8EC6F702D68ded71112031D78bBFf959c7234C7",
"address": "0x812F1D3EAfFB39968D458B2dEc7812B379d45561",
"abi": [
{
"inputs": [],
Expand Down Expand Up @@ -327,52 +327,52 @@
"type": "constructor"
}
],
"transactionHash": "0x5f504732448b02c7fd4f8d241cb492b30cee93d0bbb371d16a7ad53c5c00fb9f",
"transactionHash": "0x0b7c86c09568175b190b45c8692b440a1daff7f0644137f5e5a95f1ead0c2e45",
"receipt": {
"to": null,
"from": "0x81F5f7bf0AFE2aFb9D7d6a21F4FeA1FB888E79CF",
"contractAddress": "0xE8EC6F702D68ded71112031D78bBFf959c7234C7",
"transactionIndex": 22,
"gasUsed": "869014",
"logsBloom": "0x00000000000000008000000000000000400000000000000000000000010200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000020000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000002000000000400000000000000000000000000000000000000008000000000000000000000000000000000000000000000",
"blockHash": "0x4c720d670126e368b05a1ce41af607a71ce14031dd52c5e712364bf079eff6f6",
"transactionHash": "0x5f504732448b02c7fd4f8d241cb492b30cee93d0bbb371d16a7ad53c5c00fb9f",
"contractAddress": "0x812F1D3EAfFB39968D458B2dEc7812B379d45561",
"transactionIndex": 17,
"gasUsed": "869002",
"logsBloom": "0x00000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000082000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000004000000000000000000000020400000000000000000000000000000000400000000000080000000000000000000000000000000000000000000000000000000040000000000000000",
"blockHash": "0x92045c90b10ab6ee2f6995128abc321c0ed0d7a38f606026f4a26ebbef58185a",
"transactionHash": "0x0b7c86c09568175b190b45c8692b440a1daff7f0644137f5e5a95f1ead0c2e45",
"logs": [
{
"transactionIndex": 22,
"blockNumber": 9562348,
"transactionHash": "0x5f504732448b02c7fd4f8d241cb492b30cee93d0bbb371d16a7ad53c5c00fb9f",
"address": "0xE8EC6F702D68ded71112031D78bBFf959c7234C7",
"transactionIndex": 17,
"blockNumber": 9566649,
"transactionHash": "0x0b7c86c09568175b190b45c8692b440a1daff7f0644137f5e5a95f1ead0c2e45",
"address": "0x812F1D3EAfFB39968D458B2dEc7812B379d45561",
"topics": [
"0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b",
"0x0000000000000000000000004b973c43a5b324b35e51514cfdb1ee6b4147f7e1"
"0x0000000000000000000000001c4ad85ff36d76172eb8015a3b36858197bb1320"
],
"data": "0x",
"logIndex": 26,
"blockHash": "0x4c720d670126e368b05a1ce41af607a71ce14031dd52c5e712364bf079eff6f6"
"logIndex": 34,
"blockHash": "0x92045c90b10ab6ee2f6995128abc321c0ed0d7a38f606026f4a26ebbef58185a"
},
{
"transactionIndex": 22,
"blockNumber": 9562348,
"transactionHash": "0x5f504732448b02c7fd4f8d241cb492b30cee93d0bbb371d16a7ad53c5c00fb9f",
"address": "0xE8EC6F702D68ded71112031D78bBFf959c7234C7",
"transactionIndex": 17,
"blockNumber": 9566649,
"transactionHash": "0x0b7c86c09568175b190b45c8692b440a1daff7f0644137f5e5a95f1ead0c2e45",
"address": "0x812F1D3EAfFB39968D458B2dEc7812B379d45561",
"topics": [
"0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"
],
"data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000938e1682fbcd30149f547eca7688ed00724ac3bf",
"logIndex": 27,
"blockHash": "0x4c720d670126e368b05a1ce41af607a71ce14031dd52c5e712364bf079eff6f6"
"logIndex": 35,
"blockHash": "0x92045c90b10ab6ee2f6995128abc321c0ed0d7a38f606026f4a26ebbef58185a"
}
],
"blockNumber": 9562348,
"cumulativeGasUsed": "2775587",
"blockNumber": 9566649,
"cumulativeGasUsed": "3021737",
"status": 1,
"byzantium": true
},
"args": [
"0x4B973C43a5b324B35E51514cfDB1EE6b4147F7e1",
"0x1c4Ad85fF36D76172Eb8015a3B36858197bb1320",
"0x938e1682fBcd30149f547eca7688ed00724AC3bF",
"0x5f0f28d90000000000000000000000001e68238ce926dec62b3fbc99ab06eb1d85ce0270"
"0x5f0f28d9000000000000000000000000004c226fff73aa94b78a4df1a0e861797ba16819"
],
"numDeployments": 1,
"solcInputHash": "e20c74109a1c61285ef1a2afbbbc70eb",
Expand All @@ -382,10 +382,10 @@
"execute": {
"methodName": "initCLD",
"args": [
"0x1e68238cE926DEC62b3FBC99AB06eB1D85CE0270"
"0x004C226FFF73aA94b78a4Df1A0e861797BA16819"
]
},
"implementation": "0x4B973C43a5b324B35E51514cfDB1EE6b4147F7e1",
"implementation": "0x1c4Ad85fF36D76172Eb8015a3B36858197bb1320",
"devdoc": {
"author": "SkillZ",
"kind": "dev",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"address": "0x4B973C43a5b324B35E51514cfDB1EE6b4147F7e1",
"address": "0x1c4Ad85fF36D76172Eb8015a3B36858197bb1320",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -170,19 +170,19 @@
"type": "receive"
}
],
"transactionHash": "0x74b2f233884c7a9c5d8d2f6ae349fb813ee7e8723317f4489626a10f049d415b",
"transactionHash": "0xcb5a8f982201a5e567faa73d6c48c20ece9bb465cd62afe470ad20a94e165826",
"receipt": {
"to": null,
"from": "0x81F5f7bf0AFE2aFb9D7d6a21F4FeA1FB888E79CF",
"contractAddress": "0x4B973C43a5b324B35E51514cfDB1EE6b4147F7e1",
"transactionIndex": 9,
"contractAddress": "0x1c4Ad85fF36D76172Eb8015a3B36858197bb1320",
"transactionIndex": 7,
"gasUsed": "785078",
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"blockHash": "0x5bf722bebb229b80c45ab7b6bb25bc99a3d97b1df7d70ee5cfd9cd15da1a92ec",
"transactionHash": "0x74b2f233884c7a9c5d8d2f6ae349fb813ee7e8723317f4489626a10f049d415b",
"blockHash": "0x573671d705699e9ff31ad8ccab40b58b5208a67775bc00e446cd5a23e12165e5",
"transactionHash": "0xcb5a8f982201a5e567faa73d6c48c20ece9bb465cd62afe470ad20a94e165826",
"logs": [],
"blockNumber": 9562347,
"cumulativeGasUsed": "1348591",
"blockNumber": 9566648,
"cumulativeGasUsed": "4741984",
"status": 1,
"byzantium": true
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"address": "0xE8EC6F702D68ded71112031D78bBFf959c7234C7",
"address": "0x812F1D3EAfFB39968D458B2dEc7812B379d45561",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -178,52 +178,52 @@
"type": "receive"
}
],
"transactionHash": "0x5f504732448b02c7fd4f8d241cb492b30cee93d0bbb371d16a7ad53c5c00fb9f",
"transactionHash": "0x0b7c86c09568175b190b45c8692b440a1daff7f0644137f5e5a95f1ead0c2e45",
"receipt": {
"to": null,
"from": "0x81F5f7bf0AFE2aFb9D7d6a21F4FeA1FB888E79CF",
"contractAddress": "0xE8EC6F702D68ded71112031D78bBFf959c7234C7",
"transactionIndex": 22,
"gasUsed": "869014",
"logsBloom": "0x00000000000000008000000000000000400000000000000000000000010200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000020000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000002000000000400000000000000000000000000000000000000008000000000000000000000000000000000000000000000",
"blockHash": "0x4c720d670126e368b05a1ce41af607a71ce14031dd52c5e712364bf079eff6f6",
"transactionHash": "0x5f504732448b02c7fd4f8d241cb492b30cee93d0bbb371d16a7ad53c5c00fb9f",
"contractAddress": "0x812F1D3EAfFB39968D458B2dEc7812B379d45561",
"transactionIndex": 17,
"gasUsed": "869002",
"logsBloom": "0x00000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000082000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000004000000000000000000000020400000000000000000000000000000000400000000000080000000000000000000000000000000000000000000000000000000040000000000000000",
"blockHash": "0x92045c90b10ab6ee2f6995128abc321c0ed0d7a38f606026f4a26ebbef58185a",
"transactionHash": "0x0b7c86c09568175b190b45c8692b440a1daff7f0644137f5e5a95f1ead0c2e45",
"logs": [
{
"transactionIndex": 22,
"blockNumber": 9562348,
"transactionHash": "0x5f504732448b02c7fd4f8d241cb492b30cee93d0bbb371d16a7ad53c5c00fb9f",
"address": "0xE8EC6F702D68ded71112031D78bBFf959c7234C7",
"transactionIndex": 17,
"blockNumber": 9566649,
"transactionHash": "0x0b7c86c09568175b190b45c8692b440a1daff7f0644137f5e5a95f1ead0c2e45",
"address": "0x812F1D3EAfFB39968D458B2dEc7812B379d45561",
"topics": [
"0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b",
"0x0000000000000000000000004b973c43a5b324b35e51514cfdb1ee6b4147f7e1"
"0x0000000000000000000000001c4ad85ff36d76172eb8015a3b36858197bb1320"
],
"data": "0x",
"logIndex": 26,
"blockHash": "0x4c720d670126e368b05a1ce41af607a71ce14031dd52c5e712364bf079eff6f6"
"logIndex": 34,
"blockHash": "0x92045c90b10ab6ee2f6995128abc321c0ed0d7a38f606026f4a26ebbef58185a"
},
{
"transactionIndex": 22,
"blockNumber": 9562348,
"transactionHash": "0x5f504732448b02c7fd4f8d241cb492b30cee93d0bbb371d16a7ad53c5c00fb9f",
"address": "0xE8EC6F702D68ded71112031D78bBFf959c7234C7",
"transactionIndex": 17,
"blockNumber": 9566649,
"transactionHash": "0x0b7c86c09568175b190b45c8692b440a1daff7f0644137f5e5a95f1ead0c2e45",
"address": "0x812F1D3EAfFB39968D458B2dEc7812B379d45561",
"topics": [
"0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"
],
"data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000938e1682fbcd30149f547eca7688ed00724ac3bf",
"logIndex": 27,
"blockHash": "0x4c720d670126e368b05a1ce41af607a71ce14031dd52c5e712364bf079eff6f6"
"logIndex": 35,
"blockHash": "0x92045c90b10ab6ee2f6995128abc321c0ed0d7a38f606026f4a26ebbef58185a"
}
],
"blockNumber": 9562348,
"cumulativeGasUsed": "2775587",
"blockNumber": 9566649,
"cumulativeGasUsed": "3021737",
"status": 1,
"byzantium": true
},
"args": [
"0x4B973C43a5b324B35E51514cfDB1EE6b4147F7e1",
"0x1c4Ad85fF36D76172Eb8015a3B36858197bb1320",
"0x938e1682fBcd30149f547eca7688ed00724AC3bF",
"0x5f0f28d90000000000000000000000001e68238ce926dec62b3fbc99ab06eb1d85ce0270"
"0x5f0f28d9000000000000000000000000004c226fff73aa94b78a4df1a0e861797ba16819"
],
"numDeployments": 1,
"solcInputHash": "e20c74109a1c61285ef1a2afbbbc70eb",
Expand Down
54 changes: 27 additions & 27 deletions deployments/goerli_consensys_dev/ExecutionLayerFeeDispatcher.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"address": "0x72b4C52f18f52EbA3E4290a002dF7c387427b058",
"address": "0xc4F9BBCede27cd40291a6a551c05254FFa4982ca",
"abi": [
{
"inputs": [],
Expand Down Expand Up @@ -327,52 +327,52 @@
"type": "constructor"
}
],
"transactionHash": "0x221d0895129ae229124df3876670249fda4182aed8c9d136e8c9fe3514697b84",
"transactionHash": "0xe5066dd08b6db3e114d0f06d256d9c3796e21dd91ddb9129131ab20cb18e6ca7",
"receipt": {
"to": null,
"from": "0x81F5f7bf0AFE2aFb9D7d6a21F4FeA1FB888E79CF",
"contractAddress": "0x72b4C52f18f52EbA3E4290a002dF7c387427b058",
"transactionIndex": 20,
"gasUsed": "868992",
"logsBloom": "0x00000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000080002000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000400000000000000000000000000000000000800000000000000000000000000080040000000000000000000000000000000000000000000020000000000000000000000000000000000400000000000000000000000000000000000000000000000000002000000000000000000000000000000000",
"blockHash": "0x888e0687012af4de33bfa28ff8a46e3d1b2fbaacd1e2ea0d0a4bc5cd60bb8798",
"transactionHash": "0x221d0895129ae229124df3876670249fda4182aed8c9d136e8c9fe3514697b84",
"contractAddress": "0xc4F9BBCede27cd40291a6a551c05254FFa4982ca",
"transactionIndex": 25,
"gasUsed": "868968",
"logsBloom": "0x00000000000000000000000000000000400000000004000000000000000002000000000000000100000000000000000000000000000000000001000000000000000000000000000000000000000002000000000000000000000000000000000000000080000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000800000000000000000",
"blockHash": "0xc8d04422b871a14c11234594f9460d2925b41cd1e35a9f9c69aa13a86f23acd8",
"transactionHash": "0xe5066dd08b6db3e114d0f06d256d9c3796e21dd91ddb9129131ab20cb18e6ca7",
"logs": [
{
"transactionIndex": 20,
"blockNumber": 9562350,
"transactionHash": "0x221d0895129ae229124df3876670249fda4182aed8c9d136e8c9fe3514697b84",
"address": "0x72b4C52f18f52EbA3E4290a002dF7c387427b058",
"transactionIndex": 25,
"blockNumber": 9566651,
"transactionHash": "0xe5066dd08b6db3e114d0f06d256d9c3796e21dd91ddb9129131ab20cb18e6ca7",
"address": "0xc4F9BBCede27cd40291a6a551c05254FFa4982ca",
"topics": [
"0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b",
"0x000000000000000000000000ca4dd914fa713214844c84f153a5e1627536a7fc"
"0x0000000000000000000000005db5856c0f760df5ba45e7ff58efef2100c7d27b"
],
"data": "0x",
"logIndex": 53,
"blockHash": "0x888e0687012af4de33bfa28ff8a46e3d1b2fbaacd1e2ea0d0a4bc5cd60bb8798"
"logIndex": 93,
"blockHash": "0xc8d04422b871a14c11234594f9460d2925b41cd1e35a9f9c69aa13a86f23acd8"
},
{
"transactionIndex": 20,
"blockNumber": 9562350,
"transactionHash": "0x221d0895129ae229124df3876670249fda4182aed8c9d136e8c9fe3514697b84",
"address": "0x72b4C52f18f52EbA3E4290a002dF7c387427b058",
"transactionIndex": 25,
"blockNumber": 9566651,
"transactionHash": "0xe5066dd08b6db3e114d0f06d256d9c3796e21dd91ddb9129131ab20cb18e6ca7",
"address": "0xc4F9BBCede27cd40291a6a551c05254FFa4982ca",
"topics": [
"0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"
],
"data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000938e1682fbcd30149f547eca7688ed00724ac3bf",
"logIndex": 54,
"blockHash": "0x888e0687012af4de33bfa28ff8a46e3d1b2fbaacd1e2ea0d0a4bc5cd60bb8798"
"logIndex": 94,
"blockHash": "0xc8d04422b871a14c11234594f9460d2925b41cd1e35a9f9c69aa13a86f23acd8"
}
],
"blockNumber": 9562350,
"cumulativeGasUsed": "2910558",
"blockNumber": 9566651,
"cumulativeGasUsed": "5015975",
"status": 1,
"byzantium": true
},
"args": [
"0xca4DD914fA713214844c84F153A5e1627536a7fC",
"0x5db5856C0f760df5BA45E7FF58EFeF2100C7D27B",
"0x938e1682fBcd30149f547eca7688ed00724AC3bF",
"0x068a8c8d0000000000000000000000001e68238ce926dec62b3fbc99ab06eb1d85ce0270"
"0x068a8c8d000000000000000000000000004c226fff73aa94b78a4df1a0e861797ba16819"
],
"numDeployments": 1,
"solcInputHash": "e20c74109a1c61285ef1a2afbbbc70eb",
Expand All @@ -382,10 +382,10 @@
"execute": {
"methodName": "initELD",
"args": [
"0x1e68238cE926DEC62b3FBC99AB06eB1D85CE0270"
"0x004C226FFF73aA94b78a4Df1A0e861797BA16819"
]
},
"implementation": "0xca4DD914fA713214844c84F153A5e1627536a7fC",
"implementation": "0x5db5856C0f760df5BA45E7FF58EFeF2100C7D27B",
"devdoc": {
"author": "SkillZ",
"kind": "dev",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"address": "0xca4DD914fA713214844c84F153A5e1627536a7fC",
"address": "0x5db5856C0f760df5BA45E7FF58EFeF2100C7D27B",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -170,19 +170,19 @@
"type": "receive"
}
],
"transactionHash": "0x0f847a47b5f5095d424338a1ff5a0011c292dca611461a3f3f3c104f147629fb",
"transactionHash": "0x2dce6581e22af02b4f4f889e7b21382d9e0e5e0ffb44c4b0823a92874e4c7e6b",
"receipt": {
"to": null,
"from": "0x81F5f7bf0AFE2aFb9D7d6a21F4FeA1FB888E79CF",
"contractAddress": "0xca4DD914fA713214844c84F153A5e1627536a7fC",
"transactionIndex": 18,
"contractAddress": "0x5db5856C0f760df5BA45E7FF58EFeF2100C7D27B",
"transactionIndex": 32,
"gasUsed": "662335",
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"blockHash": "0xfdf1d12d6a7d466af82dbd0d4098a325bfe1abc413e525c03e94b04a4b2f86c7",
"transactionHash": "0x0f847a47b5f5095d424338a1ff5a0011c292dca611461a3f3f3c104f147629fb",
"blockHash": "0x822acd4a4089c31b4235f86a0d32dd30a5aafbacffa6be316738fcee05c6d711",
"transactionHash": "0x2dce6581e22af02b4f4f889e7b21382d9e0e5e0ffb44c4b0823a92874e4c7e6b",
"logs": [],
"blockNumber": 9562349,
"cumulativeGasUsed": "4719359",
"blockNumber": 9566650,
"cumulativeGasUsed": "7824236",
"status": 1,
"byzantium": true
},
Expand Down
Loading

0 comments on commit 20438fc

Please sign in to comment.