diff --git a/XDCx/XDCx.go b/XDCx/XDCx.go index 60a73455eb..478366738c 100644 --- a/XDCx/XDCx.go +++ b/XDCx/XDCx.go @@ -144,7 +144,6 @@ func (XDCx *XDCX) APIs() []rpc.API { return []rpc.API{ { Namespace: ProtocolName, - Version: ProtocolVersionStr, Service: NewPublicXDCXAPI(XDCx), }, } diff --git a/XDCxlending/XDCxlending.go b/XDCxlending/XDCxlending.go index 80cc74415d..d0093dc151 100644 --- a/XDCxlending/XDCxlending.go +++ b/XDCxlending/XDCxlending.go @@ -90,7 +90,6 @@ func (l *Lending) APIs() []rpc.API { return []rpc.API{ { Namespace: ProtocolName, - Version: ProtocolVersionStr, Service: NewPublicXDCXLendingAPI(l), }, } diff --git a/consensus/XDPoS/XDPoS.go b/consensus/XDPoS/XDPoS.go index 04114bcd1c..856021c632 100644 --- a/consensus/XDPoS/XDPoS.go +++ b/consensus/XDPoS/XDPoS.go @@ -174,7 +174,6 @@ func (x *XDPoS) Initial(chain consensus.ChainReader, header *types.Header) error func (x *XDPoS) APIs(chain consensus.ChainReader) []rpc.API { return []rpc.API{{ Namespace: "XDPoS", - Version: "1.0", Service: &API{chain: chain, XDPoS: x}, }} } diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index f3a5773b51..c69ada37d1 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -693,7 +693,6 @@ func CalcDifficulty(snap *Snapshot, signer common.Address) *big.Int { func (c *Clique) APIs(chain consensus.ChainReader) []rpc.API { return []rpc.API{{ Namespace: "clique", - Version: "1.0", Service: &API{chain: chain, clique: c}, }} } diff --git a/eth/backend.go b/eth/backend.go index 9556ea07dc..e7f459916b 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -400,39 +400,30 @@ func (e *Ethereum) APIs() []rpc.API { return append(apis, []rpc.API{ { Namespace: "eth", - Version: "1.0", Service: NewPublicEthereumAPI(e), }, { Namespace: "eth", - Version: "1.0", Service: NewPublicMinerAPI(e), }, { Namespace: "eth", - Version: "1.0", Service: downloader.NewPublicDownloaderAPI(e.protocolManager.downloader, e.eventMux), }, { Namespace: "miner", - Version: "1.0", Service: NewPrivateMinerAPI(e), }, { Namespace: "eth", - Version: "1.0", Service: filters.NewFilterAPI(filters.NewFilterSystem(e.ApiBackend, filters.Config{LogCacheSize: e.config.FilterLogCacheSize}), false), }, { Namespace: "admin", - Version: "1.0", Service: NewPrivateAdminAPI(e), }, { Namespace: "debug", - Version: "1.0", Service: NewPublicDebugAPI(e), }, { Namespace: "debug", - Version: "1.0", Service: NewPrivateDebugAPI(e.chainConfig, e), }, { Namespace: "net", - Version: "1.0", Service: e.netRPCService, }, }...) diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index 53bff4ab19..b1d81e64e7 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -124,39 +124,30 @@ func GetAPIs(apiBackend Backend, chainReader consensus.ChainReader) []rpc.API { return []rpc.API{ { Namespace: "eth", - Version: "1.0", Service: NewPublicEthereumAPI(apiBackend), }, { Namespace: "eth", - Version: "1.0", Service: NewPublicBlockChainAPI(apiBackend, chainReader), }, { Namespace: "eth", - Version: "1.0", Service: NewPublicTransactionPoolAPI(apiBackend, nonceLock), }, { Namespace: "XDCx", - Version: "1.0", Service: NewPublicXDCXTransactionPoolAPI(apiBackend, nonceLock), }, { Namespace: "txpool", - Version: "1.0", Service: NewPublicTxPoolAPI(apiBackend), }, { Namespace: "debug", - Version: "1.0", Service: NewPublicDebugAPI(apiBackend), }, { Namespace: "debug", - Version: "1.0", Service: NewPrivateDebugAPI(apiBackend), }, { Namespace: "eth", - Version: "1.0", Service: NewPublicAccountAPI(apiBackend.AccountManager()), }, { Namespace: "personal", - Version: "1.0", Service: NewPrivateAccountAPI(apiBackend, nonceLock), }, } diff --git a/node/api.go b/node/api.go index 67fd03346a..47f6e27ab7 100644 --- a/node/api.go +++ b/node/api.go @@ -34,19 +34,15 @@ func (n *Node) apis() []rpc.API { return []rpc.API{ { Namespace: "admin", - Version: "1.0", Service: &privateAdminAPI{n}, }, { Namespace: "admin", - Version: "1.0", Service: &publicAdminAPI{n}, }, { Namespace: "debug", - Version: "1.0", Service: debug.Handler, }, { Namespace: "web3", - Version: "1.0", Service: &publicWeb3API{n}, }, } diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index 77d1305902..1123a54727 100644 --- a/p2p/simulations/adapters/exec.go +++ b/p2p/simulations/adapters/exec.go @@ -452,7 +452,6 @@ func execP2PNode() { // Add the snapshot API. stack.RegisterAPIs([]rpc.API{{ Namespace: "simulation", - Version: "1.0", Service: SnapshotAPI{services}, }}) diff --git a/rpc/types.go b/rpc/types.go index 62f173ae88..282775e82a 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -30,7 +30,7 @@ import ( // API describes the set of methods offered over the RPC interface type API struct { Namespace string // namespace under which the rpc methods of Service are exposed - Version string // api version for DApp's + Version string // deprecated - this field is no longer used, but retained for compatibility Service interface{} // receiver instance which holds the methods Public bool // deprecated - this field is no longer used, but retained for compatibility }