Merge pull request #156 from Dstack-TEE/fix-phala-cloud-integration

fix deploy scripts

Author: Leechael

gateway/tapp/.gitignore gateway/dstack-app/.gitignoregateway/tapp/.gitignore renamed to gateway/dstack-app/.gitignore

@@ -15,7 +15,7 @@ else
 # Please uncomment and set values for the following variables:
 
 # The URL of the dstack-vmm RPC service
-# VMM_=unix:../../../build/vmm.sock
+# VMM_RPC=unix:../../../build/vmm.sock
 
 # Cloudflare API token for DNS challenge
 # CF_API_TOKEN=your_cloudflare_api_token
@@ -72,7 +72,7 @@ required_env_vars=(
   "WG_ADDR"
   "GATEWAY_APP_ID"
   "MY_URL"
-  "BOOTNODE_URL"
+  # "BOOTNODE_URL"
 )
 
 # Validate required environment variables

gateway/tapp/deploy-to-vmm.sh gateway/dstack-app/deploy-to-vmm.shgateway/tapp/deploy-to-vmm.sh renamed to gateway/dstack-app/deploy-to-vmm.sh

@@ -53,6 +53,7 @@ if [[ ! "$SUBNET_INDEX" =~ ^[0-9]+$ ]] || [ "$SUBNET_INDEX" -lt 0 ] || [ "$SUBNE
     exit 1
 fi
 
+SYNC_ENABLED=$([ -z "$BOOTNODE_URL" ] && echo "false" || echo "true")
 # The IP address of this dstack-gateway node
 IP="10.4.0.$((SUBNET_INDEX + 1))/16"
 # Reserving 5 bits(32 IPs) for server use
@@ -63,6 +64,7 @@ CLIENT_RANGE="10.4.$((SUBNET_INDEX * 16)).0/20"
 echo "IP: $IP"
 echo "RESERVED_NET: $RESERVED_NET"
 echo "CLIENT_RANGE: $CLIENT_RANGE"
+echo "SYNC_ENABLED: $SYNC_ENABLED"
 
 # Create gateway.toml configuration
 cat >$CONFIG_PATH <<EOF
@@ -86,7 +88,7 @@ rpc_domain = "gateway.$SRV_DOMAIN"
 run_in_dstack = true
 
 [core.sync]
-enabled = true
+enabled = $SYNC_ENABLED
 interval = "30s"
 my_url = "$MY_URL"
 bootnode = "$BOOTNODE_URL"

gateway/tapp/docker-compose.yaml gateway/dstack-app/docker-compose.yamlgateway/tapp/docker-compose.yaml renamed to gateway/dstack-app/docker-compose.yaml

@@ -54,4 +54,8 @@ export class EthereumBackend {
       gatewayAppId,
     }
   }
+
+  async getGatewayAppId(): Promise<string> {
+    return await this.kmsAuth.gatewayAppId();
+  }
 }

gateway/tapp/entrypoint.sh gateway/dstack-app/entrypoint.shgateway/tapp/entrypoint.sh renamed to gateway/dstack-app/entrypoint.sh

@@ -46,6 +46,14 @@ export async function build(): Promise<FastifyInstance> {
   const provider = new ethers.JsonRpcProvider(rpcUrl);
   server.decorate('ethereum', new EthereumBackend(provider, kmsContractAddr));
 
+  server.get('/', async (request, reply) => {
+    return {
+      status: 'ok',
+      kmsContractAddr: kmsContractAddr,
+      gatewayAppId: await server.ethereum.getGatewayAppId(),
+    };
+  });
+
   // Define routes
   server.post<{
     Body: BootInfo;
@@ -61,6 +69,7 @@ export async function build(): Promise<FastifyInstance> {
     try {
       return await server.ethereum.checkBoot(request.body, false);
     } catch (error) {
+      console.error(error);
       reply.code(200).send({
         isAllowed: false,
         gatewayAppId: '',
@@ -83,6 +92,7 @@ export async function build(): Promise<FastifyInstance> {
     try {
       return await server.ethereum.checkBoot(request.body, true);
     } catch (error) {
+      console.error(error);
       reply.code(200).send({
         isAllowed: false,
         gatewayAppId: '',

kms/auth-eth/src/ethereum.ts

@@ -86,6 +86,7 @@ export interface KmsAuthInterface extends Interface {
       | "appAllowedImages"
       | "appAllowedSystemMrs"
       | "apps"
+      | "gatewayAppId"
       | "initialize"
       | "isAppAllowed"
       | "isKmsAllowed"
@@ -102,11 +103,10 @@ export interface KmsAuthInterface extends Interface {
       | "removeKmsAggregatedMr"
       | "removeKmsDevice"
       | "renounceOwnership"
+      | "setGatewayAppId"
       | "setKmsEventlog"
       | "setKmsInfo"
       | "setKmsQuote"
-      | "setTproxyAppId"
-      | "tproxyAppId"
       | "transferOwnership"
       | "upgradeToAndCall"
   ): FunctionFragment;
@@ -118,14 +118,14 @@ export interface KmsAuthInterface extends Interface {
       | "AppRegistered"
       | "AppSystemMrAdded"
       | "AppSystemMrRemoved"
+      | "GatewayAppIdSet"
       | "Initialized"
       | "KmsAggregatedMrAdded"
       | "KmsAggregatedMrRemoved"
       | "KmsDeviceAdded"
       | "KmsDeviceRemoved"
       | "KmsInfoSet"
       | "OwnershipTransferred"
-      | "TproxyAppIdSet"
       | "Upgraded"
   ): EventFragment;
 
@@ -158,6 +158,10 @@ export interface KmsAuthInterface extends Interface {
     values: [BytesLike]
   ): string;
   encodeFunctionData(functionFragment: "apps", values: [AddressLike]): string;
+  encodeFunctionData(
+    functionFragment: "gatewayAppId",
+    values?: undefined
+  ): string;
   encodeFunctionData(
     functionFragment: "initialize",
     values: [AddressLike]
@@ -213,6 +217,10 @@ export interface KmsAuthInterface extends Interface {
     functionFragment: "renounceOwnership",
     values?: undefined
   ): string;
+  encodeFunctionData(
+    functionFragment: "setGatewayAppId",
+    values: [string]
+  ): string;
   encodeFunctionData(
     functionFragment: "setKmsEventlog",
     values: [BytesLike]
@@ -225,14 +233,6 @@ export interface KmsAuthInterface extends Interface {
     functionFragment: "setKmsQuote",
     values: [BytesLike]
   ): string;
-  encodeFunctionData(
-    functionFragment: "setTproxyAppId",
-    values: [string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "tproxyAppId",
-    values?: undefined
-  ): string;
   encodeFunctionData(
     functionFragment: "transferOwnership",
     values: [AddressLike]
@@ -271,6 +271,10 @@ export interface KmsAuthInterface extends Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "apps", data: BytesLike): Result;
+  decodeFunctionResult(
+    functionFragment: "gatewayAppId",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "isAppAllowed",
@@ -324,20 +328,16 @@ export interface KmsAuthInterface extends Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "setKmsEventlog",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "setKmsInfo", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "setKmsQuote",
+    functionFragment: "setGatewayAppId",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "setTproxyAppId",
+    functionFragment: "setKmsEventlog",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(functionFragment: "setKmsInfo", data: BytesLike): Result;
   decodeFunctionResult(
-    functionFragment: "tproxyAppId",
+    functionFragment: "setKmsQuote",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
@@ -410,6 +410,18 @@ export namespace AppSystemMrRemovedEvent {
   export type LogDescription = TypedLogDescription<Event>;
 }
 
+export namespace GatewayAppIdSetEvent {
+  export type InputTuple = [gatewayAppId: string];
+  export type OutputTuple = [gatewayAppId: string];
+  export interface OutputObject {
+    gatewayAppId: string;
+  }
+  export type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
+  export type Filter = TypedDeferredTopicFilter<Event>;
+  export type Log = TypedEventLog<Event>;
+  export type LogDescription = TypedLogDescription<Event>;
+}
+
 export namespace InitializedEvent {
   export type InputTuple = [version: BigNumberish];
   export type OutputTuple = [version: bigint];
@@ -495,18 +507,6 @@ export namespace OwnershipTransferredEvent {
   export type LogDescription = TypedLogDescription<Event>;
 }
 
-export namespace TproxyAppIdSetEvent {
-  export type InputTuple = [tproxyAppId: string];
-  export type OutputTuple = [tproxyAppId: string];
-  export interface OutputObject {
-    tproxyAppId: string;
-  }
-  export type Event = TypedContractEvent<InputTuple, OutputTuple, OutputObject>;
-  export type Filter = TypedDeferredTopicFilter<Event>;
-  export type Log = TypedEventLog<Event>;
-  export type LogDescription = TypedLogDescription<Event>;
-}
-
 export namespace UpgradedEvent {
   export type InputTuple = [implementation: AddressLike];
   export type OutputTuple = [implementation: string];
@@ -602,6 +602,8 @@ export interface KmsAuth extends BaseContract {
     "view"
   >;
 
+  gatewayAppId: TypedContractMethod<[], [string], "view">;
+
   initialize: TypedContractMethod<
     [initialOwner: AddressLike],
     [void],
@@ -685,6 +687,8 @@ export interface KmsAuth extends BaseContract {
 
   renounceOwnership: TypedContractMethod<[], [void], "nonpayable">;
 
+  setGatewayAppId: TypedContractMethod<[appId: string], [void], "nonpayable">;
+
   setKmsEventlog: TypedContractMethod<
     [eventlog: BytesLike],
     [void],
@@ -699,10 +703,6 @@ export interface KmsAuth extends BaseContract {
 
   setKmsQuote: TypedContractMethod<[quote: BytesLike], [void], "nonpayable">;
 
-  setTproxyAppId: TypedContractMethod<[appId: string], [void], "nonpayable">;
-
-  tproxyAppId: TypedContractMethod<[], [string], "view">;
-
   transferOwnership: TypedContractMethod<
     [newOwner: AddressLike],
     [void],
@@ -747,6 +747,9 @@ export interface KmsAuth extends BaseContract {
     [[boolean, string] & { isRegistered: boolean; controller: string }],
     "view"
   >;
+  getFunction(
+    nameOrSignature: "gatewayAppId"
+  ): TypedContractMethod<[], [string], "view">;
   getFunction(
     nameOrSignature: "initialize"
   ): TypedContractMethod<[initialOwner: AddressLike], [void], "nonpayable">;
@@ -814,6 +817,9 @@ export interface KmsAuth extends BaseContract {
   getFunction(
     nameOrSignature: "renounceOwnership"
   ): TypedContractMethod<[], [void], "nonpayable">;
+  getFunction(
+    nameOrSignature: "setGatewayAppId"
+  ): TypedContractMethod<[appId: string], [void], "nonpayable">;
   getFunction(
     nameOrSignature: "setKmsEventlog"
   ): TypedContractMethod<[eventlog: BytesLike], [void], "nonpayable">;
@@ -823,12 +829,6 @@ export interface KmsAuth extends BaseContract {
   getFunction(
     nameOrSignature: "setKmsQuote"
   ): TypedContractMethod<[quote: BytesLike], [void], "nonpayable">;
-  getFunction(
-    nameOrSignature: "setTproxyAppId"
-  ): TypedContractMethod<[appId: string], [void], "nonpayable">;
-  getFunction(
-    nameOrSignature: "tproxyAppId"
-  ): TypedContractMethod<[], [string], "view">;
   getFunction(
     nameOrSignature: "transferOwnership"
   ): TypedContractMethod<[newOwner: AddressLike], [void], "nonpayable">;
@@ -875,6 +875,13 @@ export interface KmsAuth extends BaseContract {
     AppSystemMrRemovedEvent.OutputTuple,
     AppSystemMrRemovedEvent.OutputObject
   >;
+  getEvent(
+    key: "GatewayAppIdSet"
+  ): TypedContractEvent<
+    GatewayAppIdSetEvent.InputTuple,
+    GatewayAppIdSetEvent.OutputTuple,
+    GatewayAppIdSetEvent.OutputObject
+  >;
   getEvent(
     key: "Initialized"
   ): TypedContractEvent<
@@ -924,13 +931,6 @@ export interface KmsAuth extends BaseContract {
     OwnershipTransferredEvent.OutputTuple,
     OwnershipTransferredEvent.OutputObject
   >;
-  getEvent(
-    key: "TproxyAppIdSet"
-  ): TypedContractEvent<
-    TproxyAppIdSetEvent.InputTuple,
-    TproxyAppIdSetEvent.OutputTuple,
-    TproxyAppIdSetEvent.OutputObject
-  >;
   getEvent(
     key: "Upgraded"
   ): TypedContractEvent<
@@ -995,6 +995,17 @@ export interface KmsAuth extends BaseContract {
       AppSystemMrRemovedEvent.OutputObject
     >;
 
+    "GatewayAppIdSet(string)": TypedContractEvent<
+      GatewayAppIdSetEvent.InputTuple,
+      GatewayAppIdSetEvent.OutputTuple,
+      GatewayAppIdSetEvent.OutputObject
+    >;
+    GatewayAppIdSet: TypedContractEvent<
+      GatewayAppIdSetEvent.InputTuple,
+      GatewayAppIdSetEvent.OutputTuple,
+      GatewayAppIdSetEvent.OutputObject
+    >;
+
     "Initialized(uint64)": TypedContractEvent<
       InitializedEvent.InputTuple,
       InitializedEvent.OutputTuple,
@@ -1072,17 +1083,6 @@ export interface KmsAuth extends BaseContract {
       OwnershipTransferredEvent.OutputObject
     >;
 
-    "TproxyAppIdSet(string)": TypedContractEvent<
-      TproxyAppIdSetEvent.InputTuple,
-      TproxyAppIdSetEvent.OutputTuple,
-      TproxyAppIdSetEvent.OutputObject
-    >;
-    TproxyAppIdSet: TypedContractEvent<
-      TproxyAppIdSetEvent.InputTuple,
-      TproxyAppIdSetEvent.OutputTuple,
-      TproxyAppIdSetEvent.OutputObject
-    >;
-
     "Upgraded(address)": TypedContractEvent<
       UpgradedEvent.InputTuple,
       UpgradedEvent.OutputTuple,