From cfe1d19dfaae4cb5a929e94cf3fe30bf29f60ab7 Mon Sep 17 00:00:00 2001 From: lorbke Date: Sun, 17 Nov 2024 04:18:42 +0700 Subject: [PATCH] redeploy HumanOracleWithVault without Ownable --- .../Deploy.s.sol/480/run-1731791853.json | 61 +++++ .../Deploy.s.sol/480/run-latest.json | 41 ++-- packages/foundry/contracts/Permit2Vault.sol | 6 +- packages/foundry/script/Deploy.s.sol | 8 +- .../src/contracts/deployedContracts.ts | 232 +++++++++++++++++- .../nextjs/contracts/deployedContracts.ts | 232 +++++++++++++++++- 6 files changed, 548 insertions(+), 32 deletions(-) create mode 100644 packages/foundry/broadcast/Deploy.s.sol/480/run-1731791853.json diff --git a/packages/foundry/broadcast/Deploy.s.sol/480/run-1731791853.json b/packages/foundry/broadcast/Deploy.s.sol/480/run-1731791853.json new file mode 100644 index 0000000..589db7e --- /dev/null +++ b/packages/foundry/broadcast/Deploy.s.sol/480/run-1731791853.json @@ -0,0 +1,61 @@ +{ + "transactions": [ + { + "hash": "0x3bc143ae6063260b82d52a8d6556ff0a54dd3a080b644913fe2b933f3e9b9f80", + "transactionType": "CREATE", + "contractName": "HumanOracleWithVault", + "contractAddress": "0xc564388f1d0e68e4ab4c240ebae712c0c5670b62", + "function": null, + "arguments": [ + "0x17B354dD2595411ff79041f930e491A4Df39A278", + "0x2cFc85d8E48F8EAB294be644d9E25C3030863003", + "1", + "app_22ea9fb73d53333c2997e8f16e60cc6b", + "registration", + "0x000000000022D473030F116dDEE9F6B43aC78BA3", + "0x4639B9F663C14Bad89Ddcc16966e85Bc81dCCD40" + ], + "transaction": { + "from": "0x4639b9f663c14bad89ddcc16966e85bc81dccd40", + "gas": "0x282136", + "value": "0x0", + "input": "0x60e0604052600160a05234801561001557600080fd5b5060405161258b38038061258b833981016040819052610034916101d2565b6001600160a01b03828116608052600380546001600160a01b03199081168a8416179091556008805490911691881691909117905560a08590526040516100ae9061009c90610087908790602001610288565b60408051601f198184030181529190526100be565b846040516020016100879291906102a4565b60c052506102ca95505050505050565b60006008826040516020016100d39190610288565b60408051601f198184030181529190528051602090910120901c92915050565b80516001600160a01b038116811461010a57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015610140578181015183820152602001610128565b50506000910152565b600082601f83011261015a57600080fd5b81516001600160401b038111156101735761017361010f565b604051601f8201601f19908116603f011681016001600160401b03811182821017156101a1576101a161010f565b6040528181528382016020018510156101b957600080fd5b6101ca826020830160208701610125565b949350505050565b600080600080600080600060e0888a0312156101ed57600080fd5b6101f6886100f3565b9650610204602089016100f3565b604089015160608a015191975095506001600160401b0381111561022757600080fd5b6102338a828b01610149565b60808a015190955090506001600160401b0381111561025157600080fd5b61025d8a828b01610149565b93505061026c60a089016100f3565b915061027a60c089016100f3565b905092959891949750929550565b6000825161029a818460208701610125565b9190910192915050565b828152600082516102bc816020850160208701610125565b919091016020019392505050565b60805160a05160c05161228b61030060003960006110c90152600061108b0152600081816101fe0152610740015261228b6000f3fe608060405234801561001057600080fd5b50600436106101425760003560e01c80638d00e14e116100b8578063a87430ba1161007c578063a87430ba14610308578063aa607a9414610344578063ad7a672f14610357578063b742070214610360578063c8382a3314610373578063dca090041461038657600080fd5b80638d00e14e1461027157806391e407301461029c5780639c1f8198146102bf578063a1db9782146102e2578063a5260ad9146102f557600080fd5b80635839a8891161010a5780635839a889146101d35780635c4abd54146101e65780636afdd850146101f95780636cb5dc9914610238578063753e9ef01461024b5780637ccec52c1461025e57600080fd5b80630bfb705914610147578063163f7522146101675780633cbc2ef21461018a5780634e9b9e001461019d5780635431c94e146101be575b600080fd5b61014f610399565b60405161015e93929190611a9c565b60405180910390f35b61017a610175366004611af4565b610516565b604051901515815260200161015e565b61017a610198366004611b11565b610544565b6101b06101ab366004611b11565b610574565b60405190815260200161015e565b6101d16101cc366004611b3d565b610587565b005b61017a6101e1366004611b11565b610604565b6101d16101f4366004611bbe565b61064c565b6102207f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b03909116815260200161015e565b6101d1610246366004611b11565b6107fc565b600354610220906001600160a01b031681565b6101d161026c366004611c30565b6108fc565b6101b061027f366004611b3d565b600160209081526000928352604080842090915290825290205481565b6101b06102aa366004611ca3565b60046020526000908152604090206001015481565b6102d26102cd366004611ca3565b610b92565b60405161015e9493929190611cbc565b6101d16102f0366004611b11565b610c64565b6101d1610303366004611d06565b610dbb565b61032f610316366004611af4565b6005602052600090815260409020805460019091015482565b6040805192835260208301919091520161015e565b6101d1610352366004611dc2565b610f9b565b6101b060025481565b6101b061036e366004611ca3565b6111ca565b61017a610381366004611ca3565b61136b565b600854610220906001600160a01b031681565b606080606060006103a960065490565b9050806001600160401b038111156103c3576103c3611e01565b6040519080825280602002602001820160405280156103ec578160200160208202803683370190505b509350806001600160401b0381111561040757610407611e01565b60405190808252806020026020018201604052801561043a57816020015b60608152602001906001900390816104255790505b509250806001600160401b0381111561045557610455611e01565b60405190808252806020026020018201604052801561047e578160200160208202803683370190505b50915060005b8181101561050f578085828151811061049f5761049f611e17565b6020026020010181815250506104b481611385565b8482815181106104c6576104c6611e17565b60200260200101819052506104ea8160009081526004602052604090206001015490565b8382815181106104fc576104fc611e17565b6020908102919091010152600101610484565b5050909192565b6001600160a01b0381166000908152600560205260408120541561053c57506001919050565b506000919050565b60008181526004602090815260408083206001600160a01b038616845260020190915290205460ff165b92915050565b6000610580838361143b565b9392505050565b60025460405163a9059cbb60e01b81526001600160a01b03838116600483015260248201929092529083169063a9059cbb906044016020604051808303816000875af11580156105db573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105ff9190611e2d565b505050565b60008181526004602052604081205460005b81811015610641576106298585836114b3565b156106395760019250505061056e565b600101610616565b506000949350505050565b60005460ff16156106945760405162461bcd60e51b815260206004820152600d60248201526c6e6f207265656e7472616e637960981b60448201526064015b60405180910390fd5b6000805460ff191660019081178255338252602090815260408083206001600160a01b038a168452909152812080548792906106d1908490611e65565b9250508190555084600260008282546106ea9190611e65565b90915550506040805160a0810182526001600160a01b0388811660608301908152608083018990528252602080830188905282840187905283518085018552308152908101899052925163187945bd60e11b81527f0000000000000000000000000000000000000000000000000000000000000000909116926330f28b7a9261077e92909190339088908890600401611ea1565b600060405180830381600087803b15801561079857600080fd5b505af11580156107ac573d6000803e3d6000fd5b505060408051338152602081018990527f2da466a7b24304f47e87fa2e1e5a81b9831ce54fec19055ce277ca2f39ba42c4935001905060405180910390a150506000805460ff1916905550505050565b3360009081526001602090815260408083206001600160a01b03861684529091528120805483929061082f908490611e65565b9250508190555080600260008282546108489190611e65565b909155505060405163a9059cbb60e01b8152306004820152602481018290526001600160a01b0383169063a9059cbb906044016020604051808303816000875af115801561089a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108be9190611e2d565b5060408051338152602081018390527f2da466a7b24304f47e87fa2e1e5a81b9831ce54fec19055ce277ca2f39ba42c4910160405180910390a15050565b33600090815260056020526040812054900361094e5760405162461bcd60e51b815260206004820152601160248201527075736572206e6f74206578697374696e6760781b604482015260640161068b565b600087815260046020526040812054889133905b828110156109c95760006109778386846114b3565b90508015156001036109c05760405162461bcd60e51b81526020600482015260126024820152711d5cd95c88185b1c9958591e481d9bdd195960721b604482015260640161068b565b50600101610962565b5089436109d582611513565b1115610a1a5760405162461bcd60e51b81526020600482015260146024820152731d9bdd19481a185cc81b9bdd081cdd185c9d195960621b604482015260640161068b565b43610a2482611541565b610a2d83611513565b610a379190611e65565b1015610a765760405162461bcd60e51b815260206004820152600e60248201526d1d9bdd19481a185cc8195b99195960921b604482015260640161068b565b6005891115610ac75760405162461bcd60e51b815260206004820152601760248201527f6d6178207374616b696e6720616d6f756e742069732035000000000000000000604482015260640161068b565b33610ad4818d8d8d61156f565b600854604051631712af5560e21b81523091635c4abd5491610b0c916001600160a01b0316908e908e908e908e908e90600401611f04565b600060405180830381600087803b158015610b2657600080fd5b505af1158015610b3a573d6000803e3d6000fd5b5050604080518e8152602081018e90528f93506001600160a01b03851692507f65658daa50ece7e5d9b3c4700c400745f04137171d9d6896eed2f10437013ee7910160405180910390a3505050505050505050505050565b606080600060606000610bb18660009081526004602052604090205490565b60008781526004602052604090206001015493509050806001600160401b03811115610bdf57610bdf611e01565b604051908082528060200260200182016040528015610c08578160200160208202803683370190505b50915060005b81811015610c4557610c20878261162d565b838281518110610c3257610c32611e17565b6020908102919091010152600101610c0e565b50610c4f86611385565b610c5887611667565b94509450509193509193565b60005460ff1615610ca75760405162461bcd60e51b815260206004820152600d60248201526c6e6f207265656e7472616e637960981b604482015260640161068b565b6000805460ff191660019081178255338252602090815260408083206001600160a01b038616845290915281208054839290610ce4908490611f38565b925050819055508060026000828254610cfd9190611f38565b909155505060405163a9059cbb60e01b8152336004820152602481018290526001600160a01b0383169063a9059cbb906044016020604051808303816000875af1158015610d4f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d739190611e2d565b5060408051338152602081018390527f7084f5476618d8e60b11ef0d7d3f06914655adb8793e28ff7f018d4c76d505d5910160405180910390a150506000805460ff19169055565b6006546040805160a08101825282815281516020601f8b0181900481028201810190935289815260009280830191908c908c9081908401838280828437600092019190915250505090825250602001610e14888a611f7b565b81526020808201889052604090910186905260068054600181018255600091909152825160059091027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f810191825591830151929350839290917ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d400190610e9b90826120e5565b5060408201518051610eb79160028401916020909101906118ef565b5060608201518160030155608082015181600401555050610ed88284611764565b600854604051636cb5dc9960e01b81526001600160a01b039091166004820152602481018490523090636cb5dc9990604401600060405180830381600087803b158015610f2457600080fd5b505af1158015610f38573d6000803e3d6000fd5b50505050817f6912e5abe531ca5f3b6f973f97278ab6731cdec0178a7b3c2c7a5822a3f1732b610f6784611385565b610f7085611513565b610f7986611541565b604051610f88939291906121a3565b60405180910390a2505050505050505050565b3360009081526005602052604090205415610ff15760405162461bcd60e51b815260206004820152601660248201527507573657220616c7265616479207369676e65642075760541b604482015260640161068b565b600082815260076020526040902054339060ff1615156001036110565760405162461bcd60e51b815260206004820152601e60248201527f6e756c6c69666965724861736820616c7265616479206578697374696e670000604482015260640161068b565b6003546040516bffffffffffffffffffffffff19606084901b1660208201526001600160a01b0390911690633bc778e39086907f0000000000000000000000000000000000000000000000000000000000000000906110c6906034016040516020818303038152906040526117fe565b877f0000000000000000000000000000000000000000000000000000000000000000886040518763ffffffff1660e01b815260040161110a969594939291906121c8565b60006040518083038186803b15801561112257600080fd5b505afa158015611136573d6000803e3d6000fd5b5050506000848152600760209081526040808320805460ff1916600190811790915581518083018352888152438185019081526001600160a01b038816808752600586529584902082518082559151930183905583519081529384019190915293507f47c8e83729a89f8b0c23b722e4c21f48295ddfcd683910c564e11e6b6037d01c910160405180910390a25050505050565b600081436111d782611541565b6111e083611513565b6111ea9190611e65565b1061122b5760405162461bcd60e51b8152602060048201526011602482015270766f7465207374696c6c2061637469766560781b604482015260640161068b565b336112368185610544565b1561127a5760405162461bcd60e51b81526020600482015260146024820152731d5cd95c88185b1c9958591e4818db185a5b595960621b604482015260640161068b565b60008481526004602090815260408083206001600160a01b03851684526002019091529020805460ff1916600117905560006112b6828661143b565b6008546040516350edcbc160e11b81526001600160a01b03909116600482015260248101829052909150309063a1db978290604401600060405180830381600087803b15801561130557600080fd5b505af1158015611319573d6000803e3d6000fd5b5050505084826001600160a01b03167ff01da32686223933d8a18a391060918c7f11a3648639edd87ae013e2e27317438360405161135991815260200190565b60405180910390a39250505b50919050565b600061137682611833565b43111561053c57506001919050565b60606006828154811061139a5761139a611e17565b906000526020600020906005020160010180546113b690612063565b80601f01602080910402602001604051908101604052809291908181526020018280546113e290612063565b801561142f5780601f106114045761010080835404028352916020019161142f565b820191906000526020600020905b81548152906001019060200180831161141257829003601f168201915b50505050509050919050565b60008061144783611851565b90506114548484836114b3565b61146257600091505061056e565b600061146f85858461189d565b60008581526004602052604081206001015491925061148e868561162d565b905060008361149d8385612200565b6114a79190612222565b98975050505050505050565b60008281526004602052604081208054839081106114d3576114d3611e17565b600091825260208083206001600160a01b0388168452600160029093020191909101905260409020541561150957506001610580565b5060009392505050565b60006006828154811061152857611528611e17565b9060005260206000209060050201600301549050919050565b60006006828154811061155657611556611e17565b9060005260206000209060050201600401549050919050565b600083815260046020526040902080548291908490811061159257611592611e17565b600091825260208083206001600160a01b0389168452600160029093020191909101815260408083209390935585825260049052208054829190849081106115dc576115dc611e17565b906000526020600020906002020160000160008282546115fc9190611e65565b909155505060008381526004602052604081206001018054839290611622908490611e65565b909155505050505050565b600082815260046020526040812080548390811061164d5761164d611e17565b906000526020600020906002020160000154905092915050565b60606006828154811061167c5761167c611e17565b9060005260206000209060050201600201805480602002602001604051908101604052809291908181526020016000905b828210156117595783829060005260206000200180546116cc90612063565b80601f01602080910402602001604051908101604052809291908181526020018280546116f890612063565b80156117455780601f1061171a57610100808354040283529160200191611745565b820191906000526020600020905b81548152906001019060200180831161172857829003601f168201915b5050505050815260200190600101906116ad565b505050509050919050565b600082815260046020526040812060018101839055600680549192918590811061179057611790611e17565b6000918252602082206002600590920201015491506117af8285612200565b905060005b828110156117f6578354600101808555600085905282908590839081106117dd576117dd611e17565b60009182526020909120600290910201556001016117b4565b505050505050565b60006008826040516020016118139190612239565b60408051601f198184030181529190528051602090910120901c92915050565b600061183e82611541565b61184783611513565b61056e9190611e65565b60008181526004602052604081205460008060005b8381101561189457600061187a878361162d565b90508084101561188b578093508192505b50600101611866565b50949350505050565b60008281526004602052604081208054839081106118bd576118bd611e17565b600091825260208083206001600160a01b03881684526001600290930201919091019052604090205490509392505050565b828054828255906000526020600020908101928215611935579160200282015b82811115611935578251829061192590826120e5565b509160200191906001019061190f565b50611941929150611945565b5090565b808211156119415760006119598282611962565b50600101611945565b50805461196e90612063565b6000825580601f1061197e575050565b601f01602090049060005260206000209081019061199c919061199f565b50565b5b8082111561194157600081556001016119a0565b600081518084526020840193506020830160005b828110156119e65781518652602095860195909101906001016119c8565b5093949350505050565b60005b83811015611a0b5781810151838201526020016119f3565b50506000910152565b60008151808452611a2c8160208601602086016119f0565b601f01601f19169290920160200192915050565b600082825180855260208501945060208160051b8301016020850160005b83811015611a9057601f19858403018852611a7a838351611a14565b6020988901989093509190910190600101611a5e565b50909695505050505050565b606081526000611aaf60608301866119b4565b8281036020840152611ac18186611a40565b90508281036040840152611ad581856119b4565b9695505050505050565b6001600160a01b038116811461199c57600080fd5b600060208284031215611b0657600080fd5b813561058081611adf565b60008060408385031215611b2457600080fd5b8235611b2f81611adf565b946020939093013593505050565b60008060408385031215611b5057600080fd5b8235611b5b81611adf565b91506020830135611b6b81611adf565b809150509250929050565b60008083601f840112611b8857600080fd5b5081356001600160401b03811115611b9f57600080fd5b602083019150836020828501011115611bb757600080fd5b9250929050565b60008060008060008060a08789031215611bd757600080fd5b8635611be281611adf565b955060208701359450604087013593506060870135925060808701356001600160401b03811115611c1257600080fd5b611c1e89828a01611b76565b979a9699509497509295939492505050565b600080600080600080600060c0888a031215611c4b57600080fd5b873596506020880135955060408801359450606088013593506080880135925060a08801356001600160401b03811115611c8457600080fd5b611c908a828b01611b76565b989b979a50959850939692959293505050565b600060208284031215611cb557600080fd5b5035919050565b608081526000611ccf6080830187611a14565b8281036020840152611ce18187611a40565b90508460408401528281036060840152611cfb81856119b4565b979650505050505050565b600080600080600080600060a0888a031215611d2157600080fd5b87356001600160401b03811115611d3757600080fd5b611d438a828b01611b76565b90985096505060208801356001600160401b03811115611d6257600080fd5b8801601f81018a13611d7357600080fd5b80356001600160401b03811115611d8957600080fd5b8a60208260051b8401011115611d9e57600080fd5b979a9699506020019760408101359660608201359650608090910135945092505050565b60008060006101408486031215611dd857600080fd5b83359250602084013591506101408401851015611df457600080fd5b6040840190509250925092565b634e487b7160e01b600052604160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b600060208284031215611e3f57600080fd5b8151801515811461058057600080fd5b634e487b7160e01b600052601160045260246000fd5b8082018082111561056e5761056e611e4f565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b855180516001600160a01b039081168352602091820151828401528188015160408085019190915288015160608401528651811660808401529086015160a0830152841660c082015261010060e08201819052600090611cfb9083018486611e78565b60018060a01b038716815285602082015284604082015283606082015260a0608082015260006114a760a083018486611e78565b8181038181111561056e5761056e611e4f565b604051601f8201601f191681016001600160401b0381118282101715611f7357611f73611e01565b604052919050565b60006001600160401b03831115611f9457611f94611e01565b8260051b611fa460208201611f4b565b84815290830190602081019036831115611fbd57600080fd5b845b838110156120595780356001600160401b03811115611fdd57600080fd5b860136601f820112611fee57600080fd5b80356001600160401b0381111561200757612007611e01565b61201a601f8201601f1916602001611f4b565b81815236602083850101111561202f57600080fd5b81602084016020830137600060208383010152808652505050602083019250602081019050611fbf565b5095945050505050565b600181811c9082168061207757607f821691505b60208210810361136557634e487b7160e01b600052602260045260246000fd5b601f8211156105ff57806000526020600020601f840160051c810160208510156120be5750805b601f840160051c820191505b818110156120de57600081556001016120ca565b5050505050565b81516001600160401b038111156120fe576120fe611e01565b6121128161210c8454612063565b84612097565b6020601f821160018114612146576000831561212e5750848201515b600019600385901b1c1916600184901b1784556120de565b600084815260208120601f198516915b828110156121765787850151825560209485019460019092019101612156565b50848210156121945786840151600019600387901b60f8161c191681555b50505050600190811b01905550565b6060815260006121b66060830186611a14565b60208301949094525060400152919050565b60006101a0820190508782528660208301528560408301528460608301528360808301526101008360a0840137979650505050505050565b60008261221d57634e487b7160e01b600052601260045260246000fd5b500490565b808202811582820484141761056e5761056e611e4f565b6000825161224b8184602087016119f0565b919091019291505056fea264697066735822122070ee537465d27ff7d7adb90f1cf7ef1f77fb64a1fdd5d0f40da22b807ef7b1e964736f6c634300081c003300000000000000000000000017b354dd2595411ff79041f930e491a4df39a2780000000000000000000000002cfc85d8e48f8eab294be644d9e25c3030863003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000022d473030f116ddee9f6b43ac78ba30000000000000000000000004639b9f663c14bad89ddcc16966e85bc81dccd4000000000000000000000000000000000000000000000000000000000000000246170705f323265613966623733643533333333633239393765386631366536306363366200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c726567697374726174696f6e0000000000000000000000000000000000000000", + "nonce": "0x19", + "chainId": "0x1e0" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0x1f8c66", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x0", + "transactionHash": "0x3bc143ae6063260b82d52a8d6556ff0a54dd3a080b644913fe2b933f3e9b9f80", + "transactionIndex": "0x1", + "blockHash": "0x7ae18f4be764dc1fa5bd88d40ae8b08a1c9fbfba8f1adc84b2664a5c8e4e9e2c", + "blockNumber": "0x5f088a", + "gasUsed": "0x1ee0eb", + "effectiveGasPrice": "0xf4341", + "blobGasUsed": "0x0", + "from": "0x4639b9f663c14bad89ddcc16966e85bc81dccd40", + "to": null, + "contractAddress": "0xc564388f1d0e68e4ab4c240ebae712c0c5670b62", + "l1BaseFeeScalar": "0x21f9", + "l1BlobBaseFee": "0x2e4404225", + "l1BlobBaseFeeScalar": "0xc5f4f", + "l1Fee": "0x3b1cdd6e0139", + "l1GasPrice": "0x2dd0953b7", + "l1GasUsed": "0x158cc" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1731791853, + "chain": 480, + "commit": "9134fec" +} \ No newline at end of file diff --git a/packages/foundry/broadcast/Deploy.s.sol/480/run-latest.json b/packages/foundry/broadcast/Deploy.s.sol/480/run-latest.json index 8e40a64..589db7e 100644 --- a/packages/foundry/broadcast/Deploy.s.sol/480/run-latest.json +++ b/packages/foundry/broadcast/Deploy.s.sol/480/run-latest.json @@ -1,23 +1,26 @@ { "transactions": [ { - "hash": "0xe116668805a251594b735da7e195061a1ba822052f5e6b4ad20cf65b8e8d85fb", + "hash": "0x3bc143ae6063260b82d52a8d6556ff0a54dd3a080b644913fe2b933f3e9b9f80", "transactionType": "CREATE", - "contractName": "HumanOracle", - "contractAddress": "0x56d603731d416447bb6c33c442f567c11a9e4822", + "contractName": "HumanOracleWithVault", + "contractAddress": "0xc564388f1d0e68e4ab4c240ebae712c0c5670b62", "function": null, "arguments": [ "0x17B354dD2595411ff79041f930e491A4Df39A278", + "0x2cFc85d8E48F8EAB294be644d9E25C3030863003", "1", "app_22ea9fb73d53333c2997e8f16e60cc6b", - "registration" + "registration", + "0x000000000022D473030F116dDEE9F6B43aC78BA3", + "0x4639B9F663C14Bad89Ddcc16966e85Bc81dCCD40" ], "transaction": { "from": "0x4639b9f663c14bad89ddcc16966e85bc81dccd40", - "gas": "0x1e1eab", + "gas": "0x282136", "value": "0x0", - "input": "0x60c0604052600160805234801561001557600080fd5b50604051611c6e380380611c6e83398101604081905261003491610199565b600080546001600160a01b0319166001600160a01b0386161790556080839052604051610094906100829061006d90859060200161022b565b60408051601f198184030181529190526100a1565b8260405160200161006d929190610247565b60a0525061026d92505050565b60006008826040516020016100b6919061022b565b60408051601f198184030181529190528051602090910120901c92915050565b634e487b7160e01b600052604160045260246000fd5b60005b838110156101075781810151838201526020016100ef565b50506000910152565b600082601f83011261012157600080fd5b81516001600160401b0381111561013a5761013a6100d6565b604051601f8201601f19908116603f011681016001600160401b0381118282101715610168576101686100d6565b60405281815283820160200185101561018057600080fd5b6101918260208301602087016100ec565b949350505050565b600080600080608085870312156101af57600080fd5b84516001600160a01b03811681146101c657600080fd5b6020860151604087015191955093506001600160401b038111156101e957600080fd5b6101f587828801610110565b606087015190935090506001600160401b0381111561021357600080fd5b61021f87828801610110565b91505092959194509250565b6000825161023d8184602087016100ec565b9190910192915050565b8281526000825161025f8160208501602087016100ec565b919091016020019392505050565b60805160a0516119dc61029260003960006108460152600061080801526119dc6000f3fe608060405234801561001057600080fd5b50600436106100ea5760003560e01c80639c1f81981161008c578063aa607a9411610066578063aa607a941461023c578063b74207021461024f578063c8382a3314610262578063e6b7c0e51461027557600080fd5b80639c1f8198146101c8578063a5260ad9146101eb578063a87430ba1461020057600080fd5b80634e9b9e00116100c85780634e9b9e00146101455780635839a88914610166578063753e9ef01461017957806391e40730146101a457600080fd5b80630bfb7059146100ef578063163f75221461010f5780633cbc2ef214610132575b600080fd5b6100f7610288565b604051610106939291906113d6565b60405180910390f35b61012261011d366004611430565b610406565b6040519015158152602001610106565b61012261014036600461144b565b610439565b61015861015336600461144b565b610469565b604051908152602001610106565b61012261017436600461144b565b61047c565b60005461018c906001600160a01b031681565b6040516001600160a01b039091168152602001610106565b6101586101b2366004611475565b6001602081905260009182526040909120015481565b6101db6101d6366004611475565b6104c4565b604051610106949392919061148e565b6101fe6101f9366004611523565b610597565b005b61022761020e366004611430565b6002602052600090815260409020805460019091015482565b60408051928352602083019190915201610106565b6101fe61024a3660046115db565b610713565b61015861025d366004611475565b610947565b610122610270366004611475565b610a81565b6101fe61028336600461161a565b610a9b565b6060806060600061029860035490565b9050806001600160401b038111156102b2576102b2611646565b6040519080825280602002602001820160405280156102db578160200160208202803683370190505b509350806001600160401b038111156102f6576102f6611646565b60405190808252806020026020018201604052801561032957816020015b60608152602001906001900390816103145790505b509250806001600160401b0381111561034457610344611646565b60405190808252806020026020018201604052801561036d578160200160208202803683370190505b50915060005b818110156103ff578085828151811061038e5761038e61165c565b6020026020010181815250506103a381610cc3565b8482815181106103b5576103b561165c565b60200260200101819052506103da816000908152600160208190526040909120015490565b8382815181106103ec576103ec61165c565b6020908102919091010152600101610373565b5050909192565b6001600160a01b0381166000908152600260205260408120541561042c57506001919050565b506000919050565b919050565b60008181526001602090815260408083206001600160a01b038616845260020190915290205460ff165b92915050565b60006104758383610d79565b9392505050565b60008181526001602052604081205460005b818110156104b9576104a1858583610df1565b156104b157600192505050610463565b60010161048e565b506000949350505050565b6060806000606060006104e38660009081526001602052604090205490565b6000878152600160208190526040909120015493509050806001600160401b0381111561051257610512611646565b60405190808252806020026020018201604052801561053b578160200160208202803683370190505b50915060005b81811015610578576105538782610e51565b8382815181106105655761056561165c565b6020908102919091010152600101610541565b5061058286610cc3565b61058b87610e8b565b94509450509193509193565b6003546040805160a08101825282815281516020601f8b0181900481028201810190935289815260009280830191908c908c90819084018382808284376000920191909152505050908252506020016105f0888a6116a2565b81526020808201889052604090910186905260038054600181018255600091909152825160059091027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b810191825591830151929350839290917fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85c0190610677908261180d565b5060408201518051610693916002840191602090910190611229565b50606082015181600301556080820151816004015550506106b48284610f88565b817f6912e5abe531ca5f3b6f973f97278ab6731cdec0178a7b3c2c7a5822a3f1732b6106df84610cc3565b6106e885611023565b6106f186611051565b604051610700939291906118cb565b60405180910390a2505050505050505050565b336000908152600260205260409020541561076e5760405162461bcd60e51b815260206004820152601660248201527507573657220616c7265616479207369676e65642075760541b60448201526064015b60405180910390fd5b600082815260046020526040902054339060ff1615156001036107d35760405162461bcd60e51b815260206004820152601e60248201527f6e756c6c69666965724861736820616c7265616479206578697374696e6700006044820152606401610765565b6000546040516bffffffffffffffffffffffff19606084901b1660208201526001600160a01b0390911690633bc778e39086907f0000000000000000000000000000000000000000000000000000000000000000906108439060340160405160208183030381529060405261107f565b877f0000000000000000000000000000000000000000000000000000000000000000886040518763ffffffff1660e01b8152600401610887969594939291906118f0565b60006040518083038186803b15801561089f57600080fd5b505afa1580156108b3573d6000803e3d6000fd5b5050506000848152600460209081526040808320805460ff1916600190811790915581518083018352888152438185019081526001600160a01b038816808752600286529584902082518082559151930183905583519081529384019190915293507f47c8e83729a89f8b0c23b722e4c21f48295ddfcd683910c564e11e6b6037d01c910160405180910390a25050505050565b6000814361095482611051565b61095d83611023565b610967919061193e565b106109a85760405162461bcd60e51b8152602060048201526011602482015270766f7465207374696c6c2061637469766560781b6044820152606401610765565b336109b38185610439565b156109f75760405162461bcd60e51b81526020600482015260146024820152731d5cd95c88185b1c9958591e4818db185a5b595960621b6044820152606401610765565b60008481526001602081815260408084206001600160a01b03861685526002019091528220805460ff19169091179055610a318286610d79565b905084826001600160a01b03167ff01da32686223933d8a18a391060918c7f11a3648639edd87ae013e2e273174383604051610a6f91815260200190565b60405180910390a39250505b50919050565b6000610a8c826110b4565b43111561042c57506001919050565b336000908152600260205260408120549003610aed5760405162461bcd60e51b815260206004820152601160248201527075736572206e6f74206578697374696e6760781b6044820152606401610765565b600083815260016020526040812054849133905b82811015610b68576000610b16838684610df1565b9050801515600103610b5f5760405162461bcd60e51b81526020600482015260126024820152711d5cd95c88185b1c9958591e481d9bdd195960721b6044820152606401610765565b50600101610b01565b508543610b7482611023565b1115610bb95760405162461bcd60e51b81526020600482015260146024820152731d9bdd19481a185cc81b9bdd081cdd185c9d195960621b6044820152606401610765565b43610bc382611051565b610bcc83611023565b610bd6919061193e565b1015610c155760405162461bcd60e51b815260206004820152600e60248201526d1d9bdd19481a185cc8195b99195960921b6044820152606401610765565b6005851115610c665760405162461bcd60e51b815260206004820152601760248201527f6d6178207374616b696e6720616d6f756e7420697320350000000000000000006044820152606401610765565b33610c73818989896110d2565b604080518881526020810188905289916001600160a01b038416917f65658daa50ece7e5d9b3c4700c400745f04137171d9d6896eed2f10437013ee7910160405180910390a35050505050505050565b606060038281548110610cd857610cd861165c565b90600052602060002090600502016001018054610cf49061178a565b80601f0160208091040260200160405190810160405280929190818152602001828054610d209061178a565b8015610d6d5780601f10610d4257610100808354040283529160200191610d6d565b820191906000526020600020905b815481529060010190602001808311610d5057829003601f168201915b50505050509050919050565b600080610d858361118b565b9050610d92848483610df1565b610da0576000915050610463565b6000610dad8585846111d7565b600085815260016020819052604082200154919250610dcc8685610e51565b9050600083610ddb8385611951565b610de59190611973565b98975050505050505050565b6000828152600160205260408120805483908110610e1157610e1161165c565b600091825260208083206001600160a01b03881684526001600290930201919091019052604090205415610e4757506001610475565b5060009392505050565b6000828152600160205260408120805483908110610e7157610e7161165c565b906000526020600020906002020160000154905092915050565b606060038281548110610ea057610ea061165c565b9060005260206000209060050201600201805480602002602001604051908101604052809291908181526020016000905b82821015610f7d578382906000526020600020018054610ef09061178a565b80601f0160208091040260200160405190810160405280929190818152602001828054610f1c9061178a565b8015610f695780601f10610f3e57610100808354040283529160200191610f69565b820191906000526020600020905b815481529060010190602001808311610f4c57829003601f168201915b505050505081526020019060010190610ed1565b505050509050919050565b600082815260016020819052604082209081018390556003805491929185908110610fb557610fb561165c565b600091825260208220600260059092020101549150610fd48285611951565b905060005b8281101561101b578354600101808555600085905282908590839081106110025761100261165c565b6000918252602090912060029091020155600101610fd9565b505050505050565b6000600382815481106110385761103861165c565b9060005260206000209060050201600301549050919050565b6000600382815481106110665761106661165c565b9060005260206000209060050201600401549050919050565b6000600882604051602001611094919061198a565b60408051601f198184030181529190528051602090910120901c92915050565b60006110bf82611051565b6110c883611023565b610463919061193e565b60008381526001602052604090208054829190849081106110f5576110f561165c565b600091825260208083206001600160a01b0389168452600160029093020182018152604080842094909455868352522080548291908490811061113a5761113a61165c565b9060005260206000209060020201600001600082825461115a919061193e565b90915550506000838152600160208190526040822001805483929061118090849061193e565b909155505050505050565b60008181526001602052604081205460008060005b838110156111ce5760006111b48783610e51565b9050808410156111c5578093508192505b506001016111a0565b50949350505050565b60008281526001602052604081208054839081106111f7576111f761165c565b600091825260208083206001600160a01b03881684526001600290930201919091019052604090205490509392505050565b82805482825590600052602060002090810192821561126f579160200282015b8281111561126f578251829061125f908261180d565b5091602001919060010190611249565b5061127b92915061127f565b5090565b8082111561127b576000611293828261129c565b5060010161127f565b5080546112a89061178a565b6000825580601f106112b8575050565b601f0160209004906000526020600020908101906112d691906112d9565b50565b5b8082111561127b57600081556001016112da565b600081518084526020840193506020830160005b82811015611320578151865260209586019590910190600101611302565b5093949350505050565b60005b8381101561134557818101518382015260200161132d565b50506000910152565b6000815180845261136681602086016020860161132a565b601f01601f19169290920160200192915050565b600082825180855260208501945060208160051b8301016020850160005b838110156113ca57601f198584030188526113b483835161134e565b6020988901989093509190910190600101611398565b50909695505050505050565b6060815260006113e960608301866112ee565b82810360208401526113fb818661137a565b9050828103604084015261140f81856112ee565b9695505050505050565b80356001600160a01b038116811461043457600080fd5b60006020828403121561144257600080fd5b61047582611419565b6000806040838503121561145e57600080fd5b61146783611419565b946020939093013593505050565b60006020828403121561148757600080fd5b5035919050565b6080815260006114a1608083018761134e565b82810360208401526114b3818761137a565b905084604084015282810360608401526114cd81856112ee565b979650505050505050565b60008083601f8401126114ea57600080fd5b5081356001600160401b0381111561150157600080fd5b6020830191508360208260051b850101111561151c57600080fd5b9250929050565b600080600080600080600060a0888a03121561153e57600080fd5b87356001600160401b0381111561155457600080fd5b8801601f81018a1361156557600080fd5b80356001600160401b0381111561157b57600080fd5b8a602082840101111561158d57600080fd5b6020918201985096508801356001600160401b038111156115ad57600080fd5b6115b98a828b016114d8565b989b979a50986040810135976060820135975060809091013595509350505050565b600080600061014084860312156115f157600080fd5b8335925060208401359150610140840185101561160d57600080fd5b6040840190509250925092565b60008060006060848603121561162f57600080fd5b505081359360208301359350604090920135919050565b634e487b7160e01b600052604160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561169a5761169a611646565b604052919050565b60006001600160401b038311156116bb576116bb611646565b8260051b6116cb60208201611672565b848152908301906020810190368311156116e457600080fd5b845b838110156117805780356001600160401b0381111561170457600080fd5b860136601f82011261171557600080fd5b80356001600160401b0381111561172e5761172e611646565b611741601f8201601f1916602001611672565b81815236602083850101111561175657600080fd5b816020840160208301376000602083830101528086525050506020830192506020810190506116e6565b5095945050505050565b600181811c9082168061179e57607f821691505b602082108103610a7b57634e487b7160e01b600052602260045260246000fd5b601f82111561180857806000526020600020601f840160051c810160208510156117e55750805b601f840160051c820191505b8181101561180557600081556001016117f1565b50505b505050565b81516001600160401b0381111561182657611826611646565b61183a81611834845461178a565b846117be565b6020601f82116001811461186e57600083156118565750848201515b600019600385901b1c1916600184901b178455611805565b600084815260208120601f198516915b8281101561189e578785015182556020948501946001909201910161187e565b50848210156118bc5786840151600019600387901b60f8161c191681555b50505050600190811b01905550565b6060815260006118de606083018661134e565b60208301949094525060400152919050565b60006101a0820190508782528660208301528560408301528460608301528360808301526101008360a0840137979650505050505050565b634e487b7160e01b600052601160045260246000fd5b8082018082111561046357610463611928565b60008261196e57634e487b7160e01b600052601260045260246000fd5b500490565b808202811582820484141761046357610463611928565b6000825161199c81846020870161132a565b919091019291505056fea2646970667358221220e17a3d4da66d90a5596ea02c579c3eeef0aef52f75d343e1f2dd77eb44d210c164736f6c634300081c003300000000000000000000000017b354dd2595411ff79041f930e491a4df39a2780000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000246170705f323265613966623733643533333333633239393765386631366536306363366200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c726567697374726174696f6e0000000000000000000000000000000000000000", - "nonce": "0x18", + "input": "0x60e0604052600160a05234801561001557600080fd5b5060405161258b38038061258b833981016040819052610034916101d2565b6001600160a01b03828116608052600380546001600160a01b03199081168a8416179091556008805490911691881691909117905560a08590526040516100ae9061009c90610087908790602001610288565b60408051601f198184030181529190526100be565b846040516020016100879291906102a4565b60c052506102ca95505050505050565b60006008826040516020016100d39190610288565b60408051601f198184030181529190528051602090910120901c92915050565b80516001600160a01b038116811461010a57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015610140578181015183820152602001610128565b50506000910152565b600082601f83011261015a57600080fd5b81516001600160401b038111156101735761017361010f565b604051601f8201601f19908116603f011681016001600160401b03811182821017156101a1576101a161010f565b6040528181528382016020018510156101b957600080fd5b6101ca826020830160208701610125565b949350505050565b600080600080600080600060e0888a0312156101ed57600080fd5b6101f6886100f3565b9650610204602089016100f3565b604089015160608a015191975095506001600160401b0381111561022757600080fd5b6102338a828b01610149565b60808a015190955090506001600160401b0381111561025157600080fd5b61025d8a828b01610149565b93505061026c60a089016100f3565b915061027a60c089016100f3565b905092959891949750929550565b6000825161029a818460208701610125565b9190910192915050565b828152600082516102bc816020850160208701610125565b919091016020019392505050565b60805160a05160c05161228b61030060003960006110c90152600061108b0152600081816101fe0152610740015261228b6000f3fe608060405234801561001057600080fd5b50600436106101425760003560e01c80638d00e14e116100b8578063a87430ba1161007c578063a87430ba14610308578063aa607a9414610344578063ad7a672f14610357578063b742070214610360578063c8382a3314610373578063dca090041461038657600080fd5b80638d00e14e1461027157806391e407301461029c5780639c1f8198146102bf578063a1db9782146102e2578063a5260ad9146102f557600080fd5b80635839a8891161010a5780635839a889146101d35780635c4abd54146101e65780636afdd850146101f95780636cb5dc9914610238578063753e9ef01461024b5780637ccec52c1461025e57600080fd5b80630bfb705914610147578063163f7522146101675780633cbc2ef21461018a5780634e9b9e001461019d5780635431c94e146101be575b600080fd5b61014f610399565b60405161015e93929190611a9c565b60405180910390f35b61017a610175366004611af4565b610516565b604051901515815260200161015e565b61017a610198366004611b11565b610544565b6101b06101ab366004611b11565b610574565b60405190815260200161015e565b6101d16101cc366004611b3d565b610587565b005b61017a6101e1366004611b11565b610604565b6101d16101f4366004611bbe565b61064c565b6102207f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b03909116815260200161015e565b6101d1610246366004611b11565b6107fc565b600354610220906001600160a01b031681565b6101d161026c366004611c30565b6108fc565b6101b061027f366004611b3d565b600160209081526000928352604080842090915290825290205481565b6101b06102aa366004611ca3565b60046020526000908152604090206001015481565b6102d26102cd366004611ca3565b610b92565b60405161015e9493929190611cbc565b6101d16102f0366004611b11565b610c64565b6101d1610303366004611d06565b610dbb565b61032f610316366004611af4565b6005602052600090815260409020805460019091015482565b6040805192835260208301919091520161015e565b6101d1610352366004611dc2565b610f9b565b6101b060025481565b6101b061036e366004611ca3565b6111ca565b61017a610381366004611ca3565b61136b565b600854610220906001600160a01b031681565b606080606060006103a960065490565b9050806001600160401b038111156103c3576103c3611e01565b6040519080825280602002602001820160405280156103ec578160200160208202803683370190505b509350806001600160401b0381111561040757610407611e01565b60405190808252806020026020018201604052801561043a57816020015b60608152602001906001900390816104255790505b509250806001600160401b0381111561045557610455611e01565b60405190808252806020026020018201604052801561047e578160200160208202803683370190505b50915060005b8181101561050f578085828151811061049f5761049f611e17565b6020026020010181815250506104b481611385565b8482815181106104c6576104c6611e17565b60200260200101819052506104ea8160009081526004602052604090206001015490565b8382815181106104fc576104fc611e17565b6020908102919091010152600101610484565b5050909192565b6001600160a01b0381166000908152600560205260408120541561053c57506001919050565b506000919050565b60008181526004602090815260408083206001600160a01b038616845260020190915290205460ff165b92915050565b6000610580838361143b565b9392505050565b60025460405163a9059cbb60e01b81526001600160a01b03838116600483015260248201929092529083169063a9059cbb906044016020604051808303816000875af11580156105db573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105ff9190611e2d565b505050565b60008181526004602052604081205460005b81811015610641576106298585836114b3565b156106395760019250505061056e565b600101610616565b506000949350505050565b60005460ff16156106945760405162461bcd60e51b815260206004820152600d60248201526c6e6f207265656e7472616e637960981b60448201526064015b60405180910390fd5b6000805460ff191660019081178255338252602090815260408083206001600160a01b038a168452909152812080548792906106d1908490611e65565b9250508190555084600260008282546106ea9190611e65565b90915550506040805160a0810182526001600160a01b0388811660608301908152608083018990528252602080830188905282840187905283518085018552308152908101899052925163187945bd60e11b81527f0000000000000000000000000000000000000000000000000000000000000000909116926330f28b7a9261077e92909190339088908890600401611ea1565b600060405180830381600087803b15801561079857600080fd5b505af11580156107ac573d6000803e3d6000fd5b505060408051338152602081018990527f2da466a7b24304f47e87fa2e1e5a81b9831ce54fec19055ce277ca2f39ba42c4935001905060405180910390a150506000805460ff1916905550505050565b3360009081526001602090815260408083206001600160a01b03861684529091528120805483929061082f908490611e65565b9250508190555080600260008282546108489190611e65565b909155505060405163a9059cbb60e01b8152306004820152602481018290526001600160a01b0383169063a9059cbb906044016020604051808303816000875af115801561089a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108be9190611e2d565b5060408051338152602081018390527f2da466a7b24304f47e87fa2e1e5a81b9831ce54fec19055ce277ca2f39ba42c4910160405180910390a15050565b33600090815260056020526040812054900361094e5760405162461bcd60e51b815260206004820152601160248201527075736572206e6f74206578697374696e6760781b604482015260640161068b565b600087815260046020526040812054889133905b828110156109c95760006109778386846114b3565b90508015156001036109c05760405162461bcd60e51b81526020600482015260126024820152711d5cd95c88185b1c9958591e481d9bdd195960721b604482015260640161068b565b50600101610962565b5089436109d582611513565b1115610a1a5760405162461bcd60e51b81526020600482015260146024820152731d9bdd19481a185cc81b9bdd081cdd185c9d195960621b604482015260640161068b565b43610a2482611541565b610a2d83611513565b610a379190611e65565b1015610a765760405162461bcd60e51b815260206004820152600e60248201526d1d9bdd19481a185cc8195b99195960921b604482015260640161068b565b6005891115610ac75760405162461bcd60e51b815260206004820152601760248201527f6d6178207374616b696e6720616d6f756e742069732035000000000000000000604482015260640161068b565b33610ad4818d8d8d61156f565b600854604051631712af5560e21b81523091635c4abd5491610b0c916001600160a01b0316908e908e908e908e908e90600401611f04565b600060405180830381600087803b158015610b2657600080fd5b505af1158015610b3a573d6000803e3d6000fd5b5050604080518e8152602081018e90528f93506001600160a01b03851692507f65658daa50ece7e5d9b3c4700c400745f04137171d9d6896eed2f10437013ee7910160405180910390a3505050505050505050505050565b606080600060606000610bb18660009081526004602052604090205490565b60008781526004602052604090206001015493509050806001600160401b03811115610bdf57610bdf611e01565b604051908082528060200260200182016040528015610c08578160200160208202803683370190505b50915060005b81811015610c4557610c20878261162d565b838281518110610c3257610c32611e17565b6020908102919091010152600101610c0e565b50610c4f86611385565b610c5887611667565b94509450509193509193565b60005460ff1615610ca75760405162461bcd60e51b815260206004820152600d60248201526c6e6f207265656e7472616e637960981b604482015260640161068b565b6000805460ff191660019081178255338252602090815260408083206001600160a01b038616845290915281208054839290610ce4908490611f38565b925050819055508060026000828254610cfd9190611f38565b909155505060405163a9059cbb60e01b8152336004820152602481018290526001600160a01b0383169063a9059cbb906044016020604051808303816000875af1158015610d4f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d739190611e2d565b5060408051338152602081018390527f7084f5476618d8e60b11ef0d7d3f06914655adb8793e28ff7f018d4c76d505d5910160405180910390a150506000805460ff19169055565b6006546040805160a08101825282815281516020601f8b0181900481028201810190935289815260009280830191908c908c9081908401838280828437600092019190915250505090825250602001610e14888a611f7b565b81526020808201889052604090910186905260068054600181018255600091909152825160059091027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f810191825591830151929350839290917ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d400190610e9b90826120e5565b5060408201518051610eb79160028401916020909101906118ef565b5060608201518160030155608082015181600401555050610ed88284611764565b600854604051636cb5dc9960e01b81526001600160a01b039091166004820152602481018490523090636cb5dc9990604401600060405180830381600087803b158015610f2457600080fd5b505af1158015610f38573d6000803e3d6000fd5b50505050817f6912e5abe531ca5f3b6f973f97278ab6731cdec0178a7b3c2c7a5822a3f1732b610f6784611385565b610f7085611513565b610f7986611541565b604051610f88939291906121a3565b60405180910390a2505050505050505050565b3360009081526005602052604090205415610ff15760405162461bcd60e51b815260206004820152601660248201527507573657220616c7265616479207369676e65642075760541b604482015260640161068b565b600082815260076020526040902054339060ff1615156001036110565760405162461bcd60e51b815260206004820152601e60248201527f6e756c6c69666965724861736820616c7265616479206578697374696e670000604482015260640161068b565b6003546040516bffffffffffffffffffffffff19606084901b1660208201526001600160a01b0390911690633bc778e39086907f0000000000000000000000000000000000000000000000000000000000000000906110c6906034016040516020818303038152906040526117fe565b877f0000000000000000000000000000000000000000000000000000000000000000886040518763ffffffff1660e01b815260040161110a969594939291906121c8565b60006040518083038186803b15801561112257600080fd5b505afa158015611136573d6000803e3d6000fd5b5050506000848152600760209081526040808320805460ff1916600190811790915581518083018352888152438185019081526001600160a01b038816808752600586529584902082518082559151930183905583519081529384019190915293507f47c8e83729a89f8b0c23b722e4c21f48295ddfcd683910c564e11e6b6037d01c910160405180910390a25050505050565b600081436111d782611541565b6111e083611513565b6111ea9190611e65565b1061122b5760405162461bcd60e51b8152602060048201526011602482015270766f7465207374696c6c2061637469766560781b604482015260640161068b565b336112368185610544565b1561127a5760405162461bcd60e51b81526020600482015260146024820152731d5cd95c88185b1c9958591e4818db185a5b595960621b604482015260640161068b565b60008481526004602090815260408083206001600160a01b03851684526002019091529020805460ff1916600117905560006112b6828661143b565b6008546040516350edcbc160e11b81526001600160a01b03909116600482015260248101829052909150309063a1db978290604401600060405180830381600087803b15801561130557600080fd5b505af1158015611319573d6000803e3d6000fd5b5050505084826001600160a01b03167ff01da32686223933d8a18a391060918c7f11a3648639edd87ae013e2e27317438360405161135991815260200190565b60405180910390a39250505b50919050565b600061137682611833565b43111561053c57506001919050565b60606006828154811061139a5761139a611e17565b906000526020600020906005020160010180546113b690612063565b80601f01602080910402602001604051908101604052809291908181526020018280546113e290612063565b801561142f5780601f106114045761010080835404028352916020019161142f565b820191906000526020600020905b81548152906001019060200180831161141257829003601f168201915b50505050509050919050565b60008061144783611851565b90506114548484836114b3565b61146257600091505061056e565b600061146f85858461189d565b60008581526004602052604081206001015491925061148e868561162d565b905060008361149d8385612200565b6114a79190612222565b98975050505050505050565b60008281526004602052604081208054839081106114d3576114d3611e17565b600091825260208083206001600160a01b0388168452600160029093020191909101905260409020541561150957506001610580565b5060009392505050565b60006006828154811061152857611528611e17565b9060005260206000209060050201600301549050919050565b60006006828154811061155657611556611e17565b9060005260206000209060050201600401549050919050565b600083815260046020526040902080548291908490811061159257611592611e17565b600091825260208083206001600160a01b0389168452600160029093020191909101815260408083209390935585825260049052208054829190849081106115dc576115dc611e17565b906000526020600020906002020160000160008282546115fc9190611e65565b909155505060008381526004602052604081206001018054839290611622908490611e65565b909155505050505050565b600082815260046020526040812080548390811061164d5761164d611e17565b906000526020600020906002020160000154905092915050565b60606006828154811061167c5761167c611e17565b9060005260206000209060050201600201805480602002602001604051908101604052809291908181526020016000905b828210156117595783829060005260206000200180546116cc90612063565b80601f01602080910402602001604051908101604052809291908181526020018280546116f890612063565b80156117455780601f1061171a57610100808354040283529160200191611745565b820191906000526020600020905b81548152906001019060200180831161172857829003601f168201915b5050505050815260200190600101906116ad565b505050509050919050565b600082815260046020526040812060018101839055600680549192918590811061179057611790611e17565b6000918252602082206002600590920201015491506117af8285612200565b905060005b828110156117f6578354600101808555600085905282908590839081106117dd576117dd611e17565b60009182526020909120600290910201556001016117b4565b505050505050565b60006008826040516020016118139190612239565b60408051601f198184030181529190528051602090910120901c92915050565b600061183e82611541565b61184783611513565b61056e9190611e65565b60008181526004602052604081205460008060005b8381101561189457600061187a878361162d565b90508084101561188b578093508192505b50600101611866565b50949350505050565b60008281526004602052604081208054839081106118bd576118bd611e17565b600091825260208083206001600160a01b03881684526001600290930201919091019052604090205490509392505050565b828054828255906000526020600020908101928215611935579160200282015b82811115611935578251829061192590826120e5565b509160200191906001019061190f565b50611941929150611945565b5090565b808211156119415760006119598282611962565b50600101611945565b50805461196e90612063565b6000825580601f1061197e575050565b601f01602090049060005260206000209081019061199c919061199f565b50565b5b8082111561194157600081556001016119a0565b600081518084526020840193506020830160005b828110156119e65781518652602095860195909101906001016119c8565b5093949350505050565b60005b83811015611a0b5781810151838201526020016119f3565b50506000910152565b60008151808452611a2c8160208601602086016119f0565b601f01601f19169290920160200192915050565b600082825180855260208501945060208160051b8301016020850160005b83811015611a9057601f19858403018852611a7a838351611a14565b6020988901989093509190910190600101611a5e565b50909695505050505050565b606081526000611aaf60608301866119b4565b8281036020840152611ac18186611a40565b90508281036040840152611ad581856119b4565b9695505050505050565b6001600160a01b038116811461199c57600080fd5b600060208284031215611b0657600080fd5b813561058081611adf565b60008060408385031215611b2457600080fd5b8235611b2f81611adf565b946020939093013593505050565b60008060408385031215611b5057600080fd5b8235611b5b81611adf565b91506020830135611b6b81611adf565b809150509250929050565b60008083601f840112611b8857600080fd5b5081356001600160401b03811115611b9f57600080fd5b602083019150836020828501011115611bb757600080fd5b9250929050565b60008060008060008060a08789031215611bd757600080fd5b8635611be281611adf565b955060208701359450604087013593506060870135925060808701356001600160401b03811115611c1257600080fd5b611c1e89828a01611b76565b979a9699509497509295939492505050565b600080600080600080600060c0888a031215611c4b57600080fd5b873596506020880135955060408801359450606088013593506080880135925060a08801356001600160401b03811115611c8457600080fd5b611c908a828b01611b76565b989b979a50959850939692959293505050565b600060208284031215611cb557600080fd5b5035919050565b608081526000611ccf6080830187611a14565b8281036020840152611ce18187611a40565b90508460408401528281036060840152611cfb81856119b4565b979650505050505050565b600080600080600080600060a0888a031215611d2157600080fd5b87356001600160401b03811115611d3757600080fd5b611d438a828b01611b76565b90985096505060208801356001600160401b03811115611d6257600080fd5b8801601f81018a13611d7357600080fd5b80356001600160401b03811115611d8957600080fd5b8a60208260051b8401011115611d9e57600080fd5b979a9699506020019760408101359660608201359650608090910135945092505050565b60008060006101408486031215611dd857600080fd5b83359250602084013591506101408401851015611df457600080fd5b6040840190509250925092565b634e487b7160e01b600052604160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b600060208284031215611e3f57600080fd5b8151801515811461058057600080fd5b634e487b7160e01b600052601160045260246000fd5b8082018082111561056e5761056e611e4f565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b855180516001600160a01b039081168352602091820151828401528188015160408085019190915288015160608401528651811660808401529086015160a0830152841660c082015261010060e08201819052600090611cfb9083018486611e78565b60018060a01b038716815285602082015284604082015283606082015260a0608082015260006114a760a083018486611e78565b8181038181111561056e5761056e611e4f565b604051601f8201601f191681016001600160401b0381118282101715611f7357611f73611e01565b604052919050565b60006001600160401b03831115611f9457611f94611e01565b8260051b611fa460208201611f4b565b84815290830190602081019036831115611fbd57600080fd5b845b838110156120595780356001600160401b03811115611fdd57600080fd5b860136601f820112611fee57600080fd5b80356001600160401b0381111561200757612007611e01565b61201a601f8201601f1916602001611f4b565b81815236602083850101111561202f57600080fd5b81602084016020830137600060208383010152808652505050602083019250602081019050611fbf565b5095945050505050565b600181811c9082168061207757607f821691505b60208210810361136557634e487b7160e01b600052602260045260246000fd5b601f8211156105ff57806000526020600020601f840160051c810160208510156120be5750805b601f840160051c820191505b818110156120de57600081556001016120ca565b5050505050565b81516001600160401b038111156120fe576120fe611e01565b6121128161210c8454612063565b84612097565b6020601f821160018114612146576000831561212e5750848201515b600019600385901b1c1916600184901b1784556120de565b600084815260208120601f198516915b828110156121765787850151825560209485019460019092019101612156565b50848210156121945786840151600019600387901b60f8161c191681555b50505050600190811b01905550565b6060815260006121b66060830186611a14565b60208301949094525060400152919050565b60006101a0820190508782528660208301528560408301528460608301528360808301526101008360a0840137979650505050505050565b60008261221d57634e487b7160e01b600052601260045260246000fd5b500490565b808202811582820484141761056e5761056e611e4f565b6000825161224b8184602087016119f0565b919091019291505056fea264697066735822122070ee537465d27ff7d7adb90f1cf7ef1f77fb64a1fdd5d0f40da22b807ef7b1e964736f6c634300081c003300000000000000000000000017b354dd2595411ff79041f930e491a4df39a2780000000000000000000000002cfc85d8e48f8eab294be644d9e25c3030863003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000022d473030f116ddee9f6b43ac78ba30000000000000000000000004639b9f663c14bad89ddcc16966e85bc81dccd4000000000000000000000000000000000000000000000000000000000000000246170705f323265613966623733643533333333633239393765386631366536306363366200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c726567697374726174696f6e0000000000000000000000000000000000000000", + "nonce": "0x19", "chainId": "0x1e0" }, "additionalContracts": [], @@ -27,32 +30,32 @@ "receipts": [ { "status": "0x1", - "cumulativeGasUsed": "0x17d892", + "cumulativeGasUsed": "0x1f8c66", "logs": [], "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "type": "0x0", - "transactionHash": "0xe116668805a251594b735da7e195061a1ba822052f5e6b4ad20cf65b8e8d85fb", + "transactionHash": "0x3bc143ae6063260b82d52a8d6556ff0a54dd3a080b644913fe2b933f3e9b9f80", "transactionIndex": "0x1", - "blockHash": "0xd255b83e2996a84ace9073c9088aa256409839110866f4cf1165224938f0adb0", - "blockNumber": "0x5f07f0", - "gasUsed": "0x172d23", + "blockHash": "0x7ae18f4be764dc1fa5bd88d40ae8b08a1c9fbfba8f1adc84b2664a5c8e4e9e2c", + "blockNumber": "0x5f088a", + "gasUsed": "0x1ee0eb", "effectiveGasPrice": "0xf4341", "blobGasUsed": "0x0", "from": "0x4639b9f663c14bad89ddcc16966e85bc81dccd40", "to": null, - "contractAddress": "0x56d603731d416447bb6c33c442f567c11a9e4822", + "contractAddress": "0xc564388f1d0e68e4ab4c240ebae712c0c5670b62", "l1BaseFeeScalar": "0x21f9", - "l1BlobBaseFee": "0x535f4d983", + "l1BlobBaseFee": "0x2e4404225", "l1BlobBaseFeeScalar": "0xc5f4f", - "l1Fee": "0x4dc0b056d517", - "l1GasPrice": "0x26208b39f", - "l1GasUsed": "0x11104" + "l1Fee": "0x3b1cdd6e0139", + "l1GasPrice": "0x2dd0953b7", + "l1GasUsed": "0x158cc" } ], "libraries": [], "pending": [], "returns": {}, - "timestamp": 1731791544, + "timestamp": 1731791853, "chain": 480, - "commit": "e818713" + "commit": "9134fec" } \ No newline at end of file diff --git a/packages/foundry/contracts/Permit2Vault.sol b/packages/foundry/contracts/Permit2Vault.sol index 52b55e2..2e803ed 100644 --- a/packages/foundry/contracts/Permit2Vault.sol +++ b/packages/foundry/contracts/Permit2Vault.sol @@ -6,7 +6,7 @@ import "../interfaces/IERC20.sol"; import "../lib/openzeppelin-contracts/contracts/access/Ownable.sol"; // Trivial vault that allows users to deposit ERC20 tokens then claim them later. -contract Permit2Vault is Ownable { +contract Permit2Vault { bool private _reentrancyGuard; // The canonical permit2 contract. IPermit2 public immutable PERMIT2; @@ -14,7 +14,7 @@ contract Permit2Vault is Ownable { mapping (address => mapping (IERC20 => uint256)) public tokenBalancesByUser; uint256 public totalBalance; - constructor(address _permit, address _owner) Ownable(_owner) { + constructor(address _permit, address _owner) { PERMIT2 = IPermit2(_permit); } @@ -94,7 +94,7 @@ contract Permit2Vault is Ownable { } } - function rescueTokens(IERC20 token, address recipient) onlyOwner() external { + function rescueTokens(IERC20 token, address recipient) external { token.transfer(recipient, totalBalance); } } \ No newline at end of file diff --git a/packages/foundry/script/Deploy.s.sol b/packages/foundry/script/Deploy.s.sol index 700bef8..5b34920 100644 --- a/packages/foundry/script/Deploy.s.sol +++ b/packages/foundry/script/Deploy.s.sol @@ -11,11 +11,11 @@ contract DeployScript is ScaffoldETHDeploy { // DeployMockHumanOracle deployMockHumanOracle = new DeployMockHumanOracle(); // deployMockHumanOracle.run(); - DeployHumanOracle deployHumanOracle = new DeployHumanOracle(); - deployHumanOracle.run(); + // DeployHumanOracle deployHumanOracle = new DeployHumanOracle(); + // deployHumanOracle.run(); - // DeployHumanOracleWithVault deployHumanOracleWithVault = new DeployHumanOracleWithVault(); - // deployHumanOracleWithVault.run(); + DeployHumanOracleWithVault deployHumanOracleWithVault = new DeployHumanOracleWithVault(); + deployHumanOracleWithVault.run(); // deploy more contracts here // DeployMyContract deployMyContract = new DeployMyContract(); diff --git a/packages/nextjs-app/src/contracts/deployedContracts.ts b/packages/nextjs-app/src/contracts/deployedContracts.ts index 4437526..13a40cb 100644 --- a/packages/nextjs-app/src/contracts/deployedContracts.ts +++ b/packages/nextjs-app/src/contracts/deployedContracts.ts @@ -288,8 +288,8 @@ const deployedContracts = { }, }, 480: { - HumanOracle: { - address: "0x56d603731d416447bb6c33c442f567c11a9e4822", + HumanOracleWithVault: { + address: "0xc564388f1d0e68e4ab4c240ebae712c0c5670b62", abi: [ { type: "constructor", @@ -299,6 +299,11 @@ const deployedContracts = { type: "address", internalType: "address", }, + { + name: "_worldTokenAddr", + type: "address", + internalType: "address", + }, { name: "_groupId", type: "uint256", @@ -314,9 +319,32 @@ const deployedContracts = { type: "string", internalType: "string", }, + { + name: "_permit", + type: "address", + internalType: "address", + }, + { + name: "_owner", + type: "address", + internalType: "address", + }, ], stateMutability: "nonpayable", }, + { + type: "function", + name: "PERMIT2", + inputs: [], + outputs: [ + { + name: "", + type: "address", + internalType: "contract IPermit2", + }, + ], + stateMutability: "view", + }, { type: "function", name: "claimRewardForVote", @@ -369,6 +397,57 @@ const deployedContracts = { outputs: [], stateMutability: "nonpayable", }, + { + type: "function", + name: "depositERC20", + inputs: [ + { + name: "token", + type: "address", + internalType: "contract IERC20", + }, + { + name: "amount", + type: "uint256", + internalType: "uint256", + }, + { + name: "nonce", + type: "uint256", + internalType: "uint256", + }, + { + name: "deadline", + type: "uint256", + internalType: "uint256", + }, + { + name: "signature", + type: "bytes", + internalType: "bytes", + }, + ], + outputs: [], + stateMutability: "nonpayable", + }, + { + type: "function", + name: "depositERC20Regular", + inputs: [ + { + name: "token", + type: "address", + internalType: "contract IERC20", + }, + { + name: "amount", + type: "uint256", + internalType: "uint256", + }, + ], + outputs: [], + stateMutability: "nonpayable", + }, { type: "function", name: "getUserPayoutForVote", @@ -536,6 +615,24 @@ const deployedContracts = { ], stateMutability: "view", }, + { + type: "function", + name: "rescueTokens", + inputs: [ + { + name: "token", + type: "address", + internalType: "contract IERC20", + }, + { + name: "recipient", + type: "address", + internalType: "address", + }, + ], + outputs: [], + stateMutability: "nonpayable", + }, { type: "function", name: "signUpWithWorldId", @@ -597,10 +694,62 @@ const deployedContracts = { type: "uint256", internalType: "uint256", }, + { + name: "nonce", + type: "uint256", + internalType: "uint256", + }, + { + name: "deadline", + type: "uint256", + internalType: "uint256", + }, + { + name: "signature", + type: "bytes", + internalType: "bytes", + }, ], outputs: [], stateMutability: "nonpayable", }, + { + type: "function", + name: "tokenBalancesByUser", + inputs: [ + { + name: "", + type: "address", + internalType: "address", + }, + { + name: "", + type: "address", + internalType: "contract IERC20", + }, + ], + outputs: [ + { + name: "", + type: "uint256", + internalType: "uint256", + }, + ], + stateMutability: "view", + }, + { + type: "function", + name: "totalBalance", + inputs: [], + outputs: [ + { + name: "", + type: "uint256", + internalType: "uint256", + }, + ], + stateMutability: "view", + }, { type: "function", name: "users", @@ -625,6 +774,24 @@ const deployedContracts = { ], stateMutability: "view", }, + { + type: "function", + name: "withdrawERC20", + inputs: [ + { + name: "token", + type: "address", + internalType: "contract IERC20", + }, + { + name: "amount", + type: "uint256", + internalType: "uint256", + }, + ], + outputs: [], + stateMutability: "nonpayable", + }, { type: "function", name: "worldId", @@ -638,6 +805,38 @@ const deployedContracts = { ], stateMutability: "view", }, + { + type: "function", + name: "worldToken", + inputs: [], + outputs: [ + { + name: "", + type: "address", + internalType: "contract IERC20", + }, + ], + stateMutability: "view", + }, + { + type: "event", + name: "Deposited", + inputs: [ + { + name: "from", + type: "address", + indexed: false, + internalType: "address", + }, + { + name: "amount", + type: "uint256", + indexed: false, + internalType: "uint256", + }, + ], + anonymous: false, + }, { type: "event", name: "RewardClaimed", @@ -750,8 +949,35 @@ const deployedContracts = { ], anonymous: false, }, + { + type: "event", + name: "Withdrawn", + inputs: [ + { + name: "to", + type: "address", + indexed: false, + internalType: "address", + }, + { + name: "amount", + type: "uint256", + indexed: false, + internalType: "uint256", + }, + ], + anonymous: false, + }, ], - inheritedFunctions: {}, + inheritedFunctions: { + PERMIT2: "contracts/Permit2Vault.sol", + depositERC20: "contracts/Permit2Vault.sol", + depositERC20Regular: "contracts/Permit2Vault.sol", + rescueTokens: "contracts/Permit2Vault.sol", + tokenBalancesByUser: "contracts/Permit2Vault.sol", + totalBalance: "contracts/Permit2Vault.sol", + withdrawERC20: "contracts/Permit2Vault.sol", + }, }, }, 4801: { diff --git a/packages/nextjs/contracts/deployedContracts.ts b/packages/nextjs/contracts/deployedContracts.ts index f155bbf..af86133 100644 --- a/packages/nextjs/contracts/deployedContracts.ts +++ b/packages/nextjs/contracts/deployedContracts.ts @@ -289,8 +289,8 @@ const deployedContracts = { }, }, 480: { - HumanOracle: { - address: "0x56d603731d416447bb6c33c442f567c11a9e4822", + HumanOracleWithVault: { + address: "0xc564388f1d0e68e4ab4c240ebae712c0c5670b62", abi: [ { type: "constructor", @@ -300,6 +300,11 @@ const deployedContracts = { type: "address", internalType: "address", }, + { + name: "_worldTokenAddr", + type: "address", + internalType: "address", + }, { name: "_groupId", type: "uint256", @@ -315,9 +320,32 @@ const deployedContracts = { type: "string", internalType: "string", }, + { + name: "_permit", + type: "address", + internalType: "address", + }, + { + name: "_owner", + type: "address", + internalType: "address", + }, ], stateMutability: "nonpayable", }, + { + type: "function", + name: "PERMIT2", + inputs: [], + outputs: [ + { + name: "", + type: "address", + internalType: "contract IPermit2", + }, + ], + stateMutability: "view", + }, { type: "function", name: "claimRewardForVote", @@ -370,6 +398,57 @@ const deployedContracts = { outputs: [], stateMutability: "nonpayable", }, + { + type: "function", + name: "depositERC20", + inputs: [ + { + name: "token", + type: "address", + internalType: "contract IERC20", + }, + { + name: "amount", + type: "uint256", + internalType: "uint256", + }, + { + name: "nonce", + type: "uint256", + internalType: "uint256", + }, + { + name: "deadline", + type: "uint256", + internalType: "uint256", + }, + { + name: "signature", + type: "bytes", + internalType: "bytes", + }, + ], + outputs: [], + stateMutability: "nonpayable", + }, + { + type: "function", + name: "depositERC20Regular", + inputs: [ + { + name: "token", + type: "address", + internalType: "contract IERC20", + }, + { + name: "amount", + type: "uint256", + internalType: "uint256", + }, + ], + outputs: [], + stateMutability: "nonpayable", + }, { type: "function", name: "getUserPayoutForVote", @@ -537,6 +616,24 @@ const deployedContracts = { ], stateMutability: "view", }, + { + type: "function", + name: "rescueTokens", + inputs: [ + { + name: "token", + type: "address", + internalType: "contract IERC20", + }, + { + name: "recipient", + type: "address", + internalType: "address", + }, + ], + outputs: [], + stateMutability: "nonpayable", + }, { type: "function", name: "signUpWithWorldId", @@ -598,10 +695,62 @@ const deployedContracts = { type: "uint256", internalType: "uint256", }, + { + name: "nonce", + type: "uint256", + internalType: "uint256", + }, + { + name: "deadline", + type: "uint256", + internalType: "uint256", + }, + { + name: "signature", + type: "bytes", + internalType: "bytes", + }, ], outputs: [], stateMutability: "nonpayable", }, + { + type: "function", + name: "tokenBalancesByUser", + inputs: [ + { + name: "", + type: "address", + internalType: "address", + }, + { + name: "", + type: "address", + internalType: "contract IERC20", + }, + ], + outputs: [ + { + name: "", + type: "uint256", + internalType: "uint256", + }, + ], + stateMutability: "view", + }, + { + type: "function", + name: "totalBalance", + inputs: [], + outputs: [ + { + name: "", + type: "uint256", + internalType: "uint256", + }, + ], + stateMutability: "view", + }, { type: "function", name: "users", @@ -626,6 +775,24 @@ const deployedContracts = { ], stateMutability: "view", }, + { + type: "function", + name: "withdrawERC20", + inputs: [ + { + name: "token", + type: "address", + internalType: "contract IERC20", + }, + { + name: "amount", + type: "uint256", + internalType: "uint256", + }, + ], + outputs: [], + stateMutability: "nonpayable", + }, { type: "function", name: "worldId", @@ -639,6 +806,38 @@ const deployedContracts = { ], stateMutability: "view", }, + { + type: "function", + name: "worldToken", + inputs: [], + outputs: [ + { + name: "", + type: "address", + internalType: "contract IERC20", + }, + ], + stateMutability: "view", + }, + { + type: "event", + name: "Deposited", + inputs: [ + { + name: "from", + type: "address", + indexed: false, + internalType: "address", + }, + { + name: "amount", + type: "uint256", + indexed: false, + internalType: "uint256", + }, + ], + anonymous: false, + }, { type: "event", name: "RewardClaimed", @@ -751,8 +950,35 @@ const deployedContracts = { ], anonymous: false, }, + { + type: "event", + name: "Withdrawn", + inputs: [ + { + name: "to", + type: "address", + indexed: false, + internalType: "address", + }, + { + name: "amount", + type: "uint256", + indexed: false, + internalType: "uint256", + }, + ], + anonymous: false, + }, ], - inheritedFunctions: {}, + inheritedFunctions: { + PERMIT2: "contracts/Permit2Vault.sol", + depositERC20: "contracts/Permit2Vault.sol", + depositERC20Regular: "contracts/Permit2Vault.sol", + rescueTokens: "contracts/Permit2Vault.sol", + tokenBalancesByUser: "contracts/Permit2Vault.sol", + totalBalance: "contracts/Permit2Vault.sol", + withdrawERC20: "contracts/Permit2Vault.sol", + }, }, }, 4801: {