WIP fixup

Agoric · Sep 11, 2024 · 81a8fec · 81a8fec
1 parent 41cca56
commit 81a8fec
Showing 1 changed file with 44 additions and 15 deletions.
diff --git a/packages/orchestration/src/exos/cosmos-orchestration-account.js b/packages/orchestration/src/exos/cosmos-orchestration-account.js
@@ -41,6 +41,14 @@ import {
 } from '../utils/cosmos.js';
 import { orchestrationAccountMethods } from '../utils/orchestrationAccount.js';
 import { makeTimestampHelper } from '../utils/time.js';
+import { QueryDelegationRewardsRequest } from '@agoric/cosmic-proto/cosmos/distribution/v1beta1/query.js';
+import {
+  QueryDelegationRequest,
+  QueryDelegatorDelegationsRequest,
+  QueryDelegatorUnbondingDelegationsRequest,
+  QueryRedelegationsRequest,
+  QueryUnbondingDelegationRequest,
+} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/query.js';
 
 /**
  * @import {HostOf} from '@agoric/async-flow';
@@ -661,8 +669,8 @@ export const prepareCosmosOrchestrationAccountKit = (
             const results = E(icqConnection).query([
               toRequestQueryJson(
                 QueryDelegationRequest.toProtoMsg({
-                  delegatorAddress: chainAddress.value,
-                  validatorAddress: validator.value,
+                  delegatorAddr: chainAddress.value,
+                  validatorAddr: validator.value,
                 }),
               ),
             ]);
@@ -680,8 +688,8 @@ export const prepareCosmosOrchestrationAccountKit = (
             }
             const results = E(icqConnection).query([
               toRequestQueryJson(
-                QueryDelegationsRequest.toProtoMsg({
-                  delegatorAddress: chainAddress.value,
+                QueryDelegatorDelegationsRequest.toProtoMsg({
+                  delegatorAddr: chainAddress.value,
                 }),
               ),
             ]);
@@ -700,8 +708,8 @@ export const prepareCosmosOrchestrationAccountKit = (
             const results = E(icqConnection).query([
               toRequestQueryJson(
                 QueryUnbondingDelegationRequest.toProtoMsg({
-                  delegatorAddress: chainAddress.value,
-                  validatorAddress: validator.value,
+                  delegatorAddr: chainAddress.value,
+                  validatorAddr: validator.value,
                 }),
               ),
             ]);
@@ -719,8 +727,8 @@ export const prepareCosmosOrchestrationAccountKit = (
             }
             const results = E(icqConnection).query([
               toRequestQueryJson(
-                QueryUnbondingDelegationsRequest.toProtoMsg({
-                  delegatorAddress: chainAddress.value,
+                QueryDelegatorUnbondingDelegationsRequest.toProtoMsg({
+                  delegatorAddr: chainAddress.value,
                 }),
               ),
             ]);
@@ -738,10 +746,10 @@ export const prepareCosmosOrchestrationAccountKit = (
             }
             const results = E(icqConnection).query([
               toRequestQueryJson(
-                QueryRedelegationRequest.toProtoMsg({
-                  delegatorAddress: chainAddress.value,
-                  validatorSrcAddress: srcValidator.value,
-                  validatorDstAddress: dstValidator.value,
+                QueryRedelegationsRequest.toProtoMsg({
+                  delegatorAddr: chainAddress.value,
+                  srcValidatorAddr: srcValidator.value,
+                  dstValidatorAddr: dstValidator?.value,
                 }),
               ),
             ]);
@@ -760,7 +768,7 @@ export const prepareCosmosOrchestrationAccountKit = (
             const results = E(icqConnection).query([
               toRequestQueryJson(
                 QueryRedelegationsRequest.toProtoMsg({
-                  delegatorAddress: chainAddress.value,
+                  delegatorAddr: chainAddress.value,
                 }),
               ),
             ]);
@@ -778,7 +786,7 @@ export const prepareCosmosOrchestrationAccountKit = (
             }
             const results = E(icqConnection).query([
               toRequestQueryJson(
-                QueryRewardRequest.toProtoMsg({
+                QueryDelegationRewardsRequest.toProtoMsg({
                   delegatorAddress: chainAddress.value,
                   validatorAddress: validator.value,
                 }),
@@ -798,7 +806,7 @@ export const prepareCosmosOrchestrationAccountKit = (
             }
             const results = E(icqConnection).query([
               toRequestQueryJson(
-                QueryRewardsRequest.toProtoMsg({
+                QueryDelegationRewardsRequest.toProtoMsg({
                   delegatorAddress: chainAddress.value,
                 }),
               ),
@@ -807,6 +815,27 @@ export const prepareCosmosOrchestrationAccountKit = (
           });
         },
 
+        /** @type {HostOf<OrchestrationAccountI['send']>} */
+        send(toAccount, amount) {
+          return asVow(() => {
+            trace('send', toAccount, amount);
+            const { helper } = this.facets;
+            const { chainAddress } = this.state;
+            return watch(
+              E(helper.owned()).executeEncodedTx([
+                Any.toJSON(
+                  MsgSend.toProtoMsg({
+                    fromAddress: chainAddress.value,
+                    toAddress: toAccount.value,
+                    amount: [helper.amountToCoin(amount)],
+                  }),
+                ),
+              ]),
+              this.facets.returnVoidWatcher,
+            );
+          });
+        },
+
         /** @type {HostOf<OrchestrationAccountI['sendAll']>} */
         sendAll(toAccount, amounts) {
           return asVow(() => {