Skip to content

Commit

Permalink
Extract data at sign instead of create and inherit environment variab…
Browse files Browse the repository at this point in the history
…les from parent process (#6)
  • Loading branch information
zchn authored Mar 25, 2024
1 parent 61dd1d8 commit d954314
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions pkg/shell/shell.go
Original file line number Diff line number Diff line change
Expand Up @@ -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...)
}
Expand Down
5 changes: 3 additions & 2 deletions presigner.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -239,7 +239,6 @@ func main() {
SafeNonce: safeNonce,
TargetAddr: targetAddr,
ScriptName: scriptName,
Data: extractData(outBuffer),
Signatures: nil,
}

Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit d954314

Please sign in to comment.