diff --git a/docs/src/src/IE.sol/contract.IE.md b/docs/src/src/IE.sol/contract.IE.md index dd5a7e3..ccb90ab 100644 --- a/docs/src/src/IE.sol/contract.IE.md +++ b/docs/src/src/IE.sol/contract.IE.md @@ -1,5 +1,5 @@ # IE -[Git Source](https://github.com/NaniDAO/ie/blob/6d1168cdd42d680ba733a4cce0562383696cbd44/src/IE.sol) +[Git Source](https://github.com/NaniDAO/ie/blob/f061f69f55a660146bbc3247dded252faef04a99/src/IE.sol) **Author:** nani.eth (https://github.com/NaniDAO/ie) diff --git a/docs/src/src/IE.sol/interface.IExecutor.md b/docs/src/src/IE.sol/interface.IExecutor.md index 8d076ca..5aaf28f 100644 --- a/docs/src/src/IE.sol/interface.IExecutor.md +++ b/docs/src/src/IE.sol/interface.IExecutor.md @@ -1,5 +1,5 @@ # IExecutor -[Git Source](https://github.com/NaniDAO/ie/blob/6d1168cdd42d680ba733a4cce0562383696cbd44/src/IE.sol) +[Git Source](https://github.com/NaniDAO/ie/blob/f061f69f55a660146bbc3247dded252faef04a99/src/IE.sol) Simple calldata executor interface. diff --git a/docs/src/src/IE.sol/interface.INAMI.md b/docs/src/src/IE.sol/interface.INAMI.md index b8935d6..3b13333 100644 --- a/docs/src/src/IE.sol/interface.INAMI.md +++ b/docs/src/src/IE.sol/interface.INAMI.md @@ -1,5 +1,5 @@ # INAMI -[Git Source](https://github.com/NaniDAO/ie/blob/6d1168cdd42d680ba733a4cce0562383696cbd44/src/IE.sol) +[Git Source](https://github.com/NaniDAO/ie/blob/f061f69f55a660146bbc3247dded252faef04a99/src/IE.sol) *Simple NAMI names interface for resolving L2 ENS ownership.* diff --git a/docs/src/src/IE.sol/interface.ISwapRouter.md b/docs/src/src/IE.sol/interface.ISwapRouter.md index fd48cf8..b4801cd 100644 --- a/docs/src/src/IE.sol/interface.ISwapRouter.md +++ b/docs/src/src/IE.sol/interface.ISwapRouter.md @@ -1,5 +1,5 @@ # ISwapRouter -[Git Source](https://github.com/NaniDAO/ie/blob/6d1168cdd42d680ba733a4cce0562383696cbd44/src/IE.sol) +[Git Source](https://github.com/NaniDAO/ie/blob/f061f69f55a660146bbc3247dded252faef04a99/src/IE.sol) *Simple Uniswap V3 swapping interface.* diff --git a/docs/src/src/IE.sol/interface.IToken.md b/docs/src/src/IE.sol/interface.IToken.md index d1732e5..c57ed0e 100644 --- a/docs/src/src/IE.sol/interface.IToken.md +++ b/docs/src/src/IE.sol/interface.IToken.md @@ -1,5 +1,5 @@ # IToken -[Git Source](https://github.com/NaniDAO/ie/blob/6d1168cdd42d680ba733a4cce0562383696cbd44/src/IE.sol) +[Git Source](https://github.com/NaniDAO/ie/blob/f061f69f55a660146bbc3247dded252faef04a99/src/IE.sol) *Simple token transfer interface.* diff --git a/docs/src/src/NAMI.sol/contract.NAMI.md b/docs/src/src/NAMI.sol/contract.NAMI.md index aa4975f..bfdfd92 100644 --- a/docs/src/src/NAMI.sol/contract.NAMI.md +++ b/docs/src/src/NAMI.sol/contract.NAMI.md @@ -1,5 +1,5 @@ # NAMI -[Git Source](https://github.com/NaniDAO/ie/blob/6d1168cdd42d680ba733a4cce0562383696cbd44/src/NAMI.sol) +[Git Source](https://github.com/NaniDAO/ie/blob/f061f69f55a660146bbc3247dded252faef04a99/src/NAMI.sol) **Author:** nani.eth (https://github.com/NaniDAO/ie) diff --git a/docs/src/src/NAMI.sol/interface.IToken.md b/docs/src/src/NAMI.sol/interface.IToken.md index 76ff225..526fecb 100644 --- a/docs/src/src/NAMI.sol/interface.IToken.md +++ b/docs/src/src/NAMI.sol/interface.IToken.md @@ -1,5 +1,5 @@ # IToken -[Git Source](https://github.com/NaniDAO/ie/blob/6d1168cdd42d680ba733a4cce0562383696cbd44/src/NAMI.sol) +[Git Source](https://github.com/NaniDAO/ie/blob/f061f69f55a660146bbc3247dded252faef04a99/src/NAMI.sol) *Simple token balance & supply interface.* diff --git a/ui/components/version.tsx b/ui/components/version.tsx index 059410f..be58219 100644 --- a/ui/components/version.tsx +++ b/ui/components/version.tsx @@ -5,7 +5,7 @@ const versions: { [key: number]: string; } = { 1: "1.0.0", - 42161: "1.1.1 (nightly)", + 42161: "1.2.0 (nightly)", }; export const Version = () => { diff --git a/ui/lib/abi/IntentsEngineAbiArb.ts b/ui/lib/abi/IntentsEngineAbiArb.ts index 000b698..ad14ef0 100644 --- a/ui/lib/abi/IntentsEngineAbiArb.ts +++ b/ui/lib/abi/IntentsEngineAbiArb.ts @@ -1,549 +1,621 @@ export const IntentsEngineAbiArb = [ { - type: "constructor", - inputs: [], - stateMutability: "payable", + "type": "constructor", + "inputs": [], + "stateMutability": "payable" }, { - type: "fallback", - stateMutability: "payable", + "type": "fallback", + "stateMutability": "payable" }, { - type: "receive", - stateMutability: "payable", + "type": "receive", + "stateMutability": "payable" }, { - type: "function", - name: "checkPackedUserOp", - inputs: [ + "type": "function", + "name": "checkPackedUserOp", + "inputs": [ { - name: "intent", - type: "string", - internalType: "string", + "name": "intent", + "type": "string", + "internalType": "string" }, { - name: "userOp", - type: "tuple", - internalType: "struct IE.PackedUserOperation", - components: [ + "name": "userOp", + "type": "tuple", + "internalType": "struct IE.PackedUserOperation", + "components": [ { - name: "sender", - type: "address", - internalType: "address", + "name": "sender", + "type": "address", + "internalType": "address" }, { - name: "nonce", - type: "uint256", - internalType: "uint256", + "name": "nonce", + "type": "uint256", + "internalType": "uint256" }, { - name: "initCode", - type: "bytes", - internalType: "bytes", + "name": "initCode", + "type": "bytes", + "internalType": "bytes" }, { - name: "callData", - type: "bytes", - internalType: "bytes", + "name": "callData", + "type": "bytes", + "internalType": "bytes" }, { - name: "accountGasLimits", - type: "bytes32", - internalType: "bytes32", + "name": "accountGasLimits", + "type": "bytes32", + "internalType": "bytes32" }, { - name: "preVerificationGas", - type: "uint256", - internalType: "uint256", + "name": "preVerificationGas", + "type": "uint256", + "internalType": "uint256" }, { - name: "gasFees", - type: "bytes32", - internalType: "bytes32", + "name": "gasFees", + "type": "bytes32", + "internalType": "bytes32" }, { - name: "paymasterAndData", - type: "bytes", - internalType: "bytes", + "name": "paymasterAndData", + "type": "bytes", + "internalType": "bytes" }, { - name: "signature", - type: "bytes", - internalType: "bytes", - }, - ], - }, + "name": "signature", + "type": "bytes", + "internalType": "bytes" + } + ] + } ], - outputs: [ + "outputs": [ { - name: "", - type: "bool", - internalType: "bool", - }, + "name": "", + "type": "bool", + "internalType": "bool" + } ], - stateMutability: "view", + "stateMutability": "view" }, { - type: "function", - name: "checkUserOp", - inputs: [ + "type": "function", + "name": "checkUserOp", + "inputs": [ { - name: "intent", - type: "string", - internalType: "string", + "name": "intent", + "type": "string", + "internalType": "string" }, { - name: "userOp", - type: "tuple", - internalType: "struct IE.UserOperation", - components: [ + "name": "userOp", + "type": "tuple", + "internalType": "struct IE.UserOperation", + "components": [ { - name: "sender", - type: "address", - internalType: "address", + "name": "sender", + "type": "address", + "internalType": "address" }, { - name: "nonce", - type: "uint256", - internalType: "uint256", + "name": "nonce", + "type": "uint256", + "internalType": "uint256" }, { - name: "initCode", - type: "bytes", - internalType: "bytes", + "name": "initCode", + "type": "bytes", + "internalType": "bytes" }, { - name: "callData", - type: "bytes", - internalType: "bytes", + "name": "callData", + "type": "bytes", + "internalType": "bytes" }, { - name: "callGasLimit", - type: "uint256", - internalType: "uint256", + "name": "callGasLimit", + "type": "uint256", + "internalType": "uint256" }, { - name: "verificationGasLimit", - type: "uint256", - internalType: "uint256", + "name": "verificationGasLimit", + "type": "uint256", + "internalType": "uint256" }, { - name: "preVerificationGas", - type: "uint256", - internalType: "uint256", + "name": "preVerificationGas", + "type": "uint256", + "internalType": "uint256" }, { - name: "maxFeePerGas", - type: "uint256", - internalType: "uint256", + "name": "maxFeePerGas", + "type": "uint256", + "internalType": "uint256" }, { - name: "maxPriorityFeePerGas", - type: "uint256", - internalType: "uint256", + "name": "maxPriorityFeePerGas", + "type": "uint256", + "internalType": "uint256" }, { - name: "paymasterAndData", - type: "bytes", - internalType: "bytes", + "name": "paymasterAndData", + "type": "bytes", + "internalType": "bytes" }, { - name: "signature", - type: "bytes", - internalType: "bytes", - }, - ], - }, + "name": "signature", + "type": "bytes", + "internalType": "bytes" + } + ] + } ], - outputs: [ + "outputs": [ { - name: "", - type: "bool", - internalType: "bool", - }, + "name": "", + "type": "bool", + "internalType": "bool" + } ], - stateMutability: "view", + "stateMutability": "view" }, { - type: "function", - name: "command", - inputs: [ - { - name: "intent", - type: "string", - internalType: "string", - }, + "type": "function", + "name": "command", + "inputs": [ + { + "name": "intent", + "type": "string", + "internalType": "string" + } ], - outputs: [], - stateMutability: "payable", + "outputs": [], + "stateMutability": "payable" }, { - type: "function", - name: "previewCommand", - inputs: [ + "type": "function", + "name": "pairs", + "inputs": [ { - name: "intent", - type: "string", - internalType: "string", + "name": "token0", + "type": "address", + "internalType": "address" }, + { + "name": "token1", + "type": "address", + "internalType": "address" + } ], - outputs: [ + "outputs": [ { - name: "to", - type: "address", - internalType: "address", - }, + "name": "", + "type": "address", + "internalType": "address" + } + ], + "stateMutability": "view" + }, + { + "type": "function", + "name": "previewCommand", + "inputs": [ + { + "name": "intent", + "type": "string", + "internalType": "string" + } + ], + "outputs": [ { - name: "amount", - type: "uint256", - internalType: "uint256", + "name": "to", + "type": "address", + "internalType": "address" }, { - name: "minAmountOut", - type: "uint256", - internalType: "uint256", + "name": "amount", + "type": "uint256", + "internalType": "uint256" }, { - name: "token", - type: "address", - internalType: "address", + "name": "minAmountOut", + "type": "uint256", + "internalType": "uint256" }, { - name: "callData", - type: "bytes", - internalType: "bytes", + "name": "token", + "type": "address", + "internalType": "address" }, { - name: "executeCallData", - type: "bytes", - internalType: "bytes", + "name": "callData", + "type": "bytes", + "internalType": "bytes" }, + { + "name": "executeCallData", + "type": "bytes", + "internalType": "bytes" + } ], - stateMutability: "view", + "stateMutability": "view" }, { - type: "function", - name: "previewSend", - inputs: [ + "type": "function", + "name": "previewSend", + "inputs": [ { - name: "to", - type: "string", - internalType: "string", + "name": "to", + "type": "string", + "internalType": "string" }, { - name: "amount", - type: "string", - internalType: "string", + "name": "amount", + "type": "string", + "internalType": "string" }, { - name: "token", - type: "string", - internalType: "string", - }, + "name": "token", + "type": "string", + "internalType": "string" + } ], - outputs: [ + "outputs": [ { - name: "_to", - type: "address", - internalType: "address", + "name": "_to", + "type": "address", + "internalType": "address" }, { - name: "_amount", - type: "uint256", - internalType: "uint256", + "name": "_amount", + "type": "uint256", + "internalType": "uint256" }, { - name: "_token", - type: "address", - internalType: "address", + "name": "_token", + "type": "address", + "internalType": "address" }, { - name: "callData", - type: "bytes", - internalType: "bytes", + "name": "callData", + "type": "bytes", + "internalType": "bytes" }, { - name: "executeCallData", - type: "bytes", - internalType: "bytes", - }, + "name": "executeCallData", + "type": "bytes", + "internalType": "bytes" + } ], - stateMutability: "view", + "stateMutability": "view" }, { - type: "function", - name: "previewSwap", - inputs: [ + "type": "function", + "name": "previewSwap", + "inputs": [ { - name: "amountIn", - type: "string", - internalType: "string", + "name": "amountIn", + "type": "string", + "internalType": "string" }, { - name: "amountOutMinimum", - type: "string", - internalType: "string", + "name": "amountOutMinimum", + "type": "string", + "internalType": "string" }, { - name: "tokenIn", - type: "string", - internalType: "string", + "name": "tokenIn", + "type": "string", + "internalType": "string" }, { - name: "tokenOut", - type: "string", - internalType: "string", - }, + "name": "tokenOut", + "type": "string", + "internalType": "string" + } ], - outputs: [ + "outputs": [ { - name: "_amountIn", - type: "uint256", - internalType: "uint256", + "name": "_amountIn", + "type": "uint256", + "internalType": "uint256" }, { - name: "_amountOut", - type: "uint256", - internalType: "uint256", + "name": "_amountOut", + "type": "uint256", + "internalType": "uint256" }, { - name: "_tokenIn", - type: "address", - internalType: "address", + "name": "_tokenIn", + "type": "address", + "internalType": "address" }, { - name: "_tokenOut", - type: "address", - internalType: "address", - }, + "name": "_tokenOut", + "type": "address", + "internalType": "address" + } ], - stateMutability: "view", + "stateMutability": "view" }, { - type: "function", - name: "send", - inputs: [ + "type": "function", + "name": "send", + "inputs": [ { - name: "to", - type: "string", - internalType: "string", + "name": "to", + "type": "string", + "internalType": "string" }, { - name: "amount", - type: "string", - internalType: "string", + "name": "amount", + "type": "string", + "internalType": "string" }, { - name: "token", - type: "string", - internalType: "string", - }, + "name": "token", + "type": "string", + "internalType": "string" + } ], - outputs: [], - stateMutability: "payable", + "outputs": [], + "stateMutability": "payable" }, { - type: "function", - name: "setName", - inputs: [ + "type": "function", + "name": "setName", + "inputs": [ { - name: "token", - type: "address", - internalType: "address", + "name": "token", + "type": "address", + "internalType": "address" }, { - name: "name", - type: "string", - internalType: "string", - }, + "name": "name", + "type": "string", + "internalType": "string" + } ], - outputs: [], - stateMutability: "payable", + "outputs": [], + "stateMutability": "payable" }, { - type: "function", - name: "setNameAndTicker", - inputs: [ + "type": "function", + "name": "setNameAndTicker", + "inputs": [ + { + "name": "token", + "type": "address", + "internalType": "address" + } + ], + "outputs": [], + "stateMutability": "payable" + }, + { + "type": "function", + "name": "setPair", + "inputs": [ + { + "name": "tokenA", + "type": "address", + "internalType": "address" + }, { - name: "token", - type: "address", - internalType: "address", + "name": "tokenB", + "type": "address", + "internalType": "address" }, + { + "name": "pair", + "type": "address", + "internalType": "address" + } ], - outputs: [], - stateMutability: "payable", + "outputs": [], + "stateMutability": "payable" }, { - type: "function", - name: "swap", - inputs: [ + "type": "function", + "name": "swap", + "inputs": [ { - name: "amountIn", - type: "string", - internalType: "string", + "name": "amountIn", + "type": "string", + "internalType": "string" }, { - name: "amountOutMinimum", - type: "string", - internalType: "string", + "name": "amountOutMinimum", + "type": "string", + "internalType": "string" }, { - name: "tokenIn", - type: "string", - internalType: "string", + "name": "tokenIn", + "type": "string", + "internalType": "string" }, { - name: "tokenOut", - type: "string", - internalType: "string", - }, + "name": "tokenOut", + "type": "string", + "internalType": "string" + } ], - outputs: [], - stateMutability: "payable", + "outputs": [], + "stateMutability": "payable" }, { - type: "function", - name: "tokens", - inputs: [ - { - name: "name", - type: "string", - internalType: "string", - }, + "type": "function", + "name": "tokens", + "inputs": [ + { + "name": "name", + "type": "string", + "internalType": "string" + } ], - outputs: [ + "outputs": [ { - name: "", - type: "address", - internalType: "address", - }, + "name": "", + "type": "address", + "internalType": "address" + } ], - stateMutability: "view", + "stateMutability": "view" }, { - type: "function", - name: "whatIsTheAddressOf", - inputs: [ - { - name: "name", - type: "string", - internalType: "string", - }, + "type": "function", + "name": "whatIsTheAddressOf", + "inputs": [ + { + "name": "name", + "type": "string", + "internalType": "string" + } ], - outputs: [ + "outputs": [ { - name: "owner", - type: "address", - internalType: "address", + "name": "owner", + "type": "address", + "internalType": "address" }, { - name: "receiver", - type: "address", - internalType: "address", + "name": "receiver", + "type": "address", + "internalType": "address" }, { - name: "node", - type: "bytes32", - internalType: "bytes32", - }, + "name": "node", + "type": "bytes32", + "internalType": "bytes32" + } ], - stateMutability: "view", + "stateMutability": "view" }, { - type: "function", - name: "whatIsTheBalanceOf", - inputs: [ + "type": "function", + "name": "whatIsTheBalanceOf", + "inputs": [ { - name: "name", - type: "string", - internalType: "string", + "name": "name", + "type": "string", + "internalType": "string" }, { - name: "token", - type: "string", - internalType: "string", - }, + "name": "token", + "type": "string", + "internalType": "string" + } ], - outputs: [ + "outputs": [ { - name: "balance", - type: "uint256", - internalType: "uint256", + "name": "balance", + "type": "uint256", + "internalType": "uint256" }, { - name: "balanceAdjusted", - type: "uint256", - internalType: "uint256", - }, + "name": "balanceAdjusted", + "type": "uint256", + "internalType": "uint256" + } ], - stateMutability: "view", + "stateMutability": "view" }, { - type: "function", - name: "whatIsTheTotalSupplyOf", - inputs: [ + "type": "function", + "name": "whatIsTheTotalSupplyOf", + "inputs": [ + { + "name": "token", + "type": "string", + "internalType": "string" + } + ], + "outputs": [ { - name: "token", - type: "string", - internalType: "string", + "name": "supply", + "type": "uint256", + "internalType": "uint256" }, + { + "name": "supplyAdjusted", + "type": "uint256", + "internalType": "uint256" + } ], - outputs: [ + "stateMutability": "view" + }, + { + "type": "event", + "name": "NameSet", + "inputs": [ { - name: "supply", - type: "uint256", - internalType: "uint256", + "name": "token", + "type": "address", + "indexed": true, + "internalType": "address" }, { - name: "supplyAdjusted", - type: "uint256", - internalType: "uint256", - }, + "name": "name", + "type": "string", + "indexed": false, + "internalType": "string" + } ], - stateMutability: "view", + "anonymous": false }, { - type: "event", - name: "NameSet", - inputs: [ + "type": "event", + "name": "PairSet", + "inputs": [ { - name: "token", - type: "address", - indexed: true, - internalType: "address", + "name": "token0", + "type": "address", + "indexed": true, + "internalType": "address" }, { - name: "name", - type: "string", - indexed: false, - internalType: "string", + "name": "token1", + "type": "address", + "indexed": true, + "internalType": "address" }, + { + "name": "pair", + "type": "address", + "indexed": false, + "internalType": "address" + } ], - anonymous: false, + "anonymous": false }, { - type: "error", - name: "InsufficientSwap", - inputs: [], + "type": "error", + "name": "InsufficientSwap", + "inputs": [] }, { - type: "error", - name: "InvalidCharacter", - inputs: [], + "type": "error", + "name": "InvalidCharacter", + "inputs": [] }, { - type: "error", - name: "InvalidSwap", - inputs: [], + "type": "error", + "name": "InvalidSwap", + "inputs": [] }, { - type: "error", - name: "InvalidSyntax", - inputs: [], + "type": "error", + "name": "InvalidSyntax", + "inputs": [] }, { - type: "error", - name: "Overflow", - inputs: [], - }, + "type": "error", + "name": "Overflow", + "inputs": [] + } ] as const; diff --git a/ui/lib/constants.ts b/ui/lib/constants.ts index 690a9e5..7231fc4 100644 --- a/ui/lib/constants.ts +++ b/ui/lib/constants.ts @@ -4,7 +4,7 @@ export const IE_ADDRESS: { [key: number]: Address; } = { 1: "0x1E00000000Cf8ba83e0005c59c1Bf1C4682C8E00", - 42161: "0x000000001e202b5b84e56400f409800065cb6d3c", + 42161: "0x1e00003a669bb466d6B49800000099E1abDD6600", }; export const ETH_ADDRESS = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";