@agoric/orchestration 0.1.1-dev-25249e1.0.25249e1 → 0.1.1-dev-a88dd7f.0.a88dd7f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-25249e1.0.25249e1",
+  "version": "0.1.1-dev-a88dd7f.0.a88dd7f",
   "description": "Chain abstraction for Agoric's orchestration clients",
   "type": "module",
   "main": "index.js",
@@ -35,19 +35,19 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/async-flow": "0.1.1-dev-25249e1.0.25249e1",
-    "@agoric/cosmic-proto": "0.4.1-dev-25249e1.0.25249e1",
-    "@agoric/ertp": "0.16.3-dev-25249e1.0.25249e1",
-    "@agoric/internal": "0.3.3-dev-25249e1.0.25249e1",
-    "@agoric/network": "0.1.1-dev-25249e1.0.25249e1",
-    "@agoric/notifier": "0.6.3-dev-25249e1.0.25249e1",
-    "@agoric/store": "0.9.3-dev-25249e1.0.25249e1",
-    "@agoric/time": "0.3.3-dev-25249e1.0.25249e1",
-    "@agoric/vat-data": "0.5.3-dev-25249e1.0.25249e1",
-    "@agoric/vats": "0.15.2-dev-25249e1.0.25249e1",
-    "@agoric/vow": "0.1.1-dev-25249e1.0.25249e1",
-    "@agoric/zoe": "0.26.3-dev-25249e1.0.25249e1",
-    "@agoric/zone": "0.2.3-dev-25249e1.0.25249e1",
+    "@agoric/async-flow": "0.1.1-dev-a88dd7f.0.a88dd7f",
+    "@agoric/cosmic-proto": "0.4.1-dev-a88dd7f.0.a88dd7f",
+    "@agoric/ertp": "0.16.3-dev-a88dd7f.0.a88dd7f",
+    "@agoric/internal": "0.3.3-dev-a88dd7f.0.a88dd7f",
+    "@agoric/network": "0.1.1-dev-a88dd7f.0.a88dd7f",
+    "@agoric/notifier": "0.6.3-dev-a88dd7f.0.a88dd7f",
+    "@agoric/store": "0.9.3-dev-a88dd7f.0.a88dd7f",
+    "@agoric/time": "0.3.3-dev-a88dd7f.0.a88dd7f",
+    "@agoric/vat-data": "0.5.3-dev-a88dd7f.0.a88dd7f",
+    "@agoric/vats": "0.15.2-dev-a88dd7f.0.a88dd7f",
+    "@agoric/vow": "0.1.1-dev-a88dd7f.0.a88dd7f",
+    "@agoric/zoe": "0.26.3-dev-a88dd7f.0.a88dd7f",
+    "@agoric/zone": "0.2.3-dev-a88dd7f.0.a88dd7f",
     "@cosmjs/encoding": "^0.36.0",
     "@endo/base64": "^1.0.12",
     "@endo/errors": "^1.2.13",
@@ -60,7 +60,7 @@
     "bs58": "^6.0.0"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-25249e1.0.25249e1",
+    "@agoric/swingset-liveslots": "0.10.3-dev-a88dd7f.0.a88dd7f",
     "@chain-registry/client": "^1.53.194",
     "@cosmjs/amino": "^0.36.0",
     "@cosmjs/proto-signing": "^0.36.0",
@@ -105,5 +105,5 @@
   "typeCoverage": {
     "atLeast": 97.63
   },
-  "gitHead": "25249e14aa1e01799bfe4f0abe13c7a9a1a29a1c"
+  "gitHead": "a88dd7fc0ccfa5ab8c6ed52fd2cde35261ddda1c"
 }

package/src/axelar-types.d.ts

