Skip to content

Commit 2ed6c61

Browse files
committed
updates to request of native and token mech based on latest contract changes
1 parent bb72c41 commit 2ed6c61

6 files changed

+197
-270
lines changed

mech_client/abis/BalanceTrackerNvmSubscriptionNative.json

-13
Original file line numberDiff line numberDiff line change
@@ -582,19 +582,6 @@
582582
"stateMutability": "nonpayable",
583583
"type": "function"
584584
},
585-
{
586-
"inputs": [
587-
{
588-
"internalType": "address",
589-
"name": "requester",
590-
"type": "address"
591-
}
592-
],
593-
"name": "redeemRequesterCredits",
594-
"outputs": [],
595-
"stateMutability": "nonpayable",
596-
"type": "function"
597-
},
598585
{
599586
"inputs": [
600587
{

mech_client/abis/IMech.json

+13
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,18 @@
111111
],
112112
"stateMutability": "view",
113113
"type": "function"
114+
},
115+
{
116+
"inputs": [],
117+
"name": "serviceId",
118+
"outputs": [
119+
{
120+
"internalType": "uint256",
121+
"name": "",
122+
"type": "uint256"
123+
}
124+
],
125+
"stateMutability": "view",
126+
"type": "function"
114127
}
115128
]

mech_client/abis/MechMarketplace.json

