Skip to content

Commit 857ea07

Browse files
committed
flutter_rust_bridge_codegen updated to 2.0.0
1 parent 78c55c5 commit 857ea07

10 files changed

+121
-1099
lines changed

example/lib/bdk_library.dart

+6-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ class BdkLibrary {
2020
}
2121

2222
Future<Blockchain> initializeBlockchain() async {
23-
return Blockchain.createMutinynet();
23+
return await Blockchain.create(
24+
config: const BlockchainConfig.esplora(
25+
config: EsploraConfig(
26+
baseUrl: 'https://mutinynet.com/api', stopGap: 10)));
2427
}
2528

2629
Future<Wallet> restoreWallet(Descriptor descriptor) async {
@@ -92,11 +95,7 @@ class BdkLibrary {
9295
}
9396

9497
sendBitcoin(
95-
Blockchain blockchain,
96-
Wallet aliceWallet,
97-
String addressStr,
98-
int amountSat,
99-
) async {
98+
Blockchain blockchain, Wallet aliceWallet, String addressStr) async {
10099
try {
101100
final txBuilder = TxBuilder();
102101
final address = await Address.fromString(
@@ -105,7 +104,7 @@ class BdkLibrary {
105104
final script = await address.scriptPubkey();
106105
final feeRate = await estimateFeeRate(25, blockchain);
107106
final (psbt, _) = await txBuilder
108-
.addRecipient(script, amountSat)
107+
.addRecipient(script, 750)
109108
.feeRate(feeRate.satPerVb)
110109
.finish(aliceWallet);
111110
final isFinalized = await aliceWallet.sign(psbt: psbt);

example/lib/simple_wallet.dart

+9-16
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@ class _SimpleWalletState extends State<SimpleWallet> {
2525

2626
generateMnemonicKeys() async {
2727
final res = await lib.createMnemonic();
28-
final mnemonic = await res.asString();
2928
setState(() {
30-
displayText = mnemonic;
29+
displayText = res.toString();
3130
});
3231
if (kDebugMode) {
33-
print(mnemonic);
32+
print(await res.asString());
3433
}
3534
}
3635

@@ -50,13 +49,11 @@ class _SimpleWalletState extends State<SimpleWallet> {
5049
}
5150

5251
getNewAddress() async {
53-
final addressInfo = await lib.getAddress(aliceWallet);
54-
final address = await addressInfo.address.asString();
55-
56-
debugPrint(address);
52+
final res = (await (await lib.getAddress(aliceWallet)).address.asString());
53+
debugPrint(res);
5754

5855
setState(() {
59-
displayText = "Address: $address \n Index: ${addressInfo.index}";
56+
displayText = "Address: $res";
6057
});
6158
}
6259

@@ -155,13 +152,9 @@ class _SimpleWalletState extends State<SimpleWallet> {
155152
}
156153
}
157154

158-
sendBit(int amountSat) async {
155+
sendBit() async {
159156
await lib.sendBitcoin(
160-
blockchain!,
161-
aliceWallet,
162-
"tb1qyhssajdx5vfxuatt082m9tsfmxrxludgqwe52f",
163-
amountSat,
164-
);
157+
blockchain!, aliceWallet, "tb1qyhssajdx5vfxuatt082m9tsfmxrxludgqwe52f");
165158
}
166159

167160
@override
@@ -293,9 +286,9 @@ class _SimpleWalletState extends State<SimpleWallet> {
293286
fontWeight: FontWeight.w800),
294287
)),
295288
TextButton(
296-
onPressed: () => sendBit(100000),
289+
onPressed: () => sendBit(),
297290
child: const Text(
298-
'Press to send 100k sats',
291+
'Press to send 1200 satoshi',
299292
style: TextStyle(
300293
color: Colors.indigoAccent,
301294
fontSize: 12,

example/pubspec.lock

+13-13
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,10 @@ packages:
193193
dependency: transitive
194194
description:
195195
name: flutter_rust_bridge
196-
sha256: e9a8716b1ad2fc81c434f3e4bf84b86c578578678c57e568b44aea7acf210102
196+
sha256: f703c4b50e253e53efc604d50281bbaefe82d615856f8ae1e7625518ae252e98
197197
url: "https://pub.dev"
198198
source: hosted
199-
version: "2.0.0-dev.31"
199+
version: "2.0.0"
200200
flutter_test:
201201
dependency: "direct dev"
202202
description: flutter
@@ -206,10 +206,10 @@ packages:
206206
dependency: transitive
207207
description:
208208
name: freezed_annotation
209-
sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d
209+
sha256: f54946fdb1fa7b01f780841937b1a80783a20b393485f3f6cdf336fd6f4705f2
210210
url: "https://pub.dev"
211211
source: hosted
212-
version: "2.4.1"
212+
version: "2.4.2"
213213
glob:
214214
dependency: transitive
215215
description:
@@ -218,14 +218,6 @@ packages:
218218
url: "https://pub.dev"
219219
source: hosted
220220
version: "2.1.2"
221-
js:
222-
dependency: transitive
223-
description:
224-
name: js
225-
sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
226-
url: "https://pub.dev"
227-
source: hosted
228-
version: "0.7.1"
229221
json_annotation:
230222
dependency: transitive
231223
description:
@@ -439,6 +431,14 @@ packages:
439431
url: "https://pub.dev"
440432
source: hosted
441433
version: "1.1.0"
434+
web:
435+
dependency: transitive
436+
description:
437+
name: web
438+
sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
439+
url: "https://pub.dev"
440+
source: hosted
441+
version: "0.5.1"
442442
yaml:
443443
dependency: transitive
444444
description:
@@ -448,5 +448,5 @@ packages:
448448
source: hosted
449449
version: "3.1.2"
450450
sdks:
451-
dart: ">=3.3.0 <4.0.0"
451+
dart: ">=3.4.0 <4.0.0"
452452
flutter: ">=3.18.0-18.0.pre.54"

flutter_rust_bridge.yaml

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
rust_input: rust/src/api/*.rs
1+
rust_input: crate::api
2+
rust_root: rust/
23
dart_output: lib/src/generated/
34
full_dep: true
5+
web: false
6+
dart3: true
7+
enable_lifetime: true
48
c_output: ios/Classes/frb_generated.h
59
duplicated_c_output: [macos/Classes/frb_generated.h]
6-
dart_entrypoint_class_name: CApi
10+
dart_entrypoint_class_name: core

lib/src/root.dart

-24
Original file line numberDiff line numberDiff line change
@@ -61,30 +61,6 @@ class Blockchain extends BdkBlockchain {
6161
}
6262
}
6363

64-
static Future<Blockchain> createMutinynet({
65-
int stopGap = 20,
66-
}) async {
67-
final config = BlockchainConfig.esplora(
68-
config: EsploraConfig(
69-
baseUrl: 'https://mutinynet.ltbl.io/api',
70-
stopGap: stopGap,
71-
),
72-
);
73-
return create(config: config);
74-
}
75-
76-
static Future<Blockchain> createTestnet({
77-
int stopGap = 20,
78-
}) async {
79-
final config = BlockchainConfig.esplora(
80-
config: EsploraConfig(
81-
baseUrl: 'https://testnet.ltbl.io/api',
82-
stopGap: stopGap,
83-
),
84-
);
85-
return create(config: config);
86-
}
87-
8864
///Estimate the fee rate required to confirm a transaction in a given target of blocks
8965
@override
9066
Future<FeeRate> estimateFee({required int target, hint}) async {

makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ help: makefile
1111

1212
## init: Install missing dependencies.
1313
init:
14-
cargo install flutter_rust_bridge_codegen --version 2.0.0-dev.31
14+
cargo install flutter_rust_bridge_codegen --version 2.0.0
1515
## :
1616

1717
all: init generate-bindings

pubspec.lock

+6-6
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,10 @@ packages:
205205
dependency: "direct dev"
206206
description:
207207
name: ffigen
208-
sha256: "3a80687577e7e51ba915114742f389a128e8aa241c52ce69a0f70aecb8e14365"
208+
sha256: "3e12e80ccb6539bb3917217bb6f32709220efb737de0d0fa8736da0b7cb507da"
209209
url: "https://pub.dev"
210210
source: hosted
211-
version: "9.0.1"
211+
version: "12.0.0"
212212
file:
213213
dependency: transitive
214214
description:
@@ -234,10 +234,10 @@ packages:
234234
dependency: "direct main"
235235
description:
236236
name: flutter_rust_bridge
237-
sha256: e9a8716b1ad2fc81c434f3e4bf84b86c578578678c57e568b44aea7acf210102
237+
sha256: f703c4b50e253e53efc604d50281bbaefe82d615856f8ae1e7625518ae252e98
238238
url: "https://pub.dev"
239239
source: hosted
240-
version: "2.0.0-dev.31"
240+
version: "2.0.0"
241241
flutter_test:
242242
dependency: "direct dev"
243243
description: flutter
@@ -255,10 +255,10 @@ packages:
255255
dependency: "direct main"
256256
description:
257257
name: freezed_annotation
258-
sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d
258+
sha256: f54946fdb1fa7b01f780841937b1a80783a20b393485f3f6cdf336fd6f4705f2
259259
url: "https://pub.dev"
260260
source: hosted
261-
version: "2.4.1"
261+
version: "2.4.2"
262262
frontend_server_client:
263263
dependency: transitive
264264
description:

pubspec.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ environment:
1010
dependencies:
1111
flutter:
1212
sdk: flutter
13-
flutter_rust_bridge: ">2.0.0-dev.30 <= 2.0.0-dev.31"
13+
flutter_rust_bridge: "2.0.0"
1414
ffi: ^2.0.1
1515
freezed_annotation: ^2.2.0
1616
mockito: ^5.4.0
@@ -21,9 +21,9 @@ dependencies:
2121
dev_dependencies:
2222
flutter_test:
2323
sdk: flutter
24-
ffigen: ^9.0.1
25-
freezed: ^2.3.5
26-
build_runner: ^2.4.4
24+
ffigen: ^12.0.0
25+
freezed: ^2.5.2
26+
build_runner: ^2.4.8
2727
lints: ^4.0.0
2828

2929
flutter:

0 commit comments

Comments
 (0)