From 1d1a95bb99de3dd6d83c002f3410b5668c845e03 Mon Sep 17 00:00:00 2001
From: Jim Pick <jim@jimpick.com>
Date: Sun, 8 Dec 2024 15:46:09 -0800
Subject: [PATCH] Update to newer go-wallet-utils

---
 cmd/agent_create.go |  7 ++++++-
 cmd/utils.go        | 14 ++++++++++++--
 go.mod              |  2 +-
 go.sum              |  2 ++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/cmd/agent_create.go b/cmd/agent_create.go
index bf6811e..6fa68ba 100644
--- a/cmd/agent_create.go
+++ b/cmd/agent_create.go
@@ -75,7 +75,12 @@ var createCmd = &cobra.Command{
 		s.Start()
 		defer s.Stop()
 
-		auth, err := walletutils.NewEthWalletTransactor(wallet, &account, passphrase, big.NewInt(chainID))
+		ethClient, err := PoolsSDK.Extern().ConnectEthClient()
+		if err != nil {
+			logFatal(err)
+		}
+
+		_, auth, err := walletutils.NewEthWalletTransactor(wallet, &account, passphrase, big.NewInt(chainID), ethClient)
 		if err != nil {
 			logFatal(err)
 		}
diff --git a/cmd/utils.go b/cmd/utils.go
index 5baf17d..6068f93 100644
--- a/cmd/utils.go
+++ b/cmd/utils.go
@@ -300,7 +300,12 @@ func commonOwnerOrOperatorSetup(ctx context.Context, from string) (agentAddr com
 		return common.Address{}, nil, accounts.Account{}, nil, err
 	}
 
-	auth, err = walletutils.NewEthWalletTransactor(wallet, &account, passphrase, big.NewInt(chainID))
+	ethClient, err := PoolsSDK.Extern().ConnectEthClient()
+	if err != nil {
+		return common.Address{}, nil, accounts.Account{}, nil, err
+	}
+
+	_, auth, err = walletutils.NewEthWalletTransactor(wallet, &account, passphrase, big.NewInt(chainID), ethClient)
 	if err != nil {
 		logFatal(err)
 	}
@@ -356,7 +361,12 @@ func commonGenericAccountSetup(ctx context.Context, from string) (auth *bind.Tra
 		}
 	}
 
-	auth, err = walletutils.NewEthWalletTransactor(wallet, &account, passphrase, big.NewInt(chainID))
+	ethClient, err := PoolsSDK.Extern().ConnectEthClient()
+	if err != nil {
+		return nil, accounts.Account{}, err
+	}
+
+	_, auth, err = walletutils.NewEthWalletTransactor(wallet, &account, passphrase, big.NewInt(chainID), ethClient)
 	if err != nil {
 		logFatal(err)
 	}
diff --git a/go.mod b/go.mod
index 8342d28..8a49f18 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/filecoin-project/go-state-types v0.14.0
 	github.com/filecoin-project/lotus v1.28.1
 	github.com/glifio/go-pools v1.1.3
-	github.com/glifio/go-wallet-utils v0.0.0-20230719050429-ff6c4bc75533
+	github.com/glifio/go-wallet-utils v0.0.0-20241208165650-6ce2b38a31d2
 	github.com/golang/mock v1.6.0
 	github.com/ipfs/go-cid v0.4.1
 	github.com/pelletier/go-toml/v2 v2.0.6
diff --git a/go.sum b/go.sum
index 2d86b00..8521abc 100644
--- a/go.sum
+++ b/go.sum
@@ -239,6 +239,8 @@ github.com/glifio/go-pools v1.1.3 h1:o8lop9cckaxZ3P8UeWlk/GmlJLWhcQkiDIX9aDM82cA
 github.com/glifio/go-pools v1.1.3/go.mod h1:G+JltF4457QvLCk8cIMLTHl6L7HgB515Bv8IRgFJJx8=
 github.com/glifio/go-wallet-utils v0.0.0-20230719050429-ff6c4bc75533 h1:teuqQtVb7YMyqIOg+xUNO21qZAnm8ibhpKy4lIUBpag=
 github.com/glifio/go-wallet-utils v0.0.0-20230719050429-ff6c4bc75533/go.mod h1:zJ9ksxDWIsuS80RtpjaM6swuKZ7OYdJH56I00EZRxD4=
+github.com/glifio/go-wallet-utils v0.0.0-20241208165650-6ce2b38a31d2 h1:7FGk6IZO3rxeYfM/x2no58V/3QNxyixJHvB8gTYzOlI=
+github.com/glifio/go-wallet-utils v0.0.0-20241208165650-6ce2b38a31d2/go.mod h1:Zf3Lh4yyVkBVtFgNkocJ+cS3f55ENdQfXptMilpJQrU=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=