Merge branch 'main' into g/move-airdrop-folder

river-build · Dec 24, 2024 · 729c46b · 729c46b
2 parents b01659a + f1effe5
commit 729c46b
Show file tree

Hide file tree

Showing 22 changed files with 37 additions and 30 deletions.
diff --git a/contracts/deployments/alpha/base/addresses/pointsFacet.json b/contracts/deployments/alpha/base/addresses/pointsFacet.json
@@ -0,0 +1,3 @@
+{
+  "address": "0x56D58edB98f39A914Be6dBf4D924ae8C96375c89"
+}
diff --git a/contracts/deployments/gamma/base/addresses/pointsFacet.json b/contracts/deployments/gamma/base/addresses/pointsFacet.json
@@ -0,0 +1,3 @@
+{
+  "address": "0x87c86E900A8E58C6826f1F9fB5407EcA7aC53C22"
+}
diff --git a/contracts/deployments/gamma/base/addresses/riverPointsFacet.json b/contracts/deployments/gamma/base/addresses/riverPointsFacet.json
diff --git a/contracts/deployments/omega/base/addresses/pointsFacet.json b/contracts/deployments/omega/base/addresses/pointsFacet.json
@@ -0,0 +1,3 @@
+{
+  "address": "0x695965B15dFE9CA76B988807eBBA952B112ab5b4"
+}
diff --git a/contracts/scripts/deployments/facets/DeployRiverPoints.s.sol b/contracts/scripts/deployments/facets/DeployRiverPoints.s.sol
@@ -30,7 +30,7 @@ contract DeployRiverPoints is Deployer, FacetHelper {
 
   // Deploying
   function versionName() public pure override returns (string memory) {
-    return "riverPointsFacet";
+    return "pointsFacet";
   }
 
   function initializer() public pure override returns (bytes4) {

diff --git a/contracts/scripts/interactions/InteractClaimCondition.s.sol b/contracts/scripts/interactions/InteractClaimCondition.s.sol
@@ -43,7 +43,7 @@ contract InteractClaimCondition is IDropFacetBase, Interaction {
       supplyClaimed: 0,
       merkleRoot: root,
       currency: address(riverBase),
-      penaltyBps: 0
+      penaltyBps: 1000 // 10%
     });
 
     vm.startBroadcast(deployer);

diff --git a/contracts/scripts/interactions/InteractDiamondCut.s.sol b/contracts/scripts/interactions/InteractDiamondCut.s.sol
@@ -8,22 +8,21 @@ import {IDiamond} from "@river-build/diamond/src/Diamond.sol";
 
 //contracts
 import {Interaction} from "../common/Interaction.s.sol";
-import {DeployTokenMigration} from "contracts/scripts/deployments/facets/DeployTokenMigration.s.sol";
 import {DiamondHelper} from "contracts/test/diamond/Diamond.t.sol";
 
+// facet
+import {DeployRiverPoints} from "contracts/scripts/deployments/facets/DeployRiverPoints.s.sol";
+
 contract InteractDiamondCut is Interaction, DiamondHelper {
-  DeployTokenMigration tokenMigrationHelper = new DeployTokenMigration();
+  DeployRiverPoints riverPointsHelper = new DeployRiverPoints();
 
   function __interact(address deployer) internal override {
-    address diamond = getDeployment("riverMigration");
+    address diamond = getDeployment("riverAirdrop");
 
-    address tokenMigration = tokenMigrationHelper.deploy(deployer);
+    address riverPoints = riverPointsHelper.deploy(deployer);
 
     addCut(
-      tokenMigrationHelper.makeCut(
-        tokenMigration,
-        IDiamond.FacetCutAction.Replace
-      )
+      riverPointsHelper.makeCut(riverPoints, IDiamond.FacetCutAction.Replace)
     );
 
     vm.broadcast(deployer);

diff --git a/contracts/src/airdrop/points/RiverPoints.sol b/contracts/src/airdrop/points/RiverPoints.sol
@@ -170,12 +170,12 @@ contract RiverPoints is IERC20Metadata, IRiverPoints, OwnableBase, Facet {
 
   /// @inheritdoc IERC20Metadata
   function name() external pure returns (string memory) {
-    return "Beaver Points";
+    return "Towns Points";
   }
 
   /// @inheritdoc IERC20Metadata
   function symbol() external pure returns (string memory) {
-    return "BVRP";
+    return "TWP";
   }
 
   /// @inheritdoc IERC20Metadata

diff --git a/contracts/test/airdrop/scripts/index.mjs b/contracts/test/airdrop/scripts/index.mjs
@@ -2,10 +2,12 @@ import { StandardMerkleTree } from "@openzeppelin/merkle-tree";
 
 // (1)
 const values = [
+  ["0x5E38d087315217D5E1791553D8C3101A820C7E40", "1000000000000000000"],
   ["0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", "1000000000000000000"],
   ["0x2FaC60B7bCcEc9b234A2f07448D3B2a045d621B9", "1000000000000000000"],
-  ["0xa9a6512088904fbaD2aA710550B57c29ee0092c4", "1000000000000000000"],
-  ["0x86312a65B491CF25D9D265f6218AB013DaCa5e19", "1000000000000000000"],
+  ["0xd2ABa91375eC2C3f021525FeD8FAFdcd2bC08460", "1000000000000000000"],
+  ["0xCe3827fFDC199d8EDce73de2517cdE8fbE79837E", "1000000000000000000"],
+  ["0x669a0Ce817227375368F054109BF9bf5D6174eD3", "1000000000000000000"],
 ];
 
 // (2)

diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
     "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-    "version": "0.0.140",
+    "version": "0.0.141",
     "packages": ["packages/*", "protocol"],
     "npmClient": "yarn"
 }
diff --git a/packages/create-river-build-app/package.json b/packages/create-river-build-app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "create-river-build-app",
-    "version": "0.0.140",
+    "version": "0.0.141",
     "bin": "index.js",
     "engines": {
         "node": "^18.0.0 || >=20.0.0"

diff --git a/packages/dlog/package.json b/packages/dlog/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@river-build/dlog",
-    "version": "0.0.140",
+    "version": "0.0.141",
     "packageManager": "[email protected]",
     "type": "module",
     "main": "dist/index.js",

diff --git a/packages/encryption/package.json b/packages/encryption/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@river-build/encryption",
-    "version": "0.0.140",
+    "version": "0.0.141",
     "packageManager": "[email protected]",
     "type": "module",
     "main": "dist/index.js",

diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@river-build/eslint-config",
-    "version": "0.0.140",
+    "version": "0.0.141",
     "license": "MIT",
     "main": "typescript.js"
 }
diff --git a/packages/generated/package.json b/packages/generated/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@river-build/generated",
-    "version": "0.0.140",
+    "version": "0.0.141",
     "packageManager": "[email protected]",
     "scripts": {
         "build": "yarn make-config",

diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@river-build/prettier-config",
-    "version": "0.0.140",
+    "version": "0.0.141",
     "license": "MIT",
     "main": "config.js",
     "peerDependencies": {

diff --git a/packages/proto/package.json b/packages/proto/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@river-build/proto",
-    "version": "0.0.140",
+    "version": "0.0.141",
     "packageManager": "[email protected]",
     "type": "module",
     "main": "dist/index.js",

diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@river-build/react-sdk",
     "description": "React Hooks for River SDK",
-    "version": "0.0.140",
+    "version": "0.0.141",
     "type": "module",
     "main": "./dist/esm/index.js",
     "types": "./dist/types/index.d.ts",

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@river-build/sdk",
-    "version": "0.0.140",
+    "version": "0.0.141",
     "packageManager": "[email protected]",
     "type": "module",
     "main": "dist/index.js",

diff --git a/packages/web3/package.json b/packages/web3/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@river-build/web3",
-    "version": "0.0.140",
+    "version": "0.0.141",
     "packageManager": "[email protected]",
     "type": "module",
     "main": "dist/index.js",

diff --git a/protocol/package.json b/protocol/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@river-build/proto-source",
-    "version": "0.0.140",
+    "version": "0.0.141",
     "packageManager": "[email protected]",
     "files": [
         "*.proto"

diff --git a/yarn.lock b/yarn.lock
@@ -6452,7 +6452,7 @@ __metadata:
   dependencies:
     "@openzeppelin/contracts": ^5.1.0
     solady: ^0.0.281
-  checksum: 3884bdab0e68b6f64293404a8e3670280d5ad6255f905c189121e2c34d210ec7fa3d9ffda67447a08d060c02564591d0ee0923ae9f13a3d71c0ddfd46e898ff7
+  checksum: 2666668787f50af79a76004ccea89798fb362f07eea88557cdcf13a70d1164b2ad58c9278fd19ff5b304d9fc1439d097d57e03676b6c1dfeeb98535dd5059b50
   languageName: node
   linkType: hard