Skip to content

Commit c0557c9

Browse files
pkieltykapkieltyka
authored
minor cleanup, preparing for v3 (#203)
1 parent e488349 commit c0557c9

File tree

141 files changed

+685
-1689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+685
-1689
lines changed

‎Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ all:
66
bootstrap:
77
cd ./testutil/chain && yarn install
88

9+
build:
10+
go build ./...
11+
912
test: wait-on-chain check-testchain-running go-test
1013

1114
go-test:

‎contracts/artifacts/erc20/IERC20.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
},
8787
{
8888
"internalType": "uint256",
89-
"name": "amount",
89+
"name": "value",
9090
"type": "uint256"
9191
}
9292
],
@@ -137,12 +137,12 @@
137137
"inputs": [
138138
{
139139
"internalType": "address",
140-
"name": "recipient",
140+
"name": "to",
141141
"type": "address"
142142
},
143143
{
144144
"internalType": "uint256",
145-
"name": "amount",
145+
"name": "value",
146146
"type": "uint256"
147147
}
148148
],
@@ -161,17 +161,17 @@
161161
"inputs": [
162162
{
163163
"internalType": "address",
164-
"name": "sender",
164+
"name": "from",
165165
"type": "address"
166166
},
167167
{
168168
"internalType": "address",
169-
"name": "recipient",
169+
"name": "to",
170170
"type": "address"
171171
},
172172
{
173173
"internalType": "uint256",
174-
"name": "amount",
174+
"name": "value",
175175
"type": "uint256"
176176
}
177177
],

‎contracts/artifacts/erc20/IERC20Errors.json

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
{
2+
"_format": "hh-sol-artifact-1",
3+
"contractName": "IERC20Errors",
4+
"sourceName": "contracts/interfaces/draft-IERC6093.sol",
5+
"abi": [
6+
{
7+
"inputs": [
8+
{
9+
"internalType": "address",
10+
"name": "spender",
11+
"type": "address"
12+
},
13+
{
14+
"internalType": "uint256",
15+
"name": "allowance",
16+
"type": "uint256"
17+
},
18+
{
19+
"internalType": "uint256",
20+
"name": "needed",
21+
"type": "uint256"
22+
}
23+
],
24+
"name": "ERC20InsufficientAllowance",
25+
"type": "error"
26+
},
27+
{
28+
"inputs": [
29+
{
30+
"internalType": "address",
31+
"name": "sender",
32+
"type": "address"
33+
},
34+
{
35+
"internalType": "uint256",
36+
"name": "balance",
37+
"type": "uint256"
38+
},
39+
{
40+
"internalType": "uint256",
41+
"name": "needed",
42+
"type": "uint256"
43+
}
44+
],
45+
"name": "ERC20InsufficientBalance",
46+
"type": "error"
47+
},
48+
{
49+
"inputs": [
50+
{
51+
"internalType": "address",
52+
"name": "approver",
53+
"type": "address"
54+
}
55+
],
56+
"name": "ERC20InvalidApprover",
57+
"type": "error"
58+
},
59+
{
60+
"inputs": [
61+
{
62+
"internalType": "address",
63+
"name": "receiver",
64+
"type": "address"
65+
}
66+
],
67+
"name": "ERC20InvalidReceiver",
68+
"type": "error"
69+
},
70+
{
71+
"inputs": [
72+
{
73+
"internalType": "address",
74+
"name": "sender",
75+
"type": "address"
76+
}
77+
],
78+
"name": "ERC20InvalidSender",
79+
"type": "error"
80+
},
81+
{
82+
"inputs": [
83+
{
84+
"internalType": "address",
85+
"name": "spender",
86+
"type": "address"
87+
}
88+
],
89+
"name": "ERC20InvalidSpender",
90+
"type": "error"
91+
}
92+
],
93+
"bytecode": "0x",
94+
"deployedBytecode": "0x",
95+
"linkReferences": {},
96+
"deployedLinkReferences": {}
97+
}

‎contracts/artifacts/erc20/IERC20Metadata.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
},
8787
{
8888
"internalType": "uint256",
89-
"name": "amount",
89+
"name": "value",
9090
"type": "uint256"
9191
}
9292
],
@@ -176,12 +176,12 @@
176176
"inputs": [
177177
{
178178
"internalType": "address",
179-
"name": "recipient",
179+
"name": "to",
180180
"type": "address"
181181
},
182182
{
183183
"internalType": "uint256",
184-
"name": "amount",
184+
"name": "value",
185185
"type": "uint256"
186186
}
187187
],
@@ -200,17 +200,17 @@
200200
"inputs": [
201201
{
202202
"internalType": "address",
203-
"name": "sender",
203+
"name": "from",
204204
"type": "address"
205205
},
206206
{
207207
"internalType": "address",
208-
"name": "recipient",
208+
"name": "to",
209209
"type": "address"
210210
},
211211
{
212212
"internalType": "uint256",
213-
"name": "amount",
213+
"name": "value",
214214
"type": "uint256"
215215
}
216216
],

