Fix v3 reject errors.

Author: q-uint

agent.go

@@ -62,6 +62,19 @@ func effectiveCanisterID(canisterID principal.Principal, args []any) principal.P
 	}
 }
 
+func handleStatus(path []hashtree.Label, certificate *certification.Certificate) ([]byte, hashtree.Node, error) {
+	status, err := certificate.Tree.Lookup(append(path, hashtree.Label("status"))...)
+	var lookupError hashtree.LookupError
+	if errors.As(err, &lookupError) && lookupError.Type == hashtree.LookupResultAbsent {
+		// The status might not be available immediately, since the request is still being processed.
+		return nil, nil, nil
+	}
+	if err != nil {
+		return nil, nil, err
+	}
+	return status, certificate.Tree.Root, nil
+}
+
 func newNonce() ([]byte, error) {
 	/* Read 10 bytes of random data, which is smaller than the max allowed by the IC (32 bytes)
 	 * and should still be enough from a practical point of view. */
@@ -320,19 +333,6 @@ func (a Agent) RequestStatus(ecID principal.Principal, requestID RequestID) ([]b
 	return handleStatus(path, certificate)
 }
 
-func handleStatus(path []hashtree.Label, certificate *certification.Certificate) ([]byte, hashtree.Node, error) {
-	status, err := certificate.Tree.Lookup(append(path, hashtree.Label("status"))...)
-	var lookupError hashtree.LookupError
-	if errors.As(err, &lookupError) && lookupError.Type == hashtree.LookupResultAbsent {
-		// The status might not be available immediately, since the request is still being processed.
-		return nil, nil, nil
-	}
-	if err != nil {
-		return nil, nil, err
-	}
-	return status, certificate.Tree.Root, nil
-}
-
 // Sender returns the principal that is sending the requests.
 func (a Agent) Sender() principal.Principal {
 	return a.identity.Sender()
@@ -362,6 +362,12 @@ func (a Agent) poll(ecID principal.Principal, requestID RequestID) ([]byte, erro
 			if len(data) != 0 {
 				path := []hashtree.Label{hashtree.Label("request_status"), requestID[:]}
 				switch string(data) {
+				case "replied":
+					replied, err := hashtree.Lookup(node, append(path, hashtree.Label("reply"))...)
+					if err != nil {
+						return nil, fmt.Errorf("no reply found")
+					}
+					return replied, nil
 				case "rejected":
 					tree := hashtree.NewHashTree(node)
 					code, err := tree.Lookup(append(path, hashtree.Label("reject_code"))...)
@@ -373,12 +379,6 @@ func (a Agent) poll(ecID principal.Principal, requestID RequestID) ([]byte, erro
 						return nil, err
 					}
 					return nil, fmt.Errorf("(%d) %s", uint64FromBytes(code), string(message))
-				case "replied":
-					replied, err := hashtree.Lookup(node, append(path, hashtree.Label("reply"))...)
-					if err != nil {
-						return nil, fmt.Errorf("no reply found")
-					}
-					return replied, nil
 				}
 			}
 		case <-timer.C:

agent_test.go

@@ -1,6 +1,7 @@
 package agent_test
 
 import (
+	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"testing"
@@ -19,20 +20,38 @@ var (
 
 var _ = new(testLogger)
 
-func Example_anonymous_query() {
+func Example_anonymous_call() {
 	a, _ := agent.New(agent.DefaultConfig)
-	type Account struct {
-		Account string `ic:"account"`
+	var balance struct {
+		E8S uint64 `ic:"e8s"`
 	}
+
+	accountID, _ := hex.DecodeString("9523dc824aa062dcd9c91b98f4594ff9c6af661ac96747daef2090b7fe87037d")
+	err := a.Call(LEDGER_PRINCIPAL, "account_balance", []any{
+		struct {
+			Account []byte `ic:"account"`
+		}{Account: accountID},
+	}, []any{&balance})
+	fmt.Println(balance.E8S, err)
+	// Output:
+	// 0 <nil>
+}
+
+func Example_anonymous_query() {
+	a, _ := agent.New(agent.DefaultConfig)
 	var balance struct {
 		E8S uint64 `ic:"e8s"`
 	}
-	_ = a.Query(LEDGER_PRINCIPAL, "account_balance_dfx", []any{
-		Account{"9523dc824aa062dcd9c91b98f4594ff9c6af661ac96747daef2090b7fe87037d"},
+
+	accountID, _ := hex.DecodeString("9523dc824aa062dcd9c91b98f4594ff9c6af661ac96747daef2090b7fe87037d")
+	err := a.Query(LEDGER_PRINCIPAL, "account_balance", []any{
+		struct {
+			Account []byte `ic:"account"`
+		}{Account: accountID},
 	}, []any{&balance})
-	fmt.Println(balance.E8S)
+	fmt.Println(balance.E8S, err)
 	// Output:
-	// 0
+	// 0 <nil>
 }
 
 func Example_json() {
@@ -45,10 +64,11 @@ func Example_json() {
 	fmt.Println(balance.E8S)
 
 	a, _ := agent.New(agent.DefaultConfig)
-	if err := a.Query(LEDGER_PRINCIPAL, "account_balance_dfx", []any{struct {
-		Account string `json:"account"`
+	accountID, _ := hex.DecodeString("9523dc824aa062dcd9c91b98f4594ff9c6af661ac96747daef2090b7fe87037d")
+	if err := a.Query(LEDGER_PRINCIPAL, "account_balance", []any{struct {
+		Account []byte `json:"account"`
 	}{
-		Account: "9523dc824aa062dcd9c91b98f4594ff9c6af661ac96747daef2090b7fe87037d",
+		Account: accountID,
 	}}, []any{&balance}); err != nil {
 		fmt.Println(err)
 	}
@@ -66,8 +86,10 @@ func Example_query_ed25519() {
 	var balance struct {
 		E8S uint64 `ic:"e8s"`
 	}
-	_ = a.Query(ledgerID, "account_balance_dfx", []any{map[string]any{
-		"account": "9523dc824aa062dcd9c91b98f4594ff9c6af661ac96747daef2090b7fe87037d",
+
+	accountID, _ := hex.DecodeString("9523dc824aa062dcd9c91b98f4594ff9c6af661ac96747daef2090b7fe87037d")
+	_ = a.Query(ledgerID, "account_balance", []any{map[string]any{
+		"account": accountID,
 	}}, []any{&balance})
 	fmt.Println(balance.E8S)
 	// Output:
@@ -76,13 +98,14 @@ func Example_query_ed25519() {
 
 func Example_query_prime256v1() {
 	id, _ := identity.NewRandomPrime256v1Identity()
-	ledgerID := principal.MustDecode("ryjl3-tyaaa-aaaaa-aaaba-cai")
 	a, _ := agent.New(agent.Config{Identity: id})
 	var balance struct {
 		E8S uint64 `ic:"e8s"`
 	}
-	_ = a.Query(ledgerID, "account_balance_dfx", []any{map[string]any{
-		"account": "9523dc824aa062dcd9c91b98f4594ff9c6af661ac96747daef2090b7fe87037d",
+
+	accountID, _ := hex.DecodeString("9523dc824aa062dcd9c91b98f4594ff9c6af661ac96747daef2090b7fe87037d")
+	_ = a.Query(LEDGER_PRINCIPAL, "account_balance", []any{map[string]any{
+		"account": accountID,
 	}}, []any{&balance})
 	fmt.Println(balance.E8S)
 	// Output:
@@ -91,13 +114,14 @@ func Example_query_prime256v1() {
 
 func Example_query_secp256k1() {
 	id, _ := identity.NewRandomSecp256k1Identity()
-	ledgerID := principal.MustDecode("ryjl3-tyaaa-aaaaa-aaaba-cai")
 	a, _ := agent.New(agent.Config{Identity: id})
 	var balance struct {
 		E8S uint64 `ic:"e8s"`
 	}
-	_ = a.Query(ledgerID, "account_balance_dfx", []any{map[string]any{
-		"account": "9523dc824aa062dcd9c91b98f4594ff9c6af661ac96747daef2090b7fe87037d",
+
+	accountID, _ := hex.DecodeString("9523dc824aa062dcd9c91b98f4594ff9c6af661ac96747daef2090b7fe87037d")
+	_ = a.Query(LEDGER_PRINCIPAL, "account_balance", []any{map[string]any{
+		"account": accountID,
 	}}, []any{&balance})
 	fmt.Println(balance.E8S)
 	// Output:
@@ -129,14 +153,15 @@ func TestAgent_Query_Ed25519(t *testing.T) {
 	a, _ := agent.New(agent.Config{
 		Identity: id,
 	})
-	type Account struct {
-		Account string `ic:"account"`
-	}
 	var balance struct {
 		E8S uint64 `ic:"e8s"`
 	}
-	if err := a.Query(LEDGER_PRINCIPAL, "account_balance_dfx", []any{
-		Account{"9523dc824aa062dcd9c91b98f4594ff9c6af661ac96747daef2090b7fe87037d"},
+
+	accountID, _ := hex.DecodeString("9523dc824aa062dcd9c91b98f4594ff9c6af661ac96747daef2090b7fe87037d")
+	if err := a.Query(LEDGER_PRINCIPAL, "account_balance", []any{
+		struct {
+			Account []byte `ic:"account"`
+		}{Account: accountID},
 	}, []any{&balance}); err != nil {
 		t.Fatal(err)
 	}
@@ -150,14 +175,15 @@ func TestAgent_Query_Secp256k1(t *testing.T) {
 	a, _ := agent.New(agent.Config{
 		Identity: id,
 	})
-	type Account struct {
-		Account string `ic:"account"`
-	}
 	var balance struct {
 		E8S uint64 `ic:"e8s"`
 	}
-	if err := a.Query(LEDGER_PRINCIPAL, "account_balance_dfx", []any{
-		Account{"9523dc824aa062dcd9c91b98f4594ff9c6af661ac96747daef2090b7fe87037d"},
+
+	accountID, _ := hex.DecodeString("9523dc824aa062dcd9c91b98f4594ff9c6af661ac96747daef2090b7fe87037d")
+	if err := a.Query(LEDGER_PRINCIPAL, "account_balance", []any{
+		struct {
+			Account []byte `ic:"account"`
+		}{Account: accountID},
 	}, []any{&balance}); err != nil {
 		t.Fatal(err)
 	}
@@ -168,7 +194,6 @@ func TestAgent_Query_callback(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	ledgerCanisterID := principal.MustDecode("ryjl3-tyaaa-aaaaa-aaaba-cai")
 
 	type GetBlocksArgs struct {
 		Start  uint64 `ic:"start" json:"start"`
@@ -195,7 +220,7 @@ func TestAgent_Query_callback(t *testing.T) {
 	}
 	req, err := a.CreateCandidAPIRequest(
 		agent.RequestTypeQuery,
-		ledgerCanisterID,
+		LEDGER_PRINCIPAL,
 		"query_blocks",
 		args,
 	)
@@ -301,6 +326,15 @@ func TestAgent_Query_callback(t *testing.T) {
 	}
 }
 
+func TestCall_invalid(t *testing.T) {
+	a, _ := agent.New(agent.DefaultConfig)
+	qErr := a.Query(LEDGER_PRINCIPAL, "account_balance", []any{}, []any{})
+	cErr := a.Call(LEDGER_PRINCIPAL, "account_balance", []any{}, []any{})
+	if qErr != cErr {
+		t.Error(qErr, cErr)
+	}
+}
+
 type testLogger struct{}
 
 func (t testLogger) Printf(format string, v ...any) {

call.go

@@ -1,8 +1,6 @@
 package agent
 
 import (
-	"fmt"
-
 	"github.com/aviate-labs/agent-go/certification"
 	"github.com/aviate-labs/agent-go/certification/hashtree"
 	"github.com/aviate-labs/agent-go/principal"
@@ -22,11 +20,28 @@ func (c APIRequest[_, Out]) CallAndWait(out Out) error {
 		if err := cbor.Unmarshal(rawCertificate, &certificate); err != nil {
 			return err
 		}
-		raw, err := hashtree.Lookup(certificate.Tree.Root, hashtree.Label("request_status"), c.requestID[:], hashtree.Label("reply"))
+		path := []hashtree.Label{hashtree.Label("request_status"), c.requestID[:]}
+		if raw, err := certificate.Tree.Lookup(append(path, hashtree.Label("reply"))...); err == nil {
+			return c.unmarshal(raw, out)
+		}
+
+		rejectCode, err := certificate.Tree.Lookup(append(path, hashtree.Label("reject_code"))...)
+		if err != nil {
+			return err
+		}
+		message, err := certificate.Tree.Lookup(append(path, hashtree.Label("reject_message"))...)
 		if err != nil {
-			return fmt.Errorf("no reply found")
+			return err
+		}
+		errorCode, err := certificate.Tree.Lookup(append(path, hashtree.Label("error_code"))...)
+		if err != nil {
+			return err
+		}
+		return preprocessingError{
+			RejectCode: uint64FromBytes(rejectCode),
+			Message:    string(message),
+			ErrorCode:  string(errorCode),
 		}
-		return c.unmarshal(raw, out)
 	}
 
 	raw, err := c.a.poll(c.effectiveCanisterID, c.requestID)

client_test.go

@@ -8,38 +8,38 @@ import (
 	"github.com/aviate-labs/agent-go/principal"
 )
 
-func TestClient_GetNodeListSince(t *testing.T) {
+func TestClient_GetNNSSubnetID(t *testing.T) {
 	checkEnabled(t)
 
 	c, err := registry.New()
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	latestVersion, err := c.GetLatestVersion()
+	id, err := c.GetNNSSubnetID()
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	if _, err := c.GetNodeListSince(latestVersion - 100); err != nil {
-		t.Fatal(err)
+	if !id.Equal(principal.MustDecode("tdb26-jop6k-aogll-7ltgs-eruif-6kk7m-qpktf-gdiqx-mxtrf-vb5e6-eqe")) {
+		t.Error(id)
 	}
 }
 
-func TestClient_GetNNSSubnetID(t *testing.T) {
+func TestClient_GetNodeListSince(t *testing.T) {
 	checkEnabled(t)
 
 	c, err := registry.New()
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	id, err := c.GetNNSSubnetID()
+	latestVersion, err := c.GetLatestVersion()
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !id.Equal(principal.MustDecode("tdb26-jop6k-aogll-7ltgs-eruif-6kk7m-qpktf-gdiqx-mxtrf-vb5e6-eqe")) {
-		t.Error(id)
+
+	if _, err := c.GetNodeListSince(latestVersion - 100); err != nil {
+		t.Fatal(err)
 	}
 }
 

clients/registry/client_test.go

@@ -120,7 +120,11 @@ func (q APIRequest[In, Out]) Query(out Out, skipVerification bool) error {
 		}
 		return q.unmarshal(reply.Arg, out)
 	case "rejected":
-		return fmt.Errorf("(%d) %s: %s", resp.RejectCode, resp.ErrorCode, resp.RejectMsg)
+		return preprocessingError{
+			RejectCode: resp.RejectCode,
+			Message:    resp.RejectMsg,
+			ErrorCode:  resp.ErrorCode,
+		}
 	default:
 		panic("unreachable")
 	}