Merge pull request ethereum#25096 from lightclient/remove-version-field

cp-wjhan · cp-wjhan · commit b90c6346a6d6 · 2023-09-25T10:44:24.000+09:00
all: remove version field
diff --git a/cmd/clef/main.go b/cmd/clef/main.go
@@ -591,7 +591,7 @@ func signer(c *cli.Context) error {
 		{
 			Namespace: "account",
 			Service:   api,
-			Version:   "1.0"},
+		},
 	}
 	if c.Bool(utils.HTTPEnabledFlag.Name) {
 		vhosts := utils.SplitAndTrim(c.String(utils.HTTPVirtualHostsFlag.Name))
diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go
@@ -698,7 +698,6 @@ func (c *Clique) Close() error {
 func (c *Clique) APIs(chain consensus.ChainHeaderReader) []rpc.API {
 	return []rpc.API{{
 		Namespace: "clique",
-		Version:   "1.0",
 		Service:   &API{chain: chain, clique: c},
 	}}
 }
diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go
@@ -678,12 +678,10 @@ func (ethash *Ethash) APIs(chain consensus.ChainHeaderReader) []rpc.API {
 	return []rpc.API{
 		{
 			Namespace: "eth",
-			Version:   "1.0",
 			Service:   &API{ethash},
 		},
 		{
 			Namespace: "ethash",
-			Version:   "1.0",
 			Service:   &API{ethash},
 		},
 	}
diff --git a/eth/backend.go b/eth/backend.go
@@ -303,31 +303,24 @@ func (s *Ethereum) APIs() []rpc.API {
 	return append(apis, []rpc.API{
 		{
 			Namespace: "eth",
-			Version:   "1.0",
 			Service:   NewEthereumAPI(s),
 		}, {
 			Namespace: "miner",
-			Version:   "1.0",
 			Service:   NewMinerAPI(s),
 		}, {
 			Namespace: "eth",
-			Version:   "1.0",
 			Service:   downloader.NewDownloaderAPI(s.handler.downloader, s.eventMux),
 		}, {
 			Namespace: "eth",
-			Version:   "1.0",
 			Service:   filters.NewFilterAPI(s.APIBackend, false, 5*time.Minute),
 		}, {
 			Namespace: "admin",
-			Version:   "1.0",
 			Service:   NewAdminAPI(s),
 		}, {
 			Namespace: "debug",
-			Version:   "1.0",
 			Service:   NewDebugAPI(s),
 		}, {
 			Namespace: "net",
-			Version:   "1.0",
 			Service:   s.netRPCService,
 		},
 	}...)
diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
@@ -43,7 +43,6 @@ func Register(stack *node.Node, backend *eth.Ethereum) error {
 	stack.RegisterAPIs([]rpc.API{
 		{
 			Namespace:     "engine",
-			Version:       "1.0",
 			Service:       NewConsensusAPI(backend),
 			Authenticated: true,
 		},
diff --git a/eth/tracers/api.go b/eth/tracers/api.go
@@ -918,7 +918,6 @@ func APIs(backend Backend) []rpc.API {
 	return []rpc.API{
 		{
 			Namespace: "debug",
-			Version:   "1.0",
 			Service:   NewAPI(backend),
 		},
 	}
diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go
@@ -101,31 +101,24 @@ func GetAPIs(apiBackend Backend) []rpc.API {
 	return []rpc.API{
 		{
 			Namespace: "eth",
-			Version:   "1.0",
 			Service:   NewEthereumAPI(apiBackend),
 		}, {
 			Namespace: "eth",
-			Version:   "1.0",
 			Service:   NewBlockChainAPI(apiBackend),
 		}, {
 			Namespace: "eth",
-			Version:   "1.0",
 			Service:   NewTransactionAPI(apiBackend, nonceLock),
 		}, {
 			Namespace: "txpool",
-			Version:   "1.0",
 			Service:   NewTxPoolAPI(apiBackend),
 		}, {
 			Namespace: "debug",
-			Version:   "1.0",
 			Service:   NewDebugAPI(apiBackend),
 		}, {
 			Namespace: "eth",
-			Version:   "1.0",
 			Service:   NewEthereumAccountAPI(apiBackend.AccountManager()),
 		}, {
 			Namespace: "personal",
-			Version:   "1.0",
 			Service:   NewPersonalAccountAPI(apiBackend, nonceLock),
 		},
 	}
diff --git a/les/catalyst/api.go b/les/catalyst/api.go
@@ -35,7 +35,6 @@ func Register(stack *node.Node, backend *les.LightEthereum) error {
 	stack.RegisterAPIs([]rpc.API{
 		{
 			Namespace:     "engine",
-			Version:       "1.0",
 			Service:       NewConsensusAPI(backend),
 			Authenticated: true,
 		},
diff --git a/les/client.go b/les/client.go
@@ -294,27 +294,21 @@ func (s *LightEthereum) APIs() []rpc.API {
 	return append(apis, []rpc.API{
 		{
 			Namespace: "eth",
-			Version:   "1.0",
 			Service:   &LightDummyAPI{},
 		}, {
 			Namespace: "eth",
-			Version:   "1.0",
 			Service:   downloader.NewDownloaderAPI(s.handler.downloader, s.eventMux),
 		}, {
 			Namespace: "eth",
-			Version:   "1.0",
 			Service:   filters.NewFilterAPI(s.ApiBackend, true, 5*time.Minute),
 		}, {
 			Namespace: "net",
-			Version:   "1.0",
 			Service:   s.netRPCService,
 		}, {
 			Namespace: "les",
-			Version:   "1.0",
 			Service:   NewLightAPI(&s.lesCommons),
 		}, {
 			Namespace: "vflux",
-			Version:   "1.0",
 			Service:   s.serverPool.API(),
 		},
 	}...)
diff --git a/les/server.go b/les/server.go
@@ -159,17 +159,14 @@ func (s *LesServer) APIs() []rpc.API {
 	return []rpc.API{
 		{
 			Namespace: "les",
-			Version:   "1.0",
 			Service:   NewLightAPI(&s.lesCommons),
 		},
 		{
 			Namespace: "les",
-			Version:   "1.0",
 			Service:   NewLightServerAPI(s),
 		},
 		{
 			Namespace: "debug",
-			Version:   "1.0",
 			Service:   NewDebugAPI(s),
 		},
 	}
diff --git a/node/api.go b/node/api.go
@@ -36,15 +36,12 @@ func (n *Node) apis() []rpc.API {
 	return []rpc.API{
 		{
 			Namespace: "admin",
-			Version:   "1.0",
 			Service:   &adminAPI{n},
 		}, {
 			Namespace: "debug",
-			Version:   "1.0",
 			Service:   debug.Handler,
 		}, {
 			Namespace: "web3",
-			Version:   "1.0",
 			Service:   &web3API{n},
 		},
 	}
diff --git a/node/utils_test.go b/node/utils_test.go
@@ -95,15 +95,12 @@ func (f *FullService) APIs() []rpc.API {
 	return []rpc.API{
 		{
 			Namespace: "admin",
-			Version:   "1.0",
 		},
 		{
 			Namespace: "debug",
-			Version:   "1.0",
 		},
 		{
 			Namespace: "net",
-			Version:   "1.0",
 		},
 	}
 }
diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go
@@ -501,7 +501,6 @@ func startExecNodeStack() (*node.Node, error) {
 	// 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
@@ -31,7 +31,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
 	Authenticated bool        // whether the api should only be available behind authentication.

Original file line number	Diff line number	Diff line change
`@@ -591,7 +591,7 @@ func signer(c *cli.Context) error {`
`591`	`591`	`{`
`592`	`592`	`Namespace: "account",`
`593`	`593`	`Service: api,`
`594`		`- Version: "1.0"},`
	`594`	`+ },`
`595`	`595`	`}`
`596`	`596`	`if c.Bool(utils.HTTPEnabledFlag.Name) {`
`597`	`597`	`vhosts := utils.SplitAndTrim(c.String(utils.HTTPVirtualHostsFlag.Name))`
Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,6 @@ func (c *Clique) Close() error {`
`698`	`698`	`func (c *Clique) APIs(chain consensus.ChainHeaderReader) []rpc.API {`
`699`	`699`	`return []rpc.API{{`
`700`	`700`	`Namespace: "clique",`
`701`		`- Version: "1.0",`
`702`	`701`	`Service: &API{chain: chain, clique: c},`
`703`	`702`	`}}`
`704`	`703`	`}`
Original file line number	Diff line number	Diff line change
`@@ -678,12 +678,10 @@ func (ethash *Ethash) APIs(chain consensus.ChainHeaderReader) []rpc.API {`
`678`	`678`	`return []rpc.API{`
`679`	`679`	`{`
`680`	`680`	`Namespace: "eth",`
`681`		`- Version: "1.0",`
`682`	`681`	`Service: &API{ethash},`
`683`	`682`	`},`
`684`	`683`	`{`
`685`	`684`	`Namespace: "ethash",`
`686`		`- Version: "1.0",`
`687`	`685`	`Service: &API{ethash},`
`688`	`686`	`},`
`689`	`687`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ func Register(stack node.Node, backend eth.Ethereum) error {`
`43`	`43`	`stack.RegisterAPIs([]rpc.API{`
`44`	`44`	`{`
`45`	`45`	`Namespace: "engine",`
`46`		`- Version: "1.0",`
`47`	`46`	`Service: NewConsensusAPI(backend),`
`48`	`47`	`Authenticated: true,`
`49`	`48`	`},`
Original file line number	Diff line number	Diff line change
`@@ -918,7 +918,6 @@ func APIs(backend Backend) []rpc.API {`
`918`	`918`	`return []rpc.API{`
`919`	`919`	`{`
`920`	`920`	`Namespace: "debug",`
`921`		`- Version: "1.0",`
`922`	`921`	`Service: NewAPI(backend),`
`923`	`922`	`},`
`924`	`923`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ func Register(stack node.Node, backend les.LightEthereum) error {`
`35`	`35`	`stack.RegisterAPIs([]rpc.API{`
`36`	`36`	`{`
`37`	`37`	`Namespace: "engine",`
`38`		`- Version: "1.0",`
`39`	`38`	`Service: NewConsensusAPI(backend),`
`40`	`39`	`Authenticated: true,`
`41`	`40`	`},`
Original file line number	Diff line number	Diff line change
`@@ -159,17 +159,14 @@ func (s *LesServer) APIs() []rpc.API {`
`159`	`159`	`return []rpc.API{`
`160`	`160`	`{`
`161`	`161`	`Namespace: "les",`
`162`		`- Version: "1.0",`
`163`	`162`	`Service: NewLightAPI(&s.lesCommons),`
`164`	`163`	`},`
`165`	`164`	`{`
`166`	`165`	`Namespace: "les",`
`167`		`- Version: "1.0",`
`168`	`166`	`Service: NewLightServerAPI(s),`
`169`	`167`	`},`
`170`	`168`	`{`
`171`	`169`	`Namespace: "debug",`
`172`		`- Version: "1.0",`
`173`	`170`	`Service: NewDebugAPI(s),`
`174`	`171`	`},`
`175`	`172`	`}`