Merge pull request #15 from chain-notes-brussels/finalContract

wirldid update
chain-notes-brussels · Jul 13, 2024 · a362e8e · a362e8e
2 parents 7f75a22 + 5145ed0
commit a362e8e
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 6 deletions.
diff --git a/packages/foundry/broadcast/deploy_Notes.s.sol/84532/run-1720890800.json b/packages/foundry/broadcast/deploy_Notes.s.sol/84532/run-1720890800.json
@@ -0,0 +1,58 @@
+{
+  "transactions": [
+    {
+      "hash": "0x8bd77380a8f33cbc04b1636b22e3334b90fab44c1dcd4e416f085a0c9d4bb365",
+      "transactionType": "CREATE",
+      "contractName": "Notes",
+      "contractAddress": "0x0dbf4dbebf6220b1f3adbfa642e7b06f1281340a",
+      "function": null,
+      "arguments": [
+        "true",
+        "0x42FF98C4E85212a5D31358ACbFe76a621b50fC02",
+        "\"app_staging_64b18cdf405848637e6fcb93b60e8597\"",
+        "\"create-note\"",
+        "\"create-vote\""
+      ],
+      "transaction": {
+        "from": "0xf6da1082b2b8952c73ed7220db5df38aec56a1b2",
+        "gas": "0x1f5bce",
+        "value": "0x0",
+        "input": "0x60e0604052600160c05234801561001557600080fd5b50604051611e11380380611e11833981016040819052610034916101f2565b600080546001600160a81b031916861515610100600160a81b031916176101006001600160a01b038716021790556040516100a2906100909061007b9086906020016102b1565b60408051601f198184030181529190526100de565b8360405160200161007b9291906102cd565b6080526040516100d0906100be9061007b9086906020016102b1565b8260405160200161007b9291906102cd565b60a052506102f39350505050565b60006008826040516020016100f391906102b1565b60408051601f198184030181529190528051602090910120901c92915050565b80516001600160a01b038116811461012a57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015610160578181015183820152602001610148565b50506000910152565b600082601f83011261017a57600080fd5b81516001600160401b038111156101935761019361012f565b604051601f8201601f19908116603f011681016001600160401b03811182821017156101c1576101c161012f565b6040528181528382016020018510156101d957600080fd5b6101ea826020830160208701610145565b949350505050565b600080600080600060a0868803121561020a57600080fd5b8551801515811461021a57600080fd5b945061022860208701610113565b60408701519094506001600160401b0381111561024457600080fd5b61025088828901610169565b606088015190945090506001600160401b0381111561026e57600080fd5b61027a88828901610169565b608088015190935090506001600160401b0381111561029857600080fd5b6102a488828901610169565b9150509295509295909350565b600082516102c3818460208701610145565b9190910192915050565b828152600082516102e5816020850160208701610145565b919091016020019392505050565b60805160a05160c051611ae86103296000396000818161049401526109c3015260006104fe01526000610a190152611ae86000f3fe6080604052600436106100e85760003560e01c8063c70e012c1161008a578063da239bf111610059578063da239bf114610327578063f4ff0c681461033c578063f559b79b14610377578063f9eed6ab146103cc57600080fd5b8063c70e012c1461025e578063cead5f7a1461028d578063d1d368e7146102e6578063d306794d146102f957600080fd5b80635f85896c116100c65780635f85896c146101a45780636ad17676146101c65780637f889652146101f3578063a5aa50651461024457600080fd5b8063223094e9146100ed578063256e025a146101415780633ddbfa0a14610156575b600080fd5b3480156100f957600080fd5b50610129610108366004611172565b600560209081526000928352604080842090915290825290205461ffff1681565b60405161ffff90911681526020015b60405180910390f35b34801561014d57600080fd5b50610129602881565b34801561016257600080fd5b506101976101713660046111b7565b600860209081526000938452604080852082529284528284209052825290205460ff1681565b6040516101389190611224565b3480156101b057600080fd5b506101c46101bf36600461133b565b610401565b005b3480156101d257600080fd5b506101e66101e1366004611391565b610929565b60405161013891906114e3565b3480156101ff57600080fd5b5061023461020e3660046111b7565b600260209081526000938452604080852082529284528284209052825290205460ff1681565b6040519015158152602001610138565b34801561025057600080fd5b506000546102349060ff1681565b34801561026a57600080fd5b5061027e6102793660046114fd565b610cd8565b60405161013893929190611527565b34801561029957600080fd5b506102d16102a8366004611561565b600660209081526000938452604080852082529284528284209052825290205463ffffffff1681565b60405163ffffffff9091168152602001610138565b6102346102f436600461159b565b610db2565b34801561030557600080fd5b506103196103143660046115c5565b610f08565b6040516101389291906115e0565b34801561033357600080fd5b50610129600a81565b34801561034857600080fd5b50610234610357366004611692565b600160209081526000928352604080842090915290825290205460ff1681565b34801561038357600080fd5b506103b66103923660046116ae565b600760209081526000928352604080842090915290825290205464ffffffffff1681565b60405164ffffffffff9091168152602001610138565b3480156103d857600080fd5b506103ec6103e73660046114fd565b6110d3565b60408051928352901515602083015201610138565b3360009081526002602090815260408083206001600160a01b0386168452825280832061ffff8716845290915290205460ff161561045e5760016040516371709fb960e11b815260040161045591906116d8565b60405180910390fd5b60005460ff161561057457600060019054906101000a90046001600160a01b03166001600160a01b0316633bc778e382600001517f00000000000000000000000000000000000000000000000000000000000000006104f785602001516040516020016104e3919060609190911b6bffffffffffffffffffffffff1916815260140190565b604051602081830303815290604052611112565b85604001517f000000000000000000000000000000000000000000000000000000000000000087606001516040518763ffffffff1660e01b8152600401610543969594939291906116eb565b60006040518083038186803b15801561055b57600080fd5b505afa15801561056f573d6000803e3d6000fd5b505050505b33600090815260076020526040812090856002811115610596576105966111fa565b60028111156105a7576105a76111fa565b815260208101919091526040016000908120805464ffffffffff16916105cc8361175a565b825464ffffffffff9182166101009390930a9283029190920219909116179055503360009081526008602090815260408083206001600160a01b0386168452825280832061ffff871684529091529020805485919060ff19166001836002811115610639576106396111fa565b02179055506001600160a01b038216600090815260066020908152604080832061ffff87168452909152812090856002811115610678576106786111fa565b6002811115610689576106896111fa565b815260208101919091526040016000908120805463ffffffff16916106ad83611781565b82546101009290920a63ffffffff8181021990931691831602179091556001600160a01b038416600090815260066020908152604080832061ffff891684528252808320600184529091528082205460028352818320548380529183205492945083169261071f92918116911661179d565b610729919061179d565b9050600063ffffffff8216156107df576001600160a01b038416600090815260066020908152604080832061ffff89168452825280832060028452909152902054829061077d9063ffffffff1660286117b9565b6001600160a01b038616600090815260066020908152604080832061ffff8b16845282528083208380529091529020546107be9063ffffffff1660506117b9565b6107c8919061179d565b6107d291906117df565b63ffffffff1690506107e3565b5060005b604080518082019091526000602082015281815260288211801561080d5750600a8363ffffffff16115b1561081e576001602082015261084e565b8060200151801561082f5750600a82105b80156108415750600a8363ffffffff16115b1561084e57600060208201525b6001600160a01b0385166000908152600460205260409020805482919061ffff891690811061087f5761087f611815565b6000918252602080832084516002938402909101908155938101516001948501805491151560ff199283161790553380855292825260408085206001600160a01b038c1680875290845281862061ffff8e16875290935293849020805490911690941790935590517fc6c17ac9b5234cac54c97de00eef6ce25bdbb704c801bfe650017e716c328e5290610918908a908c90889061182b565b60405180910390a350505050505050565b604080516060808201835260008083526020830152918101919091523360009081526001602090815260408083206001600160a01b038a16845290915290205460ff161561098d5760006040516371709fb960e11b815260040161045591906116d8565b60005460ff1615610a8f57600060019054906101000a90046001600160a01b03166001600160a01b0316633bc778e383600001517f0000000000000000000000000000000000000000000000000000000000000000610a1286602001516040516020016104e3919060609190911b6bffffffffffffffffffffffff1916815260140190565b86604001517f000000000000000000000000000000000000000000000000000000000000000088606001516040518763ffffffff1660e01b8152600401610a5e969594939291906116eb565b60006040518083038186803b158015610a7657600080fd5b505afa158015610a8a573d6000803e3d6000fd5b505050505b6040518060600160405280336001600160a01b03168152602001846001811115610abb57610abb6111fa565b815260200186868080601f016020809104026020016040519081016040528093929190818152602001838380828437600092018290525093909452505060408051808201825282815260208082018490526001600160a01b03808d168552600382529284208054600181810183559186529482902087516002909602018054959094166001600160a01b0319861681178555918701519697509195879550929384926001600160a81b031990911690911790600160a01b908490811115610b8457610b846111fa565b021790555060408201516001820190610b9d90826118da565b5050506001600160a01b0387166000818152600460209081526040808320805460018082018355918552838520875160029092020190815586840151908201805460ff191691151591909117905593835260059091528120918690811115610c0757610c076111fa565b6001811115610c1857610c186111fa565b815260208101919091526040016000908120805461ffff1691610c3a83611999565b825461ffff9182166101009390930a9283029190920219909116179055503360008181526001602081815260408084206001600160a01b038d16808652908352818520805460ff19169094179093556003909152918290205491519092917f856b6fde5187880a03fdf824b79b5521ccc9396b3a4fb07be2693ad7035c02f891610cc6919087906119b1565b60405180910390a35095945050505050565b60036020528160005260406000208181548110610cf457600080fd5b6000918252602090912060029091020180546001820180546001600160a01b0383169550600160a01b90920460ff16935090610d2f90611851565b80601f0160208091040260200160405190810160405280929190818152602001828054610d5b90611851565b8015610da85780601f10610d7d57610100808354040283529160200191610da8565b820191906000526020600020905b815481529060010190602001808311610d8b57829003601f168201915b5050505050905083565b6001600160a01b0381166000908152600360205260408120805461ffff8516908110610de057610de0611815565b600091825260208220600290910201546040516001600160a01b039091169134919081818185875af1925050503d8060008114610e39576040519150601f19603f3d011682016040523d82523d6000602084013e610e3e565b606091505b50506001600160a01b03831660008181526003602052604090208054929350909161ffff8616908110610e7357610e73611815565b600091825260208083206002909202909101546001600160a01b038681168452600390925260409092208054919092169133917f9728d3b4ce6090c2419194a16313c30e5c8d99790e9e21140e5ee1e2ebde6dfa91349161ffff8a16908110610ede57610ede611815565b9060005260206000209060020201604051610efa9291906119ca565b60405180910390a492915050565b6001600160a01b03811660009081526003602090815260408083208054825181850281018501909352808352606094859484015b8282101561104857600084815260209081902060408051606081019091526002850290910180546001600160a01b03811683529192909190830190600160a01b900460ff166001811115610f9257610f926111fa565b6001811115610fa357610fa36111fa565b8152602001600182018054610fb790611851565b80601f0160208091040260200160405190810160405280929190818152602001828054610fe390611851565b80156110305780601f1061100557610100808354040283529160200191611030565b820191906000526020600020905b81548152906001019060200180831161101357829003601f168201915b50505050508152505081526020019060010190610f3c565b5050506001600160a01b038516600090815260046020908152604080832080548251818502810185019093528083529597509094909350919084015b828210156110c857600084815260209081902060408051808201909152600285029091018054825260019081015460ff161515828401529083529092019101611084565b505050509050915091565b600460205281600052604060002081815481106110ef57600080fd5b60009182526020909120600290910201805460019091015490925060ff16905082565b60006008826040516020016111279190611a96565b60408051601f198184030181529190528051602090910120901c92915050565b80356001600160a01b038116811461115e57600080fd5b919050565b80356002811061115e57600080fd5b6000806040838503121561118557600080fd5b61118e83611147565b915061119c60208401611163565b90509250929050565b803561ffff8116811461115e57600080fd5b6000806000606084860312156111cc57600080fd5b6111d584611147565b92506111e360208501611147565b91506111f1604085016111a5565b90509250925092565b634e487b7160e01b600052602160045260246000fd5b60038110611220576112206111fa565b9052565b602081016112328284611210565b92915050565b80356003811061115e57600080fd5b634e487b7160e01b600052604160045260246000fd5b6040516080810167ffffffffffffffff8111828210171561128057611280611247565b60405290565b604051610100810167ffffffffffffffff8111828210171561128057611280611247565b600061016082840312156112bd57600080fd5b6112c561125d565b8235815290506112d760208301611147565b602082015260408281013590820152607f820183136112f557600080fd5b6112fd611286565b8061016084018581111561131057600080fd5b606085015b8181101561132d578035845260209384019301611315565b505060608301525092915050565b6000806000806101c0858703121561135257600080fd5b61135b85611238565b9350611369602086016111a5565b925061137760408601611147565b915061138686606087016112aa565b905092959194509250565b60008060008060006101c086880312156113aa57600080fd5b6113b386611147565b9450602086013567ffffffffffffffff8111156113cf57600080fd5b8601601f810188136113e057600080fd5b803567ffffffffffffffff8111156113f757600080fd5b88602082840101111561140957600080fd5b6020919091019450925061141f60408701611163565b915061142e87606088016112aa565b90509295509295909350565b6002811061144a5761144a6111fa565b50565b60005b83811015611468578181015183820152602001611450565b50506000910152565b6000815180845261148981602086016020860161144d565b601f01601f19169290920160200192915050565b80516001600160a01b0316825260208101516000906114bb8161143a565b806020850152506040820151606060408501526114db6060850182611471565b949350505050565b6020815260006114f6602083018461149d565b9392505050565b6000806040838503121561151057600080fd5b61151983611147565b946020939093013593505050565b6001600160a01b038416815261153c8361143a565b8260208201526060604082015260006115586060830184611471565b95945050505050565b60008060006060848603121561157657600080fd5b61157f84611147565b925061158d602085016111a5565b91506111f160408501611238565b600080604083850312156115ae57600080fd5b6115b7836111a5565b915061119c60208401611147565b6000602082840312156115d757600080fd5b6114f682611147565b6000604082016040835280855180835260608501915060608160051b86010192506020870160005b8281101561163957605f1987860301845261162485835161149d565b94506020938401939190910190600101611608565b50505050828103602084015280845180835260208301915060208601925060005b81811015611686578351805184526020908101511515818501529093019260409092019160010161165a565b50909695505050505050565b600080604083850312156116a557600080fd5b6115b783611147565b600080604083850312156116c157600080fd5b6116ca83611147565b915061119c60208401611238565b602081016116e58361143a565b91905290565b60006101a08201905087825286602083015285604083015284606083015283608083015260a082018360005b6008811015611736578151835260209283019290910190600101611717565b505050979650505050505050565b634e487b7160e01b600052601160045260246000fd5b600064ffffffffff821664ffffffffff810361177857611778611744565b60010192915050565b600063ffffffff821663ffffffff810361177857611778611744565b63ffffffff818116838216019081111561123257611232611744565b63ffffffff81811683821602908116908181146117d8576117d8611744565b5092915050565b600063ffffffff83168061180357634e487b7160e01b600052601260045260246000fd5b8063ffffffff84160491505092915050565b634e487b7160e01b600052603260045260246000fd5b61ffff84168152606081016118436020830185611210565b826040830152949350505050565b600181811c9082168061186557607f821691505b60208210810361188557634e487b7160e01b600052602260045260246000fd5b50919050565b601f8211156118d557806000526020600020601f840160051c810160208510156118b25750805b601f840160051c820191505b818110156118d257600081556001016118be565b50505b505050565b815167ffffffffffffffff8111156118f4576118f4611247565b611908816119028454611851565b8461188b565b6020601f82116001811461193c57600083156119245750848201515b600019600385901b1c1916600184901b1784556118d2565b600084815260208120601f198516915b8281101561196c578785015182556020948501946001909201910161194c565b508482101561198a5786840151600019600387901b60f8161c191681555b50505050600190811b01905550565b600061ffff821661ffff810361177857611778611744565b8281526040602082015260006114db604083018461149d565b82815260406020820181905282546001600160a01b0381169183019190915260009060a01c60ff166119fb8161143a565b80606084015250600183016060608084015260008154611a1a81611851565b8060a08701526001821660008114611a395760018114611a5557611a89565b60ff19831660c088015260c082151560051b8801019350611a89565b84600052602060002060005b83811015611a8057815489820160c00152600190910190602001611a61565b880160c0019450505b5091979650505050505050565b60008251611aa881846020870161144d565b919091019291505056fea26469706673582212205c2e5d16cf69cda5397419d8b77d8076fd1411137978c07a28fac0168e7ac04064736f6c634300081a0033000000000000000000000000000000000000000000000000000000000000000100000000000000000000000042ff98c4e85212a5d31358acbfe76a621b50fc0200000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000002c6170705f73746167696e675f36346231386364663430353834383633376536666362393362363065383539370000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b6372656174652d6e6f7465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b6372656174652d766f7465000000000000000000000000000000000000000000",
+        "nonce": "0x5",
+        "chainId": "0x14a34"
+      },
+      "additionalContracts": [],
+      "isFixedGasLimit": false
+    }
+  ],
+  "receipts": [
+    {
+      "status": "0x1",
+      "cumulativeGasUsed": "0x3480a9",
+      "logs": [],
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "type": "0x0",
+      "transactionHash": "0x8bd77380a8f33cbc04b1636b22e3334b90fab44c1dcd4e416f085a0c9d4bb365",
+      "transactionIndex": "0xc",
+      "blockHash": "0x7174e0d8181c4141d2975a567c743b864012fdee9a14943c34842bceaa9e6060",
+      "blockNumber": "0xbfab5c",
+      "gasUsed": "0x182136",
+      "effectiveGasPrice": "0xf4353",
+      "from": "0xf6da1082b2b8952c73ed7220db5df38aec56a1b2",
+      "to": null,
+      "contractAddress": "0x0dbf4dbebf6220b1f3adbfa642e7b06f1281340a",
+      "l1BaseFeeScalar": "0x44d",
+      "l1BlobBaseFee": "0x242",
+      "l1BlobBaseFeeScalar": "0xa118b",
+      "l1Fee": "0x2b1bf33038",
+      "l1GasPrice": "0x8c020505",
+      "l1GasUsed": "0x117a8"
+    }
+  ],
+  "libraries": [],
+  "pending": [],
+  "returns": {},
+  "timestamp": 1720890800,
+  "chain": 84532,
+  "commit": "fd0ba97"
+}
diff --git a/packages/foundry/script/deploy_Notes.s.sol b/packages/foundry/script/deploy_Notes.s.sol
@@ -18,7 +18,7 @@ contract CounterScript is Script {
         if (_onBase) {
             notes = new Notes(
                 true,
-                0x163b09b4fE21177c455D850BD815B6D583732432,
+                0x42FF98C4E85212a5D31358ACbFe76a621b50fC02,
                 appId,
                 noteId,
                 voteId

diff --git a/packages/foundry/src/Notes.sol b/packages/foundry/src/Notes.sol
@@ -126,7 +126,8 @@ contract Notes {
      *
      * @param _contractAddress address off contract we are about to add a note for
      * @param _uri IPFS uri for note
-     * @param _sentiment if the comment is POSETIVE or NEGATIVE
+     * @param _sentiment if the comment is POSITIVE or NEGATIVE
+     * @param _proof worldID proof (if on supported network)
      *
      * @return _note the finalized note datastructure
      *
@@ -145,7 +146,7 @@ contract Notes {
             // verify proof
             worldId.verifyProof(
                 _proof.root,
-                //groupId,
+                groupId,
                 abi.encodePacked(_proof.signal).hashToField(),
                 _proof.nullifierHash,
                 externalNullifierNote,
@@ -210,7 +211,7 @@ contract Notes {
             // verify proof
             worldId.verifyProof(
                 _proof.root,
-                //groupId,
+                groupId,
                 abi.encodePacked(_proof.signal).hashToField(),
                 _proof.nullifierHash,
                 externalNullifierVote,