@@ -43,7 +43,7 @@ admin: public(address)
43
43
factory_ng: FactoryNG
44
44
rate_oracle: address
45
45
46
- @external
46
+ @deploy
47
47
def __init__ (impl: address ):
48
48
IMPL = impl
49
49
self .admin = msg .sender
@@ -52,26 +52,26 @@ def __init__(impl: address):
52
52
@external
53
53
def deploy (coin_a: ERC20, coin_b: ERC20) -> address :
54
54
pool: Swap = Swap (create_minimal_proxy_to (IMPL))
55
- pool.initialize (
55
+ extcall pool.initialize (
56
56
"TestName " ,
57
57
"TST " ,
58
- [address ( coin_a), address ( coin_b) , empty (address ), empty (address )],
59
- [10 ** (18 - coin_a.decimals ()) * 10 ** 18 , 10 ** (18 - coin_b.decimals ()) * 10 ** 18 , 0 , 0 ],
58
+ [coin_a. address , coin_b. address , empty (address ), empty (address )],
59
+ [10 ** (18 - staticcall coin_a.decimals ()) * 10 ** 18 , 10 ** (18 - staticcall coin_b.decimals ()) * 10 ** 18 , 0 , 0 ],
60
60
100 ,
61
61
0 ,
62
62
)
63
- self .pools[self .n] = address ( pool)
63
+ self .pools[self .n] = pool. address
64
64
self .n += 1
65
- return address ( pool)
65
+ return pool. address
66
66
67
67
68
68
@external
69
69
def deploy_ng (coin_a: ERC20, coin_b: ERC20) -> address :
70
- assert address ( self .factory_ng) != empty (address ), "Factory not set "
71
- pool: address = self .factory_ng.deploy_plain_pool (
70
+ assert self .factory_ng. address != empty (address ), "Factory not set "
71
+ pool: address = extcall self .factory_ng.deploy_plain_pool (
72
72
"TestName-ng " ,
73
73
"TST-ng " ,
74
- [address ( coin_a), address ( coin_b) ],
74
+ [coin_a. address , coin_b. address ],
75
75
100 ,
76
76
0 ,
77
77
10000000000 ,
0 commit comments