Skip to content

Commit ffd67d0

Browse files
fix(api): replace ethereum with chain_address in /addresses response (#4978)
1 parent 936b149 commit ffd67d0

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

openapi/SwarmCommon.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ components:
2929
$ref: "#/components/schemas/P2PUnderlay"
3030
ethereum:
3131
$ref: "#/components/schemas/EthereumAddress"
32+
chain_address:
33+
$ref: "#/components/schemas/EthereumAddress"
3234
publicKey:
3335
$ref: "#/components/schemas/PublicKey"
3436
pssPublicKey:

pkg/api/p2p.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ import (
1818
type addressesResponse struct {
1919
Overlay *swarm.Address `json:"overlay"`
2020
Underlay []multiaddr.Multiaddr `json:"underlay"`
21-
Ethereum common.Address `json:"ethereum"`
21+
Ethereum common.Address `json:"ethereum"` // deprecated
22+
ChainAddress common.Address `json:"chain_address"`
2223
PublicKey string `json:"publicKey"`
2324
PSSPublicKey string `json:"pssPublicKey"`
2425
}
@@ -43,6 +44,7 @@ func (s *Service) addressesHandler(w http.ResponseWriter, _ *http.Request) {
4344
Overlay: s.overlay,
4445
Underlay: underlay,
4546
Ethereum: s.ethereumAddress,
47+
ChainAddress: s.ethereumAddress,
4648
PublicKey: hex.EncodeToString(crypto.EncodeSecp256k1PublicKey(&s.publicKey)),
4749
PSSPublicKey: hex.EncodeToString(crypto.EncodeSecp256k1PublicKey(&s.pssPublicKey)),
4850
})

pkg/api/p2p_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ func TestAddresses(t *testing.T) {
5757
Overlay: &overlay,
5858
Underlay: addresses,
5959
Ethereum: ethereumAddress,
60+
ChainAddress: ethereumAddress,
6061
PublicKey: hex.EncodeToString(crypto.EncodeSecp256k1PublicKey(&privateKey.PublicKey)),
6162
PSSPublicKey: hex.EncodeToString(crypto.EncodeSecp256k1PublicKey(&pssPrivateKey.PublicKey)),
6263
}),

0 commit comments

Comments
 (0)