Address books

Author: kubasiemion

state/state.go

@@ -12,8 +12,7 @@ import (
 )
 
 type StateStruct struct {
-	Senders    []*common.Address
-	Paymasters []*common.Address
+	AddressBooks map[string]*AddressBook
 	//Default Gas Costs?
 	Signers    []signer.Signer `json:"-"`
 	SignersRaw []string
@@ -31,15 +30,50 @@ func InitState() {
 	err := State.Load()
 	if err != nil {
 		fmt.Println(err)
+		State.AddressBooks = make(map[string]*AddressBook)
 
-		State.Senders = []*common.Address{}
-		State.Paymasters = make([]*common.Address, 1)
-		State.Paymasters[0] = &common.Address{}
+		State.AddressBooks[Sender] = &AddressBook{}
+		State.AddressBooks[Paymaster] = &AddressBook{}
 		State.Signers = []signer.Signer{}
 		State.ABIs = make(map[string]string)
 	}
 }
 
+type AddressBook []*common.Address
+
+const Sender = "Sender"
+const Paymaster = "Paymaster"
+
+func GetAddressBook(label string) (*AddressBook, bool) {
+	ab, ok := State.AddressBooks[label]
+	if !ok {
+		ab = &AddressBook{}
+		State.AddressBooks[label] = ab
+	}
+	return ab, true
+}
+
+func (ab *AddressBook) Add(addr *common.Address) {
+	*ab = append(*ab, addr)
+	State.Save()
+}
+
+func (ab *AddressBook) Remove(addr *common.Address) {
+	//Find the address index
+	i := 0
+	for i = 0; i < len(*ab); i++ {
+		if (*ab)[i].Hex() == addr.Hex() {
+			break
+		}
+	}
+	if i == len(*ab) {
+		return
+	}
+	//Remove the address
+	*ab = append((*ab)[:i], (*ab)[i+1:]...)
+	State.Save()
+}
+
 var StateFile = "state.json"
 
 func (st *StateStruct) Save() {

ui/abiui.go

@@ -258,7 +258,10 @@ func SelectMethodUI(contract string) {
 func SetParamUI(label string, input abi.Argument) (interface{}, error) {
 	switch input.Type.T {
 	case abi.AddressTy:
-		return InputNewAddressUI(label)
+		addr, ok := AddressFromBookUI(label)
+		if ok {
+			return addr, nil
+		}
 	case abi.UintTy:
 		switch input.Type.Size {
 		case 256, 160, 128:

ui/addressbookui.go

@@ -0,0 +1,81 @@
+package ui
+
+import (
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/manifoldco/promptui"
+	"github.com/san-lab/go4337/state"
+)
+
+var AddAddressItem = &Item{Label: "Add a new Address"}
+var RemoveAddressItem = &Item{Label: "Remove an Address"}
+
+func AddressFromBookUI(label string) (*common.Address, bool) {
+	selectToRemove := false
+	abook, ok := state.GetAddressBook(label)
+	if !ok {
+		fmt.Println("Invalid address book: ", label)
+		return nil, false
+	}
+	normalLabel := "Select a " + label
+	removeLabel := "Select a " + label + " to remove"
+	currentLabel := normalLabel
+	for {
+		items := []*Item{}
+		for _, s := range *abook {
+			items = append(items, &Item{Label: s.String(), Details: "Select this " + label, Value: s})
+
+		}
+		if !selectToRemove {
+			items = append(items, AddAddressItem, RemoveAddressItem)
+		}
+		items = append(items, Back)
+		// Create a new select prompt
+		prompt := promptui.Select{
+			Label:     currentLabel,
+			Items:     items,
+			Templates: ItemTemplate,
+			Size:      10,
+		}
+		_, sel, err := prompt.Run()
+		if err != nil {
+			fmt.Println(err)
+			return nil, false
+		}
+
+		switch sel {
+
+		case Back.Label:
+			return nil, false
+		case AddAddressItem.Label:
+
+			naddrs, err := InputNewAddressUI("Add a new " + label)
+			if err != nil {
+				fmt.Println(err)
+			} else {
+				abook.Add(naddrs)
+
+				continue
+			}
+		case RemoveAddressItem.Label:
+			selectToRemove = true
+			currentLabel = removeLabel
+		default:
+			val, ok := GetValue(sel, items)
+			if !ok || val == nil {
+				fmt.Println("Invalid selection: ", sel)
+				return nil, false
+
+			}
+			if selectToRemove {
+				abook.Remove(val.(*common.Address))
+				selectToRemove = false
+				currentLabel = normalLabel
+			} else {
+				return val.(*common.Address), true
+			}
+		}
+	}
+
+}

ui/commoninputs.go

@@ -164,6 +164,7 @@ func InputNewAddressUI(label string) (*common.Address, error) {
 	if err != nil {
 		return nil, err
 	}
+	s = strings.Trim(s, " ")
 	common.BytesToAddress(common.FromHex(s))
 	addr := common.HexToAddress(s)
 	return &addr, nil

ui/paymasterui.go

@@ -1,58 +1,18 @@
 package ui
 
 import (
-	"fmt"
-
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/manifoldco/promptui"
 	"github.com/san-lab/go4337/state"
 )
 
 var AddPaymasterItem = &Item{Label: "Add Paymaster", Details: "Add a new paymaster address"}
 
-func PaymasterUI() (*common.Address, error) {
-	for {
-		items := []*Item{}
-		for _, s := range state.State.Paymasters {
-			items = append(items, &Item{Label: s.String(), Details: "Select this Paymaster", Value: s})
-
-		}
-		items = append(items, AddPaymasterItem, Back)
-		// Create a new select prompt
-		prompt := promptui.Select{
-			Label:     "Select a Paymaster",
-			Items:     items,
-			Templates: ItemTemplate,
-			Size:      10,
-		}
-		_, sel, err := prompt.Run()
-		if err != nil {
-			return nil, err
-		}
-		switch sel {
-		case Back.Label:
-			return nil, fmt.Errorf("Back")
-		case AddPaymasterItem.Label:
-			pymas, err := InputNewAddressUI("Add Paymester")
-			if err != nil {
-				fmt.Println(err)
-			} else {
-				state.State.Paymasters = append(state.State.Paymasters, pymas)
-				state.State.Save()
-			}
-
-		default:
-			val, ok := GetValue(sel, items)
-			if !ok {
-				return nil, fmt.Errorf("Invalid selection")
-			}
-			addr := val.(*common.Address)
+func PaymasterUI() (*common.Address, bool) {
 
-			PaymasterItem.Value = addr
-			PaymasterItem.DisplayValue = addr.String()
-			fmt.Println("Selected Paymaster:", addr.String())
-			return addr, nil
-		}
+	addr, ok := AddressFromBookUI(state.Paymaster)
+	if ok {
+		PaymasterItem.Value = addr
+		PaymasterItem.DisplayValue = addr.String()
 	}
-	return nil, nil
+	return addr, ok
 }

ui/rootui.go

@@ -31,6 +31,7 @@ func RootUI() {
 		UserOpItem,
 		SignerItem,
 		AbisItem,
+		ChainIDItem,
 		EntryPointItem,
 		Exit,
 	}
@@ -60,6 +61,8 @@ func RootUI() {
 			EntryPointUI()
 		case Exit.Label:
 			return
+		case ChainIDItem.Label:
+			InputUint(ChainIDItem, 64)
 		default:
 			fmt.Println("Not implemented yet:", sel)
 		}

ui/senderui.go

@@ -35,10 +35,8 @@ func SignerUI() {
 			AddSignerUI()
 		default:
 			if i < len(state.State.Signers) {
-				SignItem.Value = state.State.Signers[i]
-				SignItem.DisplayValue = state.State.Signers[i].String()
+				SignerItem.Value = state.State.Signers[i]
 				SignerItem.DisplayValue = state.State.Signers[i].String()
-				SignItem.Details = "Sign the user operation with " + state.State.Signers[i].String()
 				return
 			}
 			fmt.Println("Unreachable reached:", sel)