Merge pull request ethereum#112 from OffchainLabs/arb-deposit-from

Add From field to Arbitrum Deposit Tx
joshuacolvin0 · Jun 17, 2022 · 77902b6 · 77902b6
2 parents f214d2c + 86e5ab6
commit 77902b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/core/types/arb_types.go b/core/types/arb_types.go
@@ -302,6 +302,7 @@ func (tx *ArbitrumSubmitRetryableTx) data() []byte {
 type ArbitrumDepositTx struct {
 	ChainId     *big.Int
 	L1RequestId common.Hash
+	From        common.Address
 	To          common.Address
 	Value       *big.Int
 }
@@ -314,6 +315,7 @@ func (d *ArbitrumDepositTx) copy() TxData {
 	tx := &ArbitrumDepositTx{
 		ChainId:     new(big.Int),
 		L1RequestId: d.L1RequestId,
+		From:        d.From,
 		To:          d.To,
 		Value:       new(big.Int),
 	}

diff --git a/core/types/arbitrum_signer.go b/core/types/arbitrum_signer.go
@@ -25,7 +25,7 @@ func (s arbitrumSigner) Sender(tx *Transaction) (common.Address, error) {
 	case *ArbitrumContractTx:
 		return inner.From, nil
 	case *ArbitrumDepositTx:
-		return ArbosAddress, nil
+		return inner.From, nil
 	case *ArbitrumInternalTx:
 		return ArbosAddress, nil
 	case *ArbitrumRetryTx: