This commit is contained in:
callebtc
2022-10-05 20:03:04 +02:00
parent 7f1f3e3574
commit 149d69f99d
8 changed files with 26 additions and 53 deletions

View File

@@ -6,15 +6,12 @@ COIN = 100_000_000
TXID = "bff785da9f8169f49be92fa95e31f0890c385bfb1bd24d6b94d7900057c617ae" TXID = "bff785da9f8169f49be92fa95e31f0890c385bfb1bd24d6b94d7900057c617ae"
SEED = b"__not__used" SEED = b"__not__used"
from bitcoin.core import CMutableTxIn, CMutableTxOut, COutPoint, CTransaction, lx from bitcoin.core import (CMutableTxIn, CMutableTxOut, COutPoint, CTransaction,
lx)
from bitcoin.core.script import * from bitcoin.core.script import *
from bitcoin.core.script import CScript from bitcoin.core.script import CScript
from bitcoin.core.scripteval import ( from bitcoin.core.scripteval import (SCRIPT_VERIFY_P2SH, EvalScriptError,
SCRIPT_VERIFY_P2SH, VerifyScript, VerifyScriptError)
EvalScriptError,
VerifyScript,
VerifyScriptError,
)
from bitcoin.wallet import CBitcoinSecret, P2SHBitcoinAddress from bitcoin.wallet import CBitcoinSecret, P2SHBitcoinAddress

View File

@@ -1,6 +1,7 @@
import os import os
import sys import sys
from pathlib import Path from pathlib import Path
from environs import Env # type: ignore from environs import Env # type: ignore
from loguru import logger from loguru import logger

View File

@@ -16,14 +16,9 @@ from cashu.core.secp import PrivateKey, PublicKey
from cashu.core.settings import LIGHTNING, MAX_ORDER from cashu.core.settings import LIGHTNING, MAX_ORDER
from cashu.core.split import amount_split from cashu.core.split import amount_split
from cashu.lightning import WALLET from cashu.lightning import WALLET
from cashu.mint.crud import ( from cashu.mint.crud import (get_lightning_invoice, get_proofs_used,
get_lightning_invoice, invalidate_proof, store_lightning_invoice,
get_proofs_used, store_promise, update_lightning_invoice)
invalidate_proof,
store_lightning_invoice,
store_promise,
update_lightning_invoice,
)
class Ledger: class Ledger:

View File

@@ -3,16 +3,9 @@ from typing import Union
from fastapi import APIRouter from fastapi import APIRouter
from secp256k1 import PublicKey from secp256k1 import PublicKey
from cashu.core.base import ( from cashu.core.base import (CashuError, CheckRequest, GetMeltResponse,
CashuError, GetMintResponse, MeltRequest, MintRequest,
CheckRequest, PostSplitResponse, SplitRequest)
MeltRequest,
MintRequest,
SplitRequest,
GetMintResponse,
GetMeltResponse,
PostSplitResponse,
)
from cashu.mint import ledger from cashu.mint import ledger
router: APIRouter = APIRouter() router: APIRouter = APIRouter()

View File

@@ -6,8 +6,8 @@ import json
import math import math
import os import os
import sys import sys
from datetime import datetime
import time import time
from datetime import datetime
from functools import wraps from functools import wraps
from itertools import groupby from itertools import groupby
from operator import itemgetter from operator import itemgetter
@@ -20,7 +20,8 @@ from cashu.core.base import Proof
from cashu.core.bolt11 import Invoice from cashu.core.bolt11 import Invoice
from cashu.core.helpers import fee_reserve from cashu.core.helpers import fee_reserve
from cashu.core.migrations import migrate_databases from cashu.core.migrations import migrate_databases
from cashu.core.settings import CASHU_DIR, DEBUG, LIGHTNING, MINT_URL, VERSION, ENV_FILE from cashu.core.settings import (CASHU_DIR, DEBUG, ENV_FILE, LIGHTNING,
MINT_URL, VERSION)
from cashu.wallet import migrations from cashu.wallet import migrations
from cashu.wallet.crud import get_reserved_proofs, get_unused_locks from cashu.wallet.crud import get_reserved_proofs, get_unused_locks
from cashu.wallet.wallet import Wallet as Wallet from cashu.wallet.wallet import Wallet as Wallet

View File

@@ -1,7 +1,7 @@
import time import time
from typing import Optional, List, Any from typing import Any, List, Optional
from cashu.core.base import Proof, P2SHScript from cashu.core.base import P2SHScript, Proof
from cashu.core.db import Connection, Database from cashu.core.db import Connection, Database

View File

@@ -8,34 +8,19 @@ import requests
from loguru import logger from loguru import logger
import cashu.core.b_dhke as b_dhke import cashu.core.b_dhke as b_dhke
from cashu.core.base import ( from cashu.core.base import (BlindedMessage, BlindedSignature, CheckRequest,
BlindedMessage, MeltRequest, MintRequest, P2SHScript, Proof,
BlindedSignature, SplitRequest)
CheckRequest,
MeltRequest,
MintRequest,
P2SHScript,
Proof,
SplitRequest,
)
from cashu.core.script import (
step0_carol_privkey,
step0_carol_checksig_redeemscrip,
step1_carol_create_p2sh_address,
step2_carol_sign_tx,
)
from cashu.core.db import Database from cashu.core.db import Database
from cashu.core.script import (step0_carol_checksig_redeemscrip,
step0_carol_privkey,
step1_carol_create_p2sh_address,
step2_carol_sign_tx)
from cashu.core.secp import PublicKey from cashu.core.secp import PublicKey
from cashu.core.settings import DEBUG from cashu.core.settings import DEBUG
from cashu.core.split import amount_split from cashu.core.split import amount_split
from cashu.wallet.crud import ( from cashu.wallet.crud import (get_proofs, invalidate_proof, secret_used,
get_proofs, store_p2sh, store_proof, update_proof_reserved)
invalidate_proof,
secret_used,
store_proof,
update_proof_reserved,
store_p2sh,
)
class LedgerAPI: class LedgerAPI:

View File

@@ -1,5 +1,6 @@
import time import time
from re import S from re import S
import pytest import pytest
from cashu.core.helpers import async_unwrap from cashu.core.helpers import async_unwrap