‎contracts/artifacts/erc20/IERC20Permit.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"_format": "hh-sol-artifact-1",
33
"contractName": "IERC20Permit",
4-
"sourceName": "contracts/token/ERC20/extensions/draft-IERC20Permit.sol",
4+
"sourceName": "contracts/token/ERC20/extensions/IERC20Permit.sol",
55
"abi": [
66
{
77
"inputs": [],

‎contracts/artifacts/erc721/IERC721.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
},
238238
{
239239
"internalType": "bool",
240-
"name": "_approved",
240+
"name": "approved",
241241
"type": "bool"
242242
}
243243
],

‎contracts/artifacts/erc721/IERC721Enumerable.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
},
238238
{
239239
"internalType": "bool",
240-
"name": "_approved",
240+
"name": "approved",
241241
"type": "bool"
242242
}
243243
],
@@ -301,7 +301,7 @@
301301
"outputs": [
302302
{
303303
"internalType": "uint256",
304-
"name": "tokenId",
304+
"name": "",
305305
"type": "uint256"
306306
}
307307
],

‎contracts/artifacts/erc721/IERC721Errors.json

+114
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
{
2+
"_format": "hh-sol-artifact-1",
3+
"contractName": "IERC721Errors",
4+
"sourceName": "contracts/interfaces/draft-IERC6093.sol",
5+
"abi": [
6+
{
7+
"inputs": [
8+
{
9+
"internalType": "address",
10+
"name": "sender",
11+
"type": "address"
12+
},
13+
{
14+
"internalType": "uint256",
15+
"name": "tokenId",
16+
"type": "uint256"
17+
},
18+
{
19+
"internalType": "address",
20+
"name": "owner",
21+
"type": "address"
22+
}
23+
],
24+
"name": "ERC721IncorrectOwner",
25+
"type": "error"
26+
},
27+
{
28+
"inputs": [
29+
{
30+
"internalType": "address",
31+
"name": "operator",
32+
"type": "address"
33+
},
34+
{
35+
"internalType": "uint256",
36+
"name": "tokenId",
37+
"type": "uint256"
38+
}
39+
],
40+
"name": "ERC721InsufficientApproval",
41+
"type": "error"
42+
},
43+
{
44+
"inputs": [
45+
{
46+
"internalType": "address",
47+
"name": "approver",
48+
"type": "address"
49+
}
50+
],
51+
"name": "ERC721InvalidApprover",
52+
"type": "error"
53+
},
54+
{
55+
"inputs": [
56+
{
57+
"internalType": "address",
58+
"name": "operator",
59+
"type": "address"
60+
}
61+
],
62+
"name": "ERC721InvalidOperator",
63+
"type": "error"
64+
},
65+
{
66+
"inputs": [
67+
{
68+
"internalType": "address",
69+
"name": "owner",
70+
"type": "address"
71+
}
72+
],
73+
"name": "ERC721InvalidOwner",
74+
"type": "error"
75+
},
76+
{
77+
"inputs": [
78+
{
79+
"internalType": "address",
80+
"name": "receiver",
81+
"type": "address"
82+
}
83+
],
84+
"name": "ERC721InvalidReceiver",
85+
"type": "error"
86+
},
87+
{
88+
"inputs": [
89+
{
90+
"internalType": "address",
91+
"name": "sender",
92+
"type": "address"
93+
}
94+
],
95+
"name": "ERC721InvalidSender",
96+
"type": "error"
97+
},
98+
{
99+
"inputs": [
100+
{
101+
"internalType": "uint256",
102+
"name": "tokenId",
103+
"type": "uint256"
104+
}
105+
],
106+
"name": "ERC721NonexistentToken",
107+
"type": "error"
108+
}
109+
],
110+
"bytecode": "0x",
111+
"deployedBytecode": "0x",
112+
"linkReferences": {},
113+
"deployedLinkReferences": {}
114+
}

‎contracts/artifacts/erc721/IERC721Metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
},
251251
{
252252
"internalType": "bool",
253-
"name": "_approved",
253+
"name": "approved",
254254
"type": "bool"
255255
}
256256
],

‎contracts/artifacts/wallet-contracts-v2/Factory.sol/Factory.dbg.json

-4
This file was deleted.

‎contracts/artifacts/wallet-contracts-v2/Factory.sol/Factory.json

+18-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
33
"contractName": "Factory",
44
"sourceName": "contracts/Factory.sol",
55
"abi": [
6+
{
7+
"inputs": [
8+
{
9+
"internalType": "address",
10+
"name": "_mainModule",
11+
"type": "address"
12+
},
13+
{
14+
"internalType": "bytes32",
15+
"name": "_salt",
16+
"type": "bytes32"
17+
}
18+
],
19+
"name": "DeployFailed",
20+
"type": "error"
21+
},
622
{
723
"inputs": [
824
{
@@ -28,8 +44,8 @@
2844
"type": "function"
2945
}
3046
],
31-
"bytecode": "0x608060405234801561001057600080fd5b5061019a806100206000396000f3fe60806040526004361061001e5760003560e01c806332c02a1414610023575b600080fd5b6100366100313660046100c5565b61005f565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60008060405180606001604052806028815260200161013d602891398473ffffffffffffffffffffffffffffffffffffffff166040516020016100a392919061010a565b60405160208183030381529060405290508281516020830134f5949350505050565b600080604083850312156100d857600080fd5b823573ffffffffffffffffffffffffffffffffffffffff811681146100fc57600080fd5b946020939093013593505050565b6000835160005b8181101561012b5760208187018101518583015201610111565b50919091019182525060200191905056fe603a600e3d39601a805130553df3363d3d373d3d3d363d30545af43d82803e903d91601857fd5bf3a2646970667358221220c1ff72447789cdf27bd9fa7b505b879782826ca091b9b69d7f20373b588c55fd64736f6c63430008120033",
32-
"deployedBytecode": "0x60806040526004361061001e5760003560e01c806332c02a1414610023575b600080fd5b6100366100313660046100c5565b61005f565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b60008060405180606001604052806028815260200161013d602891398473ffffffffffffffffffffffffffffffffffffffff166040516020016100a392919061010a565b60405160208183030381529060405290508281516020830134f5949350505050565b600080604083850312156100d857600080fd5b823573ffffffffffffffffffffffffffffffffffffffff811681146100fc57600080fd5b946020939093013593505050565b6000835160005b8181101561012b5760208187018101518583015201610111565b50919091019182525060200191905056fe603a600e3d39601a805130553df3363d3d373d3d3d363d30545af43d82803e903d91601857fd5bf3a2646970667358221220c1ff72447789cdf27bd9fa7b505b879782826ca091b9b69d7f20373b588c55fd64736f6c63430008120033",
47+
"bytecode": "0x608060405234801561001057600080fd5b5061020b806100206000396000f3fe60806040526004361061001e5760003560e01c806332c02a1414610023575b600080fd5b610036610031366004610136565b61005f565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b6000806040518060600160405280602881526020016101ae602891398473ffffffffffffffffffffffffffffffffffffffff166040516020016100a392919061017b565b60405160208183030381529060405290508281516020830134f5915073ffffffffffffffffffffffffffffffffffffffff821661012f576040517f8caac80500000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff851660048201526024810184905260440160405180910390fd5b5092915050565b6000806040838503121561014957600080fd5b823573ffffffffffffffffffffffffffffffffffffffff8116811461016d57600080fd5b946020939093013593505050565b6000835160005b8181101561019c5760208187018101518583015201610182565b50919091019182525060200191905056fe603a600e3d39601a805130553df3363d3d373d3d3d363d30545af43d82803e903d91601857fd5bf3a26469706673582212203e46c5b0f3a6bebab844eb5e4594ebb07eac1ae451f779e533ead5e744b1a2a664736f6c63430008120033",
48+
"deployedBytecode": "0x60806040526004361061001e5760003560e01c806332c02a1414610023575b600080fd5b610036610031366004610136565b61005f565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b6000806040518060600160405280602881526020016101ae602891398473ffffffffffffffffffffffffffffffffffffffff166040516020016100a392919061017b565b60405160208183030381529060405290508281516020830134f5915073ffffffffffffffffffffffffffffffffffffffff821661012f576040517f8caac80500000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff851660048201526024810184905260440160405180910390fd5b5092915050565b6000806040838503121561014957600080fd5b823573ffffffffffffffffffffffffffffffffffffffff8116811461016d57600080fd5b946020939093013593505050565b6000835160005b8181101561019c5760208187018101518583015201610182565b50919091019182525060200191905056fe603a600e3d39601a805130553df3363d3d373d3d3d363d30545af43d82803e903d91601857fd5bf3a26469706673582212203e46c5b0f3a6bebab844eb5e4594ebb07eac1ae451f779e533ead5e744b1a2a664736f6c63430008120033",
3349
"linkReferences": {},
3450
"deployedLinkReferences": {}
3551
}

0 commit comments

Comments
 (0)