Merge pull request #711 from ava-labs/dev

v1.1.3

Author: StephenButtolph

node/node.go

@@ -67,7 +67,7 @@ var (
 	genesisHashKey = []byte("genesisID")
 
 	// Version is the version of this code
-	Version                 = version.NewDefaultVersion(constants.PlatformName, 1, 1, 2)
+	Version                 = version.NewDefaultVersion(constants.PlatformName, 1, 1, 3)
 	versionParser           = version.NewDefaultParser()
 	beaconConnectionTimeout = 1 * time.Minute
 )

scripts/build_coreth.sh

@@ -13,7 +13,7 @@ BUILD_DIR="$AVALANCHE_PATH/build" # Where binaries go
 PLUGIN_DIR="$BUILD_DIR/plugins" # Where plugin binaries (namely coreth) go
 BINARY_PATH="$PLUGIN_DIR/evm"
 
-CORETH_VER="v0.3.18"
+CORETH_VER="v0.3.19"
 
 CORETH_PATH="$GOPATH/pkg/mod/github.com/ava-labs/coreth@$CORETH_VER"
 

vms/avm/client.go

@@ -92,10 +92,17 @@ func (c *Client) GetTx(txID ids.ID) ([]byte, error) {
 
 // GetUTXOs returns the byte representation of the UTXOs controlled by [addrs]
 func (c *Client) GetUTXOs(addrs []string, limit uint32, startAddress, startUTXOID string) ([][]byte, api.Index, error) {
+	return c.GetAtomicUTXOs(addrs, "", limit, startAddress, startUTXOID)
+}
+
+// GetAtomicUTXOs returns the byte representation of the atomic UTXOs controlled by [addresses]
+// from [sourceChain]
+func (c *Client) GetAtomicUTXOs(addrs []string, sourceChain string, limit uint32, startAddress, startUTXOID string) ([][]byte, api.Index, error) {
 	res := &api.GetUTXOsReply{}
 	err := c.requester.SendRequest("getUTXOs", &api.GetUTXOsArgs{
-		Addresses: addrs,
-		Limit:     cjson.Uint32(limit),
+		Addresses:   addrs,
+		SourceChain: sourceChain,
+		Limit:       cjson.Uint32(limit),
 		StartIndex: api.Index{
 			Address: startAddress,
 			UTXO:    startUTXOID,

vms/platformvm/client.go

@@ -75,12 +75,24 @@ func (c *Client) ListAddresses(user api.UserPass) ([]string, error) {
 	return res.Addresses, err
 }
 
-// GetUTXOs returns the byte representation of the UTXOs controlled by [addresses]
-func (c *Client) GetUTXOs(addresses []string) ([][]byte, api.Index, error) {
+// GetUTXOs returns the byte representation of the UTXOs controlled by [addrs]
+func (c *Client) GetUTXOs(addrs []string, limit uint32, startAddress, startUTXOID string) ([][]byte, api.Index, error) {
+	return c.GetAtomicUTXOs(addrs, "", limit, startAddress, startUTXOID)
+}
+
+// GetAtomicUTXOs returns the byte representation of the atomic UTXOs controlled by [addresses]
+// from [sourceChain]
+func (c *Client) GetAtomicUTXOs(addrs []string, sourceChain string, limit uint32, startAddress, startUTXOID string) ([][]byte, api.Index, error) {
 	res := &api.GetUTXOsReply{}
 	err := c.requester.SendRequest("getUTXOs", &api.GetUTXOsArgs{
-		Addresses: addresses,
-		Encoding:  formatting.Hex,
+		Addresses:   addrs,
+		SourceChain: sourceChain,
+		Limit:       cjson.Uint32(limit),
+		StartIndex: api.Index{
+			Address: startAddress,
+			UTXO:    startUTXOID,
+		},
+		Encoding: formatting.Hex,
 	}, res)
 	if err != nil {
 		return nil, api.Index{}, err