Compare commits

...

3 Commits

Author SHA1 Message Date
Github Actions
a472125c65 Publish
- @0x/contracts-erc20@3.3.57
 - @0x/contracts-test-utils@5.4.47
 - @0x/contracts-treasury@1.4.40
 - @0x/contracts-utils@4.8.38
 - @0x/contracts-zero-ex@0.38.6
 - @0x/contract-addresses@8.0.3
 - @0x/contract-wrappers@13.22.16
 - @0x/protocol-utils@11.17.6
2023-02-01 00:22:23 +00:00
Github Actions
8666121bd9 Updated CHANGELOGS & MD docs 2023-02-01 00:22:20 +00:00
Elyas
8cf1c8bbd2 chore: Add woofi to Arbitrum & Optimism bridge adapters [LIT-774] (#653)
* update arb bridge adapter

* update optimism bridge adapter

* make fixes

* fix lint

* update arbitrum fqt address

* changelog

* fix changelog
2023-01-31 18:02:02 -05:00
27 changed files with 140 additions and 24 deletions

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1675210931,
"version": "3.3.57",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1675105183,
"version": "3.3.56",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.3.57 - _February 1, 2023_
* Dependencies updated
## v3.3.56 - _January 30, 2023_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc20",
"version": "3.3.56",
"version": "3.3.57",
"engines": {
"node": ">=6.12"
},
@@ -47,8 +47,8 @@
"devDependencies": {
"@0x/abi-gen": "^5.8.1",
"@0x/contracts-gen": "^2.0.48",
"@0x/contracts-test-utils": "^5.4.46",
"@0x/contracts-utils": "^4.8.37",
"@0x/contracts-test-utils": "^5.4.47",
"@0x/contracts-utils": "^4.8.38",
"@0x/dev-utils": "^5.0.0",
"@0x/sol-compiler": "^4.8.2",
"@0x/ts-doc-gen": "^0.0.28",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1675210931,
"version": "5.4.47",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1675105183,
"version": "5.4.46",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v5.4.47 - _February 1, 2023_
* Dependencies updated
## v5.4.46 - _January 30, 2023_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-test-utils",
"version": "5.4.46",
"version": "5.4.47",
"engines": {
"node": ">=6.12"
},
@@ -41,7 +41,7 @@
"dependencies": {
"@0x/assert": "^3.0.35",
"@0x/base-contract": "^7.0.0",
"@0x/contract-addresses": "^8.0.2",
"@0x/contract-addresses": "^8.0.3",
"@0x/dev-utils": "^5.0.0",
"@0x/json-schemas": "^6.4.4",
"@0x/order-utils": "^10.4.28",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1675210931,
"version": "1.4.40",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1675105183,
"version": "1.4.39",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v1.4.40 - _February 1, 2023_
* Dependencies updated
## v1.4.39 - _January 30, 2023_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-treasury",
"version": "1.4.39",
"version": "1.4.40",
"engines": {
"node": ">=6.12"
},
@@ -46,12 +46,12 @@
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
"devDependencies": {
"@0x/abi-gen": "^5.8.1",
"@0x/contract-addresses": "^8.0.2",
"@0x/contract-addresses": "^8.0.3",
"@0x/contracts-asset-proxy": "^3.7.19",
"@0x/contracts-erc20": "^3.3.56",
"@0x/contracts-erc20": "^3.3.57",
"@0x/contracts-gen": "^2.0.48",
"@0x/contracts-staking": "^2.0.45",
"@0x/contracts-test-utils": "^5.4.46",
"@0x/contracts-test-utils": "^5.4.47",
"@0x/sol-compiler": "^4.8.2",
"@0x/ts-doc-gen": "^0.0.28",
"@types/isomorphic-fetch": "^0.0.35",
@@ -73,7 +73,7 @@
},
"dependencies": {
"@0x/base-contract": "^7.0.0",
"@0x/protocol-utils": "^11.17.5",
"@0x/protocol-utils": "^11.17.6",
"@0x/subproviders": "^7.0.0",
"@0x/types": "^3.3.6",
"@0x/typescript-typings": "^5.3.1",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1675210931,
"version": "4.8.38",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1675105183,
"version": "4.8.37",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.8.38 - _February 1, 2023_
* Dependencies updated
## v4.8.37 - _January 30, 2023_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-utils",
"version": "4.8.37",
"version": "4.8.38",
"engines": {
"node": ">=6.12"
},
@@ -46,7 +46,7 @@
"devDependencies": {
"@0x/abi-gen": "^5.8.1",
"@0x/contracts-gen": "^2.0.48",
"@0x/contracts-test-utils": "^5.4.46",
"@0x/contracts-test-utils": "^5.4.47",
"@0x/dev-utils": "^5.0.0",
"@0x/order-utils": "^10.4.28",
"@0x/sol-compiler": "^4.8.2",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1675210931,
"version": "0.38.6",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1675105183,
"version": "0.38.5",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.38.6 - _February 1, 2023_
* Dependencies updated
## v0.38.5 - _January 30, 2023_
* Dependencies updated

View File

@@ -27,6 +27,7 @@ import "./mixins/MixinGMX.sol";
import "./mixins/MixinNerve.sol";
import "./mixins/MixinUniswapV3.sol";
import "./mixins/MixinUniswapV2.sol";
import "./mixins/MixinWOOFi.sol";
import "./mixins/MixinZeroExBridge.sol";
contract ArbitrumBridgeAdapter is
@@ -41,6 +42,7 @@ contract ArbitrumBridgeAdapter is
MixinNerve,
MixinUniswapV3,
MixinUniswapV2,
MixinWOOFi,
MixinZeroExBridge
{
constructor(IEtherTokenV06 weth) public MixinCurve(weth) MixinAaveV3(true) {}
@@ -108,6 +110,11 @@ contract ArbitrumBridgeAdapter is
return (0, true);
}
boughtAmount = _tradeAaveV3(sellToken, buyToken, sellAmount, order.bridgeData);
} else if (protocolId == BridgeProtocols.WOOFI) {
if (dryRun) {
return (0, true);
}
boughtAmount = _tradeWOOFi(sellToken, buyToken, sellAmount, order.bridgeData);
}
emit BridgeFill(order.source, sellToken, buyToken, sellAmount, boughtAmount);

View File

@@ -25,6 +25,7 @@ import "./mixins/MixinNerve.sol";
import "./mixins/MixinSolidly.sol";
import "./mixins/MixinSynthetix.sol";
import "./mixins/MixinUniswapV3.sol";
import "./mixins/MixinWOOFi.sol";
import "./mixins/MixinZeroExBridge.sol";
contract OptimismBridgeAdapter is
@@ -37,6 +38,7 @@ contract OptimismBridgeAdapter is
MixinSynthetix,
MixinUniswapV3,
MixinSolidly,
MixinWOOFi,
MixinZeroExBridge
{
constructor(IEtherTokenV06 weth) public MixinCurve(weth) MixinAaveV3(true) {}
@@ -95,6 +97,11 @@ contract OptimismBridgeAdapter is
return (0, true);
}
boughtAmount = _tradeAaveV3(sellToken, buyToken, sellAmount, order.bridgeData);
} else if (protocolId == BridgeProtocols.WOOFI) {
if (dryRun) {
return (0, true);
}
boughtAmount = _tradeWOOFi(sellToken, buyToken, sellAmount, order.bridgeData);
}
emit BridgeFill(order.source, sellToken, buyToken, sellAmount, boughtAmount);

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-zero-ex",
"version": "0.38.5",
"version": "0.38.6",
"engines": {
"node": ">=6.12"
},
@@ -51,10 +51,10 @@
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
"devDependencies": {
"@0x/abi-gen": "^5.8.1",
"@0x/contract-addresses": "^8.0.2",
"@0x/contracts-erc20": "^3.3.56",
"@0x/contract-addresses": "^8.0.3",
"@0x/contracts-erc20": "^3.3.57",
"@0x/contracts-gen": "^2.0.48",
"@0x/contracts-test-utils": "^5.4.46",
"@0x/contracts-test-utils": "^5.4.47",
"@0x/dev-utils": "^5.0.0",
"@0x/order-utils": "^10.4.28",
"@0x/sol-compiler": "^4.8.2",
@@ -80,7 +80,7 @@
},
"dependencies": {
"@0x/base-contract": "^7.0.0",
"@0x/protocol-utils": "^11.17.5",
"@0x/protocol-utils": "^11.17.6",
"@0x/subproviders": "^7.0.0",
"@0x/types": "^3.3.6",
"@0x/typescript-typings": "^5.3.1",

View File

@@ -1,4 +1,14 @@
[
{
"version": "8.0.3",
"changes": [
{
"note": "Upgrade Arbitrum FillQuoteTransformer to support Woofi",
"pr": 653
}
],
"timestamp": 1675210931
},
{
"timestamp": 1675105183,
"version": "8.0.2",

View File

@@ -6,6 +6,9 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v8.0.3 - _February 1, 2023_
* Upgrade Arbitrum FillQuoteTransformer to support Woofi (#653)
## v8.0.2 - _January 30, 2023_
* Dependencies updated

View File

@@ -248,7 +248,7 @@
"wethTransformer": "0x10e968968f49dd66a5efeebbb2edcb9c49c4fc49",
"payTakerTransformer": "0xd81e65fc9bb7323bdbef8b2cdddd3b83fe41d630",
"affiliateFeeTransformer": "0x970e318b8f074c20bf0cee06970f01dc7a761e50",
"fillQuoteTransformer": "0xaec6610c9069d6b7d604a5b0b3c1f6661489d0e1",
"fillQuoteTransformer": "0x2142414a2c19b4dc4ec050eb1391d1d49d096da1",
"positiveSlippageFeeTransformer": "0x20f935b037e8490d8027f2751f9452725eee01ad"
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contract-addresses",
"version": "8.0.2",
"version": "8.0.3",
"engines": {
"node": ">=6.12"
},

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1675210931,
"version": "13.22.16",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1675105183,
"version": "13.22.15",

View File

@@ -6,6 +6,9 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v13.22.16 - _February 1, 2023_
* Dependencies updated
## v13.22.15 - _January 30, 2023_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contract-wrappers",
"version": "13.22.15",
"version": "13.22.16",
"engines": {
"node": ">=6.12"
},
@@ -59,7 +59,7 @@
"dependencies": {
"@0x/assert": "^3.0.35",
"@0x/base-contract": "^7.0.0",
"@0x/contract-addresses": "^8.0.2",
"@0x/contract-addresses": "^8.0.3",
"@0x/json-schemas": "^6.4.4",
"@0x/types": "^3.3.6",
"@0x/utils": "^7.0.0",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1675210931,
"version": "11.17.6",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1675105183,
"version": "11.17.5",

View File

@@ -6,6 +6,9 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v11.17.6 - _February 1, 2023_
* Dependencies updated
## v11.17.5 - _January 30, 2023_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/protocol-utils",
"version": "11.17.5",
"version": "11.17.6",
"engines": {
"node": ">=6.12"
},
@@ -62,8 +62,8 @@
},
"dependencies": {
"@0x/assert": "^3.0.35",
"@0x/contract-addresses": "^8.0.2",
"@0x/contract-wrappers": "^13.22.15",
"@0x/contract-addresses": "^8.0.3",
"@0x/contract-wrappers": "^13.22.16",
"@0x/json-schemas": "^6.4.4",
"@0x/subproviders": "^7.0.0",
"@0x/utils": "^7.0.0",