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.

Sign up for GitHub

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

Skip tokensmanager #1771 #1795

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Skip tokensmanager #1771 #1795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a8dca61
WIP dont judge
poshdan Sep 15, 2022
7f176ab
Merge branch 'main' into equipment-manager
poshdan Oct 24, 2022
ddb73ae
updated wip migration numbers
poshdan Oct 24, 2022
5537597
equipment structure work
poshdan Oct 24, 2022
6169c40
stack limited power data calculations, WIP
poshdan Oct 26, 2022
68c6936
basic equipment functionality
poshdan Oct 28, 2022
fb6c5d0
Merge branch 'main' into equipment-manager
poshdan Nov 7, 2022
aeb69d3
merge main, tweak contracts, update migration
poshdan Nov 7, 2022
75c442c
fix contract compile errors
poshdan Nov 7, 2022
330b14b
migration fix
poshdan Nov 7, 2022
82eab75
equip fix and raid frontend function tweaks
poshdan Nov 7, 2022
768edc7
equipment half-broken frontend functionality (no shields yet)
poshdan Nov 7, 2022
fb20bee
javascript bad
poshdan Nov 9, 2022
7b659cc
undo vscode thing
poshdan Nov 9, 2022
0d7b97d
it kinda almost sorta works
poshdan Nov 9, 2022
b0eeb62
tweak to fight xp to be closer to original
poshdan Nov 9, 2022
c613b81
Merge remote-tracking branch 'origin/main' into equipment-manager
Chriserus Nov 21, 2022
24ff20e
Adjust Equipment Manager migration number
Chriserus Nov 21, 2022
dc1f0f0
implemented #1771 to skip tokensmanager to save gas if untaxed fights…
poshdan Nov 23, 2022
abfec3d
automatic setting of cb var from tokensmanager percentage setter
poshdan Nov 23, 2022
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
10 changes: 9 additions & 1 deletion contracts/CharactersBridgeProxyContract.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import "./CharacterRenameTagConsumables.sol";
import "./characters.sol";
import "./interfaces/IBridgeProxy.sol";
import "./Promos.sol";
import "./EquipmentManager.sol";


contract CharactersBridgeProxyContract is Initializable, AccessControlUpgradeable, IBridgeProxy {
Expand All @@ -24,6 +25,7 @@ contract CharactersBridgeProxyContract is Initializable, AccessControlUpgradeabl
uint8 public constant UINT_NFT_VAR_SEED3DCOSMETIC = 1;

Promos promos;
EquipmentManager equipmentManager;


modifier restricted() {
Expand Down Expand Up @@ -51,6 +53,11 @@ contract CharactersBridgeProxyContract is Initializable, AccessControlUpgradeabl
promos = _newPromos;
}

function migrate_68c6936(EquipmentManager _equipmentManager) external {
require(hasRole(DEFAULT_ADMIN_ROLE, msg.sender));
equipmentManager = _equipmentManager;
}


function collectData(uint256 tokenId) external view override returns (uint256[] memory uintVars, string memory stringVar) {
string memory rename = characterRenameTagConsumables.getCharacterRename(tokenId);
Expand Down Expand Up @@ -124,6 +131,7 @@ contract CharactersBridgeProxyContract is Initializable, AccessControlUpgradeabl
}

function canBridge(address wallet, uint256 tokenId, uint256 targetChain) external view override returns (bool) {
return characters.getNftVar(tokenId, 3) == 0; // Only gen 1 is allowed
return characters.getNftVar(tokenId, 3) == 0 // Only gen 1 is allowed
&& equipmentManager.getNftVar(address(characters), tokenId, 1) == 0; // Nothing equipped
}
}
Loading