From d954314da3aef7a3c2fc146b21495227f5ba6245 Mon Sep 17 00:00:00 2001
From: Kevin Z Chen <kevin.zchn@gmail.com>
Date: Mon, 25 Mar 2024 16:22:37 -0700
Subject: [PATCH] Extract data at sign instead of create and inherit
 environment variables from parent process (#6)

---
 pkg/shell/shell.go | 1 +
 presigner.go       | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/shell/shell.go b/pkg/shell/shell.go
index 160b56d..7df0b4c 100644
--- a/pkg/shell/shell.go
+++ b/pkg/shell/shell.go
@@ -15,6 +15,7 @@ func Run(workdir, name string, env []string, in string, silent bool, args ...str
 	cmd := exec.Command(name, args...)
 	cmd.Dir = workdir
 
+	cmd.Env = os.Environ()
 	if len(env) > 0 {
 		cmd.Env = append(cmd.Env, env...)
 	}
diff --git a/presigner.go b/presigner.go
index fcc0faa..74c7ac8 100644
--- a/presigner.go
+++ b/presigner.go
@@ -29,9 +29,9 @@ type TxState struct {
 	SafeNonce  string `json:"safe_nonce"`
 	TargetAddr string `json:"target_addr"`
 	ScriptName string `json:"script_name"`
-	Data       string `json:"data"`
 
 	// populated by sign
+	Data       string `json:"data"`
 	Signatures []TxSignature `json:"signatures,omitempty"`
 
 	// populated by simulate
@@ -239,7 +239,6 @@ func main() {
 			SafeNonce:  safeNonce,
 			TargetAddr: targetAddr,
 			ScriptName: scriptName,
-			Data:       extractData(outBuffer),
 			Signatures: nil,
 		}
 
@@ -318,6 +317,8 @@ func main() {
 			"--sender", signer,
 			"--via-ir")
 
+		tx.Data = extractData(outBuffer)
+
 		// sign the payload
 		outBuffer, _, err = shell.Run(workdir, "eip712sign", []string{}, tx.Data+"\n", false, signingFlags...)
 		if err != nil {