@agoric/orchestration 0.1.1-dev-660fc46.0 → 0.1.1-dev-c8948c5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-660fc46.0+660fc46",
+  "version": "0.1.1-dev-c8948c5.0+c8948c5",
   "description": "Chain abstraction for Agoric's orchestration clients",
   "type": "module",
   "main": "index.js",
@@ -105,5 +105,5 @@
   "typeCoverage": {
     "atLeast": 97.46
   },
-  "gitHead": "660fc463854c0928366a79da4efb842e422f7a1f"
+  "gitHead": "c8948c5d1a88100f755b3e0c97131a1105f684ea"
 }

package/src/examples/axelar-gmp.contract.d.ts

@@ -11,7 +11,9 @@ export function contract(zcf: ZCF, privateArgs: OrchestrationPowers & {
             invitationMakers: import("@endo/exo").Guarded<{
                 makeEVMTransactionInvitation(method: any, args: any): Promise<globalThis.Invitation<string | void, undefined>>;
             }>;
-        }>, undefined>>;
+        }>, {
+            gasAmount: bigint;
+        }>>;
     }>;
     creatorFacet: import("@endo/exo").Guarded<{
         registerChain(chainName: string, chainInfo: import("@agoric/orchestration").ChainInfo, ibcConnectionInfo?: import("@agoric/orchestration").IBCConnectionInfo): Promise<void>;
@@ -31,7 +33,9 @@ export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: Orchestrati
             invitationMakers: import("@endo/exo").Guarded<{
                 makeEVMTransactionInvitation(method: any, args: any): Promise<globalThis.Invitation<string | void, undefined>>;
             }>;
-        }>, undefined>>;
+        }>, {
+            gasAmount: bigint;
+        }>>;
     }>;
     creatorFacet: import("@endo/exo").Guarded<{
         registerChain(chainName: string, chainInfo: import("@agoric/orchestration").ChainInfo, ibcConnectionInfo?: import("@agoric/orchestration").IBCConnectionInfo): Promise<void>;

package/src/examples/axelar-gmp.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"axelar-gmp.contract.d.ts","sourceRoot":"","sources":["axelar-gmp.contract.js"],"names":[],"mappings":"AAiCO,8BAVI,GAAG,eACH,mBAAmB,GAAG;IAC5B,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC5C,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAC;IAC3D,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;CAClC,QACO,IAAI,oDACJ,kBAAkB;;;;;;;;;;;;GAyD5B;AAGD;gBAlEiB,UAAU;gBACV,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;gBAC/B,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE;iBAC7C,OAAO,WAAW,CAAC;;;;;;;;;;;;;GA+DY;yBA5E3B,aAAa;yCAHuB,0BAA0B;gCAE1C,0CAA0C;qCAD9B,uBAAuB;2BAAvB,uBAAuB;iCAAvB,uBAAuB;iCACnC,0CAA0C;4BAJtD,aAAa;0BACpB,cAAc;wCACqB,0BAA0B;yBAFtD,aAAa"}
+{"version":3,"file":"axelar-gmp.contract.d.ts","sourceRoot":"","sources":["axelar-gmp.contract.js"],"names":[],"mappings":"AAiCO,8BAVI,GAAG,eACH,mBAAmB,GAAG;IAC5B,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC5C,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAC;IAC3D,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;CAClC,QACO,IAAI,oDACJ,kBAAkB;;;;;;;uBAkDK,MAAM;;;;;;;GAcvC;AAGD;gBAzEiB,UAAU;gBACV,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;gBAC/B,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE;iBAC7C,OAAO,WAAW,CAAC;;;;;;;;uBAqDH,MAAM;;;;;;;GAiBS;yBAnF3B,aAAa;yCAHuB,0BAA0B;gCAE1C,0CAA0C;qCAD9B,uBAAuB;2BAAvB,uBAAuB;iCAAvB,uBAAuB;iCACnC,0CAA0C;4BAJtD,aAAa;0BACpB,cAAc;wCACqB,0BAA0B;yBAFtD,aAAa"}

package/src/examples/axelar-gmp.contract.js

@@ -1,11 +1,11 @@
-import { M } from '@endo/patterns';
-import { E } from '@endo/far';
 import { makeTracer } from '@agoric/internal';
+import { E } from '@endo/far';
+import { M, mustMatch } from '@endo/patterns';
 import { prepareChainHubAdmin } from '../exos/chain-hub-admin.js';
-import { withOrchestration } from '../utils/start-helper.js';
 import { registerChainsAndAssets } from '../utils/chain-hub-helper.js';
