Merge pull request #1387 from oceanprotocol/ganache-var-name

Replace ganache var name from HARDFORK to FORK.
This commit is contained in:
Călina Cenan 2023-12-06 11:16:01 +02:00 committed by GitHub
commit 89b634ee03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions

View File

@ -263,7 +263,7 @@ It is implemented in `DatatokenBase`, inherited by `Datatoken2`, so it can be ca
### Create Fixed Rate Exchange
* **create\_exchange**(`self`, `rate: Union[int, str]`, `base_token_addr: str`, `tx_dict: dict`, `owner_addr: Optional[str] = None`, `publish_market_fee_collector: Optional[str] = None, publish_market_fee: Union[int, str] = 0`, `with_mint: bool = False`, `allowed_swapper: str = ZERO_ADDRESS`, `full_info: bool = False`) -> `Union[OneExchange, tuple]`
* **create\_exchange**(`self`, `rate: Union[int, str]`, `base_token_addr: str`, `tx_dict: dict`, `owner_addr: Optional[str] = None`, `publish_market_fee_collector: Optional[str] = None, publish_market_fee: Union[int, str] = 0`, `allowed_swapper: str = ZERO_ADDRESS`, `full_info: bool = False`) -> `Union[OneExchange, tuple]`
It is implemented in `DatatokenBase`, inherited by `Datatoken2`, so it can be called within both instances.
@ -282,7 +282,6 @@ This wraps the smart contract method `Datatoken.createFixedRate()` with a simple
* `owner_addr` - owner of the datatoken
* `publish_market_fee_collector` - fee going to publish market address
* `publish_market_fee` - in wei or string, e.g. `int(1e15)` or `"0.001 ether"`
* `with_mint` - should the exchange mint datatokens as needed (`True`), or do they need to be supplied/allowed by participants like base token (`False`)?
* `allowed_swapper` - if `ZERO_ADDRESS`, anyone can swap
* `full_info` - return just `OneExchange`, or `(OneExchange, <other info>)`
@ -310,7 +309,6 @@ This wraps the smart contract method `Datatoken.createFixedRate()` with a simple
owner_addr: Optional[str] = None,
publish_market_fee_collector: Optional[str] = None,
publish_market_fee: Union[int, str] = 0,
with_mint: bool = False,
allowed_swapper: str = ZERO_ADDRESS,
full_info: bool = False,
) -> Union[OneExchange, tuple]:
@ -341,7 +339,7 @@ This wraps the smart contract method `Datatoken.createFixedRate()` with a simple
self.decimals(),
rate,
publish_market_fee,
with_mint,
1,
],
tx_dict,
)

View File

@ -38,7 +38,7 @@ cd barge
docker system prune -a --volumes
# Run barge: start Ganache, Provider, Aquarius; deploy contracts; update ~/.ocean
export GANACHE_HARDFORK=london # for support of type 2 transactions
export GANACHE_FORK=london # for support of type 2 transactions
./start_ocean.sh
```

View File

@ -49,7 +49,6 @@ exchange_args = ExchangeArguments(
owner_addr=publisher_wallet.address,
publish_market_fee_collector=ZERO_ADDRESS,
publish_market_fee=0,
with_mint=True,
allowed_swapper=ZERO_ADDRESS,
full_info=False,
dt_decimals=datatoken.decimals()