From 1e2943b59652b651579f6bf58fd3295aaa8f9567 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Wed, 3 Jul 2024 17:52:24 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20`RustLib`=20to=20`Agent?= =?UTF-8?q?Dart`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/agent_dart_base/test/test_utils.dart | 2 +- .../agent_dart_ffi/flutter_rust_bridge.yaml | 1 + .../agent_dart_ffi/lib/agent_dart_ffi.dart | 2 +- packages/agent_dart_ffi/lib/src/api.dart | 222 +++++++++--------- .../agent_dart_ffi/lib/src/frb_generated.dart | 48 ++-- .../lib/src/frb_generated.io.dart | 12 +- .../lib/src/frb_generated.web.dart | 12 +- 7 files changed, 152 insertions(+), 147 deletions(-) diff --git a/packages/agent_dart_base/test/test_utils.dart b/packages/agent_dart_base/test/test_utils.dart index 5499240f..6fa6d552 100644 --- a/packages/agent_dart_base/test/test_utils.dart +++ b/packages/agent_dart_base/test/test_utils.dart @@ -28,7 +28,7 @@ class ErrorMessageMatcher extends TypeMatcher { } Future ffiInit() { - return RustLib.init(); + return AgentDart.init(); } // void matchFFI() { diff --git a/packages/agent_dart_ffi/flutter_rust_bridge.yaml b/packages/agent_dart_ffi/flutter_rust_bridge.yaml index 9161c198..1bf8590c 100644 --- a/packages/agent_dart_ffi/flutter_rust_bridge.yaml +++ b/packages/agent_dart_ffi/flutter_rust_bridge.yaml @@ -1,3 +1,4 @@ +dart_entrypoint_class_name: AgentDart rust_input: crate::api rust_root: native/agent_dart dart_output: lib/src diff --git a/packages/agent_dart_ffi/lib/agent_dart_ffi.dart b/packages/agent_dart_ffi/lib/agent_dart_ffi.dart index 2945d713..f741a763 100644 --- a/packages/agent_dart_ffi/lib/agent_dart_ffi.dart +++ b/packages/agent_dart_ffi/lib/agent_dart_ffi.dart @@ -4,7 +4,7 @@ export 'src/api.dart'; export 'src/bdk/blockchain.dart'; export 'src/bdk/types.dart'; export 'src/bdk/wallet.dart'; -export 'src/frb_generated.dart' show RustLib; +export 'src/frb_generated.dart' show AgentDart; export 'src/lib.dart'; export 'src/p256.dart'; export 'src/schnorr.dart'; diff --git a/packages/agent_dart_ffi/lib/src/api.dart b/packages/agent_dart_ffi/lib/src/api.dart index f2bb3b4f..ca6051cd 100644 --- a/packages/agent_dart_ffi/lib/src/api.dart +++ b/packages/agent_dart_ffi/lib/src/api.dart @@ -25,27 +25,27 @@ import 'types.dart'; /// phrase_to_seed /// seed_to_key Future mnemonicPhraseToSeed({required PhraseToSeedReq req}) => - RustLib.instance.api.crateApiMnemonicPhraseToSeed(req: req); + AgentDart.instance.api.crateApiMnemonicPhraseToSeed(req: req); Future mnemonicSeedToKey({required SeedToKeyReq req}) => - RustLib.instance.api.crateApiMnemonicSeedToKey(req: req); + AgentDart.instance.api.crateApiMnemonicSeedToKey(req: req); /// -------------------- /// WIF /// -------------------- /// hex_bytes_to_wif Future hexBytesToWif({required String hex, required Network network}) => - RustLib.instance.api.crateApiHexBytesToWif(hex: hex, network: network); + AgentDart.instance.api.crateApiHexBytesToWif(hex: hex, network: network); /// -------------------- /// bls /// -------------------- /// bls_init /// bls_verify -Future blsInit() => RustLib.instance.api.crateApiBlsInit(); +Future blsInit() => AgentDart.instance.api.crateApiBlsInit(); Future blsVerify({required BLSVerifyReq req}) => - RustLib.instance.api.crateApiBlsVerify(req: req); + AgentDart.instance.api.crateApiBlsVerify(req: req); /// -------------- /// ed25519 @@ -54,96 +54,96 @@ Future blsVerify({required BLSVerifyReq req}) => /// ed25519_sign /// ed25519_verify Future ed25519FromSeed({required ED25519FromSeedReq req}) => - RustLib.instance.api.crateApiEd25519FromSeed(req: req); + AgentDart.instance.api.crateApiEd25519FromSeed(req: req); Future ed25519Sign({required ED25519SignReq req}) => - RustLib.instance.api.crateApiEd25519Sign(req: req); + AgentDart.instance.api.crateApiEd25519Sign(req: req); Future ed25519Verify({required ED25519VerifyReq req}) => - RustLib.instance.api.crateApiEd25519Verify(req: req); + AgentDart.instance.api.crateApiEd25519Verify(req: req); /// --------------------- /// secp256k1 /// --------------------- Future secp256K1FromSeed( {required Secp256k1FromSeedReq req}) => - RustLib.instance.api.crateApiSecp256K1FromSeed(req: req); + AgentDart.instance.api.crateApiSecp256K1FromSeed(req: req); Future secp256K1Sign({required Secp256k1SignWithSeedReq req}) => - RustLib.instance.api.crateApiSecp256K1Sign(req: req); + AgentDart.instance.api.crateApiSecp256K1Sign(req: req); Future secp256K1SignWithRng( {required Secp256k1SignWithRngReq req}) => - RustLib.instance.api.crateApiSecp256K1SignWithRng(req: req); + AgentDart.instance.api.crateApiSecp256K1SignWithRng(req: req); Future secp256K1SignRecoverable( {required Secp256k1SignWithSeedReq req}) => - RustLib.instance.api.crateApiSecp256K1SignRecoverable(req: req); + AgentDart.instance.api.crateApiSecp256K1SignRecoverable(req: req); Future secp256K1Verify({required Secp256k1VerifyReq req}) => - RustLib.instance.api.crateApiSecp256K1Verify(req: req); + AgentDart.instance.api.crateApiSecp256K1Verify(req: req); Future secp256K1GetSharedSecret( {required Secp256k1ShareSecretReq req}) => - RustLib.instance.api.crateApiSecp256K1GetSharedSecret(req: req); + AgentDart.instance.api.crateApiSecp256K1GetSharedSecret(req: req); Future secp256K1Recover({required Secp256k1RecoverReq req}) => - RustLib.instance.api.crateApiSecp256K1Recover(req: req); + AgentDart.instance.api.crateApiSecp256K1Recover(req: req); /// --------------------- /// secp256k1 /// --------------------- Future p256FromSeed({required P256FromSeedReq req}) => - RustLib.instance.api.crateApiP256FromSeed(req: req); + AgentDart.instance.api.crateApiP256FromSeed(req: req); Future p256Sign({required P256SignWithSeedReq req}) => - RustLib.instance.api.crateApiP256Sign(req: req); + AgentDart.instance.api.crateApiP256Sign(req: req); Future p256Verify({required P256VerifyReq req}) => - RustLib.instance.api.crateApiP256Verify(req: req); + AgentDart.instance.api.crateApiP256Verify(req: req); Future p256GetSharedSecret({required P256ShareSecretReq req}) => - RustLib.instance.api.crateApiP256GetSharedSecret(req: req); + AgentDart.instance.api.crateApiP256GetSharedSecret(req: req); /// --------------------- /// schnorr /// --------------------- Future schnorrFromSeed( {required SchnorrFromSeedReq req}) => - RustLib.instance.api.crateApiSchnorrFromSeed(req: req); + AgentDart.instance.api.crateApiSchnorrFromSeed(req: req); Future schnorrSign({required SchnorrSignWithSeedReq req}) => - RustLib.instance.api.crateApiSchnorrSign(req: req); + AgentDart.instance.api.crateApiSchnorrSign(req: req); Future schnorrVerify({required SchnorrVerifyReq req}) => - RustLib.instance.api.crateApiSchnorrVerify(req: req); + AgentDart.instance.api.crateApiSchnorrVerify(req: req); /// --------------------- /// aes /// --------------------- Future aes128CtrEncrypt({required AesEncryptReq req}) => - RustLib.instance.api.crateApiAes128CtrEncrypt(req: req); + AgentDart.instance.api.crateApiAes128CtrEncrypt(req: req); Future aes128CtrDecrypt({required AesDecryptReq req}) => - RustLib.instance.api.crateApiAes128CtrDecrypt(req: req); + AgentDart.instance.api.crateApiAes128CtrDecrypt(req: req); Future aes256CbcEncrypt({required AesEncryptReq req}) => - RustLib.instance.api.crateApiAes256CbcEncrypt(req: req); + AgentDart.instance.api.crateApiAes256CbcEncrypt(req: req); Future aes256CbcDecrypt({required AesDecryptReq req}) => - RustLib.instance.api.crateApiAes256CbcDecrypt(req: req); + AgentDart.instance.api.crateApiAes256CbcDecrypt(req: req); Future aes256GcmEncrypt({required AesEncryptReq req}) => - RustLib.instance.api.crateApiAes256GcmEncrypt(req: req); + AgentDart.instance.api.crateApiAes256GcmEncrypt(req: req); Future aes256GcmDecrypt({required AesDecryptReq req}) => - RustLib.instance.api.crateApiAes256GcmDecrypt(req: req); + AgentDart.instance.api.crateApiAes256GcmDecrypt(req: req); Future pbkdf2DeriveKey({required PBKDFDeriveReq req}) => - RustLib.instance.api.crateApiPbkdf2DeriveKey(req: req); + AgentDart.instance.api.crateApiPbkdf2DeriveKey(req: req); Future scryptDeriveKey({required ScriptDeriveReq req}) => - RustLib.instance.api.crateApiScryptDeriveKey(req: req); + AgentDart.instance.api.crateApiScryptDeriveKey(req: req); // Rust type: RustOpaqueMoi abstract class BdkDescriptor implements RustOpaqueInterface {} @@ -156,40 +156,41 @@ class Api { static Future addressFromScript( {required Script script, required Network network}) => - RustLib.instance.api + AgentDart.instance.api .crateApiApiAddressFromScript(script: script, network: network); static Future addressNetwork({required String address}) => - RustLib.instance.api.crateApiApiAddressNetwork(address: address); + AgentDart.instance.api.crateApiApiAddressNetwork(address: address); static Future