-import * as evmFlows from './axelar-gmp.flows.js';
+import { withOrchestration } from '../utils/start-helper.js';
 import { prepareEvmAccountKit } from './axelar-gmp-account-kit.js';
+import * as evmFlows from './axelar-gmp.flows.js';
 
 /**
  * @import {Remote, Vow} from '@agoric/vow';
@@ -77,7 +77,14 @@ export const contract = async (
     {
       createAndMonitorLCA() {
         return zcf.makeInvitation(
-          createAndMonitorLCA,
+          /**
+           * @param {ZCFSeat} seat
+           * @param {{ gasAmount: bigint }} offerArgs
+           */
+          (seat, offerArgs) => {
+            mustMatch(offerArgs, M.splitRecord({ gasAmount: M.bigint() }));
+            return createAndMonitorLCA(seat, offerArgs);
+          },
           'makeAccount',
           undefined,
         );

package/src/examples/axelar-gmp.flows.d.ts

@@ -4,7 +4,9 @@ export function createAndMonitorLCA(orch: Orchestrator, { makeEvmAccountKit, cha
     log: GuestOf<(msg: string) => Vow<void>>;
     localTransfer: GuestOf<(srcSeat: ZCFSeat, localAccount: LocalAccountMethods, amounts: AmountKeywordRecord) => Vow<void>>;
     withdrawToSeat: GuestOf<(localAccount: LocalAccountMethods, destSeat: ZCFSeat, amounts: AmountKeywordRecord) => Vow<void>>;
-}, seat: ZCFSeat): Promise<{
+}, seat: ZCFSeat, offerArgs: {
+    gasAmount: bigint;
+}): Promise<{
     invitationMakers: import("@endo/exo").Guarded<{
         makeEVMTransactionInvitation(method: any, args: any): Promise<globalThis.Invitation<string | void, undefined>>;
     }>;

package/src/examples/axelar-gmp.flows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"axelar-gmp.flows.d.ts","sourceRoot":"","sources":["axelar-gmp.flows.js"],"names":[],"mappings":"AAsDO,0CAtBI,YAAY,uEACZ;IACN,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,QAAQ,EAAE,eAAe,QAAQ,CAAC,CAAC;IACnC,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC;IACzC,aAAa,EAAE,QACnB,CACQ,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,mBAAmB,EACjC,OAAO,EAAE,mBAAmB,KACzB,IAAI,IAAI,CAAC,CACf,CAAC;IACF,cAAc,EAAE,QACpB,CACQ,YAAY,EAAE,mBAAmB,EACjC,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE,mBAAmB,KACzB,IAAI,IAAI,CAAC,CACf,CAAC;CACH,QACO,OAAO;;;;GAsGjB;kCAvIiD,uBAAuB;uCACrC,6BAA6B;8BACtC,6CAA6C;oCAH9B,oBAAoB;yBAIxC,aAAa;6BAJO,oBAAoB;6BAKf,aAAa;yCACtB,uBAAuB;yCADd,aAAa"}
+{"version":3,"file":"axelar-gmp.flows.d.ts","sourceRoot":"","sources":["axelar-gmp.flows.js"],"names":[],"mappings":"AAyDO,0CAzBI,YAAY,uEACZ;IACN,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,QAAQ,EAAE,eAAe,QAAQ,CAAC,CAAC;IACnC,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC;IACzC,aAAa,EAAE,QACnB,CACQ,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,mBAAmB,EACjC,OAAO,EAAE,mBAAmB,KACzB,IAAI,IAAI,CAAC,CACf,CAAC;IACF,cAAc,EAAE,QACpB,CACQ,YAAY,EAAE,mBAAmB,EACjC,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE,mBAAmB,KACzB,IAAI,IAAI,CAAC,CACf,CAAC;CACH,QACO,OAAO,aACP;IACN,SAAS,EAAE,MAAM,CAAC;CACnB;;;;GAuGH;kCA3IiD,uBAAuB;uCACrC,6BAA6B;8BACtC,6CAA6C;oCAH9B,oBAAoB;yBAIxC,aAAa;6BAJO,oBAAoB;6BAKf,aAAa;yCACtB,uBAAuB;yCADd,aAAa"}

package/src/examples/axelar-gmp.flows.js

@@ -9,11 +9,11 @@
  *   orchestration package.
  */
 
-import { Fail, makeError, q } from '@endo/errors';
 import { makeTracer, NonNullish } from '@agoric/internal';
