@gnolang/gnonative 4.0.0 → 4.1.0

package/ios/Frameworks/GnoCore.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>GnoCore.framework/Versions/A/GnoCore</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>GnoCore.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>GnoCore.framework/Versions/A/GnoCore</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>GnoCore.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/Frameworks/GnoCore.xcframework/ios-arm64/GnoCore.framework/Headers/GnoGnonative.objc.h

@@ -44,12 +44,6 @@
 - (long)getTcpPort;
 - (NSString* _Nonnull)getUDSPath;
 - (void)invokeGrpcMethodWithPromiseBlock:(id<GnoGnonativePromiseBlock> _Nullable)promise method:(NSString* _Nullable)method jsonMessage:(NSString* _Nullable)jsonMessage;
-/**
- * Start the Gnokey Mobile service and save it in gnokeyMobileService. This will be closed in Close().
-If the gnonative serviceServer is not started, do nothing.
-If gnokeyMobileService is already started, do nothing.
- */
-- (BOOL)startGnokeyMobileService:(NSError* _Nullable* _Nullable)error;
 - (void)streamClientReceiveWithPromiseBlock:(id<GnoGnonativePromiseBlock> _Nullable)promise id_:(NSString* _Nullable)id_;
 @end
 
@@ -63,7 +57,6 @@ If gnokeyMobileService is already started, do nothing.
 @property (nonatomic) NSString* _Nonnull tmpDir;
 @property (nonatomic) BOOL useTcpListener;
 @property (nonatomic) BOOL disableUdsListener;
-@property (nonatomic) BOOL useGnokeyMobile;
 @end
 
 FOUNDATION_EXPORT GnoGnonativeBridge* _Nullable GnoGnonativeNewBridge(GnoGnonativeBridgeConfig* _Nullable config, NSError* _Nullable* _Nullable error);

package/ios/Frameworks/GnoCore.xcframework/ios-arm64/GnoCore.framework/Versions/A/Headers/GnoGnonative.objc.h

@@ -44,12 +44,6 @@
 - (long)getTcpPort;
 - (NSString* _Nonnull)getUDSPath;
 - (void)invokeGrpcMethodWithPromiseBlock:(id<GnoGnonativePromiseBlock> _Nullable)promise method:(NSString* _Nullable)method jsonMessage:(NSString* _Nullable)jsonMessage;
-/**
- * Start the Gnokey Mobile service and save it in gnokeyMobileService. This will be closed in Close().
-If the gnonative serviceServer is not started, do nothing.
-If gnokeyMobileService is already started, do nothing.
- */
-- (BOOL)startGnokeyMobileService:(NSError* _Nullable* _Nullable)error;
 - (void)streamClientReceiveWithPromiseBlock:(id<GnoGnonativePromiseBlock> _Nullable)promise id_:(NSString* _Nullable)id_;
 @end
 
@@ -63,7 +57,6 @@ If gnokeyMobileService is already started, do nothing.
 @property (nonatomic) NSString* _Nonnull tmpDir;
 @property (nonatomic) BOOL useTcpListener;
 @property (nonatomic) BOOL disableUdsListener;
-@property (nonatomic) BOOL useGnokeyMobile;
 @end
 
 FOUNDATION_EXPORT GnoGnonativeBridge* _Nullable GnoGnonativeNewBridge(GnoGnonativeBridgeConfig* _Nullable config, NSError* _Nullable* _Nullable error);

package/ios/Frameworks/GnoCore.xcframework/ios-arm64/GnoCore.framework/Versions/Current/Headers/GnoGnonative.objc.h

@@ -44,12 +44,6 @@
 - (long)getTcpPort;
 - (NSString* _Nonnull)getUDSPath;
 - (void)invokeGrpcMethodWithPromiseBlock:(id<GnoGnonativePromiseBlock> _Nullable)promise method:(NSString* _Nullable)method jsonMessage:(NSString* _Nullable)jsonMessage;
-/**
- * Start the Gnokey Mobile service and save it in gnokeyMobileService. This will be closed in Close().
-If the gnonative serviceServer is not started, do nothing.
-If gnokeyMobileService is already started, do nothing.
- */
-- (BOOL)startGnokeyMobileService:(NSError* _Nullable* _Nullable)error;
 - (void)streamClientReceiveWithPromiseBlock:(id<GnoGnonativePromiseBlock> _Nullable)promise id_:(NSString* _Nullable)id_;
 @end
 
@@ -63,7 +57,6 @@ If gnokeyMobileService is already started, do nothing.
 @property (nonatomic) NSString* _Nonnull tmpDir;
 @property (nonatomic) BOOL useTcpListener;
 @property (nonatomic) BOOL disableUdsListener;
-@property (nonatomic) BOOL useGnokeyMobile;
 @end
 
 FOUNDATION_EXPORT GnoGnonativeBridge* _Nullable GnoGnonativeNewBridge(GnoGnonativeBridgeConfig* _Nullable config, NSError* _Nullable* _Nullable error);

package/ios/Frameworks/GnoCore.xcframework/ios-arm64_x86_64-simulator/GnoCore.framework/Headers/GnoGnonative.objc.h

@@ -44,12 +44,6 @@
 - (long)getTcpPort;
 - (NSString* _Nonnull)getUDSPath;
 - (void)invokeGrpcMethodWithPromiseBlock:(id<GnoGnonativePromiseBlock> _Nullable)promise method:(NSString* _Nullable)method jsonMessage:(NSString* _Nullable)jsonMessage;
-/**
- * Start the Gnokey Mobile service and save it in gnokeyMobileService. This will be closed in Close().
-If the gnonative serviceServer is not started, do nothing.
-If gnokeyMobileService is already started, do nothing.
- */
-- (BOOL)startGnokeyMobileService:(NSError* _Nullable* _Nullable)error;
 - (void)streamClientReceiveWithPromiseBlock:(id<GnoGnonativePromiseBlock> _Nullable)promise id_:(NSString* _Nullable)id_;
 @end
 
@@ -63,7 +57,6 @@ If gnokeyMobileService is already started, do nothing.
 @property (nonatomic) NSString* _Nonnull tmpDir;
 @property (nonatomic) BOOL useTcpListener;
 @property (nonatomic) BOOL disableUdsListener;
-@property (nonatomic) BOOL useGnokeyMobile;
 @end
 
 FOUNDATION_EXPORT GnoGnonativeBridge* _Nullable GnoGnonativeNewBridge(GnoGnonativeBridgeConfig* _Nullable config, NSError* _Nullable* _Nullable error);

package/ios/GnonativeModule.swift

@@ -92,18 +92,6 @@ public class GnonativeModule: Module {
       }
     }
     
-    AsyncFunction("startGnokeyMobileService") { (promise: Promise) in
-      do {
-        guard let service = self.bridge else {
-          throw GnoError(.notStarted)
-        }
-        try service.startGnokeyMobileService()
-        promise.resolve(true)
-      } catch let error {
-        promise.reject(error)
-      }
-    }
-    
     AsyncFunction("closeBridge") { (promise: Promise) in
       do {
         guard let service = self.bridge else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gnolang/gnonative",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Develop for Gno using your app's native language ",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -29,8 +29,6 @@
   "license": "MIT",
   "homepage": "https://github.com/gnolang/gnonative#readme",
   "dependencies": {
-    "@buf/gnolang_gnonative.bufbuild_es": "^1.8.0-20241030100906-5ceb62413f58.3",
-    "@buf/gnolang_gnonative.connectrpc_es": "^1.4.0-20241030100906-5ceb62413f58.3",
     "@bufbuild/protobuf": "^1.8.0",
     "@connectrpc/connect": "^1.4.0",
     "@connectrpc/connect-web": "^1.4.0",

package/src/GoBridge.ts

@@ -4,7 +4,6 @@ export interface GoBridgeInterface {
   initBridge(): Promise<void>;
   closeBridge(): Promise<void>;
   getTcpPort(): Promise<number>;
-  startGnokeyMobileService(): Promise<void>;
   invokeGrpcMethod(method: string, jsonMessage: string): Promise<string>;
   createStreamClient(method: string, jsonMessage: string): Promise<string>;
   streamClientReceive(id: string): Promise<string>;
@@ -24,10 +23,6 @@ class GoBridge implements GoBridgeInterface {
     return GnonativeModule.getTcpPort();
   }
 
-  startGnokeyMobileService(): Promise<void> {
-    return GnonativeModule.startGnokeyMobileService();
-  }
-
   invokeGrpcMethod(method: string, jsonMessage: string): Promise<string> {
     return GnonativeModule.invokeGrpcMethod(method, jsonMessage);
   }

package/src/api/GnoNativeApi.ts

@@ -1,3 +1,6 @@
+import { PromiseClient } from '@connectrpc/connect';
+
+import { GnoKeyApi, BridgeStatus, Config } from './types';
 import {
   AddressFromBech32Request,
   AddressToBech32Request,
@@ -46,11 +49,10 @@ import {
   SignTxResponse,
   RotatePasswordRequest,
   RotatePasswordResponse,
-} from '@buf/gnolang_gnonative.bufbuild_es/gnonativetypes_pb';
-import { GnoNativeService } from '@buf/gnolang_gnonative.connectrpc_es/rpc_connect';
-import { PromiseClient } from '@connectrpc/connect';
-
-import { GnoKeyApi, BridgeStatus, Config } from './types';
+  EstimateGasRequest,
+  EstimateGasResponse,
+} from './vendor/gnonativetypes_pb';
+import { GnoNativeService } from './vendor/rpc_connect';
 import { GoBridge, GoBridgeInterface } from '../GoBridge';
 import * as Grpc from '../grpc/client';
 
@@ -81,15 +83,11 @@ export class GnoNativeApi implements GnoKeyApi, GoBridgeInterface {
     console.log('GoBridge GRPC client instance. Done.');
 
     try {
-      await this.clientInstance.setRemote(new SetRemoteRequest({ remote: this.config.remote }));
-      await this.clientInstance.setChainID(
+      await this.clientInstance?.setRemote(new SetRemoteRequest({ remote: this.config.remote }));
+      await this.clientInstance?.setChainID(
         new SetChainIDRequest({ chainId: this.config.chain_id }),
       );
       console.log('✅ GnoNative bridge initialized.');
-      if (this.config.start_gnokey_mobile_service) {
-        await this.startGnokeyMobileService();
-        console.log('✅ Gnokey Mobile service started.');
-      }
       return true;
     } catch (error) {
       console.error(error);
@@ -138,6 +136,28 @@ export class GnoNativeApi implements GnoKeyApi, GoBridgeInterface {
     return response;
   }
 
+  async estimateGas(
+    txJson: string,
+    address: Uint8Array,
+    securityMargin: number,
+    updateTx: boolean,
+    accountNumber: bigint = BigInt(0),
+    sequenceNumber: bigint = BigInt(0),
+  ): Promise<EstimateGasResponse> {
+    const client = this.#getClient();
+    const response = client.estimateGas(
+      new EstimateGasRequest({
+        txJson,
+        address,
+        securityMargin,
+        updateTx,
+        accountNumber,
+        sequenceNumber,
+      }),
+    );
+    return response;
+  }
+
   async setChainID(chainId: string): Promise<SetChainIDResponse> {
     const client = this.#getClient();
     const response = client.setChainID(new SetChainIDRequest({ chainId }));
@@ -472,9 +492,6 @@ export class GnoNativeApi implements GnoKeyApi, GoBridgeInterface {
   getTcpPort(): Promise<number> {
     return GoBridge.getTcpPort();
   }
-  startGnokeyMobileService(): Promise<void> {
-    return GoBridge.startGnokeyMobileService();
-  }
   invokeGrpcMethod(method: string, jsonMessage: string): Promise<string> {
     return GoBridge.invokeGrpcMethod(method, jsonMessage);
   }

package/src/api/types.ts

@@ -13,10 +13,11 @@ import {
   RotatePasswordResponse,
   KeyInfo,
   SignTxResponse,
+  EstimateGasResponse,
   MakeTxResponse,
   BroadcastTxCommitResponse,
   Coin,
-} from '@buf/gnolang_gnonative.bufbuild_es/gnonativetypes_pb';
+} from './vendor/gnonativetypes_pb';
 
 export enum BridgeStatus {
   Stopped,
@@ -27,8 +28,6 @@ export enum BridgeStatus {
 export interface Config {
   remote: string;
   chain_id: string;
-  // If true, initBridge also starts a Gnokey Mobile service. (Only needed for the Gnokey Mobile app.)
-  start_gnokey_mobile_service?: boolean;
 }
 
 export interface GnoKeyApi {
@@ -89,6 +88,14 @@ export interface GnoKeyApi {
     accountNumber?: bigint,
     sequenceNumber?: bigint,
   ): Promise<SignTxResponse>;
+  estimateGas(
+    txJson: string,
+    address: Uint8Array,
+    securityMargin: number,
+    updateTx: boolean,
+    accountNumber?: bigint,
+    sequenceNumber?: bigint,
+  ): Promise<EstimateGasResponse>;
   makeCallTx(
     packagePath: string,
     fnc: string,