all: parallax virtual machine might diverge from evm in the future, so evm -> pvm

Author: andrepatta

Makefile

@@ -2,7 +2,7 @@
 # with Go source code. If you know what GOPATH is then you probably
 # don't need to bother with make.
 
-.PHONY: prlx android ios evm all test clean devtools lint cross package darwin-universal release
+.PHONY: prlx android ios pvm all test clean devtools lint cross package darwin-universal release
 
 GOBIN      = ./build/bin
 GO        ?= latest

README.md

@@ -43,9 +43,8 @@ Binaries are located under `build/bin`:
 | `devp2p`       | Networking utilities to inspect and interact at the P2P layer. |
 | `abigen`       | Generates type-safe Go bindings from contract ABIs. |
 | `bootnode`     | Lightweight discovery node to bootstrap networks. |
-| `evm`          | Execute and debug EVM bytecode snippets in isolation. |
+| `pvm`          | Execute and debug PVM bytecode snippets in isolation. |
 | `rlpdump`      | Decode RLP structures into a human-readable form. |
-| `puppeth`      | Wizard to create and manage custom Parallax networks. |
 
 ---
 

accounts/abi/bind/backends/simulated.go

@@ -395,7 +395,7 @@ func newRevertError(result *core.ExecutionResult) *revertError {
 	}
 }
 
-// revertError is an API error that encompasses an EVM revert with JSON error
+// revertError is an API error that encompasses an PVM revert with JSON error
 // code and a binary data blob.
 type revertError struct {
 	error
@@ -610,7 +610,7 @@ func (b *SimulatedBackend) callContract(ctx context.Context, call parallax.CallM
 			if call.GasTipCap == nil {
 				call.GasTipCap = new(big.Int)
 			}
-			// Backfill the legacy gasPrice for EVM execution, unless we're all zeroes
+			// Backfill the legacy gasPrice for PVM execution, unless we're all zeroes
 			call.GasPrice = new(big.Int)
 			if call.GasFeeCap.BitLen() > 0 || call.GasTipCap.BitLen() > 0 {
 				call.GasPrice = math.BigMin(new(big.Int).Add(call.GasTipCap, head.BaseFee), call.GasFeeCap)
@@ -630,11 +630,11 @@ func (b *SimulatedBackend) callContract(ctx context.Context, call parallax.CallM
 	// Execute the call.
 	msg := callMsg{call}
 
-	txContext := core.NewEVMTxContext(msg)
-	evmContext := core.NewEVMBlockContext(block.Header(), b.blockchain, nil)
+	txContext := core.NewPVMTxContext(msg)
+	pvmContext := core.NewPVMBlockContext(block.Header(), b.blockchain, nil)
 	// Create a new environment which holds all relevant information
 	// about the transaction and calling mechanisms.
-	vmEnv := vm.NewEVM(evmContext, txContext, stateDB, b.config, vm.Config{NoBaseFee: true})
+	vmEnv := vm.NewPVM(pvmContext, txContext, stateDB, b.config, vm.Config{NoBaseFee: true})
 	gasPool := new(core.GasPool).AddGas(math.MaxUint64)
 
 	return core.NewStateTransition(vmEnv, msg, gasPool).TransitionDb()

accounts/abi/bind/bind.go

@@ -59,7 +59,7 @@ func Bind(types []string, abis []string, bytecodes []string, fsigs []map[string]
 	)
 	for i := 0; i < len(types); i++ {
 		// Parse the actual ABI to generate the binding for
-		evmABI, err := abi.JSON(strings.NewReader(abis[i]))
+		pvmABI, err := abi.JSON(strings.NewReader(abis[i]))
 		if err != nil {
 			return "", err
 		}
@@ -88,13 +88,13 @@ func Bind(types []string, abis []string, bytecodes []string, fsigs []map[string]
 			eventIdentifiers    = make(map[string]bool)
 		)
 
-		for _, input := range evmABI.Constructor.Inputs {
+		for _, input := range pvmABI.Constructor.Inputs {
 			if hasStruct(input.Type) {
 				bindStructType[lang](input.Type, structs)
 			}
 		}
 
-		for _, original := range evmABI.Methods {
+		for _, original := range pvmABI.Methods {
 			// Normalize the method for capital cases and non-anonymous inputs/outputs
 			normalized := original
 			normalizedName := methodNormalizer[lang](alias(aliases, original.Name))
@@ -135,7 +135,7 @@ func Bind(types []string, abis []string, bytecodes []string, fsigs []map[string]
 				transacts[original.Name] = &tmplMethod{Original: original, Normalized: normalized, Structured: structured(original.Outputs)}
 			}
 		}
-		for _, original := range evmABI.Events {
+		for _, original := range pvmABI.Events {
 			// Skip anonymous events as they don't support explicit filtering
 			if original.Anonymous {
 				continue
@@ -165,11 +165,11 @@ func Bind(types []string, abis []string, bytecodes []string, fsigs []map[string]
 			events[original.Name] = &tmplEvent{Original: original, Normalized: normalized}
 		}
 		// Add two special fallback functions if they exist
-		if evmABI.HasFallback() {
-			fallback = &tmplMethod{Original: evmABI.Fallback}
+		if pvmABI.HasFallback() {
+			fallback = &tmplMethod{Original: pvmABI.Fallback}
 		}
-		if evmABI.HasReceive() {
-			receive = &tmplMethod{Original: evmABI.Receive}
+		if pvmABI.HasReceive() {
+			receive = &tmplMethod{Original: pvmABI.Receive}
 		}
 		// There is no easy way to pass arbitrary java objects to the Go side.
 		if len(structs) > 0 && lang == LangJava {
@@ -180,7 +180,7 @@ func Bind(types []string, abis []string, bytecodes []string, fsigs []map[string]
 			Type:        capitalise(types[i]),
 			InputABI:    strings.ReplaceAll(strippedABI, "\"", "\\\""),
 			InputBin:    strings.TrimPrefix(strings.TrimSpace(bytecodes[i]), "0x"),
-			Constructor: evmABI.Constructor,
+			Constructor: pvmABI.Constructor,
 			Calls:       calls,
 			Transacts:   transacts,
 			Fallback:    fallback,

accounts/abi/bind/template.go

@@ -30,7 +30,7 @@ type tmplData struct {
 type tmplContract struct {
 	Type        string                 // Type name of the main contract binding
 	InputABI    string                 // JSON ABI used as the input to generate the binding from
-	InputBin    string                 // Optional EVM bytecode used to generate deploy code from
+	InputBin    string                 // Optional PVM bytecode used to generate deploy code from
 	FuncSigs    map[string]string      // Optional map: string signature -> 4-byte signature
 	Constructor abi.Method             // Contract constructor for deploy parametrization
 	Calls       map[string]*tmplMethod // Contract calls that only read state data

accounts/abi/event.go

@@ -24,7 +24,7 @@ import (
 	"github.com/microstack-tech/parallax/crypto"
 )
 
-// Event is an event potentially triggered by the EVM's LOG mechanism. The Event
+// Event is an event potentially triggered by the PVM's LOG mechanism. The Event
 // holds type information (inputs) about the yielded output. Anonymous events
 // don't get the signature canonical representation as the first LOG topic.
 type Event struct {

accounts/abi/unpack.go

@@ -61,7 +61,7 @@ func ReadInteger(typ Type, b []byte) any {
 	default:
 		// the only case left for integer is int256
 		// big.SetBytes can't tell if a number is negative or positive in itself.
-		// On EVM, if the returned number > max int256, it is negative.
+		// On PVM, if the returned number > max int256, it is negative.
 		// A number is > max int256 if the bit at position 255 is set.
 		ret := new(big.Int).SetBytes(b)
 		if ret.Bit(255) == 1 {

accounts/abi/unpack_test.go

@@ -58,7 +58,7 @@ func TestUnpack(t *testing.T) {
 
 type unpackTest struct {
 	def  string // ABI definition JSON
-	enc  string // evm return data
+	enc  string // pvm return data
 	want any    // the expected output
 	err  string // empty or error if expected
 }

build/ci.go

@@ -75,7 +75,7 @@ var (
 		"COPYING",
 		executablePath("abigen"),
 		executablePath("bootnode"),
-		executablePath("evm"),
+		executablePath("pvm"),
 		executablePath("prlx"),
 		executablePath("rlpdump"),
 		executablePath("clef"),
@@ -92,7 +92,7 @@ var (
 			Description: "Parallax bootnode.",
 		},
 		{
-			BinaryName:  "evm",
+			BinaryName:  "pvm",
 			Description: "Developer utility version of the PVM (Parallax Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode.",
 		},
 		{

cmd/devp2p/internal/prltest/snap.go

@@ -211,7 +211,7 @@ type byteCodesTest struct {
 var (
 	// emptyRoot is the known root hash of an empty trie.
 	emptyRoot = common.HexToHash("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
-	// emptyCode is the known hash of the empty EVM bytecode.
+	// emptyCode is the known hash of the empty PVM bytecode.
 	emptyCode = common.HexToHash("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470")
 )