2ro
dac3cf3faa
Adopt GRIM's restructure (upstream 20db758, 2ebc8ba, 3e4a3db): the
separate `node` submodule is gone; the grin node crates now live inside
the wallet submodule at wallet/grin (a nested submodule pinned to
ardocrat/node grim tip). Pins now match upstream GRIM master exactly:
wallet = 32e132a45470d01a105fcab263e4970bc8eaff40 (ardocrat/wallet grim)
node = 7ae52bc6991da00443b40ce96f1afbe675023f6d (nested wallet/grin)
Changes:
- .gitmodules: drop the node submodule; wallet now carries nested grin.
- Cargo.toml: grin_* paths node/* -> wallet/grin/*; uuid 0.8.2 -> 1.23.4
(the new wallet API exposes uuid 1.x in its public signatures, e.g.
retrieve_payment_proof/slate ids -- forced bump, matches upstream).
- src/wallet/wallet.rs + src/node/node.rs: adapt to new upstream APIs --
HTTPNodeClient::new/new_proxy now take a request timeout; Server/ApiServer
api_chan is a tokio mpsc channel instead of a leaked futures oneshot.
Seed-at-rest is unchanged across the wallet bump: impls/lifecycle/seed.rs
is byte-identical (PBKDF2-HMAC-SHA512, 100 iters) and the node keychain
mnemonic derivation is byte-identical, so existing wallets/funds are safe.
Goblin's additive layers are untouched: money path runs over nostr (no
Tor send/pay/finalize tasks), the custom Tor engine stays on arti 0.43,
and the soft-lock work is preserved.
cargo check clean (1 pre-existing crate::node::Node warning); lib tests
280 pass / 1 ignored, i18n_keys 2 pass -- unchanged from baseline.
(cherry picked from commit eb37e66a990b537ad65db2b3438a467e1100d7ef)
5 lines
94 B
Plaintext
5 lines
94 B
Plaintext
[submodule "wallet"]
|
|
path = wallet
|
|
url = https://code.gri.mw/ardocrat/wallet
|
|
branch = grim
|