Skip to content

Commit a0b8c1a

Browse files
KodylowKodylow
authored
Merge pull request #51 from fedimint/update-wrappers
2 parents 1746851 + 8fac0b6 commit a0b8c1a

File tree

13 files changed

+45
-68
lines changed

13 files changed

+45
-68
lines changed

‎wrappers/fedimint-go/cmd/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func main() {
8787

8888
// `/v2/admin/discover-version`
8989
logMethod("/v2/admin/discover-version")
90-
discoverResponseData, err := fc.DiscoverVersion(1)
90+
discoverResponseData, err := fc.DiscoverVersion(nil)
9191
if err != nil {
9292
fmt.Println("Error calling VERSION: ", err)
9393
return
@@ -529,7 +529,7 @@ func main() {
529529

530530
// `/v2/onchain/deposit-address`
531531
logMethod("/v2/onchain/deposit-address")
532-
addr, err := fc.Onchain.CreateDepositAddress(1000, nil)
532+
addr, err := fc.Onchain.CreateDepositAddress(nil)
533533
if err != nil {
534534
fmt.Println("Error calling CREATE_DEPOSIT_ADDRESS: ", err)
535535
return

‎wrappers/fedimint-go/pkg/fedimint/client.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,8 @@ func (fc *FedimintClient) Backup(metadata *types.BackupRequest, federationId *st
239239
return err
240240
}
241241

242-
func (fc *FedimintClient) DiscoverVersion(threshold uint16) (*types.FedimintResponse, error) {
243-
request := types.DiscoverVersionRequest{Threshold: threshold}
244-
resp, err := fc.post("/admin/discover-version", request)
242+
func (fc *FedimintClient) DiscoverVersion(federationId *string) (*types.FedimintResponse, error) {
243+
resp, err := fc.postWithFederationId("/admin/discover-version", nil, federationId)
245244
if err != nil {
246245
return nil, err
247246
}
@@ -306,9 +305,8 @@ func (fc *FedimintClient) Join(inviteCode string, setActiveFederationId bool, us
306305
// Onchain //
307306
////////////
308307

309-
func (onchain *OnchainModule) CreateDepositAddress(timeout int, federationId *string) (*modules.OnchainDepositAddressResponse, error) {
310-
request := modules.OnchainDepositAddressRequest{Timeout: timeout}
311-
resp, err := onchain.Client.postWithFederationId("/onchain/deposit-address", request, federationId)
308+
func (onchain *OnchainModule) CreateDepositAddress(federationId *string) (*modules.OnchainDepositAddressResponse, error) {
309+
resp, err := onchain.Client.postWithFederationId("/onchain/deposit-address", nil, federationId)
312310
if err != nil {
313311
return nil, err
314312
}

‎wrappers/fedimint-go/pkg/fedimint/types/common.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,4 @@ type JoinResponse struct {
5353
FederationIds []string `json:"federationIds"`
5454
}
5555

56-
type DiscoverVersionRequest struct {
57-
Threshold uint16 `json:"threshold"`
58-
}
59-
6056
type FedimintResponse map[string]interface{}

‎wrappers/fedimint-go/pkg/fedimint/types/modules/onchain.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
package modules
22

3-
type OnchainDepositAddressRequest struct {
4-
Timeout int `json:"timeout"`
5-
}
6-
73
type OnchainDepositAddressResponse struct {
84
OperationId string `json:"operationId"`
95
Address string `json:"address"`
6+
TweakIdx int `json:"tweakIdx"`
107
}
118

129
type OnchainAwaitDepositRequest struct {

‎wrappers/fedimint-py/AsyncFedimintClient.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import atexit
77

88
from models.common import (
9-
DiscoverVersionRequest,
109
DiscoverVersionResponse,
1110
InfoResponse,
1211
ListOperationsRequest,
@@ -29,7 +28,6 @@
2928
from models.onchain import (
3029
OnchainAwaitDepositRequest,
3130
OnchainAwaitDepositResponse,
32-
OnchainDepositAddressRequest,
3331
OnchainDepositAddressResponse,
3432
OnchainWithdrawRequest,
3533
OnchainWithdrawResponse,
@@ -185,9 +183,12 @@ async def config(self):
185183
# async def backup(self, request: BackupRequest, federationId: str = None):
186184
# return await self._post_with_id("/admin/backup", request, federationId)
187185

188-
async def discover_version(self, threshold: int) -> DiscoverVersionResponse:
189-
request: DiscoverVersionRequest = {"threshold": threshold}
190-
return await self._post("/admin/discover-version", request)
186+
async def discover_version(
187+
self, federation_id: str = None
188+
) -> DiscoverVersionResponse:
189+
return await self._post_with_federation_id(
190+
"/admin/discover-version", {}, federation_id
191+
)
191192

192193
async def federation_ids(self):
193194
return await self._get("/admin/federation-ids")
@@ -378,10 +379,9 @@ class Onchain:
378379
def __init__(self, client):
379380
self.client = client
380381

381-
async def create_deposit_address(self, timeout: int, federation_id: str = None):
382-
request: OnchainDepositAddressRequest = {"timeout": timeout}
382+
async def create_deposit_address(self, federation_id: str = None):
383383
return await self.client._post_with_federation_id(
384-
"/onchain/deposit-address", request, federation_id
384+
"/onchain/deposit-address", {}, federation_id
385385
)
386386

387387
async def await_deposit(

‎wrappers/fedimint-py/FedimintClient.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import requests
55

66
from models.common import (
7-
DiscoverVersionRequest,
87
DiscoverVersionResponse,
98
InfoResponse,
109
ListOperationsRequest,
@@ -26,7 +25,6 @@
2625
from models.onchain import (
2726
OnchainAwaitDepositRequest,
2827
OnchainAwaitDepositResponse,
29-
OnchainDepositAddressRequest,
3028
OnchainWithdrawRequest,
3129
OnchainWithdrawResponse,
3230
)
@@ -157,9 +155,8 @@ def info(self) -> InfoResponse:
157155
def config(self):
158156
return self._get("/admin/config")
159157

160-
def discover_version(self, threshold: int) -> DiscoverVersionResponse:
161-
request: DiscoverVersionRequest = {"threshold": threshold}
162-
return self._post("/admin/discover-version", request)
158+
def discover_version(self, federation_id: str = None) -> DiscoverVersionResponse:
159+
return self._post_with_federation_id("/admin/discover-version", {})
163160

164161
def federation_ids(self):
165162
return self._get("/admin/federation-ids")
@@ -343,10 +340,9 @@ class Onchain:
343340
def __init__(self, client):
344341
self.client = client
345342

346-
def create_deposit_address(self, timeout: int, federation_id: str = None):
347-
request: OnchainDepositAddressRequest = {"timeout": timeout}
343+
def create_deposit_address(self, federation_id: str = None):
348344
return self.client._post_with_federation_id(
349-
"/onchain/deposit-address", request, federation_id
345+
"/onchain/deposit-address", {}, federation_id
350346
)
351347

352348
def await_deposit(

‎wrappers/fedimint-py/models/mint.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ class NotesJson(BaseModel):
1717

1818

1919
class MintDecodeNotesResponse(BaseModel):
20-
notesJson: NotesJson
20+
notes: NotesJson
2121

2222

2323
class MintEncodeNotesRequest(BaseModel):
2424
notesJsonStr: str
2525

2626

2727
class MintEncodeNotesResponse(BaseModel):
28-
notes: str
28+
notesJson: str
2929

3030

3131
class MintReissueRequest(BaseModel):

‎wrappers/fedimint-py/models/onchain.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22
from pydantic import BaseModel
33

44

5-
class OnchainDepositAddressRequest(BaseModel):
6-
timeout: int
7-
8-
95
class OnchainDepositAddressResponse(BaseModel):
106
operation_id: str
117
address: str
8+
tweak_idx: int
129

1310

1411
class OnchainAwaitDepositRequest(BaseModel):

‎wrappers/fedimint-py/test.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def main():
4545
log_input_and_output({}, data)
4646

4747
log_method("/v2/admin/discover-version")
48-
data = fedimint_client.discover_version(1)
48+
data = fedimint_client.discover_version()
4949
log_input_and_output({}, data)
5050

5151
log_method("/v2/admin/federation-ids")
@@ -120,8 +120,8 @@ def main():
120120
log_input_and_output({"notes": mint_data["notes"]}, data)
121121

122122
log_method("/v2/mint/encode-notes")
123-
data = fedimint_client.mint.encode_notes(data["notesJson"])
124-
log_input_and_output({"notesJson": data}, data)
123+
encoded_data = fedimint_client.mint.encode_notes(data["notesJson"])
124+
log_input_and_output({"notesJson": data}, encoded_data)
125125

126126
log_method("/v2/mint/validate")
127127
data = fedimint_client.mint.validate(mint_data["notes"])
@@ -145,8 +145,8 @@ def main():
145145

146146
# ONCHAIN METHODS
147147
log_method("/v2/onchain/deposit-address")
148-
data = fedimint_client.onchain.create_deposit_address(1000)
149-
log_input_and_output({"timeout": 1000}, data)
148+
data = fedimint_client.onchain.create_deposit_address()
149+
log_input_and_output({}, data)
150150
log_method("/v2/onchain/withdraw")
151151
withdraw_data = fedimint_client.onchain.withdraw(data["address"], 1000)
152152
log_input_and_output({"address": data["address"], "amountSat": 1000}, withdraw_data)

‎wrappers/fedimint-py/test_async.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ async def main():
4747
# log_input_and_output({}, data)
4848
# `/v2/admin/discover-version`
4949
log_method("/v2/admin/discover-version")
50-
data = await fedimint_client.discover_version(
51-
1
52-
) # Assuming threshold is required, adjust as needed
50+
data = await fedimint_client.discover_version()
5351
log_input_and_output({}, data)
5452
# `/v2/admin/federation-ids`
5553
log_method("/v2/admin/federation-ids")
@@ -130,8 +128,8 @@ async def main():
130128
log_input_and_output({"notes": mint_data["notes"]}, data)
131129
# `/v2/mint/encode-notes`
132130
log_method("/v2/mint/encode-notes")
133-
data = await fedimint_client.mint.encode_notes(data["notesJson"])
134-
log_input_and_output({"notesJson": data}, data)
131+
encoded_data = await fedimint_client.mint.encode_notes(data["notesJson"])
132+
log_input_and_output({"notesJson": data}, encoded_data)
135133
# `/v2/mint/validate`
136134
log_method("/v2/mint/validate")
137135
data = await fedimint_client.mint.validate(mint_data["notes"])
@@ -157,9 +155,8 @@ async def main():
157155
# ONCHAIN METHODS
158156
# `/v2/onchain/deposit-address`
159157
log_method("/v2/onchain/deposit-address")
160-
data = await fedimint_client.onchain.create_deposit_address(1000)
161-
print("data: ", data)
162-
log_input_and_output({"timeout": 1000}, data)
158+
data = await fedimint_client.onchain.create_deposit_address()
159+
log_input_and_output({}, data)
163160
# `/v2/onchain/withdraw`
164161
log_method("/v2/onchain/withdraw")
165162
withdraw_data = await fedimint_client.onchain.withdraw(data["address"], 1000)

‎wrappers/fedimint-ts/src/FedimintClient.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
MintValidateResponse,
2626
OnchainAwaitDepositRequest,
2727
OnchainAwaitDepositResponse,
28-
OnchainDepositAddressRequest,
2928
OnchainDepositAddressResponse,
3029
OnchainWithdrawRequest,
3130
OnchainWithdrawResponse,
@@ -612,17 +611,13 @@ export class FedimintClient {
612611
public onchain = {
613612
/**
614613
* Creates a new bitcoin deposit address to peg in bitcoin to the federation.
615-
* @param timeout - The number of seconds for the fedimint-clientd to watch for a deposit to the created address
616614
*/
617615
createDepositAddress: async (
618-
timeout: number,
619616
federationId?: string
620617
): Promise<OnchainDepositAddressResponse> => {
621-
const request: OnchainDepositAddressRequest = { timeout };
622-
623618
return await this.postWithFederationId<OnchainDepositAddressResponse>(
624619
"/onchain/deposit-address",
625-
request,
620+
{},
626621
federationId
627622
);
628623
},

‎wrappers/fedimint-ts/src/types.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,10 @@ export interface OperationOutput {
5454
outcome?: any;
5555
}
5656

57-
export interface OnchainDepositAddressRequest {
58-
timeout: number;
59-
}
60-
6157
export interface OnchainDepositAddressResponse {
6258
operationId: string;
6359
address: string;
60+
tweakIdx: number;
6461
}
6562

6663
export interface OnchainAwaitDepositRequest {
@@ -239,7 +236,7 @@ export interface MintEncodeNotesRequest {
239236
}
240237

241238
export interface MintEncodeNotesResponse {
242-
notes: string;
239+
notesJson: string;
243240
}
244241

245242
export interface MintReissueRequest {

‎wrappers/fedimint-ts/tests/test.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ async function main() {
196196
logInputAndOutput({ notes: mintData.notes }, data);
197197
// `/v2/mint/encode-notes`
198198
logMethod("/v2/mint/encode-notes");
199-
data = await fedimintClient.mint.encodeNotes(data.notesJson);
200-
logInputAndOutput({ notesJson: data.notesJson }, data);
199+
const encodeData = await fedimintClient.mint.encodeNotes(data.notesJson);
200+
logInputAndOutput({ notesJson: data.notesJson }, encodeData);
201201
// `/v2/mint/validate`
202202
logMethod("/v2/mint/validate");
203203
data = await fedimintClient.mint.validate(mintData.notes);
@@ -219,12 +219,16 @@ async function main() {
219219
// ONCHAIN METHODS
220220
// `/v2/onchain/deposit-address`
221221
logMethod("/v2/onchain/deposit-address");
222-
data = await fedimintClient.onchain.createDepositAddress(1000);
223-
logInputAndOutput({ timeout: 1000 }, data);
222+
data = await fedimintClient.onchain.createDepositAddress();
223+
logInputAndOutput({}, data);
224224
// `/v2/onchain/withdraw`
225225
logMethod("/v2/onchain/withdraw");
226-
data = await fedimintClient.onchain.withdraw(data.address, 1000);
227-
logInputAndOutput({ address: data.address, amountSat: 1000 }, data);
226+
const withdrawData = await fedimintClient.onchain.withdraw(
227+
data.address,
228+
1000
229+
);
230+
console.log("Withdrew: ", withdrawData);
231+
logInputAndOutput({ address: data.address, amountSat: 1000 }, withdrawData);
228232
// // `/v2/onchain/await-deposit`
229233
// logMethod("/v2/onchain/await-deposit");
230234
// data = await fedimintClient.onchain.awaitDeposit(data.operationId);

0 commit comments

Comments
 (0)