Create2 updates for tokens to have initializable admins

package.json

@@ -12,15 +12,14 @@
     "build": "yarn compile && yarn build:packages",
     "setup": "yarn compile && yarn build:circuits && yarn build:ptau",
     "test": "yarn workspace @webb-tools/contracts run test",
-    "fast": "yarn workspace @webb-tools/contracts run fast",
+    "fast": "yarn workspace @webb-tools/contracts run test:parallel",
     "build:circuits": "./scripts/bash/build_circuits.sh",
     "build:packages": "lerna run build",
     "build:ptau": "./scripts/bash/generate_phase1_ptau.sh",
     "clean": "rm -rf artifacts typechain && yarn clean:packages",
     "clean:packages": "lerna run clean",
     "fetch:fixtures": "cd packages/contracts/solidity-fixtures && dvc pull && cd ../../../",
     "prettier": "prettier -c .",
-    "prettier:write": "prettier -w .",
     "publish:packages": "lerna run compile && lerna publish",
     "setup:groth16:vanchor2": "./scripts/bash/groth16/vanchor/phase2_poseidon_vanchor2.sh",
     "setup:groth16:vanchor8": "./scripts/bash/groth16/vanchor/phase2_poseidon_vanchor8.sh",
@@ -34,20 +33,20 @@
     "setup:plonk:identity-vanchor8": "./scripts/bash/plonk/identity_vanchor/phase2_identity_vanchor8.sh",
     "setup:plonk": "./scripts/bash/setup_verifiers_plonk.sh",
     "ts-check": "tsc --noEmit -p ./tsconfig.json",