+66-161
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,6 @@
1515
"stateMutability": "nonpayable",
1616
"type": "constructor"
1717
},
18-
{
19-
"inputs": [
20-
{
21-
"internalType": "bytes32",
22-
"name": "requestId",
23-
"type": "bytes32"
24-
}
25-
],
26-
"name": "AlreadyDelivered",
27-
"type": "error"
28-
},
2918
{
3019
"inputs": [],
3120
"name": "AlreadyInitialized",
@@ -143,54 +132,11 @@
143132
"name": "OwnerOnly",
144133
"type": "error"
145134
},
146-
{
147-
"inputs": [
148-
{
149-
"internalType": "uint256",
150-
"name": "expected",
151-
"type": "uint256"
152-
},
153-
{
154-
"internalType": "uint256",
155-
"name": "current",
156-
"type": "uint256"
157-
}
158-
],
159-
"name": "PriorityMechResponseTimeout",
160-
"type": "error"
161-
},
162135
{
163136
"inputs": [],
164137
"name": "ReentrancyGuard",
165138
"type": "error"
166139
},
167-
{
168-
"inputs": [
169-
{
170-
"internalType": "bytes32",
171-
"name": "requestId",
172-
"type": "bytes32"
173-
}
174-
],
175-
"name": "RequestIdNotFound",
176-
"type": "error"
177-
},
178-
{
179-
"inputs": [
180-
{
181-
"internalType": "address",
182-
"name": "stakingInstance",
183-
"type": "address"
184-
},
185-
{
186-
"internalType": "uint256",
187-
"name": "serviceId",
188-
"type": "uint256"
189-
}
190-
],
191-
"name": "ServiceNotStaked",
192-
"type": "error"
193-
},
194140
{
195141
"inputs": [
196142
{
@@ -265,53 +211,6 @@
265211
"name": "WrongArrayLength",
266212
"type": "error"
267213
},
268-
{
269-
"inputs": [
270-
{
271-
"internalType": "uint256",
272-
"name": "numValues1",
273-
"type": "uint256"
274-
},
275-
{
276-
"internalType": "uint256",
277-
"name": "numValues2",
278-
"type": "uint256"
279-
},
280-
{
281-
"internalType": "uint256",
282-
"name": "numValues3",
283-
"type": "uint256"
284-
}
285-
],
286-
"name": "WrongArrayLength3",
287-
"type": "error"
288-
},
289-
{
290-
"inputs": [
291-
{
292-
"internalType": "uint256",
293-
"name": "numValues1",
294-
"type": "uint256"
295-
},
296-
{
297-
"internalType": "uint256",
298-
"name": "numValues2",
299-
"type": "uint256"
300-
},
301-
{
302-
"internalType": "uint256",
303-
"name": "numValues3",
304-
"type": "uint256"
305-
},
306-
{
307-
"internalType": "uint256",
308-
"name": "numValues4",
309-
"type": "uint256"
310-
}
311-
],
312-
"name": "WrongArrayLength4",
313-
"type": "error"
314-
},
315214
{
316215
"inputs": [
317216
{
@@ -363,6 +262,12 @@
363262
"internalType": "uint256",
364263
"name": "serviceId",
365264
"type": "uint256"
265+
},
266+
{
267+
"indexed": true,
268+
"internalType": "address",
269+
"name": "mechFactory",
270+
"type": "address"
366271
}
367272
],
368273
"name": "CreateMech",
@@ -389,6 +294,12 @@
389294
"name": "requestId",
390295
"type": "bytes32"
391296
},
297+
{
298+
"indexed": false,
299+
"internalType": "uint256",
300+
"name": "deliveryRate",
301+
"type": "uint256"
302+
},
392303
{
393304
"indexed": false,
394305
"internalType": "bytes",
@@ -467,7 +378,7 @@
467378
{
468379
"indexed": false,
469380
"internalType": "uint256",
470-
"name": "numRequests",
381+
"name": "numDeliveries",
471382
"type": "uint256"
472383
},
473384
{
@@ -549,25 +460,6 @@
549460
"name": "OwnerUpdated",
550461
"type": "event"
551462
},
552-
{
553-
"anonymous": false,
554-
"inputs": [
555-
{
556-
"indexed": true,
557-
"internalType": "address",
558-
"name": "requester",
559-
"type": "address"
560-
},
561-
{
562-
"indexed": false,
563-
"internalType": "bytes32",
564-
"name": "hash",
565-
"type": "bytes32"
566-
}
567-
],
568-
"name": "RequesterHashApproved",
569-
"type": "event"
570-
},
571463
{
572464
"anonymous": false,
573465
"inputs": [
@@ -779,11 +671,6 @@
779671
"internalType": "uint256[]",
780672
"name": "deliveryRates",
781673
"type": "uint256[]"
782-
},
783-
{
784-
"internalType": "bytes[]",
785-
"name": "deliveryDatas",
786-
"type": "bytes[]"
787674
}
788675
],
789676
"name": "deliverMarketplace",
@@ -805,19 +692,26 @@
805692
"type": "address"
806693
},
807694
{
808-
"internalType": "bytes[]",
809-
"name": "requestDatas",
810-
"type": "bytes[]"
811-
},
812-
{
813-
"internalType": "bytes[]",
814-
"name": "signatures",
815-
"type": "bytes[]"
816-
},
817-
{
818-
"internalType": "bytes[]",
819-
"name": "deliveryDatas",
820-
"type": "bytes[]"
695+
"components": [
696+
{
697+
"internalType": "bytes",
698+
"name": "requestData",
699+
"type": "bytes"
700+
},
701+
{
702+
"internalType": "bytes",
703+
"name": "signature",
704+
"type": "bytes"
705+
},
706+
{
707+
"internalType": "bytes",
708+
"name": "deliveryData",
709+
"type": "bytes"
710+
}
711+
],
712+
"internalType": "struct DeliverWithSignature[]",
713+
"name": "deliverWithSignatures",
714+
"type": "tuple[]"
821715
},
822716
{
823717
"internalType": "uint256[]",
@@ -878,7 +772,12 @@
878772
"inputs": [
879773
{
880774
"internalType": "address",
881-
"name": "account",
775+
"name": "mech",
776+
"type": "address"
777+
},
778+
{
779+
"internalType": "address",
780+
"name": "requester",
882781
"type": "address"
883782
},
884783
{
@@ -891,6 +790,11 @@
891790
"name": "deliveryRate",
892791
"type": "uint256"
893792
},
793+
{
794+
"internalType": "bytes32",
795+
"name": "paymentType",
796+
"type": "bytes32"
797+
},
894798
{
895799
"internalType": "uint256",
896800
"name": "nonce",
@@ -1159,25 +1063,6 @@
11591063
"stateMutability": "view",
11601064
"type": "function"
11611065
},
1162-
{
1163-
"inputs": [
1164-
{
1165-
"internalType": "uint256",
1166-
"name": "",
1167-
"type": "uint256"
1168-
}
1169-
],
1170-
"name": "mapServiceIdMech",
1171-
"outputs": [
1172-
{
1173-
"internalType": "address",
1174-
"name": "",
1175-
"type": "address"
1176-
}
1177-
],
1178-
"stateMutability": "view",
1179-
"type": "function"
1180-
},
11811066
{
11821067
"inputs": [],
11831068
"name": "maxResponseTimeout",
@@ -1265,9 +1150,19 @@
12651150
},
12661151
{
12671152
"internalType": "uint256",
1268-
"name": "priorityMechServiceId",
1153+
"name": "maxDeliveryRate",
12691154
"type": "uint256"
12701155
},
1156+
{
1157+
"internalType": "bytes32",
1158+
"name": "paymentType",
1159+
"type": "bytes32"
1160+
},
1161+
{
1162+
"internalType": "address",
1163+
"name": "priorityMech",
1164+
"type": "address"
1165+
},
12711166
{
12721167
"internalType": "uint256",
12731168
"name": "responseTimeout",
@@ -1299,9 +1194,19 @@
12991194
},
13001195
{
13011196
"internalType": "uint256",
1302-
"name": "priorityMechServiceId",
1197+
"name": "maxDeliveryRate",
13031198
"type": "uint256"
13041199
},
1200+
{
1201+
"internalType": "bytes32",
1202+
"name": "paymentType",
1203+
"type": "bytes32"
1204+
},
1205+
{
1206+
"internalType": "address",
1207+
"name": "priorityMech",
1208+
"type": "address"
1209+
},
13051210
{
13061211
"internalType": "uint256",
13071212
"name": "responseTimeout",

0 commit comments

Comments
 (0)