-import { denomHash } from '../utils/denomHash.js';
-import { gmpAddresses } from '../utils/gmp.js';
+import { Fail, makeError, q } from '@endo/errors';
 import { AxelarGMPMessageType } from '../axelar-types.js';
+import { denomHash } from '../utils/denomHash.js';
+import { buildGasPayload, gmpAddresses } from '../utils/gmp.js';
 
 /**
  * @import {GuestInterface, GuestOf} from '@agoric/async-flow';
@@ -51,11 +51,15 @@ const trace = makeTracer('EvmFlow');
  *   >;
  * }} ctx
  * @param {ZCFSeat} seat
+ * @param {{
+ *   gasAmount: bigint;
+ * }} offerArgs
  */
 export const createAndMonitorLCA = async (
   orch,
   { makeEvmAccountKit, chainHub, log, localTransfer, withdrawToSeat },
   seat,
+  offerArgs,
 ) => {
   void log('Inside createAndMonitorLCA');
   const [agoric, remoteChain] = await Promise.all([
@@ -117,7 +121,7 @@ export const createAndMonitorLCA = async (
   const memo = {
     destination_chain: 'Ethereum',
     destination_address: factoryContractAddress,
-    payload: [],
+    payload: buildGasPayload(offerArgs.gasAmount),
     type: AxelarGMPMessageType.ContractCall,
     fee: {
       amount: '1', // TODO: Get fee amount from api

package/src/utils/gmp.d.ts

@@ -17,6 +17,7 @@ export const gmpAddresses: {
 };
 export function constructContractCall({ target, functionSignature, args }: ContractCall): AbiEncodedContractCall;
 export function buildGMPPayload(contractCalls: ContractCall[]): number[];
+export function buildGasPayload(gasAmount: bigint): number[];
 export namespace networkConfigs {
     namespace devnet {
         let label: string;

package/src/utils/gmp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gmp.d.ts","sourceRoot":"","sources":["gmp.js"],"names":[],"mappings":";;;;;AAoBA;;;;;;GAMG;AACH,2BANU;IACL,UAAU,EAAE,aAAa,CAAC;IAC1B,UAAU,EAAE,aAAa,CAAC;IAC1B,gBAAgB,EAAE,aAAa,CAAC;CACjC,CAOF;AAQK,2EAHI,YAAY,GACV,sBAAsB,CAoBlC;AAQM,+CAHI,YAAY,EAAE,GACZ,MAAM,EAAE,CAyBpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCA9E+B,uBAAuB;kCADA,oBAAoB;4CAApB,oBAAoB"}
+{"version":3,"file":"gmp.d.ts","sourceRoot":"","sources":["gmp.js"],"names":[],"mappings":";;;;;AAoBA;;;;;;GAMG;AACH,2BANU;IACL,UAAU,EAAE,aAAa,CAAC;IAC1B,UAAU,EAAE,aAAa,CAAC;IAC1B,gBAAgB,EAAE,aAAa,CAAC;CACjC,CAOF;AAQK,2EAHI,YAAY,GACV,sBAAsB,CAoBlC;AAQM,+CAHI,YAAY,EAAE,GACZ,MAAM,EAAE,CAyBpB;AAMM,2CAHI,MAAM,GACJ,MAAM,EAAE,CASpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCA3F+B,uBAAuB;kCADA,oBAAoB;4CAApB,oBAAoB"}

package/src/utils/gmp.js

@@ -62,7 +62,7 @@ export const constructContractCall = ({ target, functionSignature, args }) => {
  * Builds a GMP payload from an array of contract calls.
  *
  * @param {ContractCall[]} contractCalls - Array of contract call objects.
- * @returns {number[]} The GMP payload object.
+ * @returns {number[]} The GMP payload array.
  */
 export const buildGMPPayload = contractCalls => {
   const abiEncodedContractCalls = [];
@@ -89,6 +89,19 @@ export const buildGMPPayload = contractCalls => {
   return Array.from(hexToBytes(abiEncodedData));
 };
 
+/**
+ * @param {bigint} gasAmount - gas amount for the EVM to Agoric message
+ * @returns {number[]} The payload array.
+ */
+export const buildGasPayload = gasAmount => {
+  const abiEncodedData = encodeAbiParameters(
+    [{ type: 'uint256' }],
+    [gasAmount],
+  );
+
+  return Array.from(hexToBytes(abiEncodedData));
+};
+
 export const networkConfigs = {
   devnet: {
     label: 'Agoric Devnet',