Commit f3e169c5 authored by protolambda's avatar protolambda

go: update to go 1.20, no custom dependencies

parent e7fc0119
module mipsevm module mipsevm
go 1.17 go 1.20
replace github.com/ethereum/go-ethereum => ../minigeth
replace github.com/unicorn-engine/unicorn => ../unicorn
require ( require (
github.com/ethereum/go-ethereum v1.10.8 github.com/ethereum/go-ethereum v1.11.5
github.com/fatih/color v1.13.0 github.com/fatih/color v1.13.0
github.com/unicorn-engine/unicorn v0.0.0-20211005173419-3fadb5aa5aad github.com/unicorn-engine/unicorn v0.0.0-20230207094436-7b8c63dfe650
) )
require ( require (
github.com/btcsuite/btcd v0.22.0-beta // indirect github.com/DataDog/zstd v1.5.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cockroachdb/errors v1.9.1 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 // indirect
github.com/cockroachdb/redact v1.1.3 // indirect
github.com/deckarep/golang-set/v2 v2.1.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
github.com/getsentry/sentry-go v0.18.0 // indirect
github.com/go-ole/go-ole v1.2.1 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/gofrs/flock v0.8.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.2.0 // indirect github.com/holiman/uint256 v1.2.0 // indirect
github.com/mattn/go-colorable v0.1.9 // indirect github.com/klauspost/compress v1.15.15 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect github.com/kr/pretty v0.3.1 // indirect
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect github.com/kr/text v0.2.0 // indirect
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.39.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
github.com/tklauser/go-sysconf v0.3.5 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
) )
This diff is collapsed.
...@@ -9,7 +9,6 @@ import ( ...@@ -9,7 +9,6 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/oracle"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/trie" "github.com/ethereum/go-ethereum/trie"
) )
...@@ -93,10 +92,11 @@ func RamFromTrie(root common.Hash) map[uint32](uint32) { ...@@ -93,10 +92,11 @@ func RamFromTrie(root common.Hash) map[uint32](uint32) {
ram := make(map[uint32](uint32)) ram := make(map[uint32](uint32))
// load into oracle // load into oracle
pp := oracle.Preimages() // TODO: broken, need pre-image integration with fault-proof-program
for k, v := range Preimages { //pp := oracle.Preimages()
pp[k] = v //for k, v := range Preimages {
} // pp[k] = v
//}
triedb := trie.Database{Root: root} triedb := trie.Database{Root: root}
tt, err := trie.New(root, &triedb) tt, err := trie.New(root, &triedb)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment