From 4abb7596663805553902fe65b6900d6364b91979 Mon Sep 17 00:00:00 2001 From: Matheus Junior Date: Mon, 1 Jan 2024 16:49:41 -0300 Subject: [PATCH 1/4] refactor pkgs --- beacon_constants.go | 2 +- main.go => cmd/main.go | 7 ++++--- eigen_pod_proofs.go | 2 +- generate_balance_update_proof.go | 2 +- generate_validator_proof.go | 2 +- generate_withdrawal_fields_proof.go | 2 +- merkle_util_test.go | 2 +- merkle_utils.go | 2 +- proof_utils.go | 2 +- proofs.go | 2 +- prove_validator.go | 2 +- prove_withdrawal.go | 2 +- utils.go | 2 +- 13 files changed, 16 insertions(+), 15 deletions(-) rename main.go => cmd/main.go (75%) diff --git a/beacon_constants.go b/beacon_constants.go index 05fda39a..f3c7fe1a 100644 --- a/beacon_constants.go +++ b/beacon_constants.go @@ -1,4 +1,4 @@ -package main +package eigenpodproofs const slotsPerHistoricalRoot = uint64(8192) diff --git a/main.go b/cmd/main.go similarity index 75% rename from main.go rename to cmd/main.go index dc33655f..4b1a413a 100644 --- a/main.go +++ b/cmd/main.go @@ -3,6 +3,7 @@ package main import ( "flag" + eigenpodproofs "github.com/Layr-Labs/eigenpod-proofs-generation" "github.com/rs/zerolog" "github.com/rs/zerolog/log" ) @@ -42,13 +43,13 @@ func main() { // Handling commands based on the 'command' flag switch *command { case "ValidatorFieldsProof": - GenerateValidatorFieldsProof(*oracleBlockHeaderFile, *stateFile, *validatorIndex, *chainID, *outputFile) + eigenpodproofs.GenerateValidatorFieldsProof(*oracleBlockHeaderFile, *stateFile, *validatorIndex, *chainID, *outputFile) case "WithdrawalFieldsProof": - GenerateWithdrawalFieldsProof(*oracleBlockHeaderFile, *stateFile, *historicalSummaryStateFile, *blockHeaderFile, *blockBodyFile, *validatorIndex, *withdrawalIndex, *historicalSummariesIndex, *blockHeaderIndex, *chainID, *outputFile) + eigenpodproofs.GenerateWithdrawalFieldsProof(*oracleBlockHeaderFile, *stateFile, *historicalSummaryStateFile, *blockHeaderFile, *blockBodyFile, *validatorIndex, *withdrawalIndex, *historicalSummariesIndex, *blockHeaderIndex, *chainID, *outputFile) case "BalanceUpdateProof": - GenerateBalanceUpdateProof(*oracleBlockHeaderFile, *stateFile, *validatorIndex, *chainID, *outputFile) + eigenpodproofs.GenerateBalanceUpdateProof(*oracleBlockHeaderFile, *stateFile, *validatorIndex, *chainID, *outputFile) default: log.Debug().Str("Unknown command:", *command) diff --git a/eigen_pod_proofs.go b/eigen_pod_proofs.go index 7cf57bc6..49eb2880 100644 --- a/eigen_pod_proofs.go +++ b/eigen_pod_proofs.go @@ -1,4 +1,4 @@ -package main +package eigenpodproofs import ( "encoding/json" diff --git a/generate_balance_update_proof.go b/generate_balance_update_proof.go index 19233754..0995eb94 100644 --- a/generate_balance_update_proof.go +++ b/generate_balance_update_proof.go @@ -1,4 +1,4 @@ -package main +package eigenpodproofs import ( "encoding/hex" diff --git a/generate_validator_proof.go b/generate_validator_proof.go index 03d32c24..5885df5b 100644 --- a/generate_validator_proof.go +++ b/generate_validator_proof.go @@ -1,4 +1,4 @@ -package main +package eigenpodproofs import ( "encoding/hex" diff --git a/generate_withdrawal_fields_proof.go b/generate_withdrawal_fields_proof.go index 7742c53a..c914df2d 100644 --- a/generate_withdrawal_fields_proof.go +++ b/generate_withdrawal_fields_proof.go @@ -1,4 +1,4 @@ -package main +package eigenpodproofs import ( "encoding/hex" diff --git a/merkle_util_test.go b/merkle_util_test.go index 212b8b9c..21f2569b 100644 --- a/merkle_util_test.go +++ b/merkle_util_test.go @@ -1,4 +1,4 @@ -package main +package eigenpodproofs import ( "encoding/binary" diff --git a/merkle_utils.go b/merkle_utils.go index 0f9ac12d..7486e1c1 100644 --- a/merkle_utils.go +++ b/merkle_utils.go @@ -1,4 +1,4 @@ -package main +package eigenpodproofs //Adapted from https://github.com/ferranbt/fastssz/blob/main/tree.go import ( diff --git a/proof_utils.go b/proof_utils.go index 9b809780..3d1918f9 100644 --- a/proof_utils.go +++ b/proof_utils.go @@ -1,4 +1,4 @@ -package main +package eigenpodproofs import ( "encoding/hex" diff --git a/proofs.go b/proofs.go index 0f99a32e..f4633c7a 100644 --- a/proofs.go +++ b/proofs.go @@ -1,4 +1,4 @@ -package main +package eigenpodproofs import ( "fmt" diff --git a/prove_validator.go b/prove_validator.go index 4cf7149c..0f750d58 100644 --- a/prove_validator.go +++ b/prove_validator.go @@ -1,4 +1,4 @@ -package main +package eigenpodproofs import ( "math/big" diff --git a/prove_withdrawal.go b/prove_withdrawal.go index bf5c9d27..2f8d3773 100644 --- a/prove_withdrawal.go +++ b/prove_withdrawal.go @@ -1,4 +1,4 @@ -package main +package eigenpodproofs import ( "errors" diff --git a/utils.go b/utils.go index 7c89f914..bd3885c6 100644 --- a/utils.go +++ b/utils.go @@ -1,4 +1,4 @@ -package main +package eigenpodproofs import ( "encoding/json" From f4e1c83830eb397d881f5d27333df5a3ad982a6d Mon Sep 17 00:00:00 2001 From: Matheus Junior Date: Mon, 1 Jan 2024 17:18:03 -0300 Subject: [PATCH 2/4] update module name --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7e8e8441..56e677f1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Layr-Labs/ProofGeneration +module github.com/Layr-Labs/eigenpodproofs go 1.20 From 0ed0bc5d7e6c19c4028285cabc66f79ea502173e Mon Sep 17 00:00:00 2001 From: Matheus Junior Date: Mon, 1 Jan 2024 17:23:23 -0300 Subject: [PATCH 3/4] update module name --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 56e677f1..e61e5eef 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Layr-Labs/eigenpodproofs +module github.com/Layr-Labs/eigenpod-proofs-generation go 1.20 From b994bb7544e23a73689cbdd8a428658b57f5bd4a Mon Sep 17 00:00:00 2001 From: Matheus Junior Date: Mon, 1 Jan 2024 17:25:09 -0300 Subject: [PATCH 4/4] update deps --- go.sum | 4 ---- 1 file changed, 4 deletions(-) diff --git a/go.sum b/go.sum index 7cfcfa3a..993fcd64 100644 --- a/go.sum +++ b/go.sum @@ -37,7 +37,6 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= @@ -55,7 +54,6 @@ github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= @@ -74,8 +72,6 @@ golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=