Skip to content

Commit

Permalink
Merge pull request #29 from zikriya/develop
Browse files Browse the repository at this point in the history 
Modifications
  • Loading branch information
@zikriya
zikriya authored Jan 5, 2024
2 parents 4e06690 + 4313e5e commit 84de6c5
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 194 deletions.
277 changes: 89 additions & 188 deletions src/constants/FiberRouter.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,23 @@
"contractName": "FiberRouter",
"sourceName": "contracts/upgradeable-Bridge/FiberRouter.sol",
"abi": [
{
"inputs": [
{
"internalType": "address",
"name": "_wethAddress",
"type": "address"
},
{
"internalType": "address",
"name": "_oneInchAggregator",
"type": "address"
},
{ "internalType": "address", "name": "_poolAddress", "type": "address" }
],
"stateMutability": "nonpayable",
"type": "constructor"
},
{
"anonymous": false,
"inputs": [
Expand Down Expand Up @@ -342,51 +359,26 @@
"type": "event"
},
{
"inputs": [
{
"internalType": "address",
"name": "",
"type": "address"
}
],
"inputs": [],
"name": "WETH",
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [{ "internalType": "address", "name": "", "type": "address" }],
"name": "inventory",
"outputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "token",
"type": "address"
},
{
"internalType": "uint256",
"name": "amount",
"type": "uint256"
},
{
"internalType": "string",
"name": "targetNetwork",
"type": "string"
},
{
"internalType": "string",
"name": "targetToken",
"type": "string"
},
{
"internalType": "string",
"name": "targetAddress",
"type": "string"
},
{ "internalType": "address", "name": "token", "type": "address" },
{ "internalType": "uint256", "name": "amount", "type": "uint256" },
{ "internalType": "string", "name": "targetNetwork", "type": "string" },
{ "internalType": "string", "name": "targetToken", "type": "string" },
{ "internalType": "string", "name": "targetAddress", "type": "string" },
{
"internalType": "bytes32",
"name": "withdrawalData",
Expand All @@ -400,16 +392,8 @@
},
{
"inputs": [
{
"internalType": "uint256",
"name": "amountIn",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "amountOut",
"type": "uint256"
},
{ "internalType": "uint256", "name": "amountIn", "type": "uint256" },
{ "internalType": "uint256", "name": "amountOut", "type": "uint256" },
{
"internalType": "string",
"name": "crossTargetNetwork",
Expand All @@ -425,16 +409,8 @@
"name": "crossTargetAddress",
"type": "string"
},
{
"internalType": "bytes",
"name": "oneInchData",
"type": "bytes"
},
{
"internalType": "address",
"name": "fromToken",
"type": "address"
},
{ "internalType": "bytes", "name": "oneInchData", "type": "bytes" },
{ "internalType": "address", "name": "fromToken", "type": "address" },
{
"internalType": "address",
"name": "foundryToken",
Expand All @@ -454,39 +430,21 @@
{
"inputs": [],
"name": "oneInchAggregatorRouter",
"outputs": [
{
"internalType": "address",
"name": "",
"type": "address"
}
],
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "owner",
"outputs": [
{
"internalType": "address",
"name": "",
"type": "address"
}
],
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "pool",
"outputs": [
{
"internalType": "address",
"name": "",
"type": "address"
}
],
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
"stateMutability": "view",
"type": "function"
},
Expand All @@ -512,11 +470,7 @@
},
{
"inputs": [
{
"internalType": "address",
"name": "_pool",
"type": "address"
}
{ "internalType": "address", "name": "_pool", "type": "address" }
],
"name": "setPool",
"outputs": [],
Expand All @@ -525,26 +479,14 @@
},
{
"inputs": [
{
"internalType": "address",
"name": "token",
"type": "address"
},
{
"internalType": "uint256",
"name": "amount",
"type": "uint256"
},
{ "internalType": "address", "name": "token", "type": "address" },
{ "internalType": "uint256", "name": "amount", "type": "uint256" },
{
"internalType": "uint256",
"name": "targetNetwork",
"type": "uint256"
},
{
"internalType": "address",
"name": "targetToken",
"type": "address"
},
{ "internalType": "address", "name": "targetToken", "type": "address" },
{
"internalType": "address",
"name": "targetAddress",
Expand All @@ -563,16 +505,8 @@
},
{
"inputs": [
{
"internalType": "uint256",
"name": "amountIn",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "amountOut",
"type": "uint256"
},
{ "internalType": "uint256", "name": "amountIn", "type": "uint256" },
{ "internalType": "uint256", "name": "amountOut", "type": "uint256" },
{
"internalType": "uint256",
"name": "crossTargetNetwork",
Expand All @@ -588,16 +522,8 @@
"name": "crossTargetAddress",
"type": "address"
},
{
"internalType": "bytes",
"name": "oneInchData",
"type": "bytes"
},
{
"internalType": "address",
"name": "fromToken",
"type": "address"
},
{ "internalType": "bytes", "name": "oneInchData", "type": "bytes" },
{ "internalType": "address", "name": "fromToken", "type": "address" },
{
"internalType": "address",
"name": "foundryToken",
Expand All @@ -616,102 +542,77 @@
},
{
"inputs": [
{ "internalType": "uint256", "name": "amountOut", "type": "uint256" },
{
"internalType": "address",
"name": "newOwner",
"type": "address"
}
],
"name": "transferOwnership",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
"internalType": "uint256",
"name": "crossTargetNetwork",
"type": "uint256"
},
{
"internalType": "address",
"name": "token",
"name": "crossTargetToken",
"type": "address"
},
{
"internalType": "address",
"name": "payee",
"name": "crossTargetAddress",
"type": "address"
},
{ "internalType": "bytes", "name": "oneInchData", "type": "bytes" },
{
"internalType": "uint256",
"name": "amount",
"type": "uint256"
"internalType": "address",
"name": "foundryToken",
"type": "address"
},
{
"internalType": "bytes32",
"name": "salt",
"name": "withdrawalData",
"type": "bytes32"
},
{
"internalType": "uint256",
"name": "expiry",
"type": "uint256"
},
{
"internalType": "bytes",
"name": "multiSignature",
"type": "bytes"
}
],
"name": "swapAndCrossOneInchETH",
"outputs": [],
"stateMutability": "payable",
"type": "function"
},
{
"inputs": [
{ "internalType": "address", "name": "newOwner", "type": "address" }
],
"name": "transferOwnership",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{ "internalType": "address", "name": "token", "type": "address" },
{ "internalType": "address", "name": "payee", "type": "address" },
{ "internalType": "uint256", "name": "amount", "type": "uint256" },
{ "internalType": "bytes32", "name": "salt", "type": "bytes32" },
{ "internalType": "uint256", "name": "expiry", "type": "uint256" },
{ "internalType": "bytes", "name": "multiSignature", "type": "bytes" }
],
"name": "withdrawSigned",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "address payable",
"name": "to",
"type": "address"
},
{
"internalType": "uint256",
"name": "amountIn",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "amountOut",
"type": "uint256"
},
{ "internalType": "address payable", "name": "to", "type": "address" },
{ "internalType": "uint256", "name": "amountIn", "type": "uint256" },
{ "internalType": "uint256", "name": "amountOut", "type": "uint256" },
{
"internalType": "address",
"name": "foundryToken",
"type": "address"
},
{
"internalType": "address",
"name": "targetToken",
"type": "address"
},
{
"internalType": "bytes",
"name": "oneInchData",
"type": "bytes"
},
{
"internalType": "bytes32",
"name": "salt",
"type": "bytes32"
},
{
"internalType": "uint256",
"name": "expiry",
"type": "uint256"
},
{
"internalType": "bytes",
"name": "multiSignature",
"type": "bytes"
}
{ "internalType": "address", "name": "targetToken", "type": "address" },
{ "internalType": "bytes", "name": "oneInchData", "type": "bytes" },
{ "internalType": "bytes32", "name": "salt", "type": "bytes32" },
{ "internalType": "uint256", "name": "expiry", "type": "uint256" },
{ "internalType": "bytes", "name": "multiSignature", "type": "bytes" }
],
"name": "withdrawSignedAndSwapOneInch",
"outputs": [],
Expand Down
Loading

0 comments on commit 84de6c5

Please sign in to comment.