fix(jsonrpc): preserve order in eth_accounts

iotaledger · Sep 20, 2023 · c630cf6 · c630cf6
1 parent 8a43912
commit c630cf6
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/packages/evm/jsonrpc/accounts.go b/packages/evm/jsonrpc/accounts.go
@@ -8,10 +8,12 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
+	"golang.org/x/exp/slices"
 )
 
 type AccountManager struct {
 	accounts map[common.Address]*ecdsa.PrivateKey
+	addrs    []common.Address
 }
 
 func NewAccountManager(accounts []*ecdsa.PrivateKey) *AccountManager {
@@ -30,18 +32,13 @@ func (a *AccountManager) Add(keyPair *ecdsa.PrivateKey) {
 		return
 	}
 	a.accounts[addr] = keyPair
+	a.addrs = append(a.addrs, addr)
 }
 
 func (a *AccountManager) Get(addr common.Address) *ecdsa.PrivateKey {
 	return a.accounts[addr]
 }
 
 func (a *AccountManager) Addresses() []common.Address {
-	ret := make([]common.Address, len(a.accounts))
-	i := 0
-	for addr := range a.accounts {
-		ret[i] = addr
-		i++
-	}
-	return ret
+	return slices.Clone(a.addrs)
 }