1- From c2e4c24c226555903705aae0386aefe0e15bf873 Mon Sep 17 00:00:00 2001
2- From: Andrew Chow <
[email protected] >
3- Date: Tue, 27 Nov 2018 17:32:44 -0500
4- Subject: [PATCH 1/3] Use linux unix socket address format
5-
6- ---
7- unix/variant/pyb.py | 6 +++---
8- 1 file changed, 3 insertions(+), 3 deletions(-)
9-
10- diff --git a/unix/variant/pyb.py b/unix/variant/pyb.py
11- index d22bb1b..fe8e7ca 100644
12- --- a/unix/variant/pyb.py
13- +++ b/unix/variant/pyb.py
14- @@ -36,10 +36,10 @@ class USB_HID:
15- import usocket as socket
16- self.pipe = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
17- # If on linux, try commenting the following line
18- - addr = bytes([len(self.fn)+2, socket.AF_UNIX] + list(self.fn))
19- + # addr = bytes([len(self.fn)+2, socket.AF_UNIX] + list(self.fn))
20- # If on linux, try uncommenting the following two lines
21- - #import struct
22- - #addr = struct.pack('H108s', socket.AF_UNIX, self.fn)
23- + import struct
24- + addr = struct.pack('H108s', socket.AF_UNIX, self.fn)
25- while 1:
26- try:
27- self.pipe.bind(addr)
28- - -
29- 2.38.1
30-
31-
321From fd51e85693e0d66129133b1f195134aead1cf7d0 Mon Sep 17 00:00:00 2001
332From: Andrew Chow <
[email protected] >
343Date: Tue, 17 Dec 2019 17:56:05 -0500
@@ -53,9 +22,9 @@ index 2706fb4..f9b533d 100644
5322+ ['mstest2', [2, 3], [[1130956047, 0, 'tpubDF2rnouQaaYrXF4noGTv6rQYmx87cQ4GrUdhpvXkhtChwQPbdGTi8GA88NUaSrwZBwNsTkC9bFkkC8vDyGBVVAQTZ2AS6gs68RQXtXcCvkP'], [1130956047, 1, 'tpubDETRnZNJAqXiVeiL8UMDzCTBAoh3JvZkgXLdb1K2xzpJLepuJ6ka8jnVyRSkVh8Nbbo8u8dobZCsNENmRKipLzHNsS5mccjKSpXgSgavTQe'], [1130956047, 2, 'tpubDF3hdPQ5oDhtYjjaC596pboPii7UZmjqZcBPBRAbb6Bgn9hKoFxb8zWsBfdiCnTq3htUs2Yi2reeG3kMqHzZGZykJQAB5aKrJ8UfiXjmaLD']], {'ft': 26, 'ch': 'XTN', "d": ["48'/1'/0'/0'", "48'/1'/1'/0'", "48'/1'/2'/0'"]}],
5423+ ]
5524 sim_defaults['fee_limit'] = -1
56-
25+
5726 if '--xfp' in sys.argv:
58- - -
27+ - -
59282.38.1
6029
6130
@@ -78,14 +47,14 @@ index 6f26644..6e190b5 100644
7847 for xfp, deriv, xpub in self.xpubs:
7948- self.xfp_paths[xfp] = str_to_keypath(xfp, deriv)
8049+ self.xfp_paths.setdefault(xfp, list()).append(str_to_keypath(xfp, deriv))
81-
50+
8251- assert len(self.xfp_paths) == self.N, 'dup XFP' # not supported
8352+ assert len(self.xpubs) == self.N, 'Number of pubkeys does not match N'
84-
53+
8554 @classmethod
8655 def render_addr_fmt(cls, addr_fmt):
8756@@ -245,7 +245,11 @@ class MultisigWallet:
88-
57+
8958 def get_xfp_paths(self):
9059 # return list of lists [xfp, *deriv]
9160- return list(self.xfp_paths.values())
@@ -94,11 +63,11 @@ index 6f26644..6e190b5 100644
9463+ for xfp_path in paths_list:
9564+ ret.append(xfp_path)
9665+ return ret
97-
66+
9867 @classmethod
9968 def find_match(cls, M, N, xfp_paths, addr_fmt=None):
10069@@ -280,24 +284,30 @@ class MultisigWallet:
101- # the same prefix path per-each xfp, as indicated
70+ # the same prefix path per-each xfp, as indicated
10271 # xfp_paths (unordered)?
10372 # - could also check non-prefix part is all non-hardened
10473- if len(xfp_paths) != len(self.xfp_paths):
@@ -138,8 +107,8 @@ index 6f26644..6e190b5 100644
138107+ else:
139108+ # No match was found
140109 return False
141-
110+
142111 return True
143- - -
112+ - -
1441132.38.1
145114
0 commit comments