sae: Implement AtomicRequests on custom txs

go.work.sum

@@ -572,6 +572,7 @@ github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/Q
 github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
@@ -719,6 +720,7 @@ github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWe
 github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY=
 github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU=
 github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
+github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
 github.com/moul/http2curl v1.0.0 h1:dRMWoAtb+ePxMlLkrCbAqh4TlPHXvoGUSQ323/9Zahs=
 github.com/mozilla/tls-observatory v0.0.0-20210609171429-7bc42856d2e5/go.mod h1:FUqVoUPHSEdDR0MnFM3Dh8AU0pZHLXUD127SAJGER/s=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=

vms/saevm/cchain/tx/BUILD.bazel

@@ -16,6 +16,7 @@ go_library(
     ],
     importpath = "github.com/ava-labs/avalanchego/vms/saevm/cchain/tx",
     deps = [
+        "//chains/atomic",
         "//codec",
         "//codec/linearcodec",
         "//graft/coreth/plugin/evm/atomic",
@@ -42,6 +43,7 @@ go_test(
     data = glob(["testdata/**"]),
     embed = [":tx"],
     deps = [
+        "//chains/atomic",
         "//graft/coreth/plugin/evm/atomic",
         "//graft/coreth/plugin/evm/atomic/vm",
         "//ids",

vms/saevm/cchain/tx/compatibility_test.go

@@ -152,3 +152,16 @@
 func (s *asOpStateDB) GetNonce(addr common.Address) uint64 {
 	return s.initialNonces[addr]
 }
+
+func FuzzAtomicRequestsCompatibility(f *testing.F) {
+	fuzz(f, func(t *testing.T, newTx *Tx) {
+		oldTx := ToOldTx(t, newTx)
+		wantChainID, wantRequests, err := oldTx.UnsignedAtomicTx.AtomicOps()
+		require.NoErrorf(t, err, "%T.AtomicOps()", oldTx.UnsignedAtomicTx)
+
+		gotChainID, gotRequests, err := newTx.AtomicRequests()
+		require.NoErrorf(t, err, "%T.AtomicRequests()", newTx)
+		assert.Equal(t, wantChainID, gotChainID, "chainID")
+		assert.Equal(t, wantRequests, gotRequests, "requests")
+	})
+}

vms/saevm/cchain/tx/export.go

@@ -16,6 +16,8 @@ import (
 	"github.com/ava-labs/avalanchego/utils/math"
 	"github.com/ava-labs/avalanchego/vms/components/avax"
 	"github.com/ava-labs/avalanchego/vms/saevm/hook"
+
+	chainsatomic "github.com/ava-labs/avalanchego/chains/atomic"
 )
 
 var _ Unsigned = (*Export)(nil)
@@ -104,3 +106,33 @@ func (e *Export) asOp(avaxAssetID ids.ID) (op, error) {
 		burn: burn,
 	}, nil
 }
+
+func (e *Export) atomicRequests(txID ids.ID) (ids.ID, *chainsatomic.Requests, error) {
+	elems := make([]*chainsatomic.Element, len(e.ExportedOutputs))
+	for i, out := range e.ExportedOutputs {
+		utxo := &avax.UTXO{
+			UTXOID: avax.UTXOID{
+				TxID:        txID,
+				OutputIndex: uint32(i), //#nosec G115 -- Won't overflow
+			},
+			Asset: out.Asset,
+			Out:   out.Out,
+		}
+
+		utxoBytes, err := c.Marshal(codecVersion, utxo)
+		if err != nil {
+			return ids.ID{}, nil, err
+		}
+		utxoID := utxo.InputID()
+		elem := &chainsatomic.Element{
+			Key:   utxoID[:],
+			Value: utxoBytes,
+		}
+		if o, ok := utxo.Out.(avax.Addressable); ok {
+			elem.Traits = o.Addresses()
+		}
+
+		elems[i] = elem
+	}
+	return e.DestinationChain, &chainsatomic.Requests{PutRequests: elems}, nil
+}

vms/saevm/cchain/tx/import.go

@@ -17,6 +17,8 @@ import (
 	"github.com/ava-labs/avalanchego/utils/math"
 	"github.com/ava-labs/avalanchego/vms/components/avax"
 	"github.com/ava-labs/avalanchego/vms/secp256k1fx"
+
+	chainsatomic "github.com/ava-labs/avalanchego/chains/atomic"
 )
 
 var _ Unsigned = (*Import)(nil)
@@ -110,3 +112,12 @@ func (i *Import) asOp(avaxAssetID ids.ID) (op, error) {
 		mint: mint,
 	}, nil
 }
+
+func (i *Import) atomicRequests(ids.ID) (ids.ID, *chainsatomic.Requests, error) {
+	utxoIDs := make([][]byte, len(i.ImportedInputs))
+	for j, in := range i.ImportedInputs {
+		inputID := in.InputID()
+		utxoIDs[j] = inputID[:]
+	}
+	return i.SourceChain, &chainsatomic.Requests{RemoveRequests: utxoIDs}, nil
+}

vms/saevm/cchain/tx/tx.go

@@ -22,6 +22,8 @@ import (
 	"github.com/ava-labs/avalanchego/vms/components/gas"
 	"github.com/ava-labs/avalanchego/vms/saevm/hook"
 	"github.com/ava-labs/avalanchego/vms/secp256k1fx"
+
+	chainsatomic "github.com/ava-labs/avalanchego/chains/atomic"
 )
 
 // Tx is a signed transaction that interacts with shared memory.
@@ -48,6 +50,10 @@ type Unsigned interface {
 	// asOp returns the operation that this transaction performs on the EVM
 	// state.
 	asOp(avaxAssetID ids.ID) (op, error)
+
+	// atomicRequests returns the operations that should be applied to shared
+	// memory when this transaction is executed.
+	atomicRequests(txID ids.ID) (chainID ids.ID, r *chainsatomic.Requests, err error)
 }
 
 // op contains the state changes of [hook.Op]
@@ -179,6 +185,12 @@ func gasPrice(cost uint64, gas gas.Gas) uint256.Int {
 	return p
 }
 
+// AtomicRequests returns shared-memory modifications that this transaction
+// should perform on the peer chainID during execution.
+func (t *Tx) AtomicRequests() (chainID ids.ID, r *chainsatomic.Requests, err error) {
+	return t.atomicRequests(t.ID())
+}
+
 // Parse deserializes a [Tx] from its canonical binary format.
 func Parse(b []byte) (*Tx, error) {
 	var tx Tx

vms/saevm/cchain/tx/tx_test.go

@@ -27,6 +27,7 @@
 	"github.com/ava-labs/avalanchego/vms/saevm/hook"
 	"github.com/ava-labs/avalanchego/vms/secp256k1fx"
 
+	chainsatomic "github.com/ava-labs/avalanchego/chains/atomic"
 	safemath "github.com/ava-labs/avalanchego/utils/math"
 )
 
@@ -35,12 +36,14 @@
 var (
 	AVAXAssetID = ids.FromStringOrPanic("FvwEAhmxKfeiG8SnEvq42hc6whRyY3EFYAvebMqDNDGCgxN5Z")
 	Tests       = [...]struct {
-		Name  string
-		Old   *atomic.Tx
-		New   *Tx
-		JSON  string
-		Bytes []byte
-		Op    hook.Op
+		Name                  string
+		Old                   *atomic.Tx
+		New                   *Tx
+		JSON                  string
+		Bytes                 []byte
+		Op                    hook.Op
+		AtomicRequestsChainID ids.ID
+		AtomicRequests        *chainsatomic.Requests
 	}{
 		{
 			Name: "import", // Included in https://subnets.avax.network/c-chain/block/4
@@ -147,6 +150,12 @@
 					common.HexToAddress("0xb8b5a87d1c05676f1f966da49151fa54dbe68c33"): scaleAVAX(50_000_000),
 				},
 			},
+			AtomicRequestsChainID: ids.FromStringOrPanic("2oYMBNV4eNHyqk2fjjV5nVQLDbtmNJzq5s3qs3Lo6ftnC6FByM"),
+			AtomicRequests: &chainsatomic.Requests{
+				RemoveRequests: [][]byte{
+					common.FromHex("0xfd9e10917c4a2dab395683cfb766cdc584eba118bc22d3d0fc356fb79345cf64"),
+				},
+			},
 		},
 		{
 			Name: "export", // Included in https://subnets.avax.network/c-chain/block/48
@@ -256,6 +265,16 @@
 					},
 				},
 			},
+			AtomicRequestsChainID: ids.FromStringOrPanic("2oYMBNV4eNHyqk2fjjV5nVQLDbtmNJzq5s3qs3Lo6ftnC6FByM"),
+			AtomicRequests: &chainsatomic.Requests{
+				PutRequests: []*chainsatomic.Element{{
+					Key:   common.FromHex("0x38ebe8fc127b2eaeeb25c72a747e0ef27460fb04b5929568ed959d67ec3e4948"),
+					Value: common.FromHex("0x000067b5812292324365c6e2a479b2601cd1cd1facc2fcc8c29d58b5ed96583ea17e0000000021e67317cbc4be2aeb00677ad6462778a8f52274b9d605df2591b23027a87dff00000007000000000000000100000000000000000000000100000001d6ce17826dd7c12a7577af257e82d99143b72500"),
+					Traits: [][]byte{
+						ids.ShortFromStringOrPanic("LanVZgBDVvtarbTXD1uU7r1nXVJyLmPUz").Bytes(),
+					},
+				}},
+			},
 		},
 		{
 			Name: "import_multi_input", // Included in https://subnets.avax.network/c-chain/block/132481
@@ -465,6 +484,14 @@
 					common.HexToAddress("0x383c293db6be7ac246f0956ad632344dc2cd1da3"): scaleAVAX(597_000_000),
 				},
 			},
+			AtomicRequestsChainID: ids.FromStringOrPanic("2oYMBNV4eNHyqk2fjjV5nVQLDbtmNJzq5s3qs3Lo6ftnC6FByM"),
+			AtomicRequests: &chainsatomic.Requests{
+				RemoveRequests: [][]byte{
+					common.FromHex("0x821514ed5d925142159bc2c78bc56b043200e53aab79e97ca75e7ca7f6a96d05"),
+					common.FromHex("0xea05e5c7135613b689d9f6b9903f431067ed72a2957ca82a652de1e8fef2c630"),
+					common.FromHex("0xd71fb48751f6d5732e7ff63168ed311b40bf517b36279e326878fc3f5169a656"),
+				},
+			},
 		},
 		{
 			Name: "export_same_address_multi_asset", // Synthetic
@@ -528,6 +555,9 @@
 					},
 				},
 			},
+			AtomicRequests: &chainsatomic.Requests{
+				PutRequests: []*chainsatomic.Element{},
+			},
 		},
 		{
 			Name: "export_multi_address_multi_asset", // Synthetic
@@ -598,6 +628,9 @@
 					},
 				},
 			},
+			AtomicRequests: &chainsatomic.Requests{
+				PutRequests: []*chainsatomic.Element{},
+			},
 		},
 		{
 			Name: "import_non_avax", // Synthetic
@@ -659,6 +692,11 @@
 				Gas:  10226,
 				Mint: map[common.Address]uint256.Int{},
 			},
+			AtomicRequests: &chainsatomic.Requests{
+				RemoveRequests: [][]byte{
+					common.FromHex("0x2c34ce1df23b838c5abf2a7f6437cca3d3067ed509ff25f11df6b11b582b51eb"),
+				},
+			},
 		},
 	}
 	OldTxs []*atomic.Tx
@@ -1107,3 +1145,14 @@
 		})
 	}
 }
+
+func TestAtomicRequests(t *testing.T) {
+	for _, test := range Tests {
+		t.Run(test.Name, func(t *testing.T) {
+			chainID, requests, err := test.New.AtomicRequests()
+			require.NoErrorf(t, err, "%T.AtomicRequests()", test.New)
+			assert.Equalf(t, test.AtomicRequestsChainID, chainID, "%T.AtomicRequests().ChainID", test.New)
+			assert.Equalf(t, test.AtomicRequests, requests, "%T.AtomicRequests().Requests", test.New)
+		})
+	}
+}