Skip to content

Commit 153bfc2

Browse files
committed
downstream #2
1 parent 3219809 commit 153bfc2

File tree

6 files changed

+223
-80
lines changed

6 files changed

+223
-80
lines changed

packages/orchestration/src/contracts/stakeAtom.contract.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { prepareStakingAccountHolder } from './stakingAccountHolder.js';
1111

1212
const trace = makeTracer('StakeAtom');
1313
/**
14-
* @import { Orchestration } from '../types.js';
14+
* @import { Orchestration } from '../orchestration.js'
1515
* @import { Baggage } from '@agoric/vat-data';
1616
* @import { IBCConnectionID } from '@agoric/vats';
1717
*/

packages/orchestration/src/delegation.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export type Delegation = {
1111
balance: Coin;
1212
};
1313

14-
export type UnbodingDelegation = {
14+
export type UnbondingDelegation = {
1515
delegator_address: ChainAddress;
1616
validator_address: ChainAddress;
1717
entries: {

packages/orchestration/src/orchestration.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { makeTxPacket, parsePacketAck } from './utils/tx.js';
99
import '@agoric/network/exported.js';
1010

1111
/**
12-
* @import { AttenuatedNetwork, Base64Bytes, ChainAddress } from './types.js';
12+
* @import { AttenuatedNetwork, ChainAccount, ChainAddress } from './types.js';
1313
* @import { IBCConnectionID } from '@agoric/vats';
1414
* @import { Zone } from '@agoric/base-zone';
1515
* @import { TxBody } from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
@@ -56,6 +56,8 @@ export const ChainAccountI = M.interface('ChainAccount', {
5656
getLocalAddress: M.call().returns(M.string()),
5757
getRemoteAddress: M.call().returns(M.string()),
5858
getPort: M.call().returns(M.remotable('Port')),
59+
// XXX better shape
60+
executeTx: M.call(M.arrayOf(M.any)).optional(M.record()).returns(M.promise()),
5961
executeEncodedTx: M.call(M.arrayOf(Proto3Shape))
6062
.optional(M.record())
6163
.returns(M.promise()),
@@ -123,6 +125,9 @@ const prepareChainAccount = zone =>
123125
getPort() {
124126
return this.state.port;
125127
},
128+
executeTx() {
129+
throw new Error('not yet implemented');
130+
},
126131
/**
127132
* Submit a transaction on behalf of the remote accoutn for execution on teh remote chain.
128133
* @param {AnyJson[]} msgs
@@ -257,7 +262,6 @@ export const prepareOrchestrationTools = zone => {
257262
harden(prepareOrchestrationTools);
258263

259264
/** @typedef {ReturnType<ReturnType<typeof prepareChainAccount>>} ChainAccountKit */
260-
/** @typedef {ChainAccountKit['account']} ChainAccount */
261265
/** @typedef {ReturnType<typeof prepareOrchestrationTools>} OrchestrationTools */
262266
/** @typedef {ReturnType<OrchestrationTools['makeOrchestration']>} OrchestrationKit */
263267
/** @typedef {OrchestrationKit['public']} Orchestration */

packages/orchestration/src/proposals/orchestration-proposal.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
import { V as E } from '@agoric/vat-data/vow.js';
33
import { Far } from '@endo/far';
44

5-
/** @import { AttenuatedNetwork, Orchestration, OrchestrationVat } from '../types' */
5+
/**
6+
* @import { AttenuatedNetwork } from '../types'
7+
* @import { Orchestration } from '../orchestration.js'
8+
* @import { OrchestrationVat } from '../vat-orchestration.js'
9+
*/
610

711
/**
812
* @param {BootstrapPowers & {

0 commit comments

Comments
 (0)