Movement move (#1211)

* [contract manager] Implement WormholeAptosContract and integrate aptos cli with the manager

* Add getChainId for wormhole contracts

* Add movement contracts

* Simplify aptos cli

Author: m30m

contract_manager/src/chains.ts

@@ -1,4 +1,4 @@
-import { KeyValueConfig, PrivateKey, Storable } from "./base";
+import { KeyValueConfig, PrivateKey, Storable, TxResult } from "./base";
 import {
   ChainName,
   SetFee,
@@ -12,7 +12,7 @@ import {
   DataSource,
   EvmSetWormholeAddress,
 } from "xc_admin_common";
-import { AptosClient, AptosAccount, CoinClient } from "aptos";
+import { AptosClient, AptosAccount, CoinClient, TxnBuilderTypes } from "aptos";
 import Web3 from "web3";
 import {
   CosmwasmExecutor,
@@ -55,6 +55,10 @@ export abstract class Chain extends Storable {
       );
   }
 
+  public getWormholeChainId(): number {
+    return toChainId(this.wormholeChainName);
+  }
+
   getId(): string {
     return this.id;
   }
@@ -509,4 +513,22 @@ export class AptosChain extends Chain {
     const coinClient = new CoinClient(client);
     return Number(await coinClient.checkBalance(account)) / 10 ** 8;
   }
+
+  async sendTransaction(
+    senderPrivateKey: PrivateKey,
+    txPayload: TxnBuilderTypes.TransactionPayloadEntryFunction
+  ): Promise<TxResult> {
+    const client = this.getClient();
+    const sender = new AptosAccount(
+      new Uint8Array(Buffer.from(senderPrivateKey, "hex"))
+    );
+    const result = await client.generateSignSubmitWaitForTransaction(
+      sender,
+      txPayload,
+      {
+        maxGasAmount: BigInt(30000),
+      }
+    );
+    return { id: result.hash, info: result };
+  }
 }

contract_manager/src/contracts/aptos.ts

@@ -1,8 +1,74 @@
 import { Contract, PriceFeed, PrivateKey, TxResult } from "../base";
-import { ApiError, AptosAccount, BCS, TxnBuilderTypes } from "aptos";
+import { ApiError, BCS, CoinClient, TxnBuilderTypes } from "aptos";
 import { AptosChain, Chain } from "../chains";
 import { DataSource } from "xc_admin_common";
-import { CoinClient } from "aptos";
+import { WormholeContract } from "./wormhole";
+
+type WormholeState = {
+  chain_id: { number: string };
+  guardian_set_index: { number: string };
+  guardian_sets: { handle: string };
+};
+
+type GuardianSet = {
+  guardians: { address: { bytes: string } }[];
+  expiration_time: { number: string };
+  index: { number: string };
+};
+
+export class WormholeAptosContract extends WormholeContract {
+  constructor(public chain: AptosChain, public address: string) {
+    super();
+  }
+
+  async getState(): Promise<WormholeState> {
+    const client = this.chain.getClient();
+    const resources = await client.getAccountResources(this.address);
+    const type = "WormholeState";
+    for (const resource of resources) {
+      if (resource.type === `${this.address}::state::${type}`) {
+        return resource.data as WormholeState;
+      }
+    }
+    throw new Error(`${type} resource not found in account ${this.address}`);
+  }
+
+  async getCurrentGuardianSetIndex(): Promise<number> {
+    const data = await this.getState();
+    return Number(data.guardian_set_index.number);
+  }
+
+  async getChainId(): Promise<number> {
+    const data = await this.getState();
+    return Number(data.chain_id.number);
+  }
+
+  async getGuardianSet(): Promise<string[]> {
+    const data = await this.getState();
+    const client = this.chain.getClient();
+    const result = (await client.getTableItem(data.guardian_sets.handle, {
+      key_type: `u64`,
+      value_type: `${this.address}::structs::GuardianSet`,
+      key: data.guardian_set_index.number.toString(),
+    })) as GuardianSet;
+    return result.guardians.map((guardian) => guardian.address.bytes);
+  }
+
+  async upgradeGuardianSets(
+    senderPrivateKey: PrivateKey,
+    vaa: Buffer
+  ): Promise<TxResult> {
+    const txPayload = new TxnBuilderTypes.TransactionPayloadEntryFunction(
+      TxnBuilderTypes.EntryFunction.natural(
+        `${this.address}::guardian_set_upgrade`,
+        "submit_vaa_entry",
+        [],
+        [BCS.bcsSerializeBytes(vaa)]
+      )
+    );
+    return this.chain.sendTransaction(senderPrivateKey, txPayload);
+  }
+}
 
 export class AptosContract extends Contract {
   static type = "AptosContract";
@@ -45,25 +111,11 @@ export class AptosContract extends Contract {
         [BCS.bcsSerializeBytes(vaa)]
       )
     );
-    return this.sendTransaction(senderPrivateKey, txPayload);
+    return this.chain.sendTransaction(senderPrivateKey, txPayload);
   }
 
