Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PP-504/remove-worker-configuration #91

Merged
merged 1 commit into from
Nov 16, 2022
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/Collector.sol
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ contract Collector is ICollector{
partners.push(_partners[i]);
}

function getPartners() external view returns (RevenuePartner[] memory){
return partners;
}

function updateShares(RevenuePartner[] memory _partners)
external
validShares(_partners)
Expand Down
2 changes: 2 additions & 0 deletions index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const CustomSmartWalletFactory = require('./build/contracts/CustomSmartWalletFac
const DeployVerifier = require('./build/contracts/DeployVerifier.json');
const Penalizer = require('./build/contracts/Penalizer.json');
const RelayHub = require('./build/contracts/RelayHub.json');
const Collector = require('./build/contracts/Collector.json');
const RelayVerifier = require('./build/contracts/RelayVerifier.json');
const SmartWallet = require('./build/contracts/SmartWallet.json');
const SmartWalletFactory = require('./build/contracts/SmartWalletFactory.json');
Expand All @@ -49,6 +50,7 @@ export {
IRelayHub,
IRelayVerifier,
ISmartWalletFactory,
Collector,
ITokenHandler,
IVersionRegistry,
IWalletCustomLogic,
Expand Down
134 changes: 89 additions & 45 deletions types/truffle-contracts/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,10 @@ export interface CollectorInstance extends Truffle.ContractInstance {

token(txDetails?: Truffle.TransactionDetails): Promise<string>;

getPartners(
txDetails?: Truffle.TransactionDetails
): Promise<{ beneficiary: string; share: string }[]>;

updateShares: {
(
_partners: { beneficiary: string | BN; share: number | BN | string }[],
Expand Down Expand Up @@ -914,15 +918,6 @@ export interface CustomSmartWalletDeployVerifierInstance

owner(txDetails?: Truffle.TransactionDetails): Promise<string>;

renounceOwnership: {
(txDetails?: Truffle.TransactionDetails): Promise<
Truffle.TransactionResponse
>;
call(txDetails?: Truffle.TransactionDetails): Promise<void>;
sendTransaction(txDetails?: Truffle.TransactionDetails): Promise<string>;
estimateGas(txDetails?: Truffle.TransactionDetails): Promise<number>;
};

tokens(
arg0: string | BN,
txDetails?: Truffle.TransactionDetails
Expand Down Expand Up @@ -1069,6 +1064,29 @@ export interface CustomSmartWalletDeployVerifierInstance
): Promise<number>;
};

removeToken: {
(
token: string | BN,
index: number | BN | string,
txDetails?: Truffle.TransactionDetails
): Promise<Truffle.TransactionResponse>;
call(
token: string | BN,
index: number | BN | string,
txDetails?: Truffle.TransactionDetails
): Promise<void>;
sendTransaction(
token: string | BN,
index: number | BN | string,
txDetails?: Truffle.TransactionDetails
): Promise<string>;
estimateGas(
token: string | BN,
index: number | BN | string,
txDetails?: Truffle.TransactionDetails
): Promise<number>;
};

getAcceptedTokens(txDetails?: Truffle.TransactionDetails): Promise<string[]>;

acceptsToken(
Expand Down Expand Up @@ -1245,15 +1263,6 @@ export interface DeployVerifierInstance extends Truffle.ContractInstance {

owner(txDetails?: Truffle.TransactionDetails): Promise<string>;

renounceOwnership: {
(txDetails?: Truffle.TransactionDetails): Promise<
Truffle.TransactionResponse
>;
call(txDetails?: Truffle.TransactionDetails): Promise<void>;
sendTransaction(txDetails?: Truffle.TransactionDetails): Promise<string>;
estimateGas(txDetails?: Truffle.TransactionDetails): Promise<number>;
};

tokens(
arg0: string | BN,
txDetails?: Truffle.TransactionDetails
Expand Down Expand Up @@ -1400,6 +1409,29 @@ export interface DeployVerifierInstance extends Truffle.ContractInstance {
): Promise<number>;
};

removeToken: {
(
token: string | BN,
index: number | BN | string,
txDetails?: Truffle.TransactionDetails
): Promise<Truffle.TransactionResponse>;
call(
token: string | BN,
index: number | BN | string,
txDetails?: Truffle.TransactionDetails
): Promise<void>;
sendTransaction(
token: string | BN,
index: number | BN | string,
txDetails?: Truffle.TransactionDetails
): Promise<string>;
estimateGas(
token: string | BN,
index: number | BN | string,
txDetails?: Truffle.TransactionDetails
): Promise<number>;
};

getAcceptedTokens(txDetails?: Truffle.TransactionDetails): Promise<string[]>;

acceptsToken(
Expand Down Expand Up @@ -1773,6 +1805,7 @@ export interface FailureCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
sig: string,
txDetails?: Truffle.TransactionDetails
): Promise<Truffle.TransactionResponse>;
Expand All @@ -1790,6 +1823,7 @@ export interface FailureCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
sig: string,
txDetails?: Truffle.TransactionDetails
): Promise<string>;
Expand All @@ -1807,6 +1841,7 @@ export interface FailureCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
sig: string,
txDetails?: Truffle.TransactionDetails
): Promise<string>;
Expand All @@ -1824,6 +1859,7 @@ export interface FailureCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
sig: string,
txDetails?: Truffle.TransactionDetails
): Promise<number>;
Expand Down Expand Up @@ -3133,6 +3169,7 @@ export interface IWalletCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
signature: string,
txDetails?: Truffle.TransactionDetails
): Promise<Truffle.TransactionResponse>;
Expand All @@ -3150,6 +3187,7 @@ export interface IWalletCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
signature: string,
txDetails?: Truffle.TransactionDetails
): Promise<string>;
Expand All @@ -3167,6 +3205,7 @@ export interface IWalletCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
signature: string,
txDetails?: Truffle.TransactionDetails
): Promise<string>;
Expand All @@ -3184,6 +3223,7 @@ export interface IWalletCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
signature: string,
txDetails?: Truffle.TransactionDetails
): Promise<number>;
Expand Down Expand Up @@ -3901,15 +3941,6 @@ export interface NonRevertTestTokenInstance extends Truffle.ContractInstance {
export interface OwnableInstance extends Truffle.ContractInstance {
owner(txDetails?: Truffle.TransactionDetails): Promise<string>;

renounceOwnership: {
(txDetails?: Truffle.TransactionDetails): Promise<
Truffle.TransactionResponse
>;
call(txDetails?: Truffle.TransactionDetails): Promise<void>;
sendTransaction(txDetails?: Truffle.TransactionDetails): Promise<string>;
estimateGas(txDetails?: Truffle.TransactionDetails): Promise<number>;
};

transferOwnership: {
(newOwner: string | BN, txDetails?: Truffle.TransactionDetails): Promise<
Truffle.TransactionResponse
Expand Down Expand Up @@ -4071,6 +4102,7 @@ export interface ProxyCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
sig: string,
txDetails?: Truffle.TransactionDetails
): Promise<Truffle.TransactionResponse>;
Expand All @@ -4088,6 +4120,7 @@ export interface ProxyCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
sig: string,
txDetails?: Truffle.TransactionDetails
): Promise<string>;
Expand All @@ -4105,6 +4138,7 @@ export interface ProxyCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
sig: string,
txDetails?: Truffle.TransactionDetails
): Promise<string>;
Expand All @@ -4122,6 +4156,7 @@ export interface ProxyCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
sig: string,
txDetails?: Truffle.TransactionDetails
): Promise<number>;
Expand Down Expand Up @@ -4557,15 +4592,6 @@ export interface RelayVerifierInstance extends Truffle.ContractInstance {

owner(txDetails?: Truffle.TransactionDetails): Promise<string>;

renounceOwnership: {
(txDetails?: Truffle.TransactionDetails): Promise<
Truffle.TransactionResponse
>;
call(txDetails?: Truffle.TransactionDetails): Promise<void>;
sendTransaction(txDetails?: Truffle.TransactionDetails): Promise<string>;
estimateGas(txDetails?: Truffle.TransactionDetails): Promise<number>;
};

tokens(
arg0: string | BN,
txDetails?: Truffle.TransactionDetails
Expand Down Expand Up @@ -4708,6 +4734,29 @@ export interface RelayVerifierInstance extends Truffle.ContractInstance {
): Promise<number>;
};

removeToken: {
(
token: string | BN,
index: number | BN | string,
txDetails?: Truffle.TransactionDetails
): Promise<Truffle.TransactionResponse>;
call(
token: string | BN,
index: number | BN | string,
txDetails?: Truffle.TransactionDetails
): Promise<void>;
sendTransaction(
token: string | BN,
index: number | BN | string,
txDetails?: Truffle.TransactionDetails
): Promise<string>;
estimateGas(
token: string | BN,
index: number | BN | string,
txDetails?: Truffle.TransactionDetails
): Promise<number>;
};

getAcceptedTokens(txDetails?: Truffle.TransactionDetails): Promise<string[]>;

acceptsToken(
Expand Down Expand Up @@ -5263,6 +5312,7 @@ export interface SuccessCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
sig: string,
txDetails?: Truffle.TransactionDetails
): Promise<Truffle.TransactionResponse>;
Expand All @@ -5280,6 +5330,7 @@ export interface SuccessCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
sig: string,
txDetails?: Truffle.TransactionDetails
): Promise<string>;
Expand All @@ -5297,6 +5348,7 @@ export interface SuccessCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
sig: string,
txDetails?: Truffle.TransactionDetails
): Promise<string>;
Expand All @@ -5314,6 +5366,7 @@ export interface SuccessCustomLogicInstance extends Truffle.ContractInstance {
tokenGas: number | BN | string;
data: string;
},
feesReceiver: string | BN,
sig: string,
txDetails?: Truffle.TransactionDetails
): Promise<number>;
Expand Down Expand Up @@ -8048,15 +8101,6 @@ export interface UpgradedStandardTokenInstance
export interface VersionRegistryInstance extends Truffle.ContractInstance {
owner(txDetails?: Truffle.TransactionDetails): Promise<string>;

renounceOwnership: {
(txDetails?: Truffle.TransactionDetails): Promise<
Truffle.TransactionResponse
>;
call(txDetails?: Truffle.TransactionDetails): Promise<void>;
sendTransaction(txDetails?: Truffle.TransactionDetails): Promise<string>;
estimateGas(txDetails?: Truffle.TransactionDetails): Promise<number>;
};

transferOwnership: {
(newOwner: string | BN, txDetails?: Truffle.TransactionDetails): Promise<
Truffle.TransactionResponse
Expand Down