Skip to content

Commit 26b4111

Browse files
feat!: remove voucher support (#511)
1 parent ea6e4ea commit 26b4111

Some content is hidden

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

54 files changed

+107
-3789
lines changed

CLI.md

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ Commands:
302302
- [init](#iexec-init)
303303
- [iexec wallet](#iexec-wallet)
304304
- [iexec account](#iexec-account)
305-
- [iexec voucher](#iexec-voucher)
306305
- [iexec app](#iexec-app)
307306
- [iexec dataset](#iexec-dataset)
308307
- [iexec workerpool](#iexec-workerpool)
@@ -742,89 +741,6 @@ Options:
742741
| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
743742
| --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
744743

745-
### iexec voucher
746-
747-
manage iExec voucher
748-
749-
Usage:
750-
751-
```sh
752-
iexec voucher <command> [options]
753-
```
754-
755-
Commands:
756-
757-
- [show](#iexec-voucher-show)
758-
- [authorize](#iexec-voucher-authorize)
759-
- [revoke](#iexec-voucher-revoke)
760-
761-
#### iexec voucher show
762-
763-
show voucher iExec details
764-
765-
Usage:
766-
767-
```sh
768-
iexec voucher show [options]
769-
```
770-
771-
Options:
772-
773-
| option | description |
774-
| --- | --- |
775-
| --raw | use raw output |
776-
| --quiet | stop prompting updates |
777-
| --password \<password\> | password used to encrypt the wallet (unsafe) |
778-
| --wallet-file \<walletFileName\> | specify the name of the wallet file to use |
779-
| --wallet-address \<walletAddress\> | specify the address of the wallet to use |
780-
| --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
781-
| --chain \<name\> | chain name from "chain.json" |
782-
| --user \<address\> | custom user address |
783-
784-
#### iexec voucher authorize
785-
786-
authorize requester to use the voucher
787-
788-
Usage:
789-
790-
```sh
791-
iexec voucher authorize <requester> [options]
792-
```
793-
794-
Options:
795-
796-
| option | description |
797-
| --- | --- |
798-
| --raw | use raw output |
799-
| --quiet | stop prompting updates |
800-
| --password \<password\> | password used to encrypt the wallet (unsafe) |
801-
| --wallet-file \<walletFileName\> | specify the name of the wallet file to use |
802-
| --wallet-address \<walletAddress\> | specify the address of the wallet to use |
803-
| --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
804-
| --chain \<name\> | chain name from "chain.json" |
805-
806-
#### iexec voucher revoke
807-
808-
revoke authorization to use the voucher
809-
810-
Usage:
811-
812-
```sh
813-
iexec voucher revoke <requester> [options]
814-
```
815-
816-
Options:
817-
818-
| option | description |
819-
| --- | --- |
820-
| --raw | use raw output |
821-
| --quiet | stop prompting updates |
822-
| --password \<password\> | password used to encrypt the wallet (unsafe) |
823-
| --wallet-file \<walletFileName\> | specify the name of the wallet file to use |
824-
| --wallet-address \<walletAddress\> | specify the address of the wallet to use |
825-
| --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
826-
| --chain \<name\> | chain name from "chain.json" |
827-
828744
### iexec app
829745

830746
manage iExec apps
@@ -1078,8 +994,6 @@ Options:
1078994
| --beneficiary \<address\> | specify the beneficiary of the request (default user address) |
1079995
| --params \<json\> | specify the params of the request<br/>\* usage: --params '{"iexec\_args":"do stuff","iexec\_input\_files":\["https://example.com/file.zip"\]}' |
1080996
| --skip-preflight-check | skip preflight check, this may result in task execution fail |
1081-
| --use-voucher | use the voucher to cover the costs of matching orders |
1082-
| --voucher-address \<voucherAddress\> | specify the voucher contract to use other than the owned voucher |
1083997

1084998
#### iexec app request-execution
1085999

@@ -1794,8 +1708,6 @@ Options:
17941708
| --request \<orderHash\> | specify the requestorder from the marketplace to fill |
17951709
| --params \<json\> | specify the params of the request, existing request order will be ignored<br/>\* usage: --params '{"iexec\_args":"do stuff","iexec\_input\_files":\["https://example.com/file.zip"\]}' |
17961710
| --skip-preflight-check | skip preflight check, this may result in task execution fail |
1797-
| --use-voucher | use the voucher to cover the costs of matching orders |
1798-
| --voucher-address \<voucherAddress\> | specify the voucher contract to use other than the owned voucher |
17991711

18001712
#### iexec order publish
18011713

@@ -2700,9 +2612,7 @@ The `chain.json` file, located in every iExec project, describes the parameters
27002612
- optional key `iexecGateway` set the url of the iexec marketplace gateway used by the SDK cli on each chain (overwrite default value).
27012613
- optional key `ipfsGateway` set the url of the IPFS gateway used by the SDK cli on each chain (overwrite default value).
27022614
- optional key `pocoSubgraph` set the url of the PoCo subgraph used by the SDK cli on each chain (overwrite default value).
2703-
- optional key `voucherSubgraph` set the url of the voucher subgraph used by the SDK cli on each chain (overwrite default value).
27042615
- optional key `bridge` set the bridge used by the SDK cli when working with bridged networks (sidechain). `bridge.contract` set the address of the RLC bridge on the chain, `bridge.bridgedChainName` set the reference to the bridged network.
2705-
- optional key `voucherHub` set the address of the voucher hub contract used by the SDK cli on each chain (overwrite default value).
27062616
- optional key `native` specify whether or not the chain native token is RLC (overwrite default value: chain value or `false`).
27072617
- optional key `useGas` specify whether or not the chain requires to spend gas to send a transaction (overwrite default value: chain value or `true`).
27082618
- optional key `providers` set the backends for public chains

cli_template.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,9 +401,7 @@ The `chain.json` file, located in every iExec project, describes the parameters
401401
- optional key `iexecGateway` set the url of the iexec marketplace gateway used by the SDK cli on each chain (overwrite default value).
402402
- optional key `ipfsGateway` set the url of the IPFS gateway used by the SDK cli on each chain (overwrite default value).
403403
- optional key `pocoSubgraph` set the url of the PoCo subgraph used by the SDK cli on each chain (overwrite default value).
404-
- optional key `voucherSubgraph` set the url of the voucher subgraph used by the SDK cli on each chain (overwrite default value).
405404
- optional key `bridge` set the bridge used by the SDK cli when working with bridged networks (sidechain). `bridge.contract` set the address of the RLC bridge on the chain, `bridge.bridgedChainName` set the reference to the bridged network.
406-
- optional key `voucherHub` set the address of the voucher hub contract used by the SDK cli on each chain (overwrite default value).
407405
- optional key `native` specify whether or not the chain native token is RLC (overwrite default value: chain value or `false`).
408406
- optional key `useGas` specify whether or not the chain requires to spend gas to send a transaction (overwrite default value: chain value or `true`).
409407
- optional key `providers` set the backends for public chains

docs/-internal-/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
- [SignedRequestorder](interfaces/SignedRequestorder.md)
5151
- [SignedWorkerpoolorder](interfaces/SignedWorkerpoolorder.md)
5252
- [Task](interfaces/Task.md)
53-
- [VoucherInfo](interfaces/VoucherInfo.md)
5453
- [Workerpool](interfaces/Workerpool.md)
5554
- [WorkerpoolDeploymentArgs](interfaces/WorkerpoolDeploymentArgs.md)
5655
- [WorkerpoolorderTemplate](interfaces/WorkerpoolorderTemplate.md)

docs/-internal-/interfaces/VoucherInfo.md

Lines changed: 0 additions & 67 deletions
This file was deleted.

docs/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ Additionally the [IExec](./classes/IExec.md) module exposes all the following li
8484
- [IExecSecretsModule](./classes/IExecSecretsModule.md) exposes **secrets** methods
8585
- [IExecStorageModule](./classes/IExecStorageModule.md) exposes **storage** methods
8686
- [IExecTaskModule](./classes/IExecTaskModule.md) exposes **task** methods
87-
- [IExecVoucherModule](./classes/IExecVoucherModule.md) exposes **voucher** methods
8887
- [IExecWalletModule](./classes/IExecWalletModule.md) exposes **wallet** methods
8988
- [IExecWorkerpoolModule](./classes/IExecWorkerpoolModule.md) exposes **workerpool** methods
9089

docs/classes/IExec.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,14 +156,6 @@ task module
156156

157157
***
158158

159-
### voucher
160-
161-
> **voucher**: [`IExecVoucherModule`](IExecVoucherModule.md)
162-
163-
voucher module
164-
165-
***
166-
167159
### wallet
168160

169161
> **wallet**: [`IExecWalletModule`](IExecWalletModule.md)

docs/classes/IExecConfig.md

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -223,29 +223,3 @@ resolve the current SMS URL
223223
#### Returns
224224

225225
`Promise`\<`string`\>
226-
227-
***
228-
229-
### resolveVoucherHubAddress()
230-
231-
> **resolveVoucherHubAddress**(): `Promise`\<`string` \| `null`\>
232-
233-
resolve the current VoucherHub contract address
234-
returns `null` if not available
235-
236-
#### Returns
237-
238-
`Promise`\<`string` \| `null`\>
239-
240-
***
241-
242-
### resolveVoucherSubgraphURL()
243-
244-
> **resolveVoucherSubgraphURL**(): `Promise`\<`string` \| `null`\>
245-
246-
resolve the current voucher subgraph URL
247-
returns `null` if not available
248-
249-
#### Returns
250-
251-
`Promise`\<`string` \| `null`\>

docs/classes/IExecModule.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ module base
2424
- [`IExecSecretsModule`](IExecSecretsModule.md)
2525
- [`IExecStorageModule`](IExecStorageModule.md)
2626
- [`IExecTaskModule`](IExecTaskModule.md)
27-
- [`IExecVoucherModule`](IExecVoucherModule.md)
2827
- [`IExecWalletModule`](IExecWalletModule.md)
2928
- [`IExecWorkerpoolModule`](IExecWorkerpoolModule.md)
3029

docs/classes/IExecOrderModule.md

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ default `0`
520520

521521
### estimateMatchOrders()
522522

523-
> **estimateMatchOrders**(`orders`, `options?`): `Promise`\<\{ `sponsored`: [`BN`](../interfaces/BN.md); `total`: [`BN`](../interfaces/BN.md); `volume`: [`BN`](../interfaces/BN.md); \}\>
523+
> **estimateMatchOrders**(`orders`): `Promise`\<\{ `sponsored`: [`BN`](../interfaces/BN.md); `total`: [`BN`](../interfaces/BN.md); `volume`: [`BN`](../interfaces/BN.md); \}\>
524524
525525
estimates the cost of matching the provided orders
526526

@@ -532,10 +532,9 @@ const orders = {
532532
workerpoolorder,
533533
requestorder,
534534
};
535-
const result = await estimateMatchOrders(orders, {useVoucher: true});
535+
const result = await estimateMatchOrders(orders);
536536
console.log(`executable volume: ${result.volume} tasks`);
537537
console.log(`total cost for matching orders: ${result.total} nRLC`);
538-
console.log(`sponsored cost covered by voucher: ${result.sponsored} nRLC`);
539538
```
540539

541540
#### Parameters
@@ -558,22 +557,6 @@ console.log(`sponsored cost covered by voucher: ${result.sponsored} nRLC`);
558557

559558
[`ConsumableWorkerpoolorder`](../-internal-/interfaces/ConsumableWorkerpoolorder.md)
560559

561-
##### options?
562-
563-
###### useVoucher?
564-
565-
`boolean`
566-
567-
use a voucher contract to sponsor the deal
568-
569-
###### voucherAddress?
570-
571-
`string`
572-
573-
override the voucher contract to use, must be combined with `useVoucher: true`
574-
575-
the user must be authorized by the voucher's owner to use it
576-
577560
#### Returns
578561

579562
`Promise`\<\{ `sponsored`: [`BN`](../interfaces/BN.md); `total`: [`BN`](../interfaces/BN.md); `volume`: [`BN`](../interfaces/BN.md); \}\>
@@ -721,20 +704,6 @@ console.log(`created deal ${dealid} in tx ${txHash}`);
721704

722705
`boolean`
723706

724-
###### useVoucher?
725-
726-
`boolean`
727-
728-
use a voucher contract to sponsor the deal
729-
730-
###### voucherAddress?
731-
732-
`string`
733-
734-
override the voucher contract to use, must be combined with `useVoucher: true`
735-
736-
the user must be authorized by the voucher's owner to use it
737-
738707
#### Returns
739708

740709
`Promise`\<\{ `dealid`: `string`; `txHash`: `string`; `volume`: [`BN`](../interfaces/BN.md); \}\>

0 commit comments

Comments
 (0)