-  private async sendTransaction(
-    senderPrivateKey: PrivateKey,
-    txPayload: TxnBuilderTypes.TransactionPayloadEntryFunction
-  ): Promise<TxResult> {
-    const client = this.chain.getClient();
-    const sender = new AptosAccount(
-      new Uint8Array(Buffer.from(senderPrivateKey, "hex"))
-    );
-    const result = await client.generateSignSubmitWaitForTransaction(
-      sender,
-      txPayload,
-      {
-        maxGasAmount: BigInt(30000),
-      }
-    );
-    return { id: result.hash, info: result };
+  public getWormholeContract(): WormholeAptosContract {
+    return new WormholeAptosContract(this.chain, this.wormholeStateId);
   }
 
   async executeUpdatePriceFeed(
@@ -78,7 +130,7 @@ export class AptosContract extends Contract {
         [BCS.serializeVectorWithFunc(vaas, "serializeBytes")]
       )
     );
-    return this.sendTransaction(senderPrivateKey, txPayload);
+    return this.chain.sendTransaction(senderPrivateKey, txPayload);
   }
 
   getStateResources() {

contract_manager/src/contracts/cosmwasm.ts

@@ -54,6 +54,11 @@ export class WormholeCosmWasmContract extends WormholeContract {
     return JSON.parse(config["\x00\x06config"])["guardian_set_index"];
   }
 
+  async getChainId(): Promise<number> {
+    const config = await this.getConfig();
+    return JSON.parse(config["\x00\x06config"])["chain_id"];
+  }
+
   async getGuardianSet(): Promise<string[]> {
     const config = await this.getConfig();
     const guardianSetIndex = JSON.parse(config["\x00\x06config"])[

contract_manager/src/contracts/evm.ts

@@ -154,6 +154,19 @@ const WORMHOLE_ABI = [
     stateMutability: "view",
     type: "function",
   },
+  {
+    inputs: [],
+    name: "chainId",
+    outputs: [
+      {
+        internalType: "uint16",
+        name: "",
+        type: "uint16",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
   {
     inputs: [
       {
@@ -228,6 +241,11 @@ export class WormholeEvmContract extends WormholeContract {
     );
   }
 
+  async getChainId(): Promise<number> {
+    const wormholeContract = this.getContract();
+    return Number(await wormholeContract.methods.chainId().call());
+  }
+
   /**
    * Returns an array of guardian addresses used for VAA verification in this contract
    */

contract_manager/src/contracts/wormhole.ts

@@ -3,6 +3,12 @@ import { PrivateKey, TxResult } from "../base";
 export abstract class WormholeContract {
   abstract getCurrentGuardianSetIndex(): Promise<number>;
 
+  /**
+   * Returns the chain id set in this contract.
+   * This should match to the chain ids stored in this repo in the chains.ts file based on the network
+   */
+  abstract getChainId(): Promise<number>;
+
   /**
    * Returns an array of guardian addresses used for VAA verification in this contract
    */
@@ -31,7 +37,11 @@ export abstract class WormholeContract {
     const currentIndex = await this.getCurrentGuardianSetIndex();
     for (let i = currentIndex; i < MAINNET_UPGRADE_VAAS.length; i++) {
       const vaa = MAINNET_UPGRADE_VAAS[i];
-      await this.upgradeGuardianSets(senderPrivateKey, Buffer.from(vaa, "hex"));
+      const result = await this.upgradeGuardianSets(
+        senderPrivateKey,
+        Buffer.from(vaa, "hex")
+      );
+      console.log(`Submitted upgrade VAA ${i} with tx id ${result.id}`);
       // make sure the upgrade is complete before continuing
       while ((await this.getCurrentGuardianSetIndex()) <= i) {
         await new Promise((resolve) => setTimeout(resolve, 5000));

contract_manager/src/shell.ts

@@ -10,7 +10,7 @@ repl.evalCode(
     "import { SuiContract } from './src/contracts/sui';" +
     "import { WormholeCosmWasmContract, CosmWasmContract } from './src/contracts/cosmwasm';" +
     "import { WormholeEvmContract, EvmContract } from './src/contracts/evm';" +
-    "import { AptosContract } from './src/contracts/aptos';" +
+    "import { WormholeAptosContract, AptosContract } from './src/contracts/aptos';" +
     "import { DefaultStore } from './src/store';" +
     "import { toPrivateKey } from './src/base';" +
     "DefaultStore"

contract_manager/store/chains/AptosChains.yaml

@@ -8,3 +8,8 @@
   mainnet: true
   rpcUrl: https://fullnode.mainnet.aptoslabs.com/v1
   type: AptosChain
+- id: movement_move_devnet
+  wormholeChainName: movement_move_devnet
+  mainnet: false
+  rpcUrl: https://devnet.m1.movementlabs.xyz/v1
+  type: AptosChain

contract_manager/store/chains/EvmChains.yaml

@@ -388,3 +388,8 @@
   rpcUrl: https://sepolia.base.org
   networkId: 84532
   type: EvmChain
+- id: movement_evm_devnet
+  mainnet: false
+  rpcUrl: https://mevm.devnet.m1.movementlabs.xyz/v1
+  networkId: 336
+  type: EvmChain

contract_manager/store/contracts/AptosContracts.yaml

@@ -6,3 +6,7 @@
   stateId: "0x7e783b349d3e89cf5931af376ebeadbfab855b3fa239b7ada8f5a92fbea6b387"
   wormholeStateId: "0x5bc11445584a763c1fa7ed39081f1b920954da14e04b32440cba863d03e19625"
   type: AptosContract
+- chain: movement_move_devnet
+  stateId: "0x9357e76fe965c9956a76181ee49f66d51b7f9c3800182a944ed96be86301e49f"
+  wormholeStateId: "0x9236893d6444b208b7e0b3e8d4be4ace90b6d17817ab7d1584e46a33ef5c50c9"
+  type: AptosContract

contract_manager/store/contracts/EvmContracts.yaml

@@ -232,3 +232,6 @@
 - chain: base_sepolia
   address: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729"
   type: EvmContract
+- chain: movement_evm_devnet
+  address: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729"
+  type: EvmContract