Full deployments for testnet by cinnabarhorse · Pull Request #273 · aavegotchi/aavegotchi-contracts

cinnabarhorse · 2024-10-10T07:43:09Z

No description provided.

Wearable-patch

cinnabarhorse · 2024-10-23T05:06:10Z

contracts/Aavegotchi/facets/PolygonXGeistBridgeFacet.sol

+        Aavegotchi memory _aavegotchi = s.aavegotchis[_tokenId];
+        bytes memory _metadata = abi.encode(_aavegotchi);
+        INFTBridge(s.gotchGeistBridge).bridge(_receiver, msg.sender, _tokenId, 1, _msgGasLimit, _connector, _metadata, new bytes(0));
+        if (_hasVault) { // this module should work when has vault


What is the Vault? And what happens if there is no Vault? @orionstardust

Maybe we can use if block.chainid == 137 { has vault}

cinnabarhorse · 2024-10-23T14:47:08Z

contracts/Aavegotchi/facets/PolygonXGeistBridgeFacet.sol

+        if (_hasVault) { // this module should work when has vault
+            for (uint slot; slot < _aavegotchi.equippedWearables.length; slot++) {
+                uint wearableId = _aavegotchi.equippedWearables[slot];
+                if (wearableId != 0) {


we need to check for borrowed wearables too

cinnabarhorse · 2024-10-23T14:56:06Z

contracts/Aavegotchi/facets/PolygonXGeistBridgeFacet.sol

+        for (uint slot; slot < _aavegotchi.equippedWearables.length; slot++) {
+            if (_aavegotchi.equippedWearables[slot] != 0) {
+                uint wearableId = _aavegotchi.equippedWearables[slot];
+                if (isMint) { // if bridge is controller, mint


can we replace this with chainids?

cinnabarhorse · 2024-10-23T14:57:01Z

contracts/Aavegotchi/facets/PolygonXGeistBridgeFacet.sol

+            if (_aavegotchi.equippedWearables[slot] != 0) {
+                uint wearableId = _aavegotchi.equippedWearables[slot];
+                if (isMint) { // if bridge is controller, mint
+                    s.itemTypes[wearableId].totalQuantity += 1;


shouldn't we decrease this when burning the token?

cinnabarhorse · 2024-10-23T15:00:59Z

contracts/Aavegotchi/facets/PolygonXGeistBridgeFacet.sol

+                delete s.aavegotchis[_tokenId].equippedWearables[slot];
+                LibItems.removeFromParent(address(this), _tokenId, wearableId, 1);
+                LibItems.addToOwner(address(0), wearableId, 1);
+                s.itemTypes[wearableId].totalQuantity -= 1;


okay i see we are lowering the quantity, good

cinnabarhorse · 2024-10-23T15:01:59Z

contracts/Aavegotchi/facets/PolygonXGeistBridgeFacet.sol

+        // delete aavegotchi info
+        string memory name = _aavegotchi.name;
+        if (bytes(name).length > 0) {
+            delete s.aavegotchiNamesUsed[LibAavegotchi.validateAndLowerName(name)];


can people rename gotchis on Geist side?

disable renaming on polygon

migrate all names on Geist

enable renaming on Geist

ensure names are handled in the metadata transfer

cinnabarhorse · 2024-10-23T15:12:00Z

contracts/Aavegotchi/libraries/LibAavegotchi.sol

            aavegotchiInfo_.collateral = s.aavegotchis[_tokenId].collateralType;
            aavegotchiInfo_.escrow = s.aavegotchis[_tokenId].escrow;
-            aavegotchiInfo_.stakedAmount = IERC20(aavegotchiInfo_.collateral).balanceOf(aavegotchiInfo_.escrow);
+//            aavegotchiInfo_.stakedAmount = IERC20(aavegotchiInfo_.collateral).balanceOf(aavegotchiInfo_.escrow);


I think we will tell users to pull out their collateral
two choices:

pull out all collateral

allow users to stake erc20 GHST instead

so when a gotchi bridges, we should require(stakedAmount < 0.001)

maybe could just unstake it for them during bridging

…chain-latest

cinnabarhorse · 2024-10-26T08:47:01Z

contracts/Aavegotchi/ForgeDiamond/ForgeDiamond.sol

-        address _ownershipFacet
+        address _ownershipFacet,
+        address _aavegotchiDiamond,
+        address wearableDiamond


We don't need this change on Polygon because this code isn't being redeployed.

cinnabarhorse · 2024-10-26T08:47:08Z

contracts/Aavegotchi/ForgeDiamond/facets/ForgeFacet.sol

    }

    // External contracts
-    function aavegotchiGameFacet() internal pure returns (AavegotchiGameFacet facet) {


We don't need this change on Polygon because this code isn't being redeployed.

cinnabarhorse · 2024-10-26T08:47:17Z

contracts/Aavegotchi/ForgeDiamond/facets/ForgeVRFFacet.sol


        // for testing
-       // tempFulfillRandomness(requestId, uint256(keccak256(abi.encodePacked(block.number, _geodeTokenIds[0]))));
+        // tempFulfillRandomness(requestId, uint256(keccak256(abi.encodePacked(block.number, _geodeTokenIds[0]))));


We don't need this change on Polygon because this code isn't being redeployed.

cinnabarhorse · 2024-10-26T08:47:27Z

contracts/Aavegotchi/ForgeDiamond/libraries/ForgeLibDiamond.sol

    }

    bytes32 public constant DIAMOND_STORAGE_POSITION = keccak256("diamond.standard.diamond.storage");
-    address public constant AAVEGOTCHI_DIAMOND = 0x86935F11C86623deC8a25696E1C19a8659CbF95d;


We don't need this change on Polygon because this code isn't being redeployed.

cinnabarhorse · 2024-10-26T08:47:37Z

contracts/Aavegotchi/InitDiamond.sol

-        uint256 chainlinkFee;
+        uint64 subscriptionId;
        address vrfCoordinator;
-        address linkAddress;


We don't need this change on Polygon because this code isn't being redeployed.

cinnabarhorse · 2024-10-26T08:48:05Z

contracts/Aavegotchi/ForgeDiamond/libraries/ForgeLibDiamond.sol

-    address public constant AAVEGOTCHI_DIAMOND = 0x86935F11C86623deC8a25696E1C19a8659CbF95d;
-    address public constant WEARABLE_DIAMOND = 0x58de9AaBCaeEC0f69883C94318810ad79Cc6a44f;
+    // address public constant AAVEGOTCHI_DIAMOND = 0x86935F11C86623deC8a25696E1C19a8659CbF95d;
+    // address public constant WEARABLE_DIAMOND = 0x58de9AaBCaeEC0f69883C94318810ad79Cc6a44f;


We don't need this change on Polygon because this code isn't being redeployed.

Timidan and others added 13 commits September 20, 2024 01:50

Merge pull request #271 from aavegotchi/wearable-patch

2d81451

Wearable-patch

rebase with main

65dbe13

fix issues in polter devnet deployment

7135508

add modifier to disable features in Gotchichain

8c79197

add polter configuration and update for geist bridge

22cd3b7

add script for configuring socket bridges on diamonds

f1327d6

fix issue

9a80219

use amoy details

993795b

update deployed bridge addresses

57589e6

update deployed bridge addresses

f665088

fix issues

2cee1df

rollback for mainnet

bf42154

chore: change onlyEnabled to onlyPolygon, and formatting

4410fa5

cinnabarhorse changed the title ~~Gotchichain latest~~ Geist Migration Oct 10, 2024

cinnabarhorse and others added 7 commits October 10, 2024 15:50

Merge branch 'master' into gotchichain-latest

f2d0e76

fix

3c13068

fix contracts for bridging equipped gotchis

8c873a8

fix contract and deploy scripts for bridging

0665498

fix scripts for bridging

d187713

bridge test and fix issues

2845af9

bridge test

f4127f0

cinnabarhorse commented Oct 23, 2024

View reviewed changes

orionstardust added 4 commits October 24, 2024 13:57

rollback related for geist/polter deployments

a5c1321

remove code for Geist/Polter chains

776b59d

add forced unstake when bridging

5440471

add missing updates for bridges

cf5b1d1

Merge remote-tracking branch 'refs/remotes/origin/master' into gotchi…

71f4782

…chain-latest

orionstardust marked this pull request as ready for review October 25, 2024 05:15

cinnabarhorse commented Oct 26, 2024

View reviewed changes

orionstardust changed the title ~~Geist Migration~~ Full deployments for testnet Oct 26, 2024

Conversation

cinnabarhorse commented Oct 10, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants