Skip to content

Conversation

@shamardy
Copy link
Collaborator

@shamardy shamardy commented Jan 22, 2024

solc updated from 0.5.0 to 0.8.20

Deps changes

Removed Deps

  • ganache-cli: ^6.2.5
  • openzeppelin-solidity: https://github.com/OpenZeppelin/openzeppelin-solidity.git#release-v2.1.0-solc-0.5
  • request: ^2.83.0
  • request-promise-native: ^1.0.5
  • sol-merger: ^0.1.0
  • web3: ^1.0.0-beta.27

Updated Dependencies

  • chai: Updated from ^4.1.2 to ^4.3.10

New Dependencies

  • @openzeppelin/contracts: ^5.0.0 (Note: This represents an evolution from openzeppelin-solidity, transitioning from a direct GitHub link to a versioned npm package.)
  • hardhat: ^2.19.4 (in devDependencies)
  • @nomicfoundation/hardhat-ethers: ^3.0.5 (in devDependencies)
  • ethers: ^6.10.0 (in devDependencies)

Dependencies Unchanged

  • chai-as-promised: Remains at ^7.1.1
  • ripemd160: Remains at ^2.0.1

…rt (#2)

This commit does the following:
* updates deps
* updates solidity version from ^0.5.0 to ^0.8.20
* implements ERC721 functions for EtomicSwap contract
* adds ERC721 tests
* implements ERC1155 functions for EtomicSwap contract
* adds ERC1155 tests
@shamardy shamardy requested a review from Alrighttt January 22, 2024 12:44
@laruh
Copy link
Collaborator

laruh commented Jan 24, 2024

I would like to note that in PR #5 there will be changes in deps

laruh and others added 3 commits February 7, 2024 11:38
#4

* add hardhat config, update deps and some tests, remove unnecessary files

* remove `connect(accounts)`, use `should.be` instead of `expect().to.be`

* remove `request`, `equest-promise-native`, `sol-merger` deps

* update setup dev commands

* use `connect` method instead of `from:address` as we use ethers V6

* update tests

* Beautify js code

* update readme and travis

* update readme (fix docker command), remove env

* call connect() when transfer NFTs

* use `rejectedWith` with a more specific error

* reduce duplication by contractRunner vars creation

* remove rpc.Dockerfile, update workspace.Dockerfile and hardhat.config

* use `to.be.rejectedWith` to match error message

* error messages in EtomicSwap.sol, format code

* update constants in tests

* split require statements
This Implements EtomicSwapV2 contract containing functions needed to support Trading Protocol Upgrade V2.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If its 1.0.1 release, lets change version in dependency package to "version": "1.0.1"

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's use 1.1.0 to follow semantic versioning in a correct way.

@shamardy shamardy changed the title chore(release): EtomicSwap 1.0.1 chore(release): EtomicSwap 1.1.0 May 9, 2024
laruh added 2 commits January 20, 2025 16:29
This commit introduces the `SwapFeeManager` contract to handle the distribution of collected fees. This contract provides a transparent and automated mechanism for splitting fees between a DEX wallet and a burn wallet.

The `SwapFeeManager` includes the following functionalities:
- It is initialized with a `dexFeeWallet` and a `burnFeeWallet`.
- `splitAndWithdraw()`: Splits the contract's Ether balance, distributing 75% to the `dexFeeWallet` and 25% to the `burnFeeWallet`.
- `splitAndWithdrawToken()`: Performs the same 75/25 split for any specified ERC20 token.
- The fee distribution functions are publicly accessible to allow for decentralized execution.

A new test suite, `test/SwapFeeManagerTest.js`, is added to ensure the correctness of the fee-splitting logic for both Ether and ERC20 tokens.

Additionally, the Solidity compiler version is updated from `^0.8.20` to `^0.8.30` across all contracts and in the `hardhat.config.js` file to align with the latest standards.
Copy link
Collaborator

@Alrighttt Alrighttt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dummy review to remove this from my https://github.com/pulls/review-requested

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants