Commit Graph

  • 6dda29bcd8 ci: fix Aaron Blankstein 2022-08-04 12:43:56 -05:00
  • f7118ece61 Merge branch 'master' into feat/use-2.1 Aaron Blankstein 2022-08-04 12:41:49 -05:00
  • 14fb22ef84 ci: first attempt at a 2.1 workflow for github actions Aaron Blankstein 2022-08-04 12:33:47 -05:00
  • 9ccde36828 Merge branch 'master' into feat/no-mint-nft Greg Coppola 2022-08-03 19:17:24 -04:00
  • 974dfbd76e Merge pull request #134 from hirosystems/feat/proposal-rpc Aaron Blankstein 2022-08-02 13:15:18 -05:00
  • 0933aaef7b chore: update stacks-node image in dockerfile Aaron Blankstein 2022-08-01 14:14:26 -05:00
  • 65426880c8 Merge branch 'master' into feat/proposal-rpc Aaron Blankstein 2022-08-01 13:10:10 -05:00
  • 549da3b4ad update format Aaron Blankstein 2022-07-29 14:29:14 -05:00
  • 121f4439e0 remove unneccessary config file Aaron Blankstein 2022-07-29 13:12:42 -05:00
  • bd1f4f0e5a Merge pull request #136 from hirosystems/feat/use-case-instructions pavitthrap 2022-07-26 17:04:54 +02:00
  • e474dc456c Added additional grep command & updated some txids Pavitthra Pandurangan 2022-07-26 14:09:34 +02:00
  • d1b7827367 Merge branch 'feat/use-case-instructions' of https://github.com/hirosystems/stacks-hyperchains into feat/use-case-instructions Pavitthra Pandurangan 2022-07-25 17:32:38 +02:00
  • 77a30c15f1 added more context for instructions Pavitthra Pandurangan 2022-07-25 17:31:12 +02:00
  • 0c84c72950 additional clarifications Pavitthra Pandurangan 2022-07-22 17:54:43 +02:00
  • d8ddc71c56 withdrawal extra note Pavitthra Pandurangan 2022-07-22 16:08:03 +02:00
  • 166b2c5bdf Updated L2 nft contract, added package.json Pavitthra Pandurangan 2022-07-22 16:02:33 +02:00
  • a4c21f5a0b use stacks-blockchain with configurable epochs as image Aaron Blankstein 2022-07-21 18:29:42 -05:00
  • bcc6cb5ca3 Merge branch 'master' into feat/use-case-instructions pavitthrap 2022-07-21 18:35:56 +02:00
  • d08212e4df Updated withdrawal explanation Pavitthra Pandurangan 2022-07-21 17:42:53 +02:00
  • 0e8a51770b tweaks Pavitthra Pandurangan 2022-07-21 17:29:39 +02:00
  • bb989b94c3 Merge branch 'feat/proposal-rpc' into feat/use-2.1 Aaron Blankstein 2022-07-20 15:24:54 -05:00
  • ca9fa3e506 add set-hc-miner step Greg Coppola 2022-07-20 13:36:18 -05:00
  • 6f316f09a2 Merge branch 'master' into feat/no-mint-nft Greg Coppola 2022-07-20 13:16:46 -05:00
  • 6eead53036 cargo fmt Aaron Blankstein 2022-07-20 13:12:33 -05:00
  • a550b66fc1 Merge pull request #118 from hirosystems/feat/multiparty-commit Aaron Blankstein 2022-07-20 12:34:50 -05:00
  • 943a33a460 Merge branch 'feat/multiparty-commit' into feat/proposal-rpc Aaron Blankstein 2022-07-20 12:24:22 -05:00
  • 8e1b36065f clean up comments on the tests Greg Coppola 2022-07-20 12:03:28 -05:00
  • d787be7256 improve test names Greg Coppola 2022-07-20 11:55:32 -05:00
  • 8f68fc5d70 clean up test and contract Greg Coppola 2022-07-20 11:39:59 -05:00
  • e66e847b2f More updates to instructions Pavitthra Pandurangan 2022-07-20 18:00:28 +02:00
  • 8f275f0268 address PR review comments Aaron Blankstein 2022-07-20 10:57:02 -05:00
  • 8db6b267b0 Updated miner addr Pavitthra Pandurangan 2022-07-20 17:39:14 +02:00
  • 974f51ace8 attempt #3 for setting matrix Aaron Blankstein 2022-07-20 10:22:12 -05:00
  • 4b7b992bcf attempt #2 for setting matrix Aaron Blankstein 2022-07-20 09:47:42 -05:00
  • e9d90ca564 attempt to use dynamic github matrix to run l1 tests Aaron Blankstein 2022-07-20 09:36:19 -05:00
  • 34082a521c Updated deposit NFT script, tweaked instructions Pavitthra Pandurangan 2022-07-20 14:07:55 +02:00
  • 3943596e24 fix Clarinet.toml Greg Coppola 2022-07-19 20:24:39 -05:00
  • e0a29163ba fix some comments Greg Coppola 2022-07-19 19:29:14 -05:00
  • e664fea725 Merge branch 'feat/multiparty-commit' into feat/proposal-rpc Aaron Blankstein 2022-07-19 14:54:00 -05:00
  • 37cbfc7d09 invoke setup-allowed-contracts at hc instantiation Aaron Blankstein 2022-07-19 14:53:44 -05:00
  • df659fba70 clean up Clarinet.toml Greg Coppola 2022-07-19 14:34:11 -05:00
  • aed49f2d5d fix: remove ft stuff from the nft PR Greg Coppola 2022-07-19 14:32:47 -05:00
  • 431cacf415 reset withdrawal test values Greg Coppola 2022-07-19 14:22:06 -05:00
  • e1f3e6d75a remove is-miner check in withdraw-(n)ft-asset Aaron Blankstein 2022-07-19 12:45:02 -05:00
  • f454ceee3b Merge branch 'master' into feat/use-case-instructions pavitthrap 2022-07-19 18:48:56 +02:00
  • 5f7aaae705 some tweaks Pavitthra Pandurangan 2022-07-19 18:48:44 +02:00
  • 5cb8207579 fix the merge Greg Coppola 2022-07-19 11:48:18 -05:00
  • 9a9aade10d Merge branch 'master' into feat/no-mint-nft Greg Coppola 2022-07-19 11:45:12 -05:00
  • 4280f92438 Simplified instructions Pavitthra Pandurangan 2022-07-19 18:20:43 +02:00
  • 01d95ee7ab Merge remote-tracking branch 'origin/master' into feat/multiparty-commit Aaron Blankstein 2022-07-19 10:36:50 -05:00
  • a23bd40cb4 Merge pull request #133 from hirosystems/feat/nft-use-case pavitthrap 2022-07-19 14:13:01 +02:00
  • 72c50f0ecc update validator signing to work with real structured hashes Aaron Blankstein 2022-07-18 15:51:41 -05:00
  • 1bd261080b set network_id correctly in 2_of_2 test Aaron Blankstein 2022-07-18 15:43:39 -05:00
  • 3a8fe94e95 same chain_id on leader and follower Aaron Blankstein 2022-07-15 11:55:52 -05:00
  • 2c05791a07 Merge branch 'master' into feat/nft-use-case Aaron Blankstein 2022-07-15 10:22:09 -05:00
  • 96f551ab40 cargo fmt --all Aaron Blankstein 2022-07-15 10:21:52 -05:00
  • 5ab93cedbf add l1_multiparty tests to the integration action, some comments Aaron Blankstein 2022-07-15 10:09:27 -05:00
  • 19f5bea57a Merge branch 'feat/multiparty-commit' into feat/proposal-rpc Aaron Blankstein 2022-07-15 10:08:55 -05:00
  • c31332c4ce nft-use-case files Pavitthra Pandurangan 2022-07-14 19:00:06 +02:00
  • 5dcd22f867 Merge remote-tracking branch 'origin/master' into feat/multiparty-commit Aaron Blankstein 2022-07-14 11:24:35 -05:00
  • 00fff24c5b Merge pull request #131 from hirosystems/feat/add-withdraw-nft-rpc pavitthrap 2022-07-14 15:15:12 +02:00
  • b035571628 working integration test for two-phase commit!! Aaron Blankstein 2022-07-13 15:55:21 -05:00
  • 725744681d stashing testing work... Aaron Blankstein 2022-07-13 14:33:17 -05:00
  • 7eb3ba73d8 updated l2 nft contract Pavitthra Pandurangan 2022-07-13 18:03:31 +02:00
  • d950160dad Updated clarinet test, added register asset function to hyperchains.clar & added L2 NFT contract Pavitthra Pandurangan 2022-07-13 16:12:35 +02:00
  • 770ff812ab updated tests after rebase Pavitthra Pandurangan 2022-07-12 19:44:54 +02:00
  • 110a42f614 WIP Pavitthra Pandurangan 2022-07-12 19:13:42 +02:00
  • ba6bda3722 NFT use case integration test working Pavitthra Pandurangan 2022-05-26 17:44:12 -04:00
  • c4781134ee Fixed failing test + updated definition for nft-withdraw? Pavitthra Pandurangan 2022-07-12 18:50:28 +02:00
  • 19dabedf4a Fixed tests Pavitthra Pandurangan 2022-07-12 15:35:42 +02:00
  • ff01562280 Added RPC endpoint for NFT withdrawals; fixed duplicate bug in withdrawal merkle tree; updated nft-withdraw function Pavitthra Pandurangan 2022-07-11 17:14:44 +02:00
  • f228af187d Merge branch 'master' into feat/no-mint-nft Greg Coppola 2022-07-11 14:25:28 -05:00
  • d29950e187 merged in master Greg Coppola 2022-07-11 14:22:39 -05:00
  • ea4222a029 Merge pull request #128 from hirosystems/projectmd-patch-1 pavitthrap 2022-07-11 13:21:21 +02:00
  • dc3a1e401f Merge pull request #119 from hirosystems/feat/config-network Gregory Coppola 2022-07-07 08:05:12 -05:00
  • 07e298087c fix uncertain case Greg Coppola 2022-07-06 20:03:34 -05:00
  • 134e96e118 import some deletes from main branch Greg Coppola 2022-07-06 19:37:53 -05:00
  • 145f45d88a merge files Greg Coppola 2022-07-06 19:14:31 -05:00
  • f4c6c33e2f Merge branch 'master' into feat/config-network-merge Greg Coppola 2022-07-06 12:04:55 -05:00
  • 46b03cf8a0 try this merge version Greg Coppola 2022-07-06 11:46:59 -05:00
  • 51e4e3ecad merged master, but need to debug the build Greg Coppola 2022-07-06 10:37:24 -05:00
  • 281571dbab Update PROJECT.md saralab 2022-07-06 09:43:36 -04:00
  • 73b2503487 initial testing harnesses Aaron Blankstein 2022-07-01 16:45:04 -05:00
  • 9616c8bb6e feat: no mint version of the ft withdraw function Greg Coppola 2022-06-29 13:01:25 -05:00
  • d593bdede7 Merge pull request #116 from hirosystems/feat/withdraw-live-demo Aaron Blankstein 2022-06-29 08:32:06 -05:00
  • 6328b974f0 Merge remote-tracking branch 'origin/master' into feat/withdraw-live-demo Aaron Blankstein 2022-06-28 16:09:40 -05:00
  • ab578696ae Merge pull request #117 from hirosystems/feat/config-cleanup Aaron Blankstein 2022-06-28 16:08:59 -05:00
  • 362acca3ba added a new test to make sure non-depositing user can withdraw the NFT Greg Coppola 2022-06-28 14:05:31 -05:00
  • e7a130e4d4 drop gift-nf from simple-nft-no-mint.clar Greg Coppola 2022-06-28 13:45:02 -05:00
  • 24690c0625 cargo fmt Aaron Blankstein 2022-06-28 13:43:55 -05:00
  • ec96558b26 first round of addressing comments, some questions to investigate Greg Coppola 2022-06-28 13:43:18 -05:00
  • ebc4f42295 fix merge error Aaron Blankstein 2022-06-28 13:41:21 -05:00
  • a997580204 address PR review comments Aaron Blankstein 2022-06-28 12:49:33 -05:00
  • e84c9b36ed Merge remote-tracking branch 'origin/master' into feat/config-cleanup Aaron Blankstein 2022-06-28 12:46:04 -05:00
  • 30cca56d0f address PR review comments Aaron Blankstein 2022-06-28 10:50:35 -05:00
  • affbb8d13b Merge remote-tracking branch 'origin/master' into feat/withdraw-live-demo Aaron Blankstein 2022-06-28 10:29:03 -05:00
  • 68ffe95acf fix up some test names Greg Coppola 2022-06-23 15:18:20 -05:00
  • 24193f4bd2 clean up simple-nft-no-mint Greg Coppola 2022-06-23 15:13:16 -05:00
  • e8d9b7f7de feat: add "no-mint" withdraw functions for the hyper-chains contract Greg Coppola 2022-06-23 15:09:24 -05:00
  • 7b702688d2 fmt Greg Coppola 2022-06-22 13:00:37 -05:00