Skip to content

Commit e6f05d0

Browse files
utuogiutuogi
committed
Merge branch '48-as-a-lisk-user-i-want-to-use-utu-protocol-without-switching-wallets-or-networks' into 'main'
Resolve "As a LISK user, I want to use UTU Protocol without switching wallets or networks" Closes #48 See merge request ututrust/utu-trust-token-solidity!56
2 parents 57ecae8 + 355e0b3 commit e6f05d0

42 files changed

Lines changed: 1344 additions & 134 deletions

Some content is hidden

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

‎.env.example‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ TESTNET_OPTIMISM_URL=<OPTIMISM testnet node URL>
1717
TEST_PRIVATE_KEY=<Deployer testnet wallet private key>
1818
MAIN_PRIVATE_KEY=<Deployer mainnet wallet private key>
1919

20+
TESTNET_LISK_URL=<Lisk testnet node URL>
21+
LISK_URL=<Lisk mainnet node URL>

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ node_modules
33
coverage
44
coverage.json
55
typechain
6+
.history
67

78
#Hardhat files
89
cache
@@ -19,4 +20,7 @@ exports
1920
typechain-types
2021
tasks/chainlink-jobs/generated/*.toml
2122
env.toml
23+
.cursorignore
24+
25+
2226

‎.openzeppelin/op-sepolia.json‎

Lines changed: 295 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,295 @@
1+
{
2+
"manifestVersion": "3.2",
3+
"proxies": [
4+
{
5+
"address": "0xbdF3b87B410C50Ba9620d8Ac416A81e6bF7296eF",
6+
"txHash": "0x45fda2d70330894ce8a30a479087764b5d683223949b11b7b361ebb41e3a945c",
7+
"kind": "transparent"
8+
}
9+
],
10+
"impls": {
11+
"b3ea336af843678bded47de4b93769dd10347c8f1282bd6190ada9537e760fd1": {
12+
"address": "0xC3586558ddb1Cc6C7c5338691842b8d5F47D253d",
13+
"txHash": "0xe132f23ef9b8075a54162d7313d78abb2d1b1016e4b23c3ae057c75a298a7c6c",
14+
"layout": {
15+
"solcVersion": "0.8.24",
16+
"storage": [
17+
{
18+
"label": "_initialized",
19+
"offset": 0,
20+
"slot": "0",
21+
"type": "t_uint8",
22+
"contract": "Initializable",
23+
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63",
24+
"retypedFrom": "bool"
25+
},
26+
{
27+
"label": "_initializing",
28+
"offset": 1,
29+
"slot": "0",
30+
"type": "t_bool",
31+
"contract": "Initializable",
32+
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68"
33+
},
34+
{
35+
"label": "__gap",
36+
"offset": 0,
37+
"slot": "1",
38+
"type": "t_array(t_uint256)50_storage",
39+
"contract": "ContextUpgradeable",
40+
"src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36"
41+
},
42+
{
43+
"label": "_owner",
44+
"offset": 0,
45+
"slot": "51",
46+
"type": "t_address",
47+
"contract": "OwnableUpgradeable",
48+
"src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22"
49+
},
50+
{
51+
"label": "__gap",
52+
"offset": 0,
53+
"slot": "52",
54+
"type": "t_array(t_uint256)49_storage",
55+
"contract": "OwnableUpgradeable",
56+
"src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94"
57+
},
58+
{
59+
"label": "s_ens",
60+
"offset": 0,
61+
"slot": "101",
62+
"type": "t_contract(ENSInterface)381",
63+
"contract": "ChainlinkClient",
64+
"src": "contracts/ChainlinkClient.sol:31"
65+
},
66+
{
67+
"label": "s_ensNode",
68+
"offset": 0,
69+
"slot": "102",
70+
"type": "t_bytes32",
71+
"contract": "ChainlinkClient",
72+
"src": "contracts/ChainlinkClient.sol:32"
73+
},
74+
{
75+
"label": "s_link",
76+
"offset": 0,
77+
"slot": "103",
78+
"type": "t_contract(LinkTokenInterface)846",
79+
"contract": "ChainlinkClient",
80+
"src": "contracts/ChainlinkClient.sol:33"
81+
},
82+
{
83+
"label": "s_oracle",
84+
"offset": 0,
85+
"slot": "104",
86+
"type": "t_contract(OperatorInterface)446",
87+
"contract": "ChainlinkClient",
88+
"src": "contracts/ChainlinkClient.sol:34"
89+
},
90+
{
91+
"label": "s_requestCount",
92+
"offset": 0,
93+
"slot": "105",
94+
"type": "t_uint256",
95+
"contract": "ChainlinkClient",
96+
"src": "contracts/ChainlinkClient.sol:35"
97+
},
98+
{
99+
"label": "s_pendingRequests",
100+
"offset": 0,
101+
"slot": "106",
102+
"type": "t_mapping(t_bytes32,t_address)",
103+
"contract": "ChainlinkClient",
104+
"src": "contracts/ChainlinkClient.sol:36"
105+
},
106+
{
107+
"label": "__gap",
108+
"offset": 0,
109+
"slot": "107",
110+
"type": "t_array(t_uint256)49_storage",
111+
"contract": "ChainlinkClient",
112+
"src": "contracts/ChainlinkClient.sol:371"
113+
},
114+
{
115+
"label": "UTUCoin",
116+
"offset": 0,
117+
"slot": "156",
118+
"type": "t_address",
119+
"contract": "UTTProxy",
120+
"src": "contracts/UTTProxy.sol:20"
121+
},
122+
{
123+
"label": "oracleRequests",
124+
"offset": 0,
125+
"slot": "157",
126+
"type": "t_mapping(t_bytes32,t_struct(OracleRequest)14750_storage)",
127+
"contract": "UTTProxy",
128+
"src": "contracts/UTTProxy.sol:40"
129+
},
130+
{
131+
"label": "oracleClaimRequests",
132+
"offset": 0,
133+
"slot": "158",
134+
"type": "t_mapping(t_bytes32,t_struct(OracleClaimRequest)14754_storage)",
135+
"contract": "UTTProxy",
136+
"src": "contracts/UTTProxy.sol:43"
137+
},
138+
{
139+
"label": "oracle",
140+
"offset": 0,
141+
"slot": "159",
142+
"type": "t_address",
143+
"contract": "UTTProxy",
144+
"src": "contracts/UTTProxy.sol:45"
145+
},
146+
{
147+
"label": "jobId",
148+
"offset": 0,
149+
"slot": "160",
150+
"type": "t_bytes32",
151+
"contract": "UTTProxy",
152+
"src": "contracts/UTTProxy.sol:48"
153+
},
154+
{
155+
"label": "fee",
156+
"offset": 0,
157+
"slot": "161",
158+
"type": "t_uint256",
159+
"contract": "UTTProxy",
160+
"src": "contracts/UTTProxy.sol:51"
161+
},
162+
{
163+
"label": "isMigrating",
164+
"offset": 0,
165+
"slot": "162",
166+
"type": "t_bool",
167+
"contract": "UTTProxy",
168+
"src": "contracts/UTTProxy.sol:54"
169+
},
170+
{
171+
"label": "claimRewardJobId",
172+
"offset": 0,
173+
"slot": "163",
174+
"type": "t_bytes32",
175+
"contract": "UTTProxy",
176+
"src": "contracts/UTTProxy.sol:57"
177+
},
178+
{
179+
"label": "__gap",
180+
"offset": 0,
181+
"slot": "164",
182+
"type": "t_array(t_uint256)48_storage",
183+
"contract": "UTTProxy",
184+
"src": "contracts/UTTProxy.sol:234"
185+
}
186+
],
187+
"types": {
188+
"t_address": {
189+
"label": "address",
190+
"numberOfBytes": "20"
191+
},
192+
"t_array(t_uint256)48_storage": {
193+
"label": "uint256[48]",
194+
"numberOfBytes": "1536"
195+
},
196+
"t_array(t_uint256)49_storage": {
197+
"label": "uint256[49]",
198+
"numberOfBytes": "1568"
199+
},
200+
"t_array(t_uint256)50_storage": {
201+
"label": "uint256[50]",
202+
"numberOfBytes": "1600"
203+
},
204+
"t_bool": {
205+
"label": "bool",
206+
"numberOfBytes": "1"
207+
},
208+
"t_bytes32": {
209+
"label": "bytes32",
210+
"numberOfBytes": "32"
211+
},
212+
"t_contract(ENSInterface)381": {
213+
"label": "contract ENSInterface",
214+
"numberOfBytes": "20"
215+
},
216+
"t_contract(LinkTokenInterface)846": {
217+
"label": "contract LinkTokenInterface",
218+
"numberOfBytes": "20"
219+
},
220+
"t_contract(OperatorInterface)446": {
221+
"label": "contract OperatorInterface",
222+
"numberOfBytes": "20"
223+
},
224+
"t_mapping(t_bytes32,t_address)": {
225+
"label": "mapping(bytes32 => address)",
226+
"numberOfBytes": "32"
227+
},
228+
"t_mapping(t_bytes32,t_struct(OracleClaimRequest)14754_storage)": {
229+
"label": "mapping(bytes32 => struct UTTProxy.OracleClaimRequest)",
230+
"numberOfBytes": "32"
231+
},
232+
"t_mapping(t_bytes32,t_struct(OracleRequest)14750_storage)": {
233+
"label": "mapping(bytes32 => struct UTTProxy.OracleRequest)",
234+
"numberOfBytes": "32"
235+
},
236+
"t_string_storage": {
237+
"label": "string",
238+
"numberOfBytes": "32"
239+
},
240+
"t_struct(OracleClaimRequest)14754_storage": {
241+
"label": "struct UTTProxy.OracleClaimRequest",
242+
"members": [
243+
{
244+
"label": "target",
245+
"type": "t_address",
246+
"offset": 0,
247+
"slot": "0"
248+
}
249+
],
250+
"numberOfBytes": "32"
251+
},
252+
"t_struct(OracleRequest)14750_storage": {
253+
"label": "struct UTTProxy.OracleRequest",
254+
"members": [
255+
{
256+
"label": "from",
257+
"type": "t_address",
258+
"offset": 0,
259+
"slot": "0"
260+
},
261+
{
262+
"label": "target",
263+
"type": "t_address",
264+
"offset": 0,
265+
"slot": "1"
266+
},
267+
{
268+
"label": "amount",
269+
"type": "t_uint256",
270+
"offset": 0,
271+
"slot": "2"
272+
},
273+
{
274+
"label": "transactionId",
275+
"type": "t_string_storage",
276+
"offset": 0,
277+
"slot": "3"
278+
}
279+
],
280+
"numberOfBytes": "128"
281+
},
282+
"t_uint256": {
283+
"label": "uint256",
284+
"numberOfBytes": "32"
285+
},
286+
"t_uint8": {
287+
"label": "uint8",
288+
"numberOfBytes": "1"
289+
}
290+
},
291+
"namespaces": {}
292+
}
293+
}
294+
}
295+
}

0 commit comments

Comments
 (0)