Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions contracts/v1_5/FiredrillCompound.sol
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ contract FiredrillCompound is Ownable2Step, HasStatus, ITypeAndVersion {
return i_ctrl.token();
}

function getARM() public view returns (address) {
return i_ctrl.compound();
}

function typeAndVersion() external pure returns (string memory) {
return "Router 1.2.0";
}
Expand Down
10 changes: 8 additions & 2 deletions contracts/v1_6/FiredrillCompound.sol
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ contract FiredrillCompound is Ownable2Step, HasStatus, ITypeAndVersion {
});
}

// ========== Router methods ==========
// ========== Router ==========
function getOnRamp(uint64) external view returns (address) {
return address(i_ctrl.onRamp());
}
Expand All @@ -59,7 +59,7 @@ contract FiredrillCompound is Ownable2Step, HasStatus, ITypeAndVersion {
}
// ==================================

// ========== FeeQuoter methods ==========
// ========== FeeQuoter ==========
function getStaticConfig() external view returns (StaticConfig memory) {
return StaticConfig({
maxFeeJuelsPerMsg: 1,
Expand All @@ -69,6 +69,12 @@ contract FiredrillCompound is Ownable2Step, HasStatus, ITypeAndVersion {
}
// ==================================

// ========== ARMProxy ==========
function getARM() public view returns (address) {
return i_ctrl.compound();
}
// ==================================

function typeAndVersion() external pure returns (string memory) {
return "Router 1.2.0 FeeQuoter 1.6.0";
}
Expand Down
13 changes: 13 additions & 0 deletions generated/v1_5/abi/FiredrillCompound.abi
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,19 @@
"outputs": [],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "getARM",
"inputs": [],
"outputs": [
{
"name": "",
"type": "address",
"internalType": "address"
}
],
"stateMutability": "view"
},
{
"type": "function",
"name": "getCurrentInboundRateLimiterState",
Expand Down
2 changes: 1 addition & 1 deletion generated/v1_5/bin/FiredrillCompound.bin
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0x60a060405234801561000f575f80fd5b50604051610e81380380610e8183398101604081905261002e916100d9565b338061005357604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b61005c8161006e565b506001600160a01b0316608052610106565b600180546001600160a01b03191690556100878161008a565b50565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100e9575f80fd5b81516001600160a01b03811681146100ff575f80fd5b9392505050565b608051610d3261014f5f395f818161036e0152818161043d015281816104c3015281816105b80152818161064601528181610812015281816108a101526109500152610d325ff3fe608060405234801561000f575f80fd5b506004361061011c575f3560e01c80638da5cb5b116100a9578063c75eea9c1161006e578063c75eea9c146102c9578063d7080f0914610338578063e30c397814610340578063f2fde38b14610351578063f5de852714610364575f80fd5b80638da5cb5b14610283578063a40e69c714610293578063a6c94a73146102a8578063a8d87a3b146102b6578063af58d59f146102c9575f80fd5b8063384b09e8116100ef578063384b09e81461019957806343d24152146101a1578063546719cd146101b4578063715018a61461027357806379ba50971461027b575f80fd5b8063181f5a771461012057806320f938b61461015757806321df0da71461016157806322f3e2d414610181575b5f80fd5b604080518082018252600c81526b0526f7574657220312e322e360a41b6020820152905161014e9190610b49565b60405180910390f35b61015f61036c565b005b61016961043a565b6040516001600160a01b03909116815260200161014e565b6101896104c0565b604051901515815260200161014e565b61015f610541565b61015f6101af366004610baa565b6105aa565b6102176040805160a0810182525f80825260208201819052918101829052606081018290526080810191909152506040805160a0810182525f80825263ffffffff4216602083015260019282019290925260326060820152608081019190915290565b60405161014e919081516fffffffffffffffffffffffffffffffff908116825260208084015163ffffffff1690830152604080840151151590830152606080840151821690830152608092830151169181019190915260a00190565b61015f610767565b61015f61077a565b5f546001600160a01b0316610169565b61029b6107c3565b60405161014e9190610be1565b6040515f815260200161014e565b6101696102c4366004610c42565b61094d565b6102176102d7366004610c42565b6040805160a0810182525f8082526020820181905291810182905260608101829052608081019190915250506040805160a0810182525f80825263ffffffff4216602083015260019282019290925260326060820152608081019190915290565b61015f6109d4565b6001546001600160a01b0316610169565b61015f61035f366004610c78565b610a15565b61015f610a85565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663fc0c546a6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156103c8573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103ec9190610c93565b6001600160a01b03167f52f50aa6d1a95a4595361ecf953d095f125d442e4673716dede699e049de148a600142604051610430929190918252602082015260400190565b60405180910390a2565b5f7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663fc0c546a6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610497573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104bb9190610c93565b905090565b5f7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166322f3e2d46040518163ffffffff1660e01b8152600401602060405180830381865afa15801561051d573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104bb9190610cae565b604080515f8082526020820181905260039282019290925267ffffffffffffffff421660608201526080810182905260a081018290523391907f8137bc8a8d712aaa27bfc6506d5566ac405618bd53f9831b8ca6b6fe5442ee7a9060c0015b60405180910390a3565b5f60405180604001604052807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166344671a5d6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610612573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106369190610c93565b6001600160a01b031681526020017f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166344671a5d6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156106a0573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106c49190610c93565b604080516001600160a01b03909216602083015267ffffffffffffffff808816918301919091528516606082015260800160408051601f198184030181529181528151602092830120909252815183516001600160a01b0316815283820151918101919091525f918101829052919250907f8257378aa73bf8e4ada848713526584a3dcee0fd3db3beed7397f7a7f5067cc99060600160405180910390a2505050565b61076f610aba565b6107785f610ae6565b565b60015433906001600160a01b031681146107b75760405163118cdaa760e01b81526001600160a01b03821660048201526024015b60405180910390fd5b6107c081610ae6565b50565b6040805160018082528183019092526060915f9190816020015b604080518082019091525f80825260208201528152602001906001900390816107dd57905050905060405180604001604052807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316634e4bc8476040518163ffffffff1660e01b8152600401602060405180830381865afa15801561086c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906108909190610ccd565b67ffffffffffffffff1681526020017f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166344671a5d6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108fb573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061091f9190610c93565b6001600160a01b0316815250815f8151811061093d5761093d610ce8565b6020908102919091010152919050565b5f7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663c021e73c6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156109aa573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109ce9190610c93565b92915050565b604080515f80825267ffffffffffffffff42166020830152917fcfdbfd8ce9a56b5f7c202c0e102184d24f47ca87121dc165063fc4c290957bde9101610430565b610a1d610aba565b600180546001600160a01b0383166001600160a01b03199091168117909155610a4d5f546001600160a01b031690565b6001600160a01b03167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e2270060405160405180910390a350565b60405160648152339030907f2d87480f50083e2b2759522a8fdda59802650a8055e609a7772cf70c07748f52906020016105a0565b5f546001600160a01b031633146107785760405163118cdaa760e01b81523360048201526024016107ae565b600180546001600160a01b03191690556107c0815f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602080835283518060208501525f5b81811015610b7557858101830151858201604001528201610b59565b505f604082860101526040601f19601f8301168501019250505092915050565b67ffffffffffffffff811681146107c0575f80fd5b5f8060408385031215610bbb575f80fd5b8235610bc681610b95565b91506020830135610bd681610b95565b809150509250929050565b602080825282518282018190525f919060409081850190868401855b82811015610c35578151805167ffffffffffffffff1685528601516001600160a01b0316868501529284019290850190600101610bfd565b5091979650505050505050565b5f60208284031215610c52575f80fd5b8135610c5d81610b95565b9392505050565b6001600160a01b03811681146107c0575f80fd5b5f60208284031215610c88575f80fd5b8135610c5d81610c64565b5f60208284031215610ca3575f80fd5b8151610c5d81610c64565b5f60208284031215610cbe575f80fd5b81518015158114610c5d575f80fd5b5f60208284031215610cdd575f80fd5b8151610c5d81610b95565b634e487b7160e01b5f52603260045260245ffdfea26469706673582212207c69df1190c8c3294cf0d312290c790fcae65d5eb84d0f533aae3a9a5c12ccac64736f6c63430008180033
0x60a060405234801561000f575f80fd5b50604051610ef8380380610ef883398101604081905261002e916100d9565b338061005357604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b61005c8161006e565b506001600160a01b0316608052610106565b600180546001600160a01b03191690556100878161008a565b50565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100e9575f80fd5b81516001600160a01b03811681146100ff575f80fd5b9392505050565b608051610da26101565f395f818161038101528181610450015281816104d60152818161055701528181610628015281816106b6015281816108820152818161091101526109c00152610da25ff3fe608060405234801561000f575f80fd5b5060043610610127575f3560e01c80638da5cb5b116100a9578063c75eea9c1161006e578063c75eea9c146102dc578063d7080f091461034b578063e30c397814610353578063f2fde38b14610364578063f5de852714610377575f80fd5b80638da5cb5b14610296578063a40e69c7146102a6578063a6c94a73146102bb578063a8d87a3b146102c9578063af58d59f146102dc575f80fd5b8063384b09e8116100ef578063384b09e8146101ac57806343d24152146101b4578063546719cd146101c7578063715018a61461028657806379ba50971461028e575f80fd5b8063181f5a771461012b57806320f938b61461016257806321df0da71461016c57806322f3e2d41461018c5780632e90aa21146101a4575b5f80fd5b604080518082018252600c81526b0526f7574657220312e322e360a41b602082015290516101599190610bb9565b60405180910390f35b61016a61037f565b005b61017461044d565b6040516001600160a01b039091168152602001610159565b6101946104d3565b6040519015158152602001610159565b610174610554565b61016a6105b1565b61016a6101c2366004610c1a565b61061a565b61022a6040805160a0810182525f80825260208201819052918101829052606081018290526080810191909152506040805160a0810182525f80825263ffffffff4216602083015260019282019290925260326060820152608081019190915290565b604051610159919081516fffffffffffffffffffffffffffffffff908116825260208084015163ffffffff1690830152604080840151151590830152606080840151821690830152608092830151169181019190915260a00190565b61016a6107d7565b61016a6107ea565b5f546001600160a01b0316610174565b6102ae610833565b6040516101599190610c51565b6040515f8152602001610159565b6101746102d7366004610cb2565b6109bd565b61022a6102ea366004610cb2565b6040805160a0810182525f8082526020820181905291810182905260608101829052608081019190915250506040805160a0810182525f80825263ffffffff4216602083015260019282019290925260326060820152608081019190915290565b61016a610a44565b6001546001600160a01b0316610174565b61016a610372366004610ce8565b610a85565b61016a610af5565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663fc0c546a6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156103db573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103ff9190610d03565b6001600160a01b03167f52f50aa6d1a95a4595361ecf953d095f125d442e4673716dede699e049de148a600142604051610443929190918252602082015260400190565b60405180910390a2565b5f7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663fc0c546a6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156104aa573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104ce9190610d03565b905090565b5f7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166322f3e2d46040518163ffffffff1660e01b8152600401602060405180830381865afa158015610530573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104ce9190610d1e565b5f7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663f69e20466040518163ffffffff1660e01b8152600401602060405180830381865afa1580156104aa573d5f803e3d5ffd5b604080515f8082526020820181905260039282019290925267ffffffffffffffff421660608201526080810182905260a081018290523391907f8137bc8a8d712aaa27bfc6506d5566ac405618bd53f9831b8ca6b6fe5442ee7a9060c0015b60405180910390a3565b5f60405180604001604052807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166344671a5d6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610682573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106a69190610d03565b6001600160a01b031681526020017f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166344671a5d6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610710573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906107349190610d03565b604080516001600160a01b03909216602083015267ffffffffffffffff808816918301919091528516606082015260800160408051601f198184030181529181528151602092830120909252815183516001600160a01b0316815283820151918101919091525f918101829052919250907f8257378aa73bf8e4ada848713526584a3dcee0fd3db3beed7397f7a7f5067cc99060600160405180910390a2505050565b6107df610b2a565b6107e85f610b56565b565b60015433906001600160a01b031681146108275760405163118cdaa760e01b81526001600160a01b03821660048201526024015b60405180910390fd5b61083081610b56565b50565b6040805160018082528183019092526060915f9190816020015b604080518082019091525f808252602082015281526020019060019003908161084d57905050905060405180604001604052807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316634e4bc8476040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108dc573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109009190610d3d565b67ffffffffffffffff1681526020017f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166344671a5d6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561096b573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061098f9190610d03565b6001600160a01b0316815250815f815181106109ad576109ad610d58565b6020908102919091010152919050565b5f7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663c021e73c6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610a1a573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a3e9190610d03565b92915050565b604080515f80825267ffffffffffffffff42166020830152917fcfdbfd8ce9a56b5f7c202c0e102184d24f47ca87121dc165063fc4c290957bde9101610443565b610a8d610b2a565b600180546001600160a01b0383166001600160a01b03199091168117909155610abd5f546001600160a01b031690565b6001600160a01b03167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e2270060405160405180910390a350565b60405160648152339030907f2d87480f50083e2b2759522a8fdda59802650a8055e609a7772cf70c07748f5290602001610610565b5f546001600160a01b031633146107e85760405163118cdaa760e01b815233600482015260240161081e565b600180546001600160a01b0319169055610830815f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602080835283518060208501525f5b81811015610be557858101830151858201604001528201610bc9565b505f604082860101526040601f19601f8301168501019250505092915050565b67ffffffffffffffff81168114610830575f80fd5b5f8060408385031215610c2b575f80fd5b8235610c3681610c05565b91506020830135610c4681610c05565b809150509250929050565b602080825282518282018190525f919060409081850190868401855b82811015610ca5578151805167ffffffffffffffff1685528601516001600160a01b0316868501529284019290850190600101610c6d565b5091979650505050505050565b5f60208284031215610cc2575f80fd5b8135610ccd81610c05565b9392505050565b6001600160a01b0381168114610830575f80fd5b5f60208284031215610cf8575f80fd5b8135610ccd81610cd4565b5f60208284031215610d13575f80fd5b8151610ccd81610cd4565b5f60208284031215610d2e575f80fd5b81518015158114610ccd575f80fd5b5f60208284031215610d4d575f80fd5b8151610ccd81610c05565b634e487b7160e01b5f52603260045260245ffdfea2646970667358221220e0146167140781724431d8e3dce1e3a05351d8576061810e9dc771b7649731a764736f6c63430008180033
2 changes: 1 addition & 1 deletion generated/v1_5/bin/FiredrillEntrypoint.bin

Large diffs are not rendered by default.

Loading