feat(nibiru): changes for Nibiru geth v1.13

Author: Unique-Divine

accounts/keystore/account_cache.go

@@ -31,7 +31,6 @@ import (
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
-	"golang.org/x/exp/slices"
 )
 
 // Minimum amount of time between cache reloads. This limit applies if the platform does
@@ -194,7 +193,16 @@ func (ac *accountCache) find(a accounts.Account) (accounts.Account, error) {
 	default:
 		err := &AmbiguousAddrError{Addr: a.Address, Matches: make([]accounts.Account, len(matches))}
 		copy(err.Matches, matches)
-		slices.SortFunc(err.Matches, byURL)
+
+		// Note: Favor `sort.Slice` form the std lib since it's stable across
+		// different Go versions.
+		// ```
+		// slices.SortFunc(err.Matches, byURL)
+		// ```
+		sort.Slice(err.Matches, func(i, j int) bool {
+			return byURL(err.Matches[i], err.Matches[j]) < 0
+		})
+
 		return accounts.Account{}, err
 	}
 }

accounts/keystore/account_cache_test.go

@@ -23,14 +23,14 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
+	"sort"
 	"testing"
 	"time"
 
 	"github.com/cespare/cp"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
-	"golang.org/x/exp/slices"
 )
 
 var (
@@ -205,7 +205,10 @@ func TestCacheAddDeleteOrder(t *testing.T) {
 	// Check that the account list is sorted by filename.
 	wantAccounts := make([]accounts.Account, len(accs))
 	copy(wantAccounts, accs)
-	slices.SortFunc(wantAccounts, byURL)
+	sort.Slice(wantAccounts, func(i, j int) bool {
+		return byURL(wantAccounts[i], wantAccounts[j]) < 0
+	})
+
 	list := cache.accounts()
 	if !reflect.DeepEqual(list, wantAccounts) {
 		t.Fatalf("got accounts: %s\nwant %s", spew.Sdump(accs), spew.Sdump(wantAccounts))

accounts/keystore/keystore_test.go

@@ -20,6 +20,7 @@ import (
 	"math/rand"
 	"os"
 	"runtime"
+	"sort"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -30,7 +31,6 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/event"
-	"golang.org/x/exp/slices"
 )
 
 var testSigData = make([]byte, 32)
@@ -431,7 +431,10 @@ func checkAccounts(t *testing.T, live map[common.Address]accounts.Account, walle
 	for _, account := range live {
 		liveList = append(liveList, account)
 	}
-	slices.SortFunc(liveList, byURL)
+	sort.Slice(liveList, func(i, j int) bool {
+		return byURL(liveList[i], liveList[j]) < 0
+	})
+
 	for j, wallet := range wallets {
 		if accs := wallet.Accounts(); len(accs) != 1 {
 			t.Errorf("wallet %d: contains invalid number of accounts: have %d, want 1", j, len(accs))

build/update-license.go

@@ -46,13 +46,12 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
 	"text/template"
 	"time"
-
-	"golang.org/x/exp/slices"
 )
 
 var (
@@ -292,7 +291,8 @@ func writeAuthors(files []string) {
 		}
 	}
 	// Write sorted list of authors back to the file.
-	slices.SortFunc(list, func(a, b string) bool {
+	sort.Slice(list, func(i, j int) bool {
+		a, b := list[i], list[j]
 		return strings.ToLower(a) < strings.ToLower(b)
 	})
 	content := new(bytes.Buffer)

cmd/devp2p/dns_route53.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -32,7 +33,6 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/p2p/dnsdisc"
 	"github.com/urfave/cli/v2"
-	"golang.org/x/exp/slices"
 )
 
 const (
@@ -288,7 +288,8 @@ func makeDeletionChanges(records map[string]recordSet, keep map[string]string) [
 // sortChanges ensures DNS changes are in leaf-added -> root-changed -> leaf-deleted order.
 func sortChanges(changes []types.Change) {
 	score := map[string]int{"CREATE": 1, "UPSERT": 2, "DELETE": 3}
-	slices.SortFunc(changes, func(a, b types.Change) int {
+
+	cmpChange := func(a, b types.Change) int {
 		if a.Action == b.Action {
 			return strings.Compare(*a.ResourceRecordSet.Name, *b.ResourceRecordSet.Name)
 		}
@@ -299,6 +300,9 @@ func sortChanges(changes []types.Change) {
 			return 1
 		}
 		return 0
+	}
+	sort.Slice(changes, func(i, j int) bool {
+		return cmpChange(changes[i], changes[j]) < 0
 	})
 }
 

cmd/devp2p/internal/ethtest/chain.go

@@ -40,7 +40,6 @@ import (
 	"github.com/ethereum/go-ethereum/eth/protocols/eth"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
-	"golang.org/x/exp/slices"
 )
 
 // Chain is a lightweight blockchain-like store which can read a hivechain
@@ -108,8 +107,8 @@ func (c *Chain) AccountsInHashOrder() []state.DumpAccount {
 		}
 		i++
 	}
-	slices.SortFunc(list, func(x, y state.DumpAccount) int {
-		return bytes.Compare(x.AddressHash, y.AddressHash)
+	sort.Slice(list, func(i, j int) bool {
+		return bytes.Compare(list[i].AddressHash, list[j].AddressHash) < 0
 	})
 	return list
 }
@@ -127,7 +126,9 @@ func (c *Chain) CodeHashes() []common.Hash {
 		hashes = append(hashes, h)
 		seen[h] = struct{}{}
 	}
-	slices.SortFunc(hashes, (common.Hash).Cmp)
+	sort.Slice(hashes, func(i, j int) bool {
+		return hashes[i].Cmp(hashes[j]) < 0
+	})
 	return hashes
 }
 

cmd/devp2p/nodeset.go

@@ -21,11 +21,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"sort"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/p2p/enode"
-	"golang.org/x/exp/slices"
 )
 
 const jsonIndent = "    "
@@ -77,8 +77,8 @@ func (ns nodeSet) nodes() []*enode.Node {
 		result = append(result, n.N)
 	}
 	// Sort by ID.
-	slices.SortFunc(result, func(a, b *enode.Node) int {
-		return bytes.Compare(a.ID().Bytes(), b.ID().Bytes())
+	sort.Slice(result, func(i, j int) bool {
+		return bytes.Compare(result[i].ID().Bytes(), result[j].ID().Bytes()) < 0
 	})
 	return result
 }
@@ -103,14 +103,19 @@ func (ns nodeSet) topN(n int) nodeSet {
 	for _, v := range ns {
 		byscore = append(byscore, v)
 	}
-	slices.SortFunc(byscore, func(a, b nodeJSON) int {
+
+	cmpScore := func(a, b nodeJSON) int {
 		if a.Score > b.Score {
-			return -1
+			return 1
 		}
 		if a.Score < b.Score {
-			return 1
+			return -1
 		}
 		return 0
+	}
+	// NOTE: Sorts in descending order ( > 0)
+	sort.Slice(byscore, func(i, j int) bool {
+		return cmpScore(byscore[i], byscore[j]) > 0
 	})
 	result := make(nodeSet, n)
 	for _, v := range byscore[:n] {

common/types.go

@@ -248,6 +248,14 @@ func (a Address) Bytes() []byte { return a[:] }
 // Big converts an address to a big integer.
 func (a Address) Big() *big.Int { return new(big.Int).SetBytes(a[:]) }
 
+// Hash converts an address to a hash by left-padding the address bytes with zeros.
+//
+// Note: This is different from BigToHash(a.Big()) because the intermediate conversion
+// to *big.Int uses a minimal byte representation, potentially stripping leading
+// zero bytes from the address before padding occurs in BytesToHash.
+// This implementation directly uses the full 20 address bytes for consistent padding.
+func (a Address) Hash() Hash { return BytesToHash(a.Bytes()) }
+
 // Hex returns an EIP55-compliant hex string representation of the address.
 func (a Address) Hex() string {
 	return string(a.checksumHex())

consensus/clique/snapshot.go

@@ -19,6 +19,7 @@ package clique
 import (
 	"bytes"
 	"encoding/json"
+	"sort"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -28,7 +29,6 @@ import (
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/params"
-	"golang.org/x/exp/slices"
 )
 
 // Vote represents a single vote that an authorized signer made to modify the
@@ -308,7 +308,9 @@ func (s *Snapshot) signers() []common.Address {
 	for sig := range s.Signers {
 		sigs = append(sigs, sig)
 	}
-	slices.SortFunc(sigs, common.Address.Cmp)
+	sort.Slice(sigs, func(i, j int) bool {
+		return sigs[i].Cmp(sigs[j]) < 0
+	})
 	return sigs
 }
 

consensus/clique/snapshot_test.go

@@ -21,6 +21,7 @@ import (
 	"crypto/ecdsa"
 	"fmt"
 	"math/big"
+	"sort"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -30,7 +31,6 @@ import (
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/params"
-	"golang.org/x/exp/slices"
 )
 
 // testerAccountPool is a pool to maintain currently active tester accounts,
@@ -53,7 +53,9 @@ func (ap *testerAccountPool) checkpoint(header *types.Header, signers []string)
 	for i, signer := range signers {
 		auths[i] = ap.address(signer)
 	}
-	slices.SortFunc(auths, common.Address.Cmp)
+	sort.Slice(auths, func(i, j int) bool {
+		return auths[i].Cmp(auths[j]) < 0
+	})
 	for i, auth := range auths {
 		copy(header.Extra[extraVanity+i*common.AddressLength:], auth.Bytes())
 	}