Deneb - web3signer

config/params/loader.go

@@ -214,3 +214,28 @@ func ConfigToYaml(cfg *BeaconChainConfig) []byte {
 	yamlFile := []byte(strings.Join(lines, "\n"))
 	return yamlFile
 }
+
+// NetworkConfigToYaml takes a provided network config and outputs its contents
+// in yaml. This allows prysm's network configs to be read by other clients.
+func NetworkConfigToYaml(cfg *NetworkConfig) []byte {
+	lines := []string{
+		fmt.Sprintf("GOSSIP_MAX_SIZE: %d", cfg.GossipMaxSize),
+		fmt.Sprintf("GOSSIP_MAX_SIZE_BELLATRIX: %d", cfg.GossipMaxSizeBellatrix),
+		fmt.Sprintf("MAX_CHUNK_SIZE: %d", cfg.MaxChunkSize),
+		fmt.Sprintf("MAX_CHUNK_SIZE_BELLATRIX: %d", cfg.MaxChunkSizeBellatrix),
+		fmt.Sprintf("ATTESTATION_SUBNET_COUNT: %d", cfg.AttestationSubnetCount),
+		fmt.Sprintf("ATTESTATION_PROPAGATION_SLOT_RANGE: %d", cfg.AttestationPropagationSlotRange),
+		fmt.Sprintf("MAX_REQUEST_BLOCKS: %d", cfg.MaxRequestBlocks),
+		fmt.Sprintf("TTFB_TIMEOUT: %d", int(cfg.TtfbTimeout.Seconds())),
+		fmt.Sprintf("RESP_TIMEOUT: %d", int(cfg.RespTimeout.Seconds())),
+		fmt.Sprintf("MAXIMUM_GOSSIP_CLOCK_DISPARITY: %d", int(cfg.MaximumGossipClockDisparity.Seconds())),
+		fmt.Sprintf("MESSAGE_DOMAIN_INVALID_SNAPPY:  %#x", cfg.MessageDomainInvalidSnappy),
+		fmt.Sprintf("MESSAGE_DOMAIN_VALID_SNAPPY: %#x", cfg.MessageDomainValidSnappy),
+		fmt.Sprintf("MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUEST: %d", cfg.MinEpochsForBlobsSidecarsRequest),
+		fmt.Sprintf("MAX_REQUEST_BLOB_SIDECARS: %d", cfg.MaxRequestBlobSidecars),
+		fmt.Sprintf("MAX_REQUEST_BLOCKS_DENEB: %d", cfg.MaxRequestBlocksDeneb),
+	}
+
+	yamlFile := []byte(strings.Join(lines, "\n"))
+	return yamlFile
+}

encoding/ssz/htrutils.go

@@ -95,8 +95,9 @@ func SlashingsRoot(slashings []uint64) ([32]byte, error) {
 // ExecutionPayload.
 func TransactionsRoot(txs [][]byte) ([32]byte, error) {
 	txRoots := make([][32]byte, 0)
+	maxLength := fieldparams.MaxBytesPerTxLength + 31 // nearest number divisible by root length (32)
 	for i := 0; i < len(txs); i++ {
-		rt, err := transactionRoot(txs[i])
+		rt, err := ByteSliceRoot(txs[i], uint64(maxLength)) // getting the transaction root here
 		if err != nil {
 			return [32]byte{}, err
 		}
@@ -141,19 +142,21 @@ func WithdrawalSliceRoot(withdrawals []*enginev1.Withdrawal, limit uint64) ([32]
 	return MixInLength(bytesRoot, bytesRootBufRoot), nil
 }
 
-func transactionRoot(tx []byte) ([32]byte, error) {
-	chunkedRoots, err := PackByChunk([][]byte{tx})
+// ByteSliceRoot is a helper func to merkleize an arbitrary List[Byte, N]
+// this func runs Chunkify + MerkleizeVector
+// max length is dividable by 32 ( root length )
+func ByteSliceRoot(slice []byte, maxLength uint64) ([32]byte, error) {
+	chunkedRoots, err := PackByChunk([][]byte{slice})
 	if err != nil {
 		return [32]byte{}, err
 	}
-
-	maxLength := (fieldparams.MaxBytesPerTxLength + 31) / 32
-	bytesRoot, err := BitwiseMerkleize(chunkedRoots, uint64(len(chunkedRoots)), uint64(maxLength))
+	maxRootLength := maxLength / fieldparams.RootLength
+	bytesRoot, err := BitwiseMerkleize(chunkedRoots, uint64(len(chunkedRoots)), maxRootLength)
 	if err != nil {
 		return [32]byte{}, errors.Wrap(err, "could not compute merkleization")
 	}
 	bytesRootBuf := new(bytes.Buffer)
-	if err := binary.Write(bytesRootBuf, binary.LittleEndian, uint64(len(tx))); err != nil {
+	if err := binary.Write(bytesRootBuf, binary.LittleEndian, uint64(len(slice))); err != nil {
 		return [32]byte{}, errors.Wrap(err, "could not marshal length")
 	}
 	bytesRootBufRoot := make([]byte, 32)

encoding/ssz/htrutils_test.go

@@ -122,6 +122,58 @@ func TestTransactionsRoot(t *testing.T) {
 	}
 }
 
+func TestByteSliceRoot(t *testing.T) {
+	tests := []struct {
+		name      string
+		slice     []byte
+		maxLength uint64
+		want      [32]byte
+		wantErr   bool
+	}{
+		{
+			name:  "nil",
+			slice: nil,
+			want:  [32]byte{245, 165, 253, 66, 209, 106, 32, 48, 39, 152, 239, 110, 211, 9, 151, 155, 67, 0, 61, 35, 32, 217, 240, 232, 234, 152, 49, 169, 39, 89, 251, 75},
+		},
+		{
+			name:  "empty",
+			slice: []byte{},
+			want:  [32]byte{245, 165, 253, 66, 209, 106, 32, 48, 39, 152, 239, 110, 211, 9, 151, 155, 67, 0, 61, 35, 32, 217, 240, 232, 234, 152, 49, 169, 39, 89, 251, 75},
+		},
+		{
+			name:  "byte slice 3 values",
+			slice: []byte{1, 2, 3},
+			want:  [32]byte{20, 159, 26, 252, 247, 204, 44, 159, 161, 135, 211, 195, 106, 59, 220, 149, 199, 163, 228, 155, 113, 118, 64, 126, 173, 223, 102, 1, 241, 158, 164, 185},
+		},
+		{
+			name:  "byte slice 32 values",
+			slice: []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32},
+			want:  [32]byte{7, 30, 46, 77, 237, 240, 59, 126, 232, 232, 232, 6, 145, 210, 31, 18, 117, 12, 217, 40, 204, 141, 90, 236, 241, 128, 221, 45, 126, 39, 39, 202},
+		},
+		{
+			name:    "over max length",
+			slice:   make([]byte, fieldparams.RootLength+1),
+			want:    [32]byte{},
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.maxLength == 0 {
+				tt.maxLength = fieldparams.RootLength
+			}
+			got, err := ssz.ByteSliceRoot(tt.slice, tt.maxLength)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("ByteSliceRoot() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("ByteSliceRoot() got = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
 func TestPackByChunk_SingleList(t *testing.T) {
 	tests := []struct {
 		name  string

testing/endtoend/components/web3remotesigner.go

@@ -256,9 +256,18 @@ func createTestnetDir() (string, error) {
 	testNetDir := e2e.TestParams.TestPath + "/web3signer-testnet"
 	configPath := filepath.Join(testNetDir, "config.yaml")
 	rawYaml := params.ConfigToYaml(params.BeaconConfig())
+
 	// Add in deposit contract in yaml
-	depContractStr := fmt.Sprintf("\nDEPOSIT_CONTRACT_ADDRESS: %s", params.BeaconConfig().DepositContractAddress)
+	depContractStr := fmt.Sprintf("\nDEPOSIT_CONTRACT_ADDRESS: %s\n", params.BeaconConfig().DepositContractAddress)
 	rawYaml = append(rawYaml, []byte(depContractStr)...)
+	rawYaml = append(rawYaml, params.NetworkConfigToYaml(params.BeaconNetworkConfig())...)
+
+	rawYaml = append(rawYaml, []byte("\nEPOCHS_PER_SUBNET_SUBSCRIPTION: 256\n")...)
+	rawYaml = append(rawYaml, []byte("\nMIN_EPOCHS_FOR_BLOCK_REQUESTS: 33024\n")...)
+	rawYaml = append(rawYaml, []byte("\nSUBNETS_PER_NODE: 2\n")...)
+	rawYaml = append(rawYaml, []byte("\nATTESTATION_SUBNET_COUNT: 64\n")...)
+	rawYaml = append(rawYaml, []byte("\nATTESTATION_SUBNET_EXTRA_BITS: 0\n")...)
+	rawYaml = append(rawYaml, []byte("\nATTESTATION_SUBNET_PREFIX_BITS: 6\n")...)
 
 	if err := file.MkdirAll(testNetDir); err != nil {
 		return "", err

testing/endtoend/deps.bzl

@@ -6,10 +6,10 @@ lighthouse_archive_name = "lighthouse-%s-x86_64-unknown-linux-gnu-portable.tar.g
 def e2e_deps():
     http_archive(
         name = "web3signer",
-        urls = ["https://artifacts.consensys.net/public/web3signer/raw/names/web3signer.tar.gz/versions/23.3.1/web3signer-23.3.1.tar.gz"],
-        sha256 = "32dfbfd8d5900f19aa426d3519724dd696e6529b7ec2f99e0cb1690dae52b3d6",
+        urls = ["https://artifacts.consensys.net/public/web3signer/raw/names/web3signer.tar.gz/versions/23.9.1/web3signer-23.9.1.tar.gz"],
+        sha256 = "aec9dc745cb25fd8d7b38b06e435e3138972c2cf842dd6f851d50be7bf081629",
         build_file = "@prysm//testing/endtoend:web3signer.BUILD",
-        strip_prefix = "web3signer-23.3.1",
+        strip_prefix = "web3signer-23.9.1",
     )
 
     http_archive(

validator/keymanager/remote-web3signer/README.md

@@ -6,15 +6,22 @@ searching `Consensys' Web3Signer API specification`
 
 issue: https://github.com/prysmaticlabs/prysm/issues/9994
 
-## Support
-
-WIP
+API interface: https://github.com/ethereum/remote-signing-api
 
 ## Features
 
 ### CLI
 
-WIP
+detailed info found on https://docs.prylabs.network/docs/wallet/web3signer
+
+Flags used on validator client
+- `--validators-external-signer-url=http://localhost:9000`
+
+with hex keys
+- `--validators-external-signer-public-keys=0xa99a...e44c,0xb89b...4a0b`
+
+with url
+- `--validators-external-signer-public-keys=https://web3signer.com/api/v1/eth2/publicKeys`
 
 ### API