@@ -36,6 +36,7 @@ export type ContractCall = {
     target: `0x${string}`;
     functionSignature: string;
     args: unknown[];
+    abi?: Abi | undefined;
 };
 export type AbiEncodedContractCall = {
     target: `0x${string}`;
@@ -47,5 +48,6 @@ import type { OrchestrationAccount } from '@agoric/orchestration';
 import type { CosmosChainAddress } from '@agoric/orchestration';
 import type { IBCChannelID } from '@agoric/vats';
 import type { Denom } from '@agoric/orchestration';
+import type { Abi } from 'viem';
 import type { EVM_CHAINS } from './utils/gmp.js';
 //# sourceMappingURL=axelar-types.d.ts.map

package/src/axelar-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"axelar-types.d.ts","sourceRoot":"","sources":["axelar-types.js"],"names":[],"mappings":";;;;;6BAwBa,CAAC,OAAO,oBAAoB,EAAE,MAAM,OAAO,oBAAoB,CAAC;;kBAK/D,MAAM;oBACN,MAAM;aACN,MAAM;UACN,cAAc;;;YAKd,MAAM;eACN,aAAa;;;uBAKb,MAAM;yBACN,MAAM;aACN,MAAM,EAAE,GAAG,IAAI;UACf,cAAc;;;;kBAMd,qBAAqB;QAAE,OAAO,EAAE,QAAQ,CAAA;KAAE,CAAC;uBAC3C,kBAAkB;mBAClB,YAAY;gBACZ,KAAK;YACL,GAAG;qBACH,GAAG;WACH,MAAM;;;YAKN,KAAK,MAAM,EAAE;uBACb,MAAM;UACN,OAAO,EAAE;;;YAKT,KAAK,MAAM,EAAE;UACb,KAAK,MAAM,EAAE;;iCAId,MAAa,iBAAU;mCAvEV,uBAAuB;0CAAvB,uBAAuB;wCAAvB,uBAAuB;kCAClB,cAAc;2BADnB,uBAAuB;gCAEpB,gBAAgB"}
+{"version":3,"file":"axelar-types.d.ts","sourceRoot":"","sources":["axelar-types.js"],"names":[],"mappings":";;;;;6BAyBa,CAAC,OAAO,oBAAoB,EAAE,MAAM,OAAO,oBAAoB,CAAC;;kBAK/D,MAAM;oBACN,MAAM;aACN,MAAM;UACN,cAAc;;;YAKd,MAAM;eACN,aAAa;;;uBAKb,MAAM;yBACN,MAAM;aACN,MAAM,EAAE,GAAG,IAAI;UACf,cAAc;;;;kBAMd,qBAAqB;QAAE,OAAO,EAAE,QAAQ,CAAA;KAAE,CAAC;uBAC3C,kBAAkB;mBAClB,YAAY;gBACZ,KAAK;YACL,GAAG;qBACH,GAAG;WACH,MAAM;;;YAKN,KAAK,MAAM,EAAE;uBACb,MAAM;UACN,OAAO,EAAE;;;;YAMT,KAAK,MAAM,EAAE;UACb,KAAK,MAAM,EAAE;;iCAId,MAAa,iBAAU;mCAzEV,uBAAuB;0CAAvB,uBAAuB;wCAAvB,uBAAuB;kCAClB,cAAc;2BADnB,uBAAuB;yBAG3B,MAAM;gCADC,gBAAgB"}

package/src/axelar-types.js

@@ -5,6 +5,7 @@
  *   Bech32Address,} from '@agoric/orchestration';
  * @import {IBCChannelID} from '@agoric/vats';
  * @import {EVM_CHAINS} from './utils/gmp.js';
+ * @import {Abi} from 'viem';
  */
 
 // NOTE: The following 3 types are also documented in README.md located at:
@@ -64,6 +65,7 @@ harden(AxelarGMPMessageType);
  * @property {`0x${string}`} target
  * @property {string} functionSignature
  * @property {unknown[]} args
+ * @property {Abi} [abi]
  */
 
 /**

package/src/utils/address.d.ts

@@ -3,6 +3,7 @@ export const DEFAULT_ICQ_VERSION: "icq-1";
 export function makeICQChannelAddress(controllerConnectionId: IBCConnectionID, version?: string): RemoteIbcAddress;
 export function findAddressField(remoteAddressString: RemoteIbcAddress): CosmosChainAddress["value"] | undefined;
 export function getBech32Prefix(address: Bech32Address | string): string;
+export function sameEvmAddress(a: EvmAddress, b: EvmAddress): boolean;
 export function coerceAccountId(idArg: AccountIdArg): AccountId;
 export function parseAccountIdArg(idArg: AccountIdArg): Caip10Record;
 export function parseAccountId(accountId: AccountId): Caip10Record;
@@ -35,6 +36,7 @@ import type { IBCConnectionID } from '@agoric/vats';
 import type { RemoteIbcAddress } from '@agoric/vats/tools/ibc-utils.js';
 import type { CosmosChainAddress } from '../types.js';
 import type { Bech32Address } from '../types.js';
+import type { Address as EvmAddress } from 'viem';
 import type { AccountIdArg } from '../orchestration-api.js';
 import type { AccountId } from '../orchestration-api.js';
 import type { Caip10Record } from '../orchestration-api.js';

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

@@ -1 +1 @@
-{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["address.js"],"names":[],"mappings":"AA4BO,wDALI,eAAe,0BACf,eAAe,6CACf,qBAAqB,GACnB,gBAAgB,CA4B5B;AAGD,kCAAmC,OAAO,CAAC;AAOpC,8DAJI,eAAe,YACf,MAAM,GACJ,gBAAgB,CAa5B;AAaM,sDAJI,gBAAgB,GAEd,kBAAkB,CAAC,OAAO,CAAC,GAAG,SAAS,CAYnD;AAaM,yCAHI,aAAa,GAAG,MAAM,GACpB,MAAM,CAQlB;AAWM,uCAJI,YAAY,GAEV,SAAS,CAQrB;AAUM,yCAJI,YAAY,GAEV,YAAY,CAaxB;AASM,0CAHI,SAAS,GACP,YAAY,CAaxB;AAUM,6CAJI,YAAY,GAEV,WAAW,CAKvB;AASM,yCAJI,MAAM,GACJ,OAAO,CAkBnB;AAUM,6CAHI,MAAM,GACJ,QAAQ,OAAO,IAAI,aAAa,CAM5C;AAUM,uDAFI,MAAM,+BAOhB;AAWM,8CAJI,SAAS,GACP,UAAU,CAatB;;;;;;;;;;;;;;;;;;;;;qCAhQiC,cAAc;sCAGb,iCAAiC;wCAFH,aAAa;mCAAb,aAAa;kCACtB,yBAAyB;+BAAzB,yBAAyB;kCAAzB,yBAAyB;iCADhB,aAAa"}
+{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["address.js"],"names":[],"mappings":"AA6BO,wDALI,eAAe,0BACf,eAAe,6CACf,qBAAqB,GACnB,gBAAgB,CA4B5B;AAGD,kCAAmC,OAAO,CAAC;AAOpC,8DAJI,eAAe,YACf,MAAM,GACJ,gBAAgB,CAa5B;AAaM,sDAJI,gBAAgB,GAEd,kBAAkB,CAAC,OAAO,CAAC,GAAG,SAAS,CAYnD;AAaM,yCAHI,aAAa,GAAG,MAAM,GACpB,MAAM,CAQlB;AASM,kCAJI,UAAU,KACV,UAAU,GACR,OAAO,CAEuD;AAYpE,uCAJI,YAAY,GAEV,SAAS,CAQrB;AAUM,yCAJI,YAAY,GAEV,YAAY,CAaxB;AASM,0CAHI,SAAS,GACP,YAAY,CAaxB;AAUM,6CAJI,YAAY,GAEV,WAAW,CAKvB;AASM,yCAJI,MAAM,GACJ,OAAO,CAkBnB;AAUM,6CAHI,MAAM,GACJ,QAAQ,OAAO,IAAI,aAAa,CAM5C;AAUM,uDAFI,MAAM,+BAOhB;AAWM,8CAJI,SAAS,GACP,UAAU,CAatB;;;;;;;;;;;;;;;;;;;;;qCA3QiC,cAAc;sCAIb,iCAAiC;wCAFH,aAAa;mCAAb,aAAa;2CADtC,MAAM;kCAEU,yBAAyB;+BAAzB,yBAAyB;kCAAzB,yBAAyB;iCADhB,aAAa"}

package/src/utils/address.js

@@ -5,6 +5,7 @@ import bs58 from 'bs58';
 
 /**
  * @import {IBCConnectionID} from '@agoric/vats';
+ * @import {Address as EvmAddress} from 'viem';
  * @import {Bech32Address, CosmosChainAddress, CaipChainId} from '../types.js';
  * @import {AccountId, AccountIdArg, Caip10Record} from '../orchestration-api.js';
  * @import {RemoteIbcAddress} from '@agoric/vats/tools/ibc-utils.js';
@@ -117,6 +118,16 @@ export const getBech32Prefix = address => {
   return address.slice(0, split);
 };
 
+/**
+ * Compare two EVM addresses for equality, case-insensitive.
+ *
+ * @param {EvmAddress} a
+ * @param {EvmAddress} b
+ * @returns {boolean}
+ */
+export const sameEvmAddress = (a, b) => a.toLowerCase() === b.toLowerCase();
+harden(sameEvmAddress);
+
 /**
  * Coerce an AccountIdArg into a plain AccountId. The latter is now preferred so
  * this utility can be used to adapt legacy calls, in particular from vows

package/src/utils/gmp.d.ts

@@ -15,7 +15,7 @@ export const gmpAddresses: {
     AXELAR_GAS: Bech32Address;
     OSMOSIS_RECEIVER: Bech32Address;
 };
-export function constructContractCall({ target, functionSignature, args }: ContractCall): AbiEncodedContractCall;
+export function constructContractCall({ target, functionSignature, args, abi, }: ContractCall): AbiEncodedContractCall;
 export function buildGMPPayload(contractCalls: ContractCall[], id?: string): number[];
 export function buildNoncePayload(nonce: bigint): number[];
 export function buildGasPayload(gasAmount: bigint): number[];

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;AASM,+CAJI,YAAY,EAAE,OACd,MAAM,GACJ,MAAM,EAAE,CAiCpB;AAMM,yCAHI,MAAM,GACJ,MAAM,EAAE,CAMpB;AAMM,2CAHI,MAAM,GACJ,MAAM,EAAE,CASpB;;;;;;mCA9G+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,iFAHI,YAAY,GACV,sBAAsB,CA0BlC;AASM,+CAJI,YAAY,EAAE,OACd,MAAM,GACJ,MAAM,EAAE,CAkCpB;AAMM,yCAHI,MAAM,GACJ,MAAM,EAAE,CAMpB;AAMM,2CAHI,MAAM,GACJ,MAAM,EAAE,CASpB;;;;;;mCArH+B,uBAAuB;kCADA,oBAAoB;4CAApB,oBAAoB"}

package/src/utils/gmp.js

@@ -38,20 +38,26 @@ export const gmpAddresses = {
  * @param {ContractCall} data - The data for the contract call.
  * @returns {AbiEncodedContractCall} The encoded contract call object.
  */
-export const constructContractCall = ({ target, functionSignature, args }) => {
+export const constructContractCall = ({
+  target,
+  functionSignature,
+  args,
+  abi,
+}) => {
   const [name, paramsRaw] = functionSignature.split('(');
   const params = paramsRaw.replace(')', '').split(',').filter(Boolean);
+  const resolvedAbi = abi ?? [
+    {
+      type: 'function',
+      name,
+      inputs: params.map((type, i) => ({ type, name: `arg${i}` })),
+    },
+  ];
 
   return {
     target,
     data: encodeFunctionData({
-      abi: [
-        {
-          type: 'function',
-          name,
-          inputs: params.map((type, i) => ({ type, name: `arg${i}` })),
-        },
-      ],
+      abi: resolvedAbi,
       functionName: name,
       args,
     }),
@@ -68,9 +74,10 @@ export const constructContractCall = ({ target, functionSignature, args }) => {
 export const buildGMPPayload = (contractCalls, id = '') => {
   const abiEncodedContractCalls = [];
   for (const call of contractCalls) {
-    const { target, functionSignature, args } = call;
+    const { target, functionSignature, args, abi } = call;
+
     abiEncodedContractCalls.push(
-      constructContractCall({ target, functionSignature, args }),
+      constructContractCall({ target, functionSignature, args, abi }),
     );
   }