ghostchain/ghost-dao-contracts
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make weaving historically dependant

Browse Source 
Signed-off-by: Uncle Fatso <uncle.fatso@ghostchain.io>
This commit is contained in:
Uncle Fatso 2026-08-02 21:23:43 +03:00
parent 6998355887
commit 15e93e7f32
Signed by: f4ts0
GPG Key ID: 565F4F2860226EBB
10 changed files with 82 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.env.template
View File

@ -104,18 +104,20 @@ GOVERNOR_VOTING_PERIOD=
GOVERNOR_PROPOSAL_THRESHOLD=
GOVERNOR_QUORUM_FRACTION=
###################### Initial ghosted supply on gatekeeper ##########################
## ghostedSupply - supply that is currently locked inside the gatekeeper ##
## existential - minimum amount that could be reflected inside other chain ##
## ghostedIn - historical supply that was bridged in (max value is 2^104) ##
## ghostedOut - historical supply that was bridged out (max value is 2^104) ##
## deployedAt - time when gatekeepers was deployed, could be inherited if needed ##
######################################################################################
###################### Initial ghosted supply on gatekeeper ###########################
## ghostedSupply - supply that is currently locked inside the gatekeeper ##
## existential - minimum amount that could be reflected inside other chain ##
## ghostedIn - historical supply that was bridged in (max value is 2^104) ##
## ghostedOut - historical supply that was bridged out (max value is 2^104) ##
## deployedAt - time when gatekeepers was deployed, could be inherited if needed ##
## previousWeaver - previous weaver address if any to make linked list of weavers ##
#######################################################################################
INITIAL_GHOSTED_SUPPLY=
INITIAL_EXISTENTIAL_DEPOSIT=
INITIAL_GHOSTED_IN=
INITIAL_GHOSTED_OUT=
GATEKEEPER_DEPLOYED_AT=
PREVIOUS_WEAVER_ADDRESS=
SEPOLIA_TEST_RPC_URL=
SEPOLIA_TEST_API_KEY=

3
src/Gatekeeper.sol
View File

