diff --git a/deployment/artifacts/tapir-free-fee-model.json b/deployment/artifacts/tapir-free-fee-model.json deleted file mode 100644 index 55552411..00000000 --- a/deployment/artifacts/tapir-free-fee-model.json +++ /dev/null @@ -1,215 +0,0 @@ -{ - "80002": { - "FreeFeeModel": { - "address": "0x130E5ff8Eaf5fe77Ad2846EC8860B8DCb0B6Ec5E", - "abi": [ - { - "type": "constructor", - "stateMutability": "nonpayable", - "inputs": [] - }, - { - "type": "error", - "name": "OwnableInvalidOwner", - "inputs": [ - { - "name": "owner", - "type": "address", - "internalType": "address" - } - ] - }, - { - "type": "error", - "name": "OwnableUnauthorizedAccount", - "inputs": [ - { - "name": "account", - "type": "address", - "internalType": "address" - } - ] - }, - { - "type": "event", - "name": "OwnershipTransferred", - "inputs": [ - { - "name": "previousOwner", - "type": "address", - "internalType": "address", - "indexed": true - }, - { - "name": "newOwner", - "type": "address", - "internalType": "address", - "indexed": true - } - ], - "anonymous": false - }, - { - "type": "function", - "name": "approveInitiator", - "stateMutability": "nonpayable", - "inputs": [ - { - "name": "initiator", - "type": "address", - "internalType": "address" - } - ], - "outputs": [] - }, - { - "type": "function", - "name": "beforeIsAuthorized", - "stateMutability": "view", - "inputs": [ - { - "name": "ritualId", - "type": "uint32", - "internalType": "uint32" - } - ], - "outputs": [] - }, - { - "type": "function", - "name": "beforeSetAuthorization", - "stateMutability": "nonpayable", - "inputs": [ - { - "name": "ritualId", - "type": "uint32", - "internalType": "uint32" - }, - { - "name": "addresses", - "type": "address[]", - "internalType": "address[]" - }, - { - "name": "value", - "type": "bool", - "internalType": "bool" - } - ], - "outputs": [] - }, - { - "type": "function", - "name": "initiatorWhiteList", - "stateMutability": "view", - "inputs": [ - { - "name": "initiator", - "type": "address", - "internalType": "address" - } - ], - "outputs": [ - { - "name": "approved", - "type": "bool", - "internalType": "bool" - } - ] - }, - { - "type": "function", - "name": "owner", - "stateMutability": "view", - "inputs": [], - "outputs": [ - { - "name": "", - "type": "address", - "internalType": "address" - } - ] - }, - { - "type": "function", - "name": "processRitualExtending", - "stateMutability": "nonpayable", - "inputs": [ - { - "name": "initiator", - "type": "address", - "internalType": "address" - }, - { - "name": "", - "type": "uint32", - "internalType": "uint32" - }, - { - "name": "", - "type": "uint256", - "internalType": "uint256" - }, - { - "name": "", - "type": "uint32", - "internalType": "uint32" - } - ], - "outputs": [] - }, - { - "type": "function", - "name": "processRitualPayment", - "stateMutability": "nonpayable", - "inputs": [ - { - "name": "initiator", - "type": "address", - "internalType": "address" - }, - { - "name": "", - "type": "uint32", - "internalType": "uint32" - }, - { - "name": "", - "type": "uint256", - "internalType": "uint256" - }, - { - "name": "", - "type": "uint32", - "internalType": "uint32" - } - ], - "outputs": [] - }, - { - "type": "function", - "name": "renounceOwnership", - "stateMutability": "nonpayable", - "inputs": [], - "outputs": [] - }, - { - "type": "function", - "name": "transferOwnership", - "stateMutability": "nonpayable", - "inputs": [ - { - "name": "newOwner", - "type": "address", - "internalType": "address" - } - ], - "outputs": [] - } - ], - "tx_hash": "0x97f3b06e4ea4bf92efc418db3d4e8c9610271bc8a117d0e4f28bb57c20368d06", - "block_number": 10944892, - "deployer": "0x3B42d26E19FF860bC4dEbB920DD8caA53F93c600" - } - } -} \ No newline at end of file diff --git a/deployment/artifacts/tapir.json b/deployment/artifacts/tapir.json index ae196e18..68496d38 100644 --- a/deployment/artifacts/tapir.json +++ b/deployment/artifacts/tapir.json @@ -2335,6 +2335,813 @@ } }, "80002": { + "BqETHSubscription": { + "address": "0x8d10e1b110761DB713A809eF7B3b084E1eA3A607", + "abi": [ + { + "inputs": [ + { + "internalType": "contract Coordinator", + "name": "_coordinator", + "type": "address" + }, + { + "internalType": "contract GlobalAllowList", + "name": "_accessController", + "type": "address" + }, + { + "internalType": "contract IERC20", + "name": "_feeToken", + "type": "address" + }, + { + "internalType": "address", + "name": "_adopterSetter", + "type": "address" + }, + { + "internalType": "uint256", + "name": "_initialBaseFeeRate", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_baseFeeRateIncrease", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_encryptorFeeRate", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_maxNodes", + "type": "uint256" + }, + { + "internalType": "uint32", + "name": "_subscriptionPeriodDuration", + "type": "uint32" + }, + { + "internalType": "uint32", + "name": "_yellowPeriodDuration", + "type": "uint32" + }, + { + "internalType": "uint32", + "name": "_redPeriodDuration", + "type": "uint32" + } + ], + "stateMutability": "nonpayable", + "type": "constructor" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "target", + "type": "address" + } + ], + "name": "AddressEmptyCode", + "type": "error" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "AddressInsufficientBalance", + "type": "error" + }, + { + "inputs": [], + "name": "FailedInnerCall", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidInitialization", + "type": "error" + }, + { + "inputs": [], + "name": "NotInitializing", + "type": "error" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "owner", + "type": "address" + } + ], + "name": "OwnableInvalidOwner", + "type": "error" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "OwnableUnauthorizedAccount", + "type": "error" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "token", + "type": "address" + } + ], + "name": "SafeERC20FailedOperation", + "type": "error" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "sponsor", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "uint128", + "name": "encryptorSlots", + "type": "uint128" + }, + { + "indexed": false, + "internalType": "uint32", + "name": "endOfCurrentPeriod", + "type": "uint32" + } + ], + "name": "EncryptorSlotsPaid", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "uint64", + "name": "version", + "type": "uint64" + } + ], + "name": "Initialized", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "previousOwner", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "newOwner", + "type": "address" + } + ], + "name": "OwnershipTransferred", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "subscriber", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "uint128", + "name": "encryptorSlots", + "type": "uint128" + }, + { + "indexed": false, + "internalType": "uint32", + "name": "endOfSubscription", + "type": "uint32" + } + ], + "name": "SubscriptionPaid", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "treasury", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "WithdrawalToTreasury", + "type": "event" + }, + { + "inputs": [], + "name": "INACTIVE_RITUAL_ID", + "outputs": [ + { + "internalType": "uint32", + "name": "", + "type": "uint32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "INCREASE_BASE", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "accessController", + "outputs": [ + { + "internalType": "contract GlobalAllowList", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "activeRitualId", + "outputs": [ + { + "internalType": "uint32", + "name": "", + "type": "uint32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "adopter", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "adopterSetter", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "baseFeeRateIncrease", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "periodNumber", + "type": "uint256" + } + ], + "name": "baseFees", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "baseFees", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint32", + "name": "ritualId", + "type": "uint32" + } + ], + "name": "beforeIsAuthorized", + "outputs": [], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint32", + "name": "ritualId", + "type": "uint32" + }, + { + "internalType": "address[]", + "name": "addresses", + "type": "address[]" + }, + { + "internalType": "bool", + "name": "value", + "type": "bool" + } + ], + "name": "beforeSetAuthorization", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "periodNumber", + "type": "uint256" + } + ], + "name": "billingInfo", + "outputs": [ + { + "internalType": "bool", + "name": "paid", + "type": "bool" + }, + { + "internalType": "uint128", + "name": "encryptorSlots", + "type": "uint128" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "coordinator", + "outputs": [ + { + "internalType": "contract Coordinator", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "encryptorFeeRate", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint128", + "name": "encryptorSlots", + "type": "uint128" + }, + { + "internalType": "uint32", + "name": "duration", + "type": "uint32" + } + ], + "name": "encryptorFees", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "feeToken", + "outputs": [ + { + "internalType": "contract IERC20", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "getCurrentPeriodNumber", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "getEndOfSubscription", + "outputs": [ + { + "internalType": "uint32", + "name": "endOfSubscription", + "type": "uint32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "periodNumber", + "type": "uint256" + } + ], + "name": "getPaidEncryptorSlots", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "initialBaseFeeRate", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "_treasury", + "type": "address" + } + ], + "name": "initialize", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "periodNumber", + "type": "uint256" + } + ], + "name": "isPeriodPaid", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "maxNodes", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "owner", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint128", + "name": "additionalEncryptorSlots", + "type": "uint128" + } + ], + "name": "payForEncryptorSlots", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint128", + "name": "encryptorSlots", + "type": "uint128" + } + ], + "name": "payForSubscription", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + }, + { + "internalType": "uint32", + "name": "ritualId", + "type": "uint32" + }, + { + "internalType": "uint256", + "name": "", + "type": "uint256" + }, + { + "internalType": "uint32", + "name": "", + "type": "uint32" + } + ], + "name": "processRitualExtending", + "outputs": [], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "initiator", + "type": "address" + }, + { + "internalType": "uint32", + "name": "ritualId", + "type": "uint32" + }, + { + "internalType": "uint256", + "name": "numberOfProviders", + "type": "uint256" + }, + { + "internalType": "uint32", + "name": "duration", + "type": "uint32" + } + ], + "name": "processRitualPayment", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "redPeriodDuration", + "outputs": [ + { + "internalType": "uint32", + "name": "", + "type": "uint32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "renounceOwnership", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "_adopter", + "type": "address" + } + ], + "name": "setAdopter", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "startOfSubscription", + "outputs": [ + { + "internalType": "uint32", + "name": "", + "type": "uint32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "subscriptionPeriodDuration", + "outputs": [ + { + "internalType": "uint32", + "name": "", + "type": "uint32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "newOwner", + "type": "address" + } + ], + "name": "transferOwnership", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "usedEncryptorSlots", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "withdrawToTreasury", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "yellowPeriodDuration", + "outputs": [ + { + "internalType": "uint32", + "name": "", + "type": "uint32" + } + ], + "stateMutability": "view", + "type": "function" + } + ], + "tx_hash": "0xb1900a546af479c01209540daeb510093da74fd1fc6311d988f27cbf50164667", + "block_number": 10985616, + "deployer": "0x3B42d26E19FF860bC4dEbB920DD8caA53F93c600" + }, "Coordinator": { "address": "0xE690b6bCC0616Dc5294fF84ff4e00335cA52C388", "abi": [ diff --git a/deployment/constructor_params/tapir/bqeth.yml b/deployment/constructor_params/tapir/bqeth.yml index 53c9b559..c0eae5cb 100644 --- a/deployment/constructor_params/tapir/bqeth.yml +++ b/deployment/constructor_params/tapir/bqeth.yml @@ -11,6 +11,7 @@ constants: COORDINATOR_PROXY: "0xE690b6bCC0616Dc5294fF84ff4e00335cA52C388" TAPIR_RITUAL_TOKEN: "0xf91afFE7cf1d9c367Cb56eDd70C0941a4E8570d9" TESTNET_DEPLOYER: "0x3B42d26E19FF860bC4dEbB920DD8caA53F93c600" + GLOBAL_ALLOW_LIST: "0xcc537b292d142dABe2424277596d8FFCC3e6A12D" MAX_NODES: 5 @@ -24,9 +25,6 @@ constants: RED_PERIOD: 86400 # 1 day contracts: - - GlobalAllowList: - constructor: - _coordinator: $COORDINATOR_PROXY - BqETHSubscription: proxy: constructor: @@ -34,7 +32,7 @@ contracts: _data: $encode:initialize,$TESTNET_DEPLOYER constructor: _coordinator: $COORDINATOR_PROXY - _accessController: $GlobalAllowList + _accessController: $GLOBAL_ALLOW_LIST _feeToken: $TAPIR_RITUAL_TOKEN _adopterSetter: $TESTNET_DEPLOYER _initialBaseFeeRate: $INITIAL_BASE_FEE_RATE