@1inch/fusion-sdk 2.3.10-rc.2 → 2.4.1

package/README.md

@@ -107,6 +107,107 @@ async function main() {
 main()
 ```
 
+## How to swap with Fusion mode from Native asset
+```typescript
+import {FusionSDK, NetworkEnum, OrderStatus, PrivateKeyProviderConnector, Web3Like, Address, NativeOrdersFactory} from "@1inch/fusion-sdk";
+import {computeAddress, formatUnits, JsonRpcProvider, Wallet} from "ethers";
+
+const PRIVATE_KEY = 'YOUR_PRIVATE_KEY'
+const NODE_URL = 'YOUR_WEB3_NODE_URL'
+const DEV_PORTAL_API_TOKEN = 'YOUR_DEV_PORTAL_API_TOKEN'
+
+const ethersRpcProvider = new JsonRpcProvider(NODE_URL)
+
+const ethersProviderConnector: Web3Like = {
+    eth: {
+        call(transactionConfig): Promise<string> {
+            return ethersRpcProvider.call(transactionConfig)
+        }
+    },
+    extend(): void {}
+}
+
+const connector = new PrivateKeyProviderConnector(
+    PRIVATE_KEY,
+    ethersProviderConnector
+)
+
+const sdk = new FusionSDK({
+    url: 'https://api.1inch.dev/fusion',
+    network: NetworkEnum.BINANCE,
+    blockchainProvider: connector,
+    authKey: DEV_PORTAL_API_TOKEN
+})
+
+const wallet = new Wallet(PRIVATE_KEY, ethersRpcProvider)
+
+async function main() {
+    const params = {
+        fromTokenAddress: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee', // ETH
+        toTokenAddress: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',  // USDC
+        amount: '2000000000000000', // 0.002 ETH
+        walletAddress: computeAddress(PRIVATE_KEY),
+        source: 'sdk-test'
+    }
+    
+    const quote = await sdk.getQuote(params)
+
+    const dstTokenDecimals = 6
+    console.log('Auction start amount', formatUnits(quote.presets[quote.recommendedPreset].auctionStartAmount, dstTokenDecimals))
+    console.log('Auction end amount', formatUnits(quote.presets[quote.recommendedPreset].auctionEndAmount), dstTokenDecimals)
+
+    const preparedOrder = await sdk.createOrder(params)
+
+    const info = await sdk.submitNativeOrder(preparedOrder.order, new Address(params.walletAddress), preparedOrder.quoteId)
+
+    console.log('OrderHash', info.orderHash)
+
+    const factory = NativeOrdersFactory.default(NetworkEnum.BINANCE)
+    const call = factory.create(new Address(wallet.address), preparedOrder.order)
+
+    const txRes = await wallet.sendTransaction({
+        to: call.to.toString(),
+        data: call.data,
+        value: call.value
+    })
+
+    console.log('TxHash', txRes.hash)
+
+    await wallet.provider.waitForTransaction(txRes.hash)
+
+
+    const start = Date.now()
+
+    while (true) {
+        try {
+            const data = await sdk.getOrderStatus(info.orderHash)
+
+            if (data.status === OrderStatus.Filled) {
+                console.log('fills', data.fills)
+                break
+            }
+
+            if (data.status === OrderStatus.Expired) {
+                console.log('Order Expired')
+                break
+            }
+            
+            if (data.status === OrderStatus.Cancelled) {
+                console.log('Order Cancelled')
+                break
+            }
+        } catch (e) {
+            console.log(e)
+        }
+
+    }
+
+    console.log('Order executed for', (Date.now() - start) / 1000, 'sec')
+}
+
+main()
+```
+
 ## Resolvers
 
 `settleOrders` function usage and Resolver contract examples you can find [here](https://github.com/1inch/fusion-resolver-example)

package/dist/cjs/fusion-order/fusion-order.js

@@ -503,6 +503,7 @@ var FusionOrder = /*#__PURE__*/ function() {
                     optimizeReceiverAddress: false
                 }));
                 _order.inner = _limitordersdk.LimitOrder.fromNative(chainId, ethOrdersFactory, _object_spread_props(_object_spread({}, _orderInfo), {
+                    receiver: _order.receiver,
                     salt: _order.salt
                 }), _order.inner.makerTraits, _order.inner.extension);
                 return _order;

package/dist/cjs/fusion-order/fusion-order.spec.js

@@ -400,4 +400,37 @@ describe('FusionOrder Native', function() {
         expect(nativeOrder.isNative(chainId, ethOrderFactory, nativeOrder.nativeSignature(maker))).toEqual(false);
         expect(_fusionorder.FusionOrder.fromDataAndExtension(nativeOrder.build(), nativeOrder.extension).isNative(chainId, ethOrderFactory, nativeOrder.nativeSignature(maker))).toEqual(false);
     });
+    it('should have extension address in receiver if surplus passed', function() {
+        var ethOrderFactory = new _limitordersdk.ProxyFactory(_limitordersdk.Address.fromBigInt(1n), _limitordersdk.Address.fromBigInt(2n));
+        var chainId = _constants.NetworkEnum.ETHEREUM;
+        var settlementExt = _limitordersdk.Address.fromBigInt(3n);
+        var maker = new _limitordersdk.Address('0x00000000219ab540356cbb839cbe05303d7705fa');
+        var nativeOrder = _fusionorder.FusionOrder.fromNative(chainId, ethOrderFactory, settlementExt, {
+            takerAsset: new _limitordersdk.Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'),
+            makingAmount: 1000000000000000000n,
+            takingAmount: 1420000000n,
+            maker: maker,
+            salt: 10n
+        }, {
+            auction: new _index.AuctionDetails({
+                duration: 180n,
+                startTime: 1673548149n,
+                initialRateBump: 50000,
+                points: [
+                    {
+                        coefficient: 20000,
+                        delay: 12
+                    }
+                ]
+            }),
+            whitelist: _index1.Whitelist.new(1673548139n, [
+                {
+                    address: new _limitordersdk.Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                    allowFrom: 0n
+                }
+            ]),
+            surplus: new _surplusparams.SurplusParams(10n, new _limitordersdk.Bps(10000n))
+        });
+        expect(nativeOrder.build().receiver).toEqual(settlementExt.toString());
+    });
 });

package/dist/esm/fusion-order/fusion-order.js

@@ -488,6 +488,7 @@ export var FusionOrder = /*#__PURE__*/ function() {
                     optimizeReceiverAddress: false
                 }));
                 _order.inner = LimitOrder.fromNative(chainId, ethOrdersFactory, _object_spread_props(_object_spread({}, _orderInfo), {
+                    receiver: _order.receiver,
                     salt: _order.salt
                 }), _order.inner.makerTraits, _order.inner.extension);
                 return _order;

package/dist/esm/fusion-order/fusion-order.spec.js

@@ -396,4 +396,37 @@ describe('FusionOrder Native', function() {
         expect(nativeOrder.isNative(chainId, ethOrderFactory, nativeOrder.nativeSignature(maker))).toEqual(false);
         expect(FusionOrder.fromDataAndExtension(nativeOrder.build(), nativeOrder.extension).isNative(chainId, ethOrderFactory, nativeOrder.nativeSignature(maker))).toEqual(false);
     });
+    it('should have extension address in receiver if surplus passed', function() {
+        var ethOrderFactory = new ProxyFactory(Address.fromBigInt(1n), Address.fromBigInt(2n));
+        var chainId = NetworkEnum.ETHEREUM;
+        var settlementExt = Address.fromBigInt(3n);
+        var maker = new Address('0x00000000219ab540356cbb839cbe05303d7705fa');
+        var nativeOrder = FusionOrder.fromNative(chainId, ethOrderFactory, settlementExt, {
+            takerAsset: new Address('0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'),
+            makingAmount: 1000000000000000000n,
+            takingAmount: 1420000000n,
+            maker: maker,
+            salt: 10n
+        }, {
+            auction: new AuctionDetails({
+                duration: 180n,
+                startTime: 1673548149n,
+                initialRateBump: 50000,
+                points: [
+                    {
+                        coefficient: 20000,
+                        delay: 12
+                    }
+                ]
+            }),
+            whitelist: Whitelist.new(1673548139n, [
+                {
+                    address: new Address('0x00000000219ab540356cbb839cbe05303d7705fa'),
+                    allowFrom: 0n
+                }
+            ]),
+            surplus: new SurplusParams(10n, new Bps(10000n))
+        });
+        expect(nativeOrder.build().receiver).toEqual(settlementExt.toString());
+    });
 });

package/dist/esm/package.json

@@ -1 +1 @@
-{"name":"@1inch/fusion-sdk","version":"2.3.10-rc.2","type":"module"}
+{"name":"@1inch/fusion-sdk","version":"2.4.1","type":"module"}