-    "format": "prettier --write \"packages/**/*.{ts,js,jsx,tsx}\""
+    "format": "prettier -w ."
   },
   "devDependencies": {
     "@nomiclabs/hardhat-ethers": "^2.0.2",
     "@nomiclabs/hardhat-truffle5": "^2.0.0",
     "@nomiclabs/hardhat-web3": "^2.0.0",
-    "@webb-tools/anchors": "^0.5.3",
-    "@webb-tools/bridges": "^0.5.3",
-    "@webb-tools/contracts": "^0.5.3",
-    "@webb-tools/evm-test-utils": "^0.5.3",
-    "@webb-tools/interfaces": "^0.5.3",
-    "@webb-tools/tokens": "^0.5.3",
-    "@webb-tools/utils": "^0.5.3",
-    "@webb-tools/vbridge": "^0.5.3",
+    "@webb-tools/anchors": "^0.5",
+    "@webb-tools/bridges": "^0.5",
+    "@webb-tools/contracts": "^0.5",
+    "@webb-tools/evm-test-utils": "^0.5",
+    "@webb-tools/interfaces": "^0.5",
+    "@webb-tools/tokens": "^0.5",
+    "@webb-tools/utils": "^0.5",
+    "@webb-tools/vbridge": "^0.5",
     "copyfiles": "^2.4.1",
     "eth-proof": "~2.1.6",
     "ethers": "5.7.0",

packages/contracts/contracts/DeterministicDeployFactory.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 contract DeterministicDeployFactory {
 	event Deploy(address addr);
 
-	function deploy(bytes memory bytecode, uint _salt) external {
+	function deploy(bytes memory bytecode, uint _salt) external returns (address) {
 		address addr;
 		assembly {
 			addr := create2(0, add(bytecode, 0x20), mload(bytecode), _salt)
@@ -14,5 +14,65 @@ contract DeterministicDeployFactory {
 		}
 
 		emit Deploy(addr);
+		return addr;
+	}
+
+	/**
+		@notice Deploy a fungible token
+		@param bytecode The bytecode of the contract
+		@param _salt The salt for the contract
+		@param _feePercentage The fee percentage for wrapping
+		@param _feeRecipient The recipient for fees from wrapping.
+		@param _handler The address of the handler
+		@param _limit The maximum amount of tokens that can be wrapped
+		@param _isNativeAllowed Whether or not native tokens are allowed to be wrapped
+	 */
+	function deployFungibleToken(
+		bytes memory bytecode,
+		uint _salt,
+		uint16 _feePercentage,
+		address _feeRecipient,
+		address _handler,
+		uint256 _limit,
+		bool _isNativeAllowed
+	) external {
+		address c = this.deploy(bytecode, _salt);
+		// delegate call initialize the contract created with the msg.sender
+		(bool success, bytes memory data) = c.call(
+			abi.encodeWithSignature(
+				"initialize(uint16,address,address,uint256,bool)",
+				_feePercentage,
+				_feeRecipient,
+				_handler,
+				_limit,
+				_isNativeAllowed
+			)
+		);
+		require(success, string(data));
+	}
+
+	/**
+		@notice Deploy a VAnchor
+		@param bytecode The bytecode of the contract
+		@param _salt The salt for the contract
+		@param _minimalWithdrawalAmount The minimal withdrawal amount
+		@param _maximumDepositAmount The maximum deposit amount
+	 */
+	function deployVAnchor(
+		bytes memory bytecode,
+		uint _salt,
+		uint256 _minimalWithdrawalAmount,
+		uint256 _maximumDepositAmount
+	) external {
+		address c = this.deploy(bytecode, _salt);
+		// delegate call initialize the contract created with the msg.sender
+		(bool success, bytes memory data) = c.call(
+			abi.encodeWithSignature(
+				"initialize(uint256,uint256)",
+				_minimalWithdrawalAmount,
+				_maximumDepositAmount
+			)
+		);
+		require(success, string(data));
 	}
 }

packages/contracts/contracts/anchors/LinkableAnchor.sol

@@ -66,6 +66,14 @@ abstract contract LinkableAnchor is
 	event EdgeAddition(uint256 chainID, uint256 latestLeafIndex, uint256 merkleRoot);
 	event EdgeUpdate(uint256 chainID, uint256 latestLeafIndex, uint256 merkleRoot);
 
+	/**
+        @notice Checks the sender is the AnchorHandler configured on this contract
+     */
+	modifier onlyHandler() {
+		require(msg.sender == handler, "sender is not the handler");
+		_;
+	}
+
 	/**
         @notice The LinkableAnchor constructor
         @param _handler The address of the `AnchorHandler` contract
@@ -227,14 +235,6 @@ abstract contract LinkableAnchor is
 		return true;
 	}
 
-	/**
-        @notice Checks the sender is the AnchorHandler configured on this contract
-     */
-	modifier onlyHandler() {
-		require(msg.sender == handler, "sender is not the handler");
-		_;
-	}
-
 	/**
         @notice Checks the `_chainID` has an edge on this contract
      */

packages/contracts/contracts/interfaces/tokens/IMultiTokenManager.sol

@@ -26,6 +26,7 @@ interface IMultiTokenManager {
         @param _limit The maximum amount of tokens that can be wrapped
         @param _feePercentage The fee percentage for wrapping
         @param _isNativeAllowed Whether or not native tokens are allowed to be wrapped
+        @param _admin The address of the admin who will receive minting rights and admin role
      */
 	function registerToken(
 		address _handler,
@@ -34,7 +35,8 @@ interface IMultiTokenManager {
 		bytes32 _salt,
 		uint256 _limit,
 		uint16 _feePercentage,
-		bool _isNativeAllowed
+		bool _isNativeAllowed,
+		address _admin
 	) external returns (address);
 
 	/**

packages/contracts/contracts/tokens/AaveTokenWrapper.sol

@@ -26,29 +26,28 @@ contract AaveTokenWrapper is FungibleTokenWrapper, IAaveTokenWrapper {
 		string memory _name,
 		string memory _symbol,
 		address _aaveLendingPool
-	) FungibleTokenWrapper(_name, _symbol) {
-		aaveLendingPool = IAaveLendingPool(_aaveLendingPool);
-	}
+	) FungibleTokenWrapper(_name, _symbol) {}
 
 	/**
         @notice AaveTokenWrapper initializer
-        @param _feeRecipient The recipient for fees from wrapping
-        @param _governor The address of the governor
+        @param _feePercentage The fee percentage for wrapping
+        @param _feeRecipient The recipient for fees from wrapping.
+        @param _handler The address of the handler
         @param _limit The maximum amount of tokens that can be wrapped
         @param _isNativeAllowed Whether or not native tokens are allowed to be wrapped
+		@param _admin The address of the admin who will receive minting rights and admin role
+		@param _aaveLendingPool The address of the Aave lending pool
      */
 	function initialize(
+		uint16 _feePercentage,
 		address _feeRecipient,
-		address _governor,
+		address _handler,
 		uint256 _limit,
 		bool _isNativeAllowed,
+		address _admin,
 		address _aaveLendingPool
-	) public {
-		require(!initialized, "Contract already initialized");
-		feeRecipient = payable(_feeRecipient);
-		wrappingLimit = _limit;
-		isNativeAllowed = _isNativeAllowed;
-		initialized = true;
+	) public onlyUninitialized {
+		super.initialize(_feePercentage, _feeRecipient, _handler, _limit, _isNativeAllowed, _admin);
 		aaveLendingPool = IAaveLendingPool(_aaveLendingPool);
 	}
 

packages/contracts/contracts/tokens/FungibleTokenWrapper.sol

@@ -18,8 +18,8 @@ import "../utils/ProposalNonceTracker.sol";
     TokenHandler contract.
  */
 contract FungibleTokenWrapper is
-	TokenWrapper,
 	Initialized,
+	TokenWrapper,
 	IFungibleTokenWrapper,
 	ProposalNonceTracker
 {
@@ -48,14 +48,17 @@ contract FungibleTokenWrapper is
         @param _handler The address of the handler
         @param _limit The maximum amount of tokens that can be wrapped
         @param _isNativeAllowed Whether or not native tokens are allowed to be wrapped
+		@param _admin The address of the admin who will receive minting rights and admin role
      */
 	function initialize(
 		uint16 _feePercentage,
 		address _feeRecipient,
 		address _handler,
 		uint256 _limit,
-		bool _isNativeAllowed
+		bool _isNativeAllowed,
+		address _admin
 	) public onlyUninitialized {
+		super._initialize(_admin);
 		initialized = true;
 		feePercentage = _feePercentage;
 		feeRecipient = payable(_feeRecipient);

packages/contracts/contracts/tokens/MultiFungibleTokenManager.sol

@@ -25,6 +25,7 @@ contract MultiFungibleTokenManager is MultiTokenManagerBase {
         @param _limit The maximum amount of tokens that can be wrapped
         @param _feePercentage The fee percentage for wrapping
         @param _isNativeAllowed Whether or not native tokens are allowed to be wrapped
+		@param _admin The address of the admin who will receive minting rights and admin role
      */
 	function registerToken(
 		address _handler,
@@ -33,7 +34,8 @@ contract MultiFungibleTokenManager is MultiTokenManagerBase {
 		bytes32 _salt,
 		uint256 _limit,
 		uint16 _feePercentage,
-		bool _isNativeAllowed
+		bool _isNativeAllowed,
+		address _admin
 	) external override onlyRegistry onlyInitialized returns (address) {
 		FungibleTokenWrapper token = new FungibleTokenWrapper{ salt: _salt }(_name, _symbol);
 
@@ -42,7 +44,8 @@ contract MultiFungibleTokenManager is MultiTokenManagerBase {
 			payable(masterFeeRecipient),
 			_handler,
 			_limit,
-			_isNativeAllowed
+			_isNativeAllowed,
+			_admin
 		);
 
 		wrappedTokens.push(address(token));

packages/contracts/contracts/tokens/MultiNftTokenManager.sol

@@ -23,7 +23,8 @@ contract MultiNftTokenManager is MultiTokenManagerBase {
 		bytes32,
 		uint256,
 		uint16,
-		bool
+		bool,
+		address
 	) public view override onlyRegistry onlyInitialized returns (address) {
 		revert();
 	}

packages/contracts/contracts/tokens/Registry.sol

@@ -90,7 +90,8 @@ contract Registry is Initialized, IRegistry, ProposalNonceTracker {
 			_salt,
 			_limit,
 			_feePercentage,
-			_isNativeAllowed
+			_isNativeAllowed,
+			maspVAnchor
 		);
 		emit TokenRegistered(token, _tokenHandler, _assetIdentifier);
 		idToWrappedAsset[_assetIdentifier] = token;

packages/contracts/contracts/tokens/TokenWrapper.sol

@@ -41,6 +41,16 @@ abstract contract TokenWrapper is ERC20PresetMinterPauser, ITokenWrapper {
 		return _amountToWrap.mul(feePercentage).div(10000);
 	}
 
+	/**
+        @notice Get the fee for a target amount to wrap
+        @param _admin the address for granting minting, pausing and admin roles at initialization
+     */
+	function _initialize(address _admin) internal returns (uint256) {
+		_setupRole(MINTER_ROLE, _admin);
+		_setupRole(DEFAULT_ADMIN_ROLE, _admin);
+		_setupRole(PAUSER_ROLE, _admin);
+	}
+
 	/**
         @notice Get the amount to wrap for a target `_deposit` amount
         @param _deposit The deposit amount

packages/contracts/contracts/vanchors/base/VAnchorBase.sol

@@ -75,14 +75,14 @@ abstract contract VAnchorBase is LinkableAnchor {
 	function configureMinimalWithdrawalLimit(
 		uint256 _minimalWithdrawalAmount,
 		uint32 _nonce
-	) public override onlyHandler onlyIncrementingByOne(_nonce) {
+	) public override onlyHandler onlyIncrementingByOne(_nonce) onlyInitialized {
 		_configureMinimalWithdrawalLimit(_minimalWithdrawalAmount);
 	}
 
 	function configureMaximumDepositLimit(
 		uint256 _maximumDepositAmount,
 		uint32 _nonce
-	) public override onlyHandler onlyIncrementingByOne(_nonce) {
+	) public override onlyHandler onlyIncrementingByOne(_nonce) onlyInitialized {
 		_configureMaximumDepositLimit(_maximumDepositAmount);
 	}
 

packages/contracts/test/identityVAnchor/identityVAnchor.test.ts

@@ -1398,7 +1398,8 @@ describe('IdentityVAnchor for 2 max edges', () => {
         dummyFeeRecipient,
         alice.address,
         '10000000000000000000000000',
-        true
+        true,
+        wallet.address
       );
       await wrappedToken.add(token.address, (await wrappedToken.proposalNonce()).add(1));
       const groupId = BigNumber.from(99); // arbitrary

packages/contracts/test/token/MultiTokenManager.test.ts

@@ -48,7 +48,8 @@ describe('MultiFungibleTokenManager', () => {
         salt,
         limit,
         feePercentage,
-        true
+        true,
+        sender.address
       );
       await tx.wait();
       const wrappedTokenAddress = await multiTokenMgr.contract.wrappedTokens(0);

packages/contracts/test/token/Registry.test.ts

@@ -72,7 +72,8 @@ describe('Registry', () => {
           salt,
           limit,
           feePercentage,
-          true
+          true,
+          sender.address
         )
       ).to.be.revertedWith('MultiTokenManagerBase: Only registry can call this function');
     });