@ -19,10 +19,11 @@ contract Gatekeeper is IGatekeeper, Metadata, Weaver {
address _staking,
uint256 _ghostedSupply,
uint256 _existential,
address _previousWeaver,
uint48 _deployedAt,
uint104 _amountIn,
uint104 _amountOut
) Metadata(_deployedAt, _amountIn, _amountOut) Weaver() {
) Metadata(_deployedAt, _amountIn, _amountOut) Weaver(_previousWeaver) {
existentialDeposit = _existential;
ghostedSupply = _ghostedSupply;
staking = _staking;

8
src/interfaces/IWeaver.sol
View File

@ -2,7 +2,9 @@
pragma solidity ^0.8.20;
interface IWeaver {
function getSlotValues(uint256 globalIndex, uint256 session, uint256 atBlock) external returns (bytes32[] memory);
function getProof(uint256 globalIndex, uint256 session, uint256 atBlock) external returns (bytes32[] memory);
function getRoot(uint256 session, uint256 atBlock) external returns (bytes32, uint256);
function currentSession() external view returns (uint256);
function startSession() external view returns (uint256);
function getSlotValues(uint256 globalIndex, uint256 session, uint256 atBlock) external view returns (bytes32[] memory);
function getProof(uint256 globalIndex, uint256 session, uint256 atBlock) external view returns (bytes32[] memory);
function getRoot(uint256 session, uint256 atBlock) external view returns (bytes32, uint256);
}

2
src/mocks/WeaverMock.sol
View File

@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
import {Weaver} from "../types/Weaver.sol";
contract WeaverMock is Weaver {
constructor() Weaver() {}
constructor(address previousWeaver) Weaver(previousWeaver) {}
function insertTreeNode(bytes32 receiver, uint256 amount) external returns (uint256) {
return _insertTreeNode(receiver, amount);

31
src/types/Weaver.sol
View File

@ -14,20 +14,33 @@ abstract contract Weaver is IWeaver {
uint256 public constant SLOTS = 2 ** DEPTH;
uint256 public constant ENTRIES = DEPTH * SLOTS;
uint256 public currentSession;
uint256 public override currentSession;
uint256 public override startSession;
address public previousWeaver;
mapping(uint256 => mapping(uint256 => Checkpoints.Trace256)) internal _treeNodes;
mapping(uint256 => mapping(uint256 => Checkpoints.Trace160)) internal _slotLenghts;
mapping(uint256 => mapping(uint256 => bytes32[])) internal _slotValues;
mapping(uint256 => uint256) internal _filledEntries;
constructor() {}
constructor(address _previousWeaver) {
previousWeaver = _previousWeaver;
if (_previousWeaver != address(0)) {
uint256 newSession = IWeaver(_previousWeaver).currentSession() + 1;
currentSession = newSession;
startSession = newSession;
}
}
function getSlotValues(
uint256 globalIndex,
uint256 session,
uint256 atBlock
) external view returns (bytes32[] memory) {
) external override view returns (bytes32[] memory) {
if (session < startSession) {
return IWeaver(previousWeaver).getSlotValues(globalIndex, session, atBlock);
}
uint256 slotIndex = globalIndex % SLOTS;
// forge-lint: disable-next-line(unsafe-typecast)
uint256 length = _slotLenghts[session][slotIndex].upperLookupRecent(uint96(atBlock));
@ -42,7 +55,11 @@ abstract contract Weaver is IWeaver {
return values;
}
function getRoot(uint256 session, uint256 atBlock) public view returns (bytes32, uint256) {
function getRoot(uint256 session, uint256 atBlock) public override view returns (bytes32, uint256) {
if (session < startSession) {
return IWeaver(previousWeaver).getRoot(session, atBlock);
}
uint256 currentLevelCount = SLOTS >> 1;
bytes32[] memory currentLevel = new bytes32[](currentLevelCount);
@ -83,7 +100,11 @@ abstract contract Weaver is IWeaver {
uint256 globalIndex,
uint256 session,
uint256 atBlock
) external view returns (bytes32[] memory) {
) external override view returns (bytes32[] memory) {
if (session < startSession) {
return IWeaver(previousWeaver).getProof(globalIndex, session, atBlock);
}
uint256 currentLevelCount = SLOTS;
uint256 currentIndex = globalIndex % SLOTS;

4
test/bonding/BondDepositorty.t.sol
View File

@ -324,7 +324,7 @@ contract GhostBondDepositoryTest is Test {
uint256 amount = 10_000 * 1e18; // 10,000
vm.startPrank(GOVERNOR);
Gatekeeper gatekeeper = new Gatekeeper(address(staking), 0, 0, 0, 0, 0);
Gatekeeper gatekeeper = new Gatekeeper(address(staking), 0, 0, address(0), 0, 0, 0);
staking.setGatekeeperAddress(address(gatekeeper));
staking.setWarmupPeriod(1);
vm.stopPrank();
@ -509,7 +509,7 @@ contract GhostBondDepositoryTest is Test {
}
vm.startPrank(GOVERNOR);
Gatekeeper gatekeeper = new Gatekeeper(address(staking), 0, 0, 0, 0, 0);
Gatekeeper gatekeeper = new Gatekeeper(address(staking), 0, 0, address(0), 0, 0, 0);
staking.setGatekeeperAddress(address(gatekeeper));
staking.setWarmupPeriod(10);
vm.stopPrank();

4
test/gatekeeper/Gatekeeper.t.sol
View File

@ -14,14 +14,14 @@ contract GatekeeperTest is Test {
event Ghosted(bytes32 indexed receiver, uint256 indexed amount);
function setUp() public {
gatekeeper = new Gatekeeper(ALICE, 0, EXISTENTIAL, 0, 0, 0);
gatekeeper = new Gatekeeper(ALICE, 0, EXISTENTIAL, address(0), 0, 0, 0);
}
function test_correctInitialization() public {
assertEq(gatekeeper.staking(), ALICE);
assertEq(gatekeeper.ghostedSupply(), 0);
Gatekeeper anotherGatekeeper = new Gatekeeper(BOB, INIT_AMOUNT, EXISTENTIAL, 0, 0, 0);
Gatekeeper anotherGatekeeper = new Gatekeeper(BOB, INIT_AMOUNT, EXISTENTIAL, address(0), 0, 0, 0);
assertEq(anotherGatekeeper.staking(), BOB);
assertEq(anotherGatekeeper.ghostedSupply(), INIT_AMOUNT);
assertEq(anotherGatekeeper.existentialDeposit(), EXISTENTIAL);

2
test/gatekeeper/GatekeeperMetadata.t.sol
View File

@ -16,7 +16,7 @@ contract GatekeeperMetadataTest is Test {
Gatekeeper gatekeeper;
function setUp() public {
gatekeeper = new Gatekeeper(ALICE, INIT_GHOSTED, EXISTENTIAL, DEPLOYED_AT, AMOUNT_IN, AMOUNT_OUT);
gatekeeper = new Gatekeeper(ALICE, INIT_GHOSTED, EXISTENTIAL, address(0), DEPLOYED_AT, AMOUNT_IN, AMOUNT_OUT);
}
function test_correctMetadataInitialization() public view {

34
test/gatekeeper/GatekeeperWeaver.t.sol
View File

@ -14,6 +14,7 @@ contract GatekeeperVerification is Gatekeeper {
address staking,
uint256 ghostedSupply,
uint256 existential,
address previousWeaver,
uint48 deployedAt,
uint104 amountIn,
uint104 amountOut
@ -21,6 +22,7 @@ contract GatekeeperVerification is Gatekeeper {
staking,
ghostedSupply,
existential,
previousWeaver,
deployedAt,
amountIn,
amountOut
@ -102,7 +104,7 @@ contract GatekeeperWeaverTest is Test {
GatekeeperVerification gatekeeper;
function setUp() public {
gatekeeper = new GatekeeperVerification(ALICE, 0, EXISTENTIAL, 0, 0, 0);
gatekeeper = new GatekeeperVerification(ALICE, 0, EXISTENTIAL, address(0), 0, 0, 0);
}
function test_insertationWorksAsExpected() public {
@ -138,6 +140,36 @@ contract GatekeeperWeaverTest is Test {
assertFalse(_verifyProof(globalIndex, newSession, 100, amounts[69], whos[69]));
assertFalse(_verifyProof(1337, currentSession, 100, amounts[1337], whos[1337]));
assertFalse(_verifyProof(2047, currentSession, 100, amounts[2047], whos[2047]));
vm.roll(block.number + 420);
gatekeeper = new GatekeeperVerification(ALICE, 0, EXISTENTIAL, address(gatekeeper), 0, 0, 0);
uint256 finalSession = gatekeeper.currentSession();
for (uint256 i = 0; i < 69; i++) {
if (i % 2 == 0) { vm.roll(block.number + 1); }
vm.prank(ALICE);
gatekeeper.ghost(whos[i], amounts[i]);
}
assertTrue(_verifyProof(globalIndex, newSession, block.number, amounts[69], whos[69]));
assertTrue(_verifyProof(0, currentSession, block.number, amounts[0], whos[0]));
assertTrue(_verifyProof(69, currentSession, block.number, amounts[69], whos[69]));
assertTrue(_verifyProof(420, currentSession, block.number, amounts[420], whos[420]));
assertTrue(_verifyProof(1337, currentSession, block.number, amounts[1337], whos[1337]));
assertTrue(_verifyProof(2047, currentSession, block.number, amounts[2047], whos[2047]));
assertTrue(_verifyProof(0, currentSession, 100, amounts[0], whos[0]));
assertTrue(_verifyProof(69, currentSession, 100, amounts[69], whos[69]));
assertTrue(_verifyProof(420, currentSession, 100, amounts[420], whos[420]));
assertFalse(_verifyProof(globalIndex, newSession, 100, amounts[69], whos[69]));
assertFalse(_verifyProof(1337, currentSession, 100, amounts[1337], whos[1337]));
assertFalse(_verifyProof(2047, currentSession, 100, amounts[2047], whos[2047]));
// TODO: this fails for some reason
assertTrue(_verifyProof(0, finalSession, block.number, amounts[0], whos[0]));
assertTrue(_verifyProof(34, finalSession, block.number, amounts[34], whos[34]));
assertTrue(_verifyProof(35, finalSession, block.number, amounts[35], whos[35]));
}
function _verifyProof(

2
test/staking/Staking.t.sol
View File

@ -110,7 +110,7 @@ contract StakingTest is Test {
treasury = new GhostTreasury(address(ftso), 69, address(authority));
stnk.initialize(address(staking), address(treasury), address(ghst));
ghst.initialize(address(staking));
gatekeeper = new Gatekeeper(address(staking), 0, 0, 0, 0, 0);
gatekeeper = new Gatekeeper(address(staking), 0, 0, address(0), 0, 0, 0);
calculator = new GhostBondingCalculator(address(ftso), 1, 1);
vm.stopPrank();
vm.roll(block.number + 1);