Merge branch 'master' into render-errors

core/types/arb_types.go

@@ -343,7 +343,7 @@ func (t *ArbitrumInternalTx) gasTipCap() *big.Int    { return bigZero }
 func (t *ArbitrumInternalTx) gasFeeCap() *big.Int    { return bigZero }
 func (t *ArbitrumInternalTx) value() *big.Int        { return common.Big0 }
 func (t *ArbitrumInternalTx) nonce() uint64          { return 0 }
-func (t *ArbitrumInternalTx) to() *common.Address    { return &arbAddress }
+func (t *ArbitrumInternalTx) to() *common.Address    { return &ArbosAddress }
 func (t *ArbitrumInternalTx) isFake() bool           { return true }
 
 func (d *ArbitrumInternalTx) rawSignatureValues() (v, r, s *big.Int) {

core/types/arbitrum_signer.go

@@ -6,7 +6,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
-var arbAddress = common.HexToAddress("0xa4b05")
+var ArbosAddress = common.HexToAddress("0xa4b05")
 var ArbRetryableTxAddress = common.HexToAddress("0x6e")
 
 type arbitrumSigner struct{ Signer }
@@ -22,9 +22,9 @@ func (s arbitrumSigner) Sender(tx *Transaction) (common.Address, error) {
 	case *ArbitrumContractTx:
 		return inner.From, nil
 	case *ArbitrumDepositTx:
-		return arbAddress, nil
+		return ArbosAddress, nil
 	case *ArbitrumInternalTx:
-		return arbAddress, nil
+		return ArbosAddress, nil
 	case *ArbitrumRetryTx:
 		return inner.From, nil
 	case *ArbitrumSubmitRetryableTx:

core/vm/stack_arbitrum.go

@@ -0,0 +1,23 @@
+// Copyright 2014 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+package vm
+
+import "github.com/holiman/uint256"
+
+func (stack *Stack) SetData(data []uint256.Int) {
+	stack